2 files changed, 12 insertions, 0 deletions
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