diff options
Diffstat (limited to '0012-x86-ucode-Distinguish-ucode-already-up-to-date.patch')
| -rw-r--r-- | 0012-x86-ucode-Distinguish-ucode-already-up-to-date.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/0012-x86-ucode-Distinguish-ucode-already-up-to-date.patch b/0012-x86-ucode-Distinguish-ucode-already-up-to-date.patch new file mode 100644 index 0000000..dd2f91a --- /dev/null +++ b/0012-x86-ucode-Distinguish-ucode-already-up-to-date.patch @@ -0,0 +1,58 @@ +From a42c83b202cc034c43c723cf363dbbabac61b1af Mon Sep 17 00:00:00 2001 +From: Andrew Cooper <andrew.cooper3@citrix.com> +Date: Tue, 21 May 2024 10:22:52 +0200 +Subject: [PATCH 12/56] x86/ucode: Distinguish "ucode already up to date" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Right now, Xen returns -ENOENT for both "the provided blob isn't correct for +this CPU", and "the blob isn't newer than what's loaded". + +This in turn causes xen-ucode to exit with an error, when "nothing to do" is +more commonly a success condition. + +Handle EEXIST specially and exit cleanly. + +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Acked-by: Roger Pau Monné <roger.pau@citrix.com> +master commit: 648db37a155aca6f66d4cf3bb118417a728c3579 +master date: 2024-05-09 18:19:49 +0100 +--- + tools/misc/xen-ucode.c | 5 ++++- + xen/arch/x86/cpu/microcode/core.c | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tools/misc/xen-ucode.c b/tools/misc/xen-ucode.c +index c6ae6498d6..390969db3d 100644 +--- a/tools/misc/xen-ucode.c ++++ b/tools/misc/xen-ucode.c +@@ -125,8 +125,11 @@ int main(int argc, char *argv[]) + exit(1); + } + ++ errno = 0; + ret = xc_microcode_update(xch, buf, len); +- if ( ret ) ++ if ( ret == -1 && errno == EEXIST ) ++ printf("Microcode already up to date\n"); ++ else if ( ret ) + { + fprintf(stderr, "Failed to update microcode. (err: %s)\n", + strerror(errno)); +diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c +index 4e011cdc41..d5338ad345 100644 +--- a/xen/arch/x86/cpu/microcode/core.c ++++ b/xen/arch/x86/cpu/microcode/core.c +@@ -640,7 +640,7 @@ static long cf_check microcode_update_helper(void *data) + "microcode: couldn't find any newer%s revision in the provided blob!\n", + opt_ucode_allow_same ? " (or the same)" : ""); + microcode_free_patch(patch); +- ret = -ENOENT; ++ ret = -EEXIST; + + goto put; + } +-- +2.45.2 + |