From 117198662778778d132ee6077c1f39635adbadd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 6 Jul 2012 17:27:37 +0300 Subject: [PATCH] Drop invalid device ops on Agesa northbridge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One could not pass a device of type APIC to PCI resource functions. The correct CPU model specific cpu->ops is set at later time in cpu_initialize(). Change-Id: Ifa274185e4db3080433c1f07e3a48f2b55c0514f Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/1180 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- .../amd/agesa/family10/northbridge.c | 18 ------------------ .../amd/agesa/family15/northbridge.c | 18 ------------------ .../amd/agesa/family15tn/northbridge.c | 18 ------------------ 3 files changed, 54 deletions(-) diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c index fb64757e5a..c4acedf8eb 100644 --- a/src/northbridge/amd/agesa/family10/northbridge.c +++ b/src/northbridge/amd/agesa/family10/northbridge.c @@ -1210,21 +1210,6 @@ static void add_more_links(device_t dev, unsigned total_links) last->next = NULL; } -/* dummy read_resources */ -static void lapic_read_resources(device_t dev) -{ -} - -static struct device_operations lapic_ops = { - .read_resources = lapic_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .init = 0, - .scan_bus = 0, - .enable = 0, - .ops_pci = 0, -}; - static u32 cpu_bus_scan(device_t dev, u32 max) { struct bus *cpu_bus; @@ -1426,9 +1411,6 @@ static u32 cpu_bus_scan(device_t dev, u32 max) if (cpu) { cpu->path.apic.node_id = i; cpu->path.apic.core_id = j; - if (cpu->path.type == DEVICE_PATH_APIC) { - cpu->ops = &lapic_ops; - } printk(BIOS_DEBUG, "CPU: %s %s\n", dev_path(cpu), cpu->enabled?"enabled":"disabled"); } diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c index 0a4691818f..2036dbf598 100644 --- a/src/northbridge/amd/agesa/family15/northbridge.c +++ b/src/northbridge/amd/agesa/family15/northbridge.c @@ -916,21 +916,6 @@ static void add_more_links(device_t dev, unsigned total_links) last->next = NULL; } -/* dummy read_resources */ -static void lapic_read_resources(device_t dev) -{ -} - -static struct device_operations lapic_ops = { - .read_resources = lapic_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .init = 0, - .scan_bus = 0, - .enable = 0, - .ops_pci = 0, -}; - static u32 cpu_bus_scan(device_t dev, u32 max) { struct bus *cpu_bus; @@ -1127,9 +1112,6 @@ static u32 cpu_bus_scan(device_t dev, u32 max) if (cpu) { cpu->path.apic.node_id = i; cpu->path.apic.core_id = j; - if (cpu->path.type == DEVICE_PATH_APIC) { - cpu->ops = &lapic_ops; - } printk(BIOS_DEBUG, "CPU: %s %s\n", dev_path(cpu), cpu->enabled?"enabled":"disabled"); } diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 0330017b07..1e14e8e97e 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -852,21 +852,6 @@ static void add_more_links(device_t dev, unsigned total_links) last->next = NULL; } -/* dummy read_resources */ -static void lapic_read_resources(device_t dev) -{ -} - -static struct device_operations lapic_ops = { - .read_resources = lapic_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .init = 0, - .scan_bus = 0, - .enable = 0, - .ops_pci = 0, -}; - static u32 cpu_bus_scan(device_t dev, u32 max) { struct bus *cpu_bus; @@ -1063,9 +1048,6 @@ static u32 cpu_bus_scan(device_t dev, u32 max) if (cpu) { cpu->path.apic.node_id = i; cpu->path.apic.core_id = j; - if (cpu->path.type == DEVICE_PATH_APIC) { - cpu->ops = &lapic_ops; - } printk(BIOS_DEBUG, "CPU: %s %s\n", dev_path(cpu), cpu->enabled?"enabled":"disabled"); }