Commit 37deba45 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/irq-intx' into next 

* pci/irq-intx:
  PCI: Add pci_irqd_intx_xlate()
  PCI: Move enum pci_interrupt_pin to linux/pci.h
parents 16f73eb0 0d58e6c1

include/linux/pci-epf.h

+1 −8
Original line number Diff line number Diff line
@@ -14,17 +14,10 @@ 


#include <linux/device.h>

#include <linux/mod_devicetable.h>

#include <linux/pci.h>



struct pci_epf;



enum pci_interrupt_pin {

	PCI_INTERRUPT_UNKNOWN,

	PCI_INTERRUPT_INTA,

	PCI_INTERRUPT_INTB,

	PCI_INTERRUPT_INTC,

	PCI_INTERRUPT_INTD,

};



enum pci_barno {

	BAR_0,

	BAR_1,

include/linux/pci.h

+54 −0
Original line number Diff line number Diff line
@@ -102,6 +102,28 @@ enum { 
	DEVICE_COUNT_RESOURCE = PCI_NUM_RESOURCES,

};



/**

 * enum pci_interrupt_pin - PCI INTx interrupt values

 * @PCI_INTERRUPT_UNKNOWN: Unknown or unassigned interrupt

 * @PCI_INTERRUPT_INTA: PCI INTA pin

 * @PCI_INTERRUPT_INTB: PCI INTB pin

 * @PCI_INTERRUPT_INTC: PCI INTC pin

 * @PCI_INTERRUPT_INTD: PCI INTD pin

 *

 * Corresponds to values for legacy PCI INTx interrupts, as can be found in the

 * PCI_INTERRUPT_PIN register.

 */

enum pci_interrupt_pin {

	PCI_INTERRUPT_UNKNOWN,

	PCI_INTERRUPT_INTA,

	PCI_INTERRUPT_INTB,

	PCI_INTERRUPT_INTC,

	PCI_INTERRUPT_INTD,

};



/* The number of legacy PCI INTx interrupts */

#define PCI_NUM_INTX	4



/*

 * pci_power_t values must match the bits in the Capabilities PME_Support

 * and Control/Status PowerState fields in the Power Management capability.
@@ -1394,6 +1416,38 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, 
					      NULL);

}



/**

 * pci_irqd_intx_xlate() - Translate PCI INTx value to an IRQ domain hwirq

 * @d: the INTx IRQ domain

 * @node: the DT node for the device whose interrupt we're translating

 * @intspec: the interrupt specifier data from the DT

 * @intsize: the number of entries in @intspec

 * @out_hwirq: pointer at which to write the hwirq number

 * @out_type: pointer at which to write the interrupt type

 *

 * Translate a PCI INTx interrupt number from device tree in the range 1-4, as

 * stored in the standard PCI_INTERRUPT_PIN register, to a value in the range

 * 0-3 suitable for use in a 4 entry IRQ domain. That is, subtract one from the

 * INTx value to obtain the hwirq number.

 *

 * Returns 0 on success, or -EINVAL if the interrupt specifier is out of range.

 */

static inline int pci_irqd_intx_xlate(struct irq_domain *d,

				      struct device_node *node,

				      const u32 *intspec,

				      unsigned int intsize,

				      unsigned long *out_hwirq,

				      unsigned int *out_type)

{

	const u32 intx = intspec[0];



	if (intx < PCI_INTERRUPT_INTA || intx > PCI_INTERRUPT_INTD)

		return -EINVAL;



	*out_hwirq = intx - PCI_INTERRUPT_INTA;

	return 0;

}



#ifdef CONFIG_PCIEPORTBUS

extern bool pcie_ports_disabled;

extern bool pcie_ports_auto;