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

Commit c4d05a2c authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86/irq: Prepare IOAPIC interfaces to support hierarchical irqdomains 



Introduce helper functions to manipulate struct irq_alloc_info for
IOAPIC.  Also add an extra parameter to IOAPIC interfaces to prepare
for hierarchical irqdomain. Function mp_set_gsi_attr() will be removed
once we have switched to hierarchical irqdomains.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Tested-by: default avatarJoerg Roedel <jroedel@suse.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Link: http://lkml.kernel.org/r/1428905519-23704-33-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4e69d7ea

arch/x86/include/asm/io_apic.h

+12 −2
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ struct IR_IO_APIC_route_entry { 
		index		: 15;

} __attribute__ ((packed));



struct irq_alloc_info;



#define IOAPIC_AUTO     -1

#define IOAPIC_EDGE     0

#define IOAPIC_LEVEL    1
@@ -194,7 +196,8 @@ extern u32 gsi_top; 
extern int mp_find_ioapic(u32 gsi);

extern int mp_find_ioapic_pin(int ioapic, u32 gsi);

extern u32 mp_pin_to_gsi(int ioapic, int pin);

extern int mp_map_gsi_to_irq(u32 gsi, unsigned int flags);

extern int mp_map_gsi_to_irq(u32 gsi, unsigned int flags,

			     struct irq_alloc_info *info);

extern void mp_unmap_irq(int irq);

extern int mp_register_ioapic(int id, u32 address, u32 gsi_base,

			      struct ioapic_domain_cfg *cfg);
@@ -203,6 +206,8 @@ extern int mp_ioapic_registered(u32 gsi_base); 
extern int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,

			    irq_hw_number_t hwirq);

extern void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq);

extern void ioapic_set_alloc_attr(struct irq_alloc_info *info,

				  int node, int trigger, int polarity);

extern int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node);



extern void mp_save_irq(struct mpc_intsrc *m);
@@ -253,7 +258,12 @@ static inline void print_IO_APICs(void) {} 
#define gsi_top (NR_IRQS_LEGACY)

static inline int mp_find_ioapic(u32 gsi) { return 0; }

static inline u32 mp_pin_to_gsi(int ioapic, int pin) { return UINT_MAX; }

static inline int mp_map_gsi_to_irq(u32 gsi, unsigned int flags) { return gsi; }

static inline int mp_map_gsi_to_irq(u32 gsi, unsigned int flags,

				    struct irq_alloc_info *info)

{

	return gsi;

}



static inline void mp_unmap_irq(int irq) { }



static inline int save_ioapic_entries(void)

arch/x86/kernel/acpi/boot.c

+4 −2
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, 
			   int polarity)

{

	int irq, node;

	struct irq_alloc_info info;



	if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)

		return gsi;
@@ -416,7 +417,8 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, 
		return -1;

	}



	irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC);

	ioapic_set_alloc_attr(&info, node, trigger, polarity);

	irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &info);

	if (irq < 0)

		return irq;
@@ -434,7 +436,7 @@ static void mp_unregister_gsi(u32 gsi) 
	if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)

		return;



	irq = mp_map_gsi_to_irq(gsi, 0);

	irq = mp_map_gsi_to_irq(gsi, 0, NULL);

	if (irq > 0)

		mp_unmap_irq(irq);

}

arch/x86/kernel/apic/io_apic.c

+26 −13
Original line number Diff line number Diff line
@@ -938,7 +938,19 @@ static int irq_trigger(int idx) 
	return trigger;

}



static int alloc_irq_from_domain(struct irq_domain *domain, u32 gsi, int pin)

void ioapic_set_alloc_attr(struct irq_alloc_info *info, int node,

			   int trigger, int polarity)

{

	init_irq_alloc_info(info, NULL);

	info->type = X86_IRQ_ALLOC_TYPE_IOAPIC;

	info->ioapic_node = node;

	info->ioapic_trigger = trigger;

	info->ioapic_polarity = polarity;

	info->ioapic_valid = 1;

}



static int alloc_irq_from_domain(struct irq_domain *domain, u32 gsi, int pin,

				 struct irq_alloc_info *info)

{

	int irq = -1;

	int ioapic = (int)(long)domain->host_data;
@@ -971,11 +983,11 @@ static int alloc_irq_from_domain(struct irq_domain *domain, u32 gsi, int pin) 
}



