From c33f1e9261adbe3921d305274e34ddab9101bc4e Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 7 Aug 2012 17:12:11 +0300 Subject: AMD northbridges: factor out CPU allocation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Factor CPU allocation out of AMD northbridge codes. As CPU topology information is required for generation of certain ACPI tables, make this code globally available. For AMDK8 and AMDFAM10 northbridge, there is a possible case of BSP CPU with lapicid!=0. We do not want to leave the lapic 0 from devicetree unused, so always use that node for BSP CPU. Change-Id: I8b1e73ed5b20b314f71dfd69a7b781ac05aea120 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/1418 Tested-by: build bot (Jenkins) Reviewed-by: Anton Kochkov Reviewed-by: Alexandru Gagniuc --- src/include/device/device.h | 10 ++++++++++ src/include/device/path.h | 2 ++ 2 files changed, 12 insertions(+) (limited to 'src/include') diff --git a/src/include/device/device.h b/src/include/device/device.h index 772b737cd9..642a4a6358 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -155,6 +155,16 @@ device_t dev_find_slot_on_smbus (unsigned int bus, unsigned int addr); device_t dev_find_lapic(unsigned apic_id); int dev_count_cpu(void); +void remap_bsp_lapic(struct bus *cpu_bus); +device_t add_cpu_device(struct bus *cpu_bus, unsigned apic_id, int enabled); +void set_cpu_topology(device_t cpu, unsigned node, unsigned package, unsigned core, unsigned thread); + +#define amd_cpu_topology(cpu, node, core) \ + set_cpu_topology(cpu, node, 0, core, 0) + +#define intel_cpu_topology(cpu, package, core, thread) \ + set_cpu_topology(cpu, 0, package, core, thread) + /* Debug functions */ void print_resource_tree(struct device * root, int debug_level, const char *msg); diff --git a/src/include/device/path.h b/src/include/device/path.h index 5af761e80b..16ad8f9089 100644 --- a/src/include/device/path.h +++ b/src/include/device/path.h @@ -39,8 +39,10 @@ struct i2c_path struct apic_path { unsigned apic_id; + unsigned package_id; unsigned node_id; unsigned core_id; + unsigned thread_id; }; struct ioapic_path -- cgit v1.2.3