Commit b352baf1 authored by Paul Burton's avatar Paul Burton Committed by Bjorn Helgaas
Browse files

PCI: Move enum pci_interrupt_pin to linux/pci.h 



We currently have a definition of enum pci_interrupt_pin in a header
specific to PCI endpoints - linux/pci-epf.h. In order to allow for use of
this enum from PCI host code in a future commit, move its definition to
linux/pci.h & include that from linux/pci-epf.h.

Additionally we add a PCI_NUM_INTX macro which indicates the number of PCI
INTx interrupts, and will be used alongside enum pci_interrupt_pin in
further patches.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
[bhelgaas: move enum pci_interrupt_pin outside #ifdef CONFIG_PCI]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 16f73eb0

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

+22 −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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE