summaryrefslogtreecommitdiffstats
path: root/src/northbridge/intel
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2021-11-15 20:12:02 +0100
committerArthur Heymans <arthur@aheymans.xyz>2022-12-01 10:27:31 +0000
commitcdb26fd011285124a6ed5e6be6dddc806ca5b3a8 (patch)
treeffab336e5873ae9c0b5fd62e0feacbbab062b778 /src/northbridge/intel
parentd52bfbb6aa822b8d5137bedef638a5214a07e4da (diff)
downloadcoreboot-cdb26fd011285124a6ed5e6be6dddc806ca5b3a8.tar.gz
coreboot-cdb26fd011285124a6ed5e6be6dddc806ca5b3a8.tar.bz2
coreboot-cdb26fd011285124a6ed5e6be6dddc806ca5b3a8.zip
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>
Diffstat (limited to 'src/northbridge/intel')
-rw-r--r--src/northbridge/intel/sandybridge/chipset.cb16
-rw-r--r--src/northbridge/intel/sandybridge/northbridge.c2
2 files changed, 6 insertions, 12 deletions
diff --git a/src/northbridge/intel/sandybridge/chipset.cb b/src/northbridge/intel/sandybridge/chipset.cb
index 16fab6d17a23..afa1e5b52668 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 ad85d68cdc61..ee4ddc589486 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -387,7 +387,6 @@ static void set_above_4g_pci(const struct device *dev)
static void mc_gen_ssdt(const struct device *dev)
{
- generate_cpu_entries(dev);
set_above_4g_pci(dev);
}
@@ -416,6 +415,7 @@ struct device_operations sandybridge_cpu_bus_ops = {
.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 = {