|
@@ -153,20 +153,8 @@ static int __init numachip_probe(void)
|
|
|
return apic == &apic_numachip;
|
|
|
}
|
|
|
|
|
|
-static void __init map_csrs(void)
|
|
|
-{
|
|
|
- printk(KERN_INFO "NumaChip: Mapping local CSR space (%016llx - %016llx)\n",
|
|
|
- NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_BASE + NUMACHIP_LCSR_SIZE - 1);
|
|
|
- init_extra_mapping_uc(NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_SIZE);
|
|
|
-
|
|
|
- printk(KERN_INFO "NumaChip: Mapping global CSR space (%016llx - %016llx)\n",
|
|
|
- NUMACHIP_GCSR_BASE, NUMACHIP_GCSR_BASE + NUMACHIP_GCSR_SIZE - 1);
|
|
|
- init_extra_mapping_uc(NUMACHIP_GCSR_BASE, NUMACHIP_GCSR_SIZE);
|
|
|
-}
|
|
|
-
|
|
|
static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
|
|
|
{
|
|
|
-
|
|
|
if (c->phys_proc_id != node) {
|
|
|
c->phys_proc_id = node;
|
|
|
per_cpu(cpu_llc_id, smp_processor_id()) = node;
|
|
@@ -175,19 +163,15 @@ static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
|
|
|
|
|
|
static int __init numachip_system_init(void)
|
|
|
{
|
|
|
- unsigned int val;
|
|
|
-
|
|
|
if (!numachip_system)
|
|
|
return 0;
|
|
|
|
|
|
+ init_extra_mapping_uc(NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_SIZE);
|
|
|
+ init_extra_mapping_uc(NUMACHIP_GCSR_BASE, NUMACHIP_GCSR_SIZE);
|
|
|
+
|
|
|
x86_cpuinit.fixup_cpu_id = fixup_cpu_id;
|
|
|
x86_init.pci.arch_init = pci_numachip_init;
|
|
|
|
|
|
- map_csrs();
|
|
|
-
|
|
|
- val = read_lcsr(CSR_G0_NODE_IDS);
|
|
|
- printk(KERN_INFO "NumaChip: Local NodeID = %08x\n", val);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
early_initcall(numachip_system_init);
|