Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe086a7b authored by Alex Chiang's avatar Alex Chiang Committed by Tony Luck
Browse files

[IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id 



Legacy HP ia64 platforms currently cannot provide
/proc/cpuinfo/physical_id due to legacy SAL/PAL implementations.
However, that physical topology information can be obtained
via ACPI.

Provide an interface that gives ACPI one last chance to provide
physical_id for these legacy platforms. This logic only comes
into play iff:

- ACPI actually provides slot information for the CPU
- we lack a valid socket_id

Otherwise, we don't do anything.

Since x86 uses the ACPI processor driver as well, we provide a nop
stub function for arch_fix_phys_package_id() in asm-x86/topology.h

Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 6ff0bc94

arch/ia64/kernel/topology.c

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,15 @@ 


static struct ia64_cpu *sysfs_cpus;



void arch_fix_phys_package_id(int num, u32 slot)

{

#ifdef CONFIG_SMP

	if (cpu_data(num)->socket_id == -1)

		cpu_data(num)->socket_id = slot;

#endif

}

EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);



int arch_register_cpu(int num)

{

#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)

drivers/acpi/processor_core.c

+9 −0
Original line number Diff line number Diff line
@@ -603,6 +603,15 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid) 
		request_region(pr->throttling.address, 6, "ACPI CPU throttle");

	}



	/*

	 * If ACPI describes a slot number for this CPU, we can use it

	 * ensure we get the right value in the "physical id" field

	 * of /proc/cpuinfo

	 */

	status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer);

	if (ACPI_SUCCESS(status))

		arch_fix_phys_package_id(pr->id, object.integer.value);



	return 0;

}

include/asm-ia64/topology.h

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ void build_cpu_to_node_map(void); 
#define smt_capable() 				(smp_num_siblings > 1)

#endif



extern void arch_fix_phys_package_id(int num, u32 slot);



#define pcibus_to_cpumask(bus)	(pcibus_to_node(bus) == -1 ? \

					CPU_MASK_ALL : \

					node_to_cpumask(pcibus_to_node(bus)) \

include/asm-x86/topology.h

+4 −0
Original line number Diff line number Diff line
@@ -193,6 +193,10 @@ extern cpumask_t cpu_coregroup_map(int cpu); 
#define topology_thread_siblings(cpu)		(per_cpu(cpu_sibling_map, cpu))

#endif



static inline void arch_fix_phys_package_id(int num, u32 slot)

{

}



struct pci_bus;

void set_pci_bus_resources_arch_default(struct pci_bus *b);