cpu/intel/model_206ax: Remove fake lapic device
Instead of using a fake lapic device hook up the cpu cluster to chip
cpu/intel/model_206ax.
The lapic device is also not needed as the mp init will allocate it for
the BSP at runtime.
Change-Id: Id3b1c4ca027e2905535e137691c3e3e60417dbf3
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59316
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 06913bc..d2d6467 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -95,18 +95,9 @@
return msr.lo & 0xffff;
}
-static void generate_C_state_entries(void)
+static void generate_C_state_entries(const struct device *dev)
{
- struct device *lapic;
- struct cpu_intel_model_206ax_config *conf = NULL;
-
- /* Find the SpeedStep CPU in the device tree using magic APIC ID */
- lapic = dev_find_lapic(SPEEDSTEP_APIC_MAGIC);
- if (!lapic)
- return;
- conf = lapic->chip_info;
- if (!conf)
- return;
+ struct cpu_intel_model_206ax_config *conf = dev->bus->dev->chip_info;
const int acpi_cstates[3] = { conf->acpi_c1, conf->acpi_c2, conf->acpi_c3 };
@@ -324,7 +315,7 @@
cpuID-1, cores_per_package);
/* Generate C-state tables */
- generate_C_state_entries();
+ generate_C_state_entries(device);
/* Generate T-state tables */
generate_T_state_entries(
diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h
index a46c7bf..13cf3163 100644
--- a/src/cpu/intel/model_206ax/chip.h
+++ b/src/cpu/intel/model_206ax/chip.h
@@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* Magic value used to locate this chip in the device tree */
-#define SPEEDSTEP_APIC_MAGIC 0xACAC
-
/* Keep this in sync with acpi.c */
enum cpu_acpi_level {
CPU_ACPI_DISABLED = 0,
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 8bb1091..6522e0fe 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -211,18 +211,11 @@
wrmsr(MSR_PP1_CURRENT_CONFIG, msr);
}
-static void configure_thermal_target(void)
+static void configure_thermal_target(struct device *dev)
{
- struct cpu_intel_model_206ax_config *conf;
- struct device *lapic;
+ struct cpu_intel_model_206ax_config *conf = dev->bus->dev->chip_info;
msr_t msr;
- /* Find pointer to CPU configuration */
- lapic = dev_find_lapic(SPEEDSTEP_APIC_MAGIC);
- if (!lapic || !lapic->chip_info)
- return;
- conf = lapic->chip_info;
-
/* Set TCC activation offset if supported */
msr = rdmsr(MSR_PLATFORM_INFO);
if ((msr.lo & (1 << 30)) && conf->tcc_offset) {
@@ -346,7 +339,7 @@
configure_misc();
/* Thermal throttle activation offset */
- configure_thermal_target();
+ configure_thermal_target(cpu);
set_aesni_lock();
diff --git a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
index 8f94378..62b0b0b 100644
--- a/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
+++ b/src/mainboard/dell/snb_ivb_workstations/variants/baseboard/devicetree.cb
@@ -1,10 +1,8 @@
chip northbridge/intel/sandybridge
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- register "tcc_offset" = "5" # TCC of 95C
- device lapic 0 on end
- device lapic 0xacac off end
- end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
+
+ register "tcc_offset" = "5" # TCC of 95C
end
device domain 0 on
diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb
index 77f58c2..87d0ed9 100644
--- a/src/mainboard/google/stout/devicetree.cb
+++ b/src/mainboard/google/stout/devicetree.cb
@@ -19,14 +19,10 @@
register "max_mem_clock_mhz" = "666"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "tcc_offset" = "5" # TCC of 95C
- end
+ register "tcc_offset" = "5" # TCC of 95C
end
device domain 0 on
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index fef8992..2eeb745 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -11,15 +11,12 @@
# Enable DVI Hotplug with 6ms pulse
register "gpu_dp_b_hotplug" = "0x06"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
- register "acpi_c1" = "CPU_ACPI_C3"
- register "acpi_c2" = "CPU_ACPI_C6"
- end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
+
+ register "acpi_c1" = "CPU_ACPI_C3"
+ register "acpi_c2" = "CPU_ACPI_C6"
end
device domain 0 on
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index a72b94f..bf87661 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -2,15 +2,11 @@
# IGD Displays
register "gfx" = "GMA_STATIC_DISPLAYS(0)"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c2" = "CPU_ACPI_C6"
- register "acpi_c3" = "CPU_ACPI_DISABLED"
- end
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
device domain 0 on
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index 2e5ee0f..44e7372 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -17,15 +17,11 @@
register "gpu_cpu_backlight" = "0x0000001a"
register "gpu_pch_backlight" = "0x002e0000"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c2" = "CPU_ACPI_C6"
- register "acpi_c3" = "CPU_ACPI_DISABLED"
- end
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
device domain 0 on
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index 20b1c9a..c6aa44c 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -17,15 +17,11 @@
register "gpu_cpu_backlight" = "0x00000ac8"
register "gpu_pch_backlight" = "0x13120000"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c2" = "CPU_ACPI_C6"
- register "acpi_c3" = "CPU_ACPI_DISABLED"
- end
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
device domain 0 on
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index cd7b907..10aeb44 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -11,15 +11,11 @@
register "max_mem_clock_mhz" = "666"
- device cpu_cluster 0 on
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on end
- register "acpi_c1" = "CPU_ACPI_C3"
- register "acpi_c2" = "CPU_ACPI_C6"
- end
+ register "acpi_c1" = "CPU_ACPI_C3"
+ register "acpi_c2" = "CPU_ACPI_C6"
end
device domain 0 on
diff --git a/src/northbridge/intel/sandybridge/chipset.cb b/src/northbridge/intel/sandybridge/chipset.cb
index 16fab6d..afa1e5b 100644
--- a/src/northbridge/intel/sandybridge/chipset.cb
+++ b/src/northbridge/intel/sandybridge/chipset.cb
@@ -1,19 +1,13 @@
# SPDX-License-Identifier: GPL-2.0-only
chip northbridge/intel/sandybridge
- device cpu_cluster 0 on
- ops sandybridge_cpu_bus_ops
- chip cpu/intel/model_206ax
- # Magic APIC ID to locate this chip
- device lapic 0 on end
- device lapic 0xacac off end
+ chip cpu/intel/model_206ax
+ device cpu_cluster 0 on ops sandybridge_cpu_bus_ops end
- register "acpi_c1" = "CPU_ACPI_C1"
- register "acpi_c2" = "CPU_ACPI_C3"
- register "acpi_c3" = "CPU_ACPI_C7"
- end
+ register "acpi_c1" = "CPU_ACPI_C1"
+ register "acpi_c2" = "CPU_ACPI_C3"
+ register "acpi_c3" = "CPU_ACPI_C7"
end
-
device domain 0 on
ops sandybridge_pci_domain_ops
end
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index ad85d68..ee4ddc5 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -387,7 +387,6 @@
static void mc_gen_ssdt(const struct device *dev)
{
- generate_cpu_entries(dev);
set_above_4g_pci(dev);
}
@@ -416,6 +415,7 @@
.read_resources = noop_read_resources,
.set_resources = noop_set_resources,
.init = mp_cpu_bus_init,
+ .acpi_fill_ssdt = generate_cpu_entries,
};
struct chip_operations northbridge_intel_sandybridge_ops = {