Commit 6cc9b6d9 authored by Andreas Herrmann's avatar Andreas Herrmann Committed by Ingo Molnar

x86: microcode_amd: consolidate macro definitions

Impact: cleanup
Signed-off-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 29d0887f
...@@ -75,15 +75,9 @@ struct microcode_amd { ...@@ -75,15 +75,9 @@ struct microcode_amd {
unsigned int mpb[0]; unsigned int mpb[0];
}; };
#define UCODE_MAX_SIZE (2048) #define UCODE_MAX_SIZE 2048
#define DEFAULT_UCODE_DATASIZE (896) #define UCODE_CONTAINER_SECTION_HDR 8
#define MC_HEADER_SIZE (sizeof(struct microcode_header_amd)) #define UCODE_CONTAINER_HEADER_SIZE 12
#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
#define DWSIZE (sizeof(u32))
/* For now we support a fixed ucode total size only */
#define get_totalsize(mc) \
((((struct microcode_amd *)mc)->hdr.mc_patch_data_len * 28) \
+ MC_HEADER_SIZE)
/* serialize access to the physical write */ /* serialize access to the physical write */
static DEFINE_SPINLOCK(microcode_update_lock); static DEFINE_SPINLOCK(microcode_update_lock);
...@@ -222,7 +216,6 @@ static void *get_next_ucode(const u8 *buf, unsigned int size, ...@@ -222,7 +216,6 @@ static void *get_next_ucode(const u8 *buf, unsigned int size,
unsigned int *mc_size) unsigned int *mc_size)
{ {
unsigned int total_size; unsigned int total_size;
#define UCODE_CONTAINER_SECTION_HDR 8
u8 section_hdr[UCODE_CONTAINER_SECTION_HDR]; u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
void *mc; void *mc;
...@@ -255,14 +248,12 @@ static void *get_next_ucode(const u8 *buf, unsigned int size, ...@@ -255,14 +248,12 @@ static void *get_next_ucode(const u8 *buf, unsigned int size,
} else } else
*mc_size = total_size + UCODE_CONTAINER_SECTION_HDR; *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
} }
#undef UCODE_CONTAINER_SECTION_HDR
return mc; return mc;
} }
static int install_equiv_cpu_table(const u8 *buf) static int install_equiv_cpu_table(const u8 *buf)
{ {
#define UCODE_CONTAINER_HEADER_SIZE 12
u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE]; u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE];
unsigned int *buf_pos = (unsigned int *)container_hdr; unsigned int *buf_pos = (unsigned int *)container_hdr;
unsigned long size; unsigned long size;
...@@ -291,7 +282,6 @@ static int install_equiv_cpu_table(const u8 *buf) ...@@ -291,7 +282,6 @@ static int install_equiv_cpu_table(const u8 *buf)
} }
return size + UCODE_CONTAINER_HEADER_SIZE; /* add header length */ return size + UCODE_CONTAINER_HEADER_SIZE; /* add header length */
#undef UCODE_CONTAINER_HEADER_SIZE
} }
static void free_equiv_cpu_table(void) static void free_equiv_cpu_table(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment