Commit 1c4248ca authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86, io_apic: Introduce x86_io_apic_ops.disable() 



This function pointer is used to call a system-specific
function for disabling the IO-APIC. Currently this is used
for IRQ remapping which has its own disable routine.

Also introduce the necessary infrastructure in the interrupt
remapping code to overwrite this and other function pointers
as necessary by interrupt remapping.

Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
Acked-by: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 336224ba

arch/x86/include/asm/io_apic.h

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ extern void __init native_io_apic_init_mappings(void); 
extern unsigned int native_io_apic_read(unsigned int apic, unsigned int reg);

extern void native_io_apic_write(unsigned int apic, unsigned int reg, unsigned int val);

extern void native_io_apic_modify(unsigned int apic, unsigned int reg, unsigned int val);

extern void native_disable_io_apic(void);



static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg)

{
@@ -223,6 +224,7 @@ static inline void disable_ioapic_support(void) { } 
#define native_io_apic_read		NULL

#define native_io_apic_write		NULL

#define native_io_apic_modify		NULL

#define native_disable_io_apic		NULL

#endif



#endif /* _ASM_X86_IO_APIC_H */

arch/x86/include/asm/x86_init.h

+5 −4
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ struct x86_io_apic_ops { 
	unsigned int	(*read)   (unsigned int apic, unsigned int reg);

	void		(*write)  (unsigned int apic, unsigned int reg, unsigned int value);

	void		(*modify) (unsigned int apic, unsigned int reg, unsigned int value);

	void		(*disable)(void);

};



extern struct x86_init_ops x86_init;

arch/x86/kernel/apic/io_apic.c

+19 −22
Original line number Diff line number Diff line
@@ -1921,30 +1921,14 @@ void __init enable_IO_APIC(void) 
	clear_IO_APIC();

}



/*

 * Not an __init, needed by the reboot code

 */

void disable_IO_APIC(void)

void native_disable_io_apic(void)

{

	/*

	 * Clear the IO-APIC before rebooting:

	 */

	clear_IO_APIC();



	if (!legacy_pic->nr_legacy_irqs)

		return;



	/*

	 * If the i8259 is routed through an IOAPIC

	 * Put that IOAPIC in virtual wire mode

	 * so legacy interrupts can be delivered.

	 *

	 * With interrupt-remapping, for now we will use virtual wire A mode,

	 * as virtual wire B is little complex (need to configure both

	 * IOAPIC RTE as well as interrupt-remapping table entry).

	 * As this gets called during crash dump, keep this simple for now.

	 */

	if (ioapic_i8259.pin != -1 && !irq_remapping_enabled) {

	if (ioapic_i8259.pin != -1) {

		struct IO_APIC_route_entry entry;



		memset(&entry, 0, sizeof(entry));
@@ -1964,12 +1948,25 @@ void disable_IO_APIC(void) 
		ioapic_write_entry(ioapic_i8259.apic, ioapic_i8259.pin, entry);

	}



	if (cpu_has_apic || apic_from_smp_config())

		disconnect_bsp_APIC(ioapic_i8259.pin != -1);



}



/*

	 * Use virtual wire A mode when interrupt remapping is enabled.

 * Not an __init, needed by the reboot code

 */

	if (cpu_has_apic || apic_from_smp_config())

		disconnect_bsp_APIC(!irq_remapping_enabled &&

				ioapic_i8259.pin != -1);

void disable_IO_APIC(void)

{

	/*

	 * Clear the IO-APIC before rebooting:

	 */

	clear_IO_APIC();



	if (!legacy_pic->nr_legacy_irqs)

		return;



	x86_io_apic_ops.disable();

}



#ifdef CONFIG_X86_32

arch/x86/kernel/x86_init.c

+5 −4
Original line number Diff line number Diff line
@@ -122,4 +122,5 @@ struct x86_io_apic_ops x86_io_apic_ops = { 
	.read			= native_io_apic_read,

	.write			= native_io_apic_write,

	.modify			= native_io_apic_modify,

	.disable		= native_disable_io_apic,

};

drivers/iommu/irq_remapping.c

+30 −1
Original line number Diff line number Diff line 
#include <linux/cpumask.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/cpumask.h>
@@ -6,6 +7,9 @@ 


#include <asm/hw_irq.h>

#include <asm/irq_remapping.h>

#include <asm/processor.h>

#include <asm/x86_init.h>

#include <asm/apic.h>



#include "irq_remapping.h"
@@ -17,6 +21,24 @@ int no_x2apic_optout; 


static struct irq_remap_ops *remap_ops;



static void irq_remapping_disable_io_apic(void)

{

	/*

	 * With interrupt-remapping, for now we will use virtual wire A

	 * mode, as virtual wire B is little complex (need to configure

	 * both IOAPIC RTE as well as interrupt-remapping table entry).

	 * As this gets called during crash dump, keep this simple for

	 * now.

	 */

	if (cpu_has_apic || apic_from_smp_config())

		disconnect_bsp_APIC(0);

}



static void __init irq_remapping_modify_x86_ops(void)

{

	x86_io_apic_ops.disable	=	irq_remapping_disable_io_apic;

}



static __init int setup_nointremap(char *str)

{

	disable_irq_remap = 1;
@@ -79,10 +101,17 @@ int __init irq_remapping_prepare(void) 


int __init irq_remapping_enable(void)

{

	int ret;



	if (!remap_ops || !remap_ops->enable)

		return -ENODEV;



	return remap_ops->enable();

	ret = remap_ops->enable();



	if (irq_remapping_enabled)

		irq_remapping_modify_x86_ops();



	return ret;

}



void irq_remapping_disable(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE