summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2023-02-08 11:39:16 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-02-09 16:54:11 +0000
commit1e78165cdcccd95306604928a145a515498e794a (patch)
tree60cf3e2f6c4a444017af9d47563b7e36b6826180 /src/cpu
parent24f3dc8a17240c6869e247c99c94a96af94be0ef (diff)
arch/x86/include/cpu: introduce CPU_TABLE_END CPU table terminator
Instead of having a magic entry in the CPU device ID table list to tell find_cpu_driver that it has reached the end of the list, introduce and use CPU_TABLE_END. Since the vendor entry in the CPU device ID struct is compared against X86_VENDOR_INVALID which is 0, use X86_VENDOR_INVALID instead of the 0 in the CPU_TABLE_END definition. TEST=Timeless build for Mandolin results in identical image. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Suggested-by: Angel Pons <th3fanbus@gmail.com> Change-Id: I0cae6d65b2265cf5ebf90fe1a9d885d0c489eb92 Reviewed-on: https://review.coreboot.org/c/coreboot/+/72888 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/amd/pi/00730F01/model_16_init.c2
-rw-r--r--src/cpu/intel/haswell/haswell_init.c2
-rw-r--r--src/cpu/intel/model_1067x/model_1067x_init.c2
-rw-r--r--src/cpu/intel/model_106cx/model_106cx_init.c2
-rw-r--r--src/cpu/intel/model_2065x/model_2065x_init.c2
-rw-r--r--src/cpu/intel/model_206ax/model_206ax_init.c2
-rw-r--r--src/cpu/intel/model_65x/model_65x_init.c2
-rw-r--r--src/cpu/intel/model_67x/model_67x_init.c3
-rw-r--r--src/cpu/intel/model_68x/model_68x_init.c3
-rw-r--r--src/cpu/intel/model_6bx/model_6bx_init.c2
-rw-r--r--src/cpu/intel/model_6ex/model_6ex_init.c2
-rw-r--r--src/cpu/intel/model_6fx/model_6fx_init.c2
-rw-r--r--src/cpu/intel/model_6xx/model_6xx_init.c2
-rw-r--r--src/cpu/intel/model_f2x/model_f2x_init.c2
-rw-r--r--src/cpu/intel/model_f3x/model_f3x_init.c2
-rw-r--r--src/cpu/intel/model_f4x/model_f4x_init.c2
-rw-r--r--src/cpu/qemu-x86/qemu.c2
17 files changed, 17 insertions, 19 deletions
diff --git a/src/cpu/amd/pi/00730F01/model_16_init.c b/src/cpu/amd/pi/00730F01/model_16_init.c
index 3806407749..a3064620a3 100644
--- a/src/cpu/amd/pi/00730F01/model_16_init.c
+++ b/src/cpu/amd/pi/00730F01/model_16_init.c
@@ -60,7 +60,7 @@ static struct device_operations cpu_dev_ops = {
static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_AMD, 0x730F00, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_AMD, 0x730F01, CPUID_EXACT_MATCH_MASK },
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver model_16 __cpu_driver = {
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index a8193bf2b1..83d847cbae 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -651,7 +651,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_C0, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_D0, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, CPUID_BROADWELL_ULT_E0, CPUID_EXACT_MATCH_MASK },
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 226495bcc5..315e7c36fc 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -268,7 +268,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x10676, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x10677, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x1067A, CPUID_EXACT_MATCH_MASK },
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index ba89f3dd7f..05f5f327cc 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -82,7 +82,7 @@ static struct device_operations cpu_dev_ops = {
static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x106c0, CPUID_EXACT_MATCH_MASK }, /* Intel Atom 230 */
{ X86_VENDOR_INTEL, 0x106ca, CPUID_EXACT_MATCH_MASK }, /* Intel Atom D5xx */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index 0556a151c7..3497ae03a6 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -180,7 +180,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x20652, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x20654, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x20655, CPUID_EXACT_MATCH_MASK },
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 04a9d2dbf3..242746e654 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -429,7 +429,7 @@ static struct device_operations cpu_dev_ops = {
static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x206a0, CPUID_ALL_STEPPINGS_MASK }, /* Intel Sandybridge */
{ X86_VENDOR_INTEL, 0x306a0, CPUID_ALL_STEPPINGS_MASK }, /* Intel IvyBridge */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_65x/model_65x_init.c b/src/cpu/intel/model_65x/model_65x_init.c
index bc1dc2d092..3ff88fd0b5 100644
--- a/src/cpu/intel/model_65x/model_65x_init.c
+++ b/src/cpu/intel/model_65x/model_65x_init.c
@@ -40,7 +40,7 @@ static const struct cpu_device_id cpu_table[] = {
/* PII/Celeron/Xeon, dB0/mdB0/B0 */
{ X86_VENDOR_INTEL, 0x0652, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x0653, CPUID_EXACT_MATCH_MASK }, /* PII/Xeon, dB1/B1 */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_67x/model_67x_init.c b/src/cpu/intel/model_67x/model_67x_init.c
index 0cc33f317f..063af2308c 100644
--- a/src/cpu/intel/model_67x/model_67x_init.c
+++ b/src/cpu/intel/model_67x/model_67x_init.c
@@ -38,8 +38,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0671, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x0672, CPUID_EXACT_MATCH_MASK }, /* PIII, kB0 */
{ X86_VENDOR_INTEL, 0x0673, CPUID_EXACT_MATCH_MASK }, /* PIII, kC0 */
-
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_68x/model_68x_init.c b/src/cpu/intel/model_68x/model_68x_init.c
index aef66bd226..72d76d032e 100644
--- a/src/cpu/intel/model_68x/model_68x_init.c
+++ b/src/cpu/intel/model_68x/model_68x_init.c
@@ -54,8 +54,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0686, CPUID_EXACT_MATCH_MASK },
/* PIII/Celeron, cD0/D0/BD0/PD0 */
{ X86_VENDOR_INTEL, 0x068a, CPUID_EXACT_MATCH_MASK },
-
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c
index 485ac49224..ff61b79bbd 100644
--- a/src/cpu/intel/model_6bx/model_6bx_init.c
+++ b/src/cpu/intel/model_6bx/model_6bx_init.c
@@ -42,7 +42,7 @@ static const struct cpu_device_id cpu_table[] = {
/* Pentium III/Celeron, tA1/A1/FPA1 */
{ X86_VENDOR_INTEL, 0x06b1, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x06b4, CPUID_EXACT_MATCH_MASK }, /* Pentium III, tB1/FPB1 */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index ebcf263372..5bd1c32815 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -123,7 +123,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x06e0, CPUID_EXACT_MATCH_MASK }, /* Intel Core Solo/Core Duo */
{ X86_VENDOR_INTEL, 0x06e8, CPUID_EXACT_MATCH_MASK }, /* Intel Core Solo/Core Duo */
{ X86_VENDOR_INTEL, 0x06ec, CPUID_EXACT_MATCH_MASK }, /* Intel Core Solo/Core Duo */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index 321c5d39b0..535fb8fae7 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -142,7 +142,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x06fd, CPUID_EXACT_MATCH_MASK }, /* Intel Core 2 Solo/Core Duo */
/* Intel Core 2 Celeron Conroe-L */
{ X86_VENDOR_INTEL, 0x10661, CPUID_EXACT_MATCH_MASK },
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c
index 7cc7860d5d..2d831d0f22 100644
--- a/src/cpu/intel/model_6xx/model_6xx_init.c
+++ b/src/cpu/intel/model_6xx/model_6xx_init.c
@@ -73,7 +73,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x06a0, CPUID_EXACT_MATCH_MASK }, /* PIII, A0 */
{ X86_VENDOR_INTEL, 0x06a1, CPUID_EXACT_MATCH_MASK }, /* PIII, A1 */
{ X86_VENDOR_INTEL, 0x06a4, CPUID_EXACT_MATCH_MASK }, /* PIII, B0 */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c
index 5f27ea4173..55fde3b767 100644
--- a/src/cpu/intel/model_f2x/model_f2x_init.c
+++ b/src/cpu/intel/model_f2x/model_f2x_init.c
@@ -22,7 +22,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f26, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x0f27, CPUID_EXACT_MATCH_MASK },
{ X86_VENDOR_INTEL, 0x0f29, CPUID_EXACT_MATCH_MASK },
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {
diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c
index 1cf1ddb287..5264c60da6 100644
--- a/src/cpu/intel/model_f3x/model_f3x_init.c
+++ b/src/cpu/intel/model_f3x/model_f3x_init.c
@@ -19,7 +19,7 @@ static struct device_operations cpu_dev_ops = {
static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f34, CPUID_EXACT_MATCH_MASK }, /* Xeon */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver model_f3x __cpu_driver = {
diff --git a/src/cpu/intel/model_f4x/model_f4x_init.c b/src/cpu/intel/model_f4x/model_f4x_init.c
index 73bb7105bb..a589d6230a 100644
--- a/src/cpu/intel/model_f4x/model_f4x_init.c
+++ b/src/cpu/intel/model_f4x/model_f4x_init.c
@@ -22,7 +22,7 @@ static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, 0x0f48, CPUID_EXACT_MATCH_MASK }, /* Not tested */
{ X86_VENDOR_INTEL, 0x0f49, CPUID_EXACT_MATCH_MASK }, /* Not tested */
{ X86_VENDOR_INTEL, 0x0f4a, CPUID_EXACT_MATCH_MASK }, /* Not tested */
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver model_f4x __cpu_driver = {
diff --git a/src/cpu/qemu-x86/qemu.c b/src/cpu/qemu-x86/qemu.c
index c0a3afe11c..06696c803f 100644
--- a/src/cpu/qemu-x86/qemu.c
+++ b/src/cpu/qemu-x86/qemu.c
@@ -13,7 +13,7 @@ static struct device_operations cpu_dev_ops = {
static const struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_ANY, 0, 0 },
- { 0, 0, 0 },
+ CPU_TABLE_END
};
static const struct cpu_driver driver __cpu_driver = {