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

Commit 0d8006dd authored by Herbert Xu's avatar Herbert Xu Committed by Bjorn Helgaas
Browse files

PCI: Add pci_irq_vector() and other stubs when !CONFIG_PCI 

Add stub functions pci_alloc_irq_vectors_affinity() and pci_irq_vector()
when CONFIG_PCI is off so drivers can use them without resorting to ifdefs.

Also move the PCI_IRQ_* macros outside of the ifdefs so they are always
available.

Fixes: 625f269a ("crypto: inside-secure - add support for PCI based FPGA development board")
Link: https://lore.kernel.org/r/20190904122600.GA28660@gondor.apana.org.au


Reported-by: default avatarkbuild test robot <lkp@intel.com>
Reported-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 46b2c32d

include/linux/pci.h

+26 −13
Original line number Diff line number Diff line
@@ -925,6 +925,11 @@ enum { 
	PCI_SCAN_ALL_PCIE_DEVS	= 0x00000040,	/* Scan all, not just dev 0 */

};



#define PCI_IRQ_LEGACY		(1 << 0) /* Allow legacy interrupts */

#define PCI_IRQ_MSI		(1 << 1) /* Allow MSI interrupts */

#define PCI_IRQ_MSIX		(1 << 2) /* Allow MSI-X interrupts */

#define PCI_IRQ_AFFINITY	(1 << 3) /* Auto-assign affinity */



/* These external functions are only available when PCI support is enabled */

#ifdef CONFIG_PCI
@@ -1408,11 +1413,6 @@ resource_size_t pcibios_window_alignment(struct pci_bus *bus, 
int pci_set_vga_state(struct pci_dev *pdev, bool decode,

		      unsigned int command_bits, u32 flags);



#define PCI_IRQ_LEGACY		(1 << 0) /* Allow legacy interrupts */

#define PCI_IRQ_MSI		(1 << 1) /* Allow MSI interrupts */

#define PCI_IRQ_MSIX		(1 << 2) /* Allow MSI-X interrupts */

#define PCI_IRQ_AFFINITY	(1 << 3) /* Auto-assign affinity */



/*

 * Virtual interrupts allow for more interrupts to be allocated

 * than the device has interrupts for. These are not programmed
@@ -1517,14 +1517,6 @@ static inline int pci_irq_get_node(struct pci_dev *pdev, int vec) 
}

#endif



static inline int

pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,

		      unsigned int max_vecs, unsigned int flags)

{

	return pci_alloc_irq_vectors_affinity(dev, min_vecs, max_vecs, flags,

					      NULL);

}



/**

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

 * @d: the INTx IRQ domain
@@ -1780,8 +1772,29 @@ static inline const struct pci_device_id *pci_match_id(const struct pci_device_i 
							 struct pci_dev *dev)

{ return NULL; }

static inline bool pci_ats_disabled(void) { return true; }



static inline int pci_irq_vector(struct pci_dev *dev, unsigned int nr)

{

	return -EINVAL;

}



static inline int

pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,

			       unsigned int max_vecs, unsigned int flags,

			       struct irq_affinity *aff_desc)

{

	return -ENOSPC;

}

#endif /* CONFIG_PCI */



static inline int

pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,

		      unsigned int max_vecs, unsigned int flags)

{

	return pci_alloc_irq_vectors_affinity(dev, min_vecs, max_vecs, flags,

					      NULL);

}



#ifdef CONFIG_PCI_ATS

/* Address Translation Service */

void pci_ats_init(struct pci_dev *dev);