static int mp_map_pin_to_irq(u32 gsi, int idx, int ioapic, int pin,

			     unsigned int flags)

			     unsigned int flags, struct irq_alloc_info *info)

{

	int irq;

	struct irq_domain *domain = mp_ioapic_irqdomain(ioapic);

	struct mp_pin_info *info = mp_pin_info(ioapic, pin);

	struct mp_pin_info *pinfo = mp_pin_info(ioapic, pin);



	if (!domain)

		return -1;
@@ -997,30 +1009,30 @@ static int mp_map_pin_to_irq(u32 gsi, int idx, int ioapic, int pin, 
	if (idx >= 0 && test_bit(mp_irqs[idx].srcbus, mp_bus_not_pci)) {

		irq = mp_irqs[idx].srcbusirq;

		if (flags & IOAPIC_MAP_ALLOC) {

			if (info->count == 0 &&

			if (pinfo->count == 0 &&

			    mp_irqdomain_map(domain, irq, pin) != 0)

				irq = -1;



			/* special handling for timer IRQ0 */

			if (irq == 0)

				info->count++;

				pinfo->count++;

		}

	} else {

		irq = irq_find_mapping(domain, pin);

		if (irq <= 0 && (flags & IOAPIC_MAP_ALLOC))

			irq = alloc_irq_from_domain(domain, gsi, pin);

			irq = alloc_irq_from_domain(domain, gsi, pin, info);

	}



	if (flags & IOAPIC_MAP_ALLOC) {

		/* special handling for legacy IRQs */

		if (irq < nr_legacy_irqs() && info->count == 1 &&

		if (irq < nr_legacy_irqs() && pinfo->count == 1 &&

		    mp_irqdomain_map(domain, irq, pin) != 0)

			irq = -1;



		if (irq > 0)

			info->count++;

		else if (info->count == 0)

			info->set = 0;

			pinfo->count++;

		else if (pinfo->count == 0)

			pinfo->set = 0;

	}



	mutex_unlock(&ioapic_mutex);
@@ -1058,10 +1070,11 @@ static int pin_2_irq(int idx, int ioapic, int pin, unsigned int flags) 
	}

#endif



	return  mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags);

	return  mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags, NULL);

}



int mp_map_gsi_to_irq(u32 gsi, unsigned int flags)

int mp_map_gsi_to_irq(u32 gsi, unsigned int flags,

		      struct irq_alloc_info *info)

{

	int ioapic, pin, idx;
@@ -1074,7 +1087,7 @@ int mp_map_gsi_to_irq(u32 gsi, unsigned int flags) 
	if ((flags & IOAPIC_MAP_CHECK) && idx < 0)

		return -1;



	return mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags);

	return mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags, info);

}



void mp_unmap_irq(int irq)

arch/x86/pci/intel_mid_pci.c

+3 −1
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, 


static int intel_mid_pci_irq_enable(struct pci_dev *dev)

{

	struct irq_alloc_info info;

	int polarity;



	if (dev->irq_managed && dev->irq > 0)
@@ -217,6 +218,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) 
		polarity = 0; /* active high */

	else

		polarity = 1; /* active low */

	ioapic_set_alloc_attr(&info, dev_to_node(&dev->dev), 1, polarity);



	/*

	 * MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to
@@ -224,7 +226,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) 
	 */

	if (mp_set_gsi_attr(dev->irq, 1, polarity, dev_to_node(&dev->dev)))

		return -EBUSY;

	if (mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC) < 0)

	if (mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC, &info) < 0)

		return -EBUSY;



	dev->irq_managed = 1;

arch/x86/platform/intel-mid/device_libs/platform_wdt.c

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ static struct platform_device wdt_dev = { 
static int tangier_probe(struct platform_device *pdev)

{

	int gsi;

	struct irq_alloc_info info;

	struct intel_mid_wdt_pdata *pdata = pdev->dev.platform_data;



	if (!pdata)
@@ -34,8 +35,9 @@ static int tangier_probe(struct platform_device *pdev) 


	/* IOAPIC builds identity mapping between GSI and IRQ on MID */

	gsi = pdata->irq;

	ioapic_set_alloc_attr(&info, cpu_to_node(0), 1, 0);

	if (mp_set_gsi_attr(gsi, 1, 0, cpu_to_node(0)) ||

	    mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC) <= 0) {

	    mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC, &info) <= 0) {

		dev_warn(&pdev->dev, "cannot find interrupt %d in ioapic\n",

			 gsi);

		return -EINVAL;