Hello Jason Glenesk,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/48533
to review the following change.
Change subject: soc/amd/picasso: Separate CPUID defs into new header ......................................................................
soc/amd/picasso: Separate CPUID defs into new header
Move CPUID definitions out of msr.h into new cpuid.h header.
BUG=b:155307433 BRANCH=Zork
Change-Id: I2ed5e0a5a6dbdb38fce8bf3e769f680330718653 Signed-off-by: Jason Glenesk jason.glenesk@amd.corp-partner.google.com --- A src/include/cpu/amd/cpuid.h M src/include/cpu/amd/msr.h M src/soc/amd/picasso/acpi.c 3 files changed, 18 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/48533/1
diff --git a/src/include/cpu/amd/cpuid.h b/src/include/cpu/amd/cpuid.h new file mode 100644 index 0000000..81f69a3 --- /dev/null +++ b/src/include/cpu/amd/cpuid.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* This file applies to AMD64 products. + * The definitions come from the AMD64 Programmers Manual vol2 + * Revision 3.30 and/or the device's BKDG. + */ + +#ifndef CPU_AMD_CPUID_H +#define CPU_AMD_CPUID_H + +#define CPUID_EXT_PM 0x80000007 +#define CPUID_MODEL 1 +#define CPUID_EBX_CORE_ID 0x8000001E +#define CPUID_EBX_THREADS_SHIFT 8 +#define CPUID_EBX_THREADS_MASK (0xFF << CPUID_EBX_THREADS_SHIFT) + +#endif /* CPU_AMD_CPUID_H */ diff --git a/src/include/cpu/amd/msr.h b/src/include/cpu/amd/msr.h index f9e7b20..78676de 100644 --- a/src/include/cpu/amd/msr.h +++ b/src/include/cpu/amd/msr.h @@ -10,11 +10,6 @@
#include <cpu/x86/msr.h>
-#define CPUID_EXT_PM 0x80000007 -#define CPUID_MODEL 1 -#define CPUID_EBX_CORE_ID 0x8000001E -#define CPUID_EBX_THREADS_SHIFT 8 -#define CPUID_EBX_THREADS_MASK (0xFF << CPUID_EBX_THREADS_SHIFT) #define MC4_MISC0 0x00000413 #define MC4_MISC1 0xC0000408 #define MC4_MISC2 0xC0000409 diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 17940e9..f5f1113 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -12,6 +12,7 @@ #include <device/pci_ops.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> +#include <cpu/amd/cpuid.h> #include <cpu/amd/msr.h> #include <cpu/x86/smm.h> #include <cbmem.h>
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48533 )
Change subject: soc/amd/picasso: Separate CPUID defs into new header ......................................................................
Patch Set 1: Code-Review+2
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48533 )
Change subject: soc/amd/picasso: Separate CPUID defs into new header ......................................................................
Patch Set 1: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48533 )
Change subject: soc/amd/picasso: Separate CPUID defs into new header ......................................................................
soc/amd/picasso: Separate CPUID defs into new header
Move CPUID definitions out of msr.h into new cpuid.h header.
BUG=b:155307433 BRANCH=Zork
Change-Id: I2ed5e0a5a6dbdb38fce8bf3e769f680330718653 Signed-off-by: Jason Glenesk jason.glenesk@amd.corp-partner.google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/48533 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Held felix-coreboot@felixheld.de Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com --- A src/include/cpu/amd/cpuid.h M src/include/cpu/amd/msr.h M src/soc/amd/picasso/acpi.c 3 files changed, 18 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved Marshall Dawson: Looks good to me, approved
diff --git a/src/include/cpu/amd/cpuid.h b/src/include/cpu/amd/cpuid.h new file mode 100644 index 0000000..81f69a3 --- /dev/null +++ b/src/include/cpu/amd/cpuid.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* This file applies to AMD64 products. + * The definitions come from the AMD64 Programmers Manual vol2 + * Revision 3.30 and/or the device's BKDG. + */ + +#ifndef CPU_AMD_CPUID_H +#define CPU_AMD_CPUID_H + +#define CPUID_EXT_PM 0x80000007 +#define CPUID_MODEL 1 +#define CPUID_EBX_CORE_ID 0x8000001E +#define CPUID_EBX_THREADS_SHIFT 8 +#define CPUID_EBX_THREADS_MASK (0xFF << CPUID_EBX_THREADS_SHIFT) + +#endif /* CPU_AMD_CPUID_H */ diff --git a/src/include/cpu/amd/msr.h b/src/include/cpu/amd/msr.h index f9e7b20..78676de 100644 --- a/src/include/cpu/amd/msr.h +++ b/src/include/cpu/amd/msr.h @@ -10,11 +10,6 @@
#include <cpu/x86/msr.h>
-#define CPUID_EXT_PM 0x80000007 -#define CPUID_MODEL 1 -#define CPUID_EBX_CORE_ID 0x8000001E -#define CPUID_EBX_THREADS_SHIFT 8 -#define CPUID_EBX_THREADS_MASK (0xFF << CPUID_EBX_THREADS_SHIFT) #define MC4_MISC0 0x00000413 #define MC4_MISC1 0xC0000408 #define MC4_MISC2 0xC0000409 diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 17940e9..f5f1113 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -12,6 +12,7 @@ #include <device/pci_ops.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> +#include <cpu/amd/cpuid.h> #include <cpu/amd/msr.h> #include <cpu/x86/smm.h> #include <cbmem.h>
-
Felix Held (Code Review) -
Jason Glenesk (Code Review)
-
Marshall Dawson (Code Review)