Patch to enable PCI buses on all nodes of NUMA-Q
RFC 1/1 Patch to enable PCI buses on all nodes of NUMA-Q
Comments / review would be much appreciated. I intend to submit this in a few days, if there are no objections.
Thanks,
Martin J. Bligh
---------------------
arch/i386/kernel/mpparse.c +11 -8
@@ -37,6 +37,8 @@int apic_version [MAX_APICS ];int mp_bus_id_to_type [MAX_MP_BUSSES ];int mp_bus_id_to_node [MAX_MP_BUSSES ]; +int mp_bus_id_to_local [MAX_MP_BUSSES ]; +int quad_local_to_mp_bus_id [NR_CPUS /4 ][4 ];int mp_bus_id_to_pci_bus [MAX_MP_BUSSES ] = { [0 ...MAX_MP_BUSSES -1 ] =-1 };int mp_current_pci_id;
@@ -241,13 +243,17 @@static void __init MP_bus_info (struct mpc_config_bus *m) {char str[7 ]; +int quad;memcpy (str, m->mpc_bustype,6 ); str[6 ] =0 ;if (clustered_apic_mode) { - mp_bus_id_to_node[m->mpc_busid] = translation_table[mpc_record]->trans_quad; -printk ("Bus #%d is %s (node %d)\n" , m->mpc_busid, str, mp_bus_id_to_node[m->mpc_busid]); + quad = translation_table[mpc_record]->trans_quad; + mp_bus_id_to_node[m->mpc_busid] = quad; + mp_bus_id_to_local[m->mpc_busid] = translation_table[mpc_record]->trans_local; + quad_local_to_mp_bus_id[quad][translation_table[mpc_record]->trans_local] = m->mpc_busid; +printk ("Bus #%d is %s (node %d)\n" , m->mpc_busid, str, quad); }else {Dprintk ("Bus #%d is %s\n" , m->mpc_busid, str); }
@@ -324,13 +330,14 @@static void __init MP_translation_info (struct mpc_config_translation *m) { -printk ("Translation: record %d, type %d, quad %d, global %d, local %d\n" , mpc_record, m->trans_type, - m->trans_quad, m->trans_global, m->trans_local); +printk ("Translation: record %d, type %d, quad %d, global %d, local %d\n" , mpc_record, m->trans_type, m->trans_quad, m->trans_global, m->trans_local);if (mpc_record >=MAX_MPC_ENTRY )printk ("MAX_MPC_ENTRY exceeded!\n" );else translation_table[mpc_record] = m;/* stash this for later */ +if (m->trans_quad+1 > numnodes) + numnodes = m->trans_quad+1 ; }/*
@@ -494,10 +501,6 @@ } } ++mpc_record; - } -if (clustered_apic_mode && nr_ioapics >2 ) { -/* don't initialise IO apics on secondary quads */ - nr_ioapics =2 ; }if (!num_processors)printk (KERN_ERR "SMP mptable: no processors registered!\n" );
arch/i386/kernel/pci-pc.c +89 -4
145 lines not on this page · raw message
arch/i386/kernel/smpboot.c +8 -5
@@ -975,11 +975,14 @@ {int apicid, cpu, bit; -if (clustered_apic_mode) { -/* remap the 1st quad's 256k range for cross-quad I/O */ - xquad_portio =ioremap (XQUAD_PORTIO_BASE ,XQUAD_PORTIO_LEN ); -printk ("Cross quad port I/O vaddr 0x%08lx, len %08lx\n" , - (u_long ) xquad_portio, (u_long )XQUAD_PORTIO_LEN ); +if (clustered_apic_mode && (numnodes >1 )) { +printk ("Remapping cross-quad port I/O for %d quads\n" , + numnodes); +printk ("xquad_portio vaddr 0x%08lx, len %08lx\n" , + (u_long ) xquad_portio, + (u_long ) numnodes *XQUAD_PORTIO_LEN ); + xquad_portio =ioremap (XQUAD_PORTIO_BASE , + numnodes *XQUAD_PORTIO_LEN ); }#ifdef CONFIG_MTRR
include/asm-i386/io.h +38 -24
97 lines not on this page · raw message
include/asm-i386/mpspec.h +3 -0
@@ -198,6 +198,9 @@ MP_BUS_MCA };extern int mp_bus_id_to_type [MAX_MP_BUSSES ]; +extern int mp_bus_id_to_node [MAX_MP_BUSSES ]; +extern int mp_bus_id_to_local [MAX_MP_BUSSES ]; +extern int quad_local_to_mp_bus_id [NR_CPUS /4 ][4 ];extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES ];extern unsigned int boot_cpu_physical_apicid;