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

Commit 9b1b0e42 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86, io-apic: Move CONFIG_IRQ_REMAP code out of x86 core 



Move all the code to either to the header file
asm/irq_remapping.h or to drivers/iommu/.

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 819508d3

arch/x86/include/asm/hw_irq.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ struct irq_cfg { 
	u8			vector;

	u8			move_in_progress : 1;

#ifdef CONFIG_IRQ_REMAP

	u8			remapped : 1;

	union {

		struct irq_2_iommu irq_2_iommu;

		struct irq_2_irte  irq_2_irte;

arch/x86/include/asm/io_apic.h

+5 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ extern int timer_through_8259; 
	(mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)



struct io_apic_irq_attr;

struct irq_cfg;

extern int io_apic_set_pci_routing(struct device *dev, int irq,

		 struct io_apic_irq_attr *irq_attr);

void setup_IO_APIC_irq_extra(u32 gsi);
@@ -152,6 +153,10 @@ extern void ioapic_insert_resources(void); 
extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *,

				     unsigned int, int,

				     struct io_apic_irq_attr *);

extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *,

				     unsigned int, int,

				     struct io_apic_irq_attr *);

extern void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg);



int io_apic_setup_irq_pin_once(unsigned int irq, int node, struct io_apic_irq_attr *attr);

arch/x86/include/asm/irq_remapping.h

+17 −0
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ extern void compose_remapped_msi_msg(struct pci_dev *pdev, 
extern int setup_hpet_msi_remapped(unsigned int irq, unsigned int id);

extern void panic_if_irq_remap(const char *msg);



static inline bool irq_remapped(struct irq_cfg *cfg)

{

	return (cfg->remapped == 1);

}



void irq_remap_modify_chip_defaults(struct irq_chip *chip);



#else  /* CONFIG_IRQ_REMAP */



static inline void setup_irq_remapping_ops(void) { }
@@ -76,6 +83,16 @@ static inline int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) 
static inline void panic_if_irq_remap(const char *msg)

{

}



static inline bool irq_remapped(struct irq_cfg *cfg)

{

	return false;

}



static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip)

{

}



#endif /* CONFIG_IRQ_REMAP */



#endif /* __X86_IRQ_REMAPPING_H */

arch/x86/kernel/apic/io_apic.c

+1 −43
Original line number Diff line number Diff line
@@ -68,22 +68,6 @@ 
#define for_each_irq_pin(entry, head) \

	for (entry = head; entry; entry = entry->next)



#ifdef CONFIG_IRQ_REMAP

static void irq_remap_modify_chip_defaults(struct irq_chip *chip);

static inline bool irq_remapped(struct irq_cfg *cfg)

{

	return cfg->irq_2_iommu.iommu != NULL;

}

#else

static inline bool irq_remapped(struct irq_cfg *cfg)

{

	return false;

}

static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip)

{

}

#endif



/*

 *      Is the SiS APIC rmw bug present ?

 *      -1 = don't know, 0 = no, 1 = yes
@@ -606,7 +590,7 @@ static void __eoi_ioapic_pin(int apic, int pin, int vector, struct irq_cfg *cfg) 
	}

}



static void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)

void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)

{

	struct irq_pin_list *entry;

	unsigned long flags;
@@ -2542,32 +2526,6 @@ static void ack_apic_level(struct irq_data *data) 
	ioapic_irqd_unmask(data, cfg, masked);

}



#ifdef CONFIG_IRQ_REMAP

static void ir_ack_apic_edge(struct irq_data *data)

{

	ack_APIC_irq();

}



static void ir_ack_apic_level(struct irq_data *data)

{

	ack_APIC_irq();

	eoi_ioapic_irq(data->irq, data->chip_data);

}



static void ir_print_prefix(struct irq_data *data, struct seq_file *p)

{

	seq_printf(p, " IR-%s", data->chip->name);

}



static void irq_remap_modify_chip_defaults(struct irq_chip *chip)

{

	chip->irq_print_chip = ir_print_prefix;

	chip->irq_ack = ir_ack_apic_edge;

	chip->irq_eoi = ir_ack_apic_level;

	chip->irq_set_affinity = x86_io_apic_ops.set_affinity;

}

#endif /* CONFIG_IRQ_REMAP */



static struct irq_chip ioapic_chip __read_mostly = {

	.name			= "IO-APIC",

	.irq_startup		= startup_ioapic_irq,

drivers/iommu/amd_iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -4017,10 +4017,10 @@ static int alloc_irq_index(struct irq_cfg *cfg, u16 devid, int count) 


			index -= count - 1;



			cfg->remapped	      = 1;

			irte_info             = &cfg->irq_2_iommu;

			irte_info->sub_handle = devid;

			irte_info->irte_index = index;

			irte_info->iommu      = (void *)cfg;



			goto out;

		}
@@ -4127,9 +4127,9 @@ static int setup_ioapic_entry(int irq, struct IO_APIC_route_entry *entry, 
	index = attr->ioapic_pin;



	/* Setup IRQ remapping info */

	cfg->remapped	      = 1;

	irte_info->sub_handle = devid;

	irte_info->irte_index = index;

	irte_info->iommu      = (void *)cfg;



	/* Setup IRTE for IOMMU */

	irte.val		= 0;
@@ -4288,9 +4288,9 @@ static int msi_setup_irq(struct pci_dev *pdev, unsigned int irq, 
	devid		= get_device_id(&pdev->dev);

	irte_info	= &cfg->irq_2_iommu;



	cfg->remapped	      = 1;

	irte_info->sub_handle = devid;

	irte_info->irte_index = index + offset;

	irte_info->iommu      = (void *)cfg;



	return 0;

}
@@ -4314,9 +4314,9 @@ static int setup_hpet_msi(unsigned int irq, unsigned int id) 
	if (index < 0)

		return index;



	cfg->remapped	      = 1;

	irte_info->sub_handle = devid;

	irte_info->irte_index = index;

	irte_info->iommu      = (void *)cfg;



	return 0;

}