Commit ef97001f authored by travis@sgi.com's avatar travis@sgi.com Committed by Ingo Molnar
Browse files

x86: change size of APICIDs from u8 to u16 



Change the size of APICIDs from u8 to u16.  This partially
supports the new x2apic mode that will be present on future
processor chips. (Chips actually support 32-bit APICIDs, but that
change is more intrusive. Supporting 16-bit is sufficient for now).

Signed-off-by: default avatarJack Steiner <steiner@sgi.com>

I've included just the partial change from u8 to u16 apicids.  The
remaining x2apic changes will be in a separate patch.

In addition, the fake_node_to_pxm_map[] and fake_apicid_to_node[]
tables have been moved from local data to the __initdata section
reducing stack pressure when MAX_NUMNODES and MAX_LOCAL_APIC are
increased in size.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a1bf250a

arch/x86/kernel/genapic_64.c

+2 −2
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ 
 * array during this time.  Is it zeroed when the per_cpu

 * data area is removed.

 */

u8 x86_cpu_to_apicid_init[NR_CPUS] __initdata

u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata

					= { [0 ... NR_CPUS-1] = BAD_APICID };

void *x86_cpu_to_apicid_ptr;

DEFINE_PER_CPU(u8, x86_cpu_to_apicid) = BAD_APICID;

DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;

EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);



struct genapic __read_mostly *genapic = &apic_flat;

arch/x86/kernel/mpparse_64.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ unsigned disabled_cpus __cpuinitdata; 
/* Bitmask of physically existing CPUs */

physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;



u8 bios_cpu_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };

u16 bios_cpu_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };





/*
@@ -132,7 +132,7 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m) 
	 * area is created.

	 */

	if (x86_cpu_to_apicid_ptr) {

		u8 *x86_cpu_to_apicid = (u8 *)x86_cpu_to_apicid_ptr;

		u16 *x86_cpu_to_apicid = (u16 *)x86_cpu_to_apicid_ptr;

		x86_cpu_to_apicid[cpu] = m->mpc_apicid;

	} else {

		per_cpu(x86_cpu_to_apicid, cpu) = m->mpc_apicid;

arch/x86/kernel/smpboot_64.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int smp_num_siblings = 1; 
EXPORT_SYMBOL(smp_num_siblings);



/* Last level cache ID of each logical CPU */

DEFINE_PER_CPU(u8, cpu_llc_id) = BAD_APICID;

DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;



/* Bitmask of currently online CPUs */

cpumask_t cpu_online_map __read_mostly;

arch/x86/mm/numa_64.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ void __init init_cpu_to_node(void) 
	int i;



	for (i = 0; i < NR_CPUS; i++) {

		u8 apicid = x86_cpu_to_apicid_init[i];

		u16 apicid = x86_cpu_to_apicid_init[i];



		if (apicid == BAD_APICID)

			continue;

arch/x86/mm/srat_64.c

+13 −9
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ void __init 
acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)

{

	int pxm, node;

	int apic_id;



	apic_id = pa->apic_id;

	if (srat_disabled())

		return;

	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
@@ -145,10 +148,10 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) 
		bad_srat();

		return;

	}

	apicid_to_node[pa->apic_id] = node;

	apicid_to_node[apic_id] = node;

	acpi_numa = 1;

	printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",

	       pxm, pa->apic_id, node);

	       pxm, apic_id, node);

}



int update_end_of_memory(unsigned long end) {return -1;}
@@ -343,7 +346,8 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) 
	/* First clean up the node list */

	for (i = 0; i < MAX_NUMNODES; i++) {

		cutoff_node(i, start, end);

		if ((nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) {

		/* ZZZ why was this needed. At least add a comment */

		if (nodes[i].end && (nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) {

			unparse_node(i);

			node_set_offline(i);

		}
@@ -384,6 +388,12 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) 
}



#ifdef CONFIG_NUMA_EMU

static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = {

	[0 ... MAX_NUMNODES-1] = PXM_INVAL

};

static unsigned char fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = {

	[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE

};

static int __init find_node_by_addr(unsigned long addr)

{

	int ret = NUMA_NO_NODE;
@@ -414,12 +424,6 @@ static int __init find_node_by_addr(unsigned long addr) 
void __init acpi_fake_nodes(const struct bootnode *fake_nodes, int num_nodes)

{

	int i, j;

	int fake_node_to_pxm_map[MAX_NUMNODES] = {

		[0 ... MAX_NUMNODES-1] = PXM_INVAL

	};

	unsigned char fake_apicid_to_node[MAX_LOCAL_APIC] = {

		[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE

	};



	printk(KERN_INFO "Faking PXM affinity for fake nodes on real "

			 "topology.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE