From 95c74f8b7aa6671e3aaec561e8d5b72f36eec669 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 20 Jun 2012 16:17:51 +0200 Subject: [PATCH] --- yaml --- r: 324038 b: refs/heads/master c: 685ca6d797af9d41164dd64dd60145d4946fc152 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/microcode_amd.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9b909753d955..a230839560dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7e632f5ba240fbc313c49ed6559681ea57534e9 +refs/heads/master: 685ca6d797af9d41164dd64dd60145d4946fc152 diff --git a/trunk/arch/x86/kernel/microcode_amd.c b/trunk/arch/x86/kernel/microcode_amd.c index 94213387a3d1..8fdf7d99b804 100644 --- a/trunk/arch/x86/kernel/microcode_amd.c +++ b/trunk/arch/x86/kernel/microcode_amd.c @@ -202,11 +202,18 @@ static int apply_microcode_amd(int cpu) if (mc_amd == NULL) return 0; - wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code); - /* get patch id after patching */ rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); - /* check current patch id and patch's id for match */ + /* need to apply patch? */ + if (rev >= mc_amd->hdr.patch_id) { + c->microcode = rev; + return 0; + } + + wrmsrl(MSR_AMD64_PATCH_LOADER, (u64)(long)&mc_amd->hdr.data_code); + + /* verify patch application was successful */ + rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); if (rev != mc_amd->hdr.patch_id) { pr_err("CPU%d: update failed for patch_level=0x%08x\n", cpu, mc_amd->hdr.patch_id);