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

Commit d83093b5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: refactor ->setup_portio_remap() subarch methods 



Only NUMAQ has a real ->setup_portio_remap() method, the other
subarchitectures define it but keep it empty.

So mark the vector as NULL, extend the generic code to handle
NULL -setup_portio_remap() entries and remove all the empty
handlers.

Also move the NUMAQ method from the header file into the
 apic driver .c file.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8058714a

arch/x86/include/asm/bigsmp/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static inline physid_mask_t bigsmp_ioapic_phys_id_map(physid_mask_t phys_map) 
	return physids_promote(0xFFL);

}



static inline void setup_portio_remap(void)

static inline void bigsmp_setup_portio_remap(void)

{

}

arch/x86/include/asm/es7000/apic.h

+0 −4
Original line number Diff line number Diff line
@@ -127,10 +127,6 @@ static inline physid_mask_t es7000_ioapic_phys_id_map(physid_mask_t phys_map) 
}





static inline void setup_portio_remap(void)

{

}



extern unsigned int boot_cpu_physical_apicid;

static inline int check_phys_apicid_present(int cpu_physical_apicid)

{

arch/x86/include/asm/mach-default/mach_apic.h

+0 −4
Original line number Diff line number Diff line
@@ -132,10 +132,6 @@ static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid) 
	return physid_mask_of_physid(phys_apicid);

}



static inline void setup_portio_remap(void)

{

}



static inline int check_phys_apicid_present(int boot_cpu_physical_apicid)

{

	return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);

arch/x86/include/asm/mach-generic/mach_apic.h

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <asm/genapic.h>



#define setup_portio_remap (apic->setup_portio_remap)

#define check_phys_apicid_present (apic->check_phys_apicid_present)

#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)

arch/x86/include/asm/numaq/apic.h

+0 −13
Original line number Diff line number Diff line
@@ -92,19 +92,6 @@ static inline physid_mask_t numaq_apicid_to_cpu_present(int logical_apicid) 


extern void *xquad_portio;



static inline void setup_portio_remap(void)

{

	int num_quads = num_online_nodes();



	if (num_quads <= 1)

       		return;



	printk("Remapping cross-quad port I/O for %d quads\n", num_quads);

	xquad_portio = ioremap(XQUAD_PORTIO_BASE, num_quads*XQUAD_PORTIO_QUAD);

	printk("xquad_portio vaddr 0x%08lx, len %08lx\n",

		(u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);

}



static inline int check_phys_apicid_present(int boot_cpu_physical_apicid)

{

	return (1);