Skip to content

Commit b0e67db

Browse files
ashok-rajbp3tk0v
authored andcommitted
x86/microcode/intel: Rename get_datasize() since its used externally
Rename get_datasize() to intel_microcode_get_datasize() and make it an inline. [ tglx: Make the argument typed and fix up the IFS code ] Suggested-by: Boris Petkov <bp@alien8.de> Signed-off-by: Ashok Raj <ashok.raj@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230812195727.894165745@linutronix.de
1 parent 18648db commit b0e67db

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

arch/x86/include/asm/microcode_intel.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ struct microcode_intel {
2626
#define MC_HEADER_TYPE_IFS 2
2727
#define DEFAULT_UCODE_DATASIZE (2000)
2828

29-
#define get_datasize(mc) \
30-
(((struct microcode_intel *)mc)->hdr.datasize ? \
31-
((struct microcode_intel *)mc)->hdr.datasize : DEFAULT_UCODE_DATASIZE)
29+
static inline int intel_microcode_get_datasize(struct microcode_header_intel *hdr)
30+
{
31+
return hdr->datasize ? : DEFAULT_UCODE_DATASIZE;
32+
}
3233

3334
static inline u32 intel_get_microcode_revision(void)
3435
{

arch/x86/kernel/cpu/microcode/intel.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ int intel_find_matching_signature(void *mc, unsigned int csig, int cpf)
118118
return 1;
119119

120120
/* Look for ext. headers: */
121-
if (get_totalsize(mc_hdr) <= get_datasize(mc_hdr) + MC_HEADER_SIZE)
121+
if (get_totalsize(mc_hdr) <= intel_microcode_get_datasize(mc_hdr) + MC_HEADER_SIZE)
122122
return 0;
123123

124-
ext_hdr = mc + get_datasize(mc_hdr) + MC_HEADER_SIZE;
124+
ext_hdr = mc + intel_microcode_get_datasize(mc_hdr) + MC_HEADER_SIZE;
125125
ext_sig = (void *)ext_hdr + EXT_HEADER_SIZE;
126126

127127
for (i = 0; i < ext_hdr->count; i++) {
@@ -156,7 +156,7 @@ int intel_microcode_sanity_check(void *mc, bool print_err, int hdr_type)
156156
struct extended_signature *ext_sig;
157157

158158
total_size = get_totalsize(mc_header);
159-
data_size = get_datasize(mc_header);
159+
data_size = intel_microcode_get_datasize(mc_header);
160160

161161
if (data_size + MC_HEADER_SIZE > total_size) {
162162
if (print_err)
@@ -438,7 +438,7 @@ static void show_saved_mc(void)
438438
date = mc_saved_header->date;
439439

440440
total_size = get_totalsize(mc_saved_header);
441-
data_size = get_datasize(mc_saved_header);
441+
data_size = intel_microcode_get_datasize(mc_saved_header);
442442

443443
pr_debug("mc_saved[%d]: sig=0x%x, pf=0x%x, rev=0x%x, total size=0x%x, date = %04x-%02x-%02x\n",
444444
i++, sig, pf, rev, total_size,

drivers/platform/x86/intel/ifs/load.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,13 @@ struct metadata_header {
5656

5757
static struct metadata_header *find_meta_data(void *ucode, unsigned int meta_type)
5858
{
59+
struct microcode_header_intel *hdr = &((struct microcode_intel *)ucode)->hdr;
5960
struct metadata_header *meta_header;
6061
unsigned long data_size, total_meta;
6162
unsigned long meta_size = 0;
6263

63-
data_size = get_datasize(ucode);
64-
total_meta = ((struct microcode_intel *)ucode)->hdr.metasize;
64+
data_size = intel_microcode_get_datasize(hdr);
65+
total_meta = hdr->metasize;
6566
if (!total_meta)
6667
return NULL;
6768

0 commit comments

Comments
 (0)