From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/4] x86/microcode/intel: Simplify update_match_cpu()
Date: Sun, 17 May 2015 12:54:59 +0200 [thread overview]
Message-ID: <1431860101-14847-3-git-send-email-bp@alien8.de> (raw)
In-Reply-To: <1431860101-14847-1-git-send-email-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
Drop unreadable macro, deconstruct compound conditional statement into
single ones and return early if they match. Add comments.
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/include/asm/microcode_intel.h | 3 ---
arch/x86/kernel/cpu/microcode/intel_lib.c | 19 +++++++++++++------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h
index 8e87e6fe98b5..45a318f677be 100644
--- a/arch/x86/include/asm/microcode_intel.h
+++ b/arch/x86/include/asm/microcode_intel.h
@@ -51,9 +51,6 @@ struct extended_sigtable {
(((struct microcode_intel *)mc)->hdr.datasize ? \
((struct microcode_intel *)mc)->hdr.datasize : DEFAULT_UCODE_DATASIZE)
-#define sigmatch(s1, s2, p1, p2) \
- (((s1) == (s2)) && (((p1) & (p2)) || (((p1) == 0) && ((p2) == 0))))
-
#define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)
extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev);
diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c
index 425f8e29b795..1ffe507931af 100644
--- a/arch/x86/kernel/cpu/microcode/intel_lib.c
+++ b/arch/x86/kernel/cpu/microcode/intel_lib.c
@@ -31,11 +31,18 @@
#include <asm/processor.h>
#include <asm/msr.h>
-static inline int
-update_match_cpu(unsigned int csig, unsigned int cpf,
- unsigned int sig, unsigned int pf)
+static inline bool cpu_signatures_match(unsigned int s1, unsigned int p1,
+ unsigned int s2, unsigned int p2)
{
- return (!sigmatch(sig, csig, pf, cpf)) ? 0 : 1;
+ if (s1 != s2)
+ return false;
+
+ /* Processor flags are either both 0 ... */
+ if (!p1 && !p2)
+ return true;
+
+ /* ... or they intersect. */
+ return p1 & p2;
}
int microcode_sanity_check(void *mc, int print_err)
@@ -132,7 +139,7 @@ int get_matching_sig(unsigned int csig, int cpf, void *mc)
int ext_sigcount, i;
struct extended_signature *ext_sig;
- if (update_match_cpu(csig, cpf, mc_header->sig, mc_header->pf))
+ if (cpu_signatures_match(csig, cpf, mc_header->sig, mc_header->pf))
return 1;
/* Look for ext. headers: */
@@ -144,7 +151,7 @@ int get_matching_sig(unsigned int csig, int cpf, void *mc)
ext_sig = (void *)ext_header + EXT_HEADER_SIZE;
for (i = 0; i < ext_sigcount; i++) {
- if (update_match_cpu(csig, cpf, ext_sig->sig, ext_sig->pf))
+ if (cpu_signatures_match(csig, cpf, ext_sig->sig, ext_sig->pf))
return 1;
ext_sig++;
}
--
2.3.5
next prev parent reply other threads:[~2015-05-17 10:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-17 10:54 [PATCH 0/4] x86/microcode/intel: Some trivial cleanups Borislav Petkov
2015-05-17 10:54 ` [PATCH 1/4] x86/microcode/intel: Rename get_matching_microcode Borislav Petkov
2015-05-18 9:10 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2015-05-17 10:54 ` Borislav Petkov [this message]
2015-05-18 9:10 ` [tip:x86/microcode] x86/microcode/intel: Simplify update_match_cpu() tip-bot for Borislav Petkov
2015-05-17 10:55 ` [PATCH 3/4] x86/microcode/intel: Simplify get_matching_sig() Borislav Petkov
2015-05-18 9:11 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2015-05-17 10:55 ` [PATCH 4/4] x86/microcode/intel: Rename get_matching_sig() Borislav Petkov
2015-05-18 9:11 ` [tip:x86/microcode] x86/microcode/intel: Rename get_matching_sig( ) tip-bot for Borislav Petkov
2015-05-21 1:42 ` [PATCH 0/4] x86/microcode/intel: Some trivial cleanups Henrique de Moraes Holschuh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431860101-14847-3-git-send-email-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=quentin.casasnovas@oracle.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).