Commit 74955cb8 authored Nov 22, 2023 by Damien Le Moal Committed by Lorenzo Pieralisi Dec 18, 2023

PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions

linux/pci.h defines the IRQ flags PCI_IRQ_INTX, PCI_IRQ_MSI and
PCI_IRQ_MSIX. Let's use these flags directly instead of the endpoint
definitions provided by enum pci_epc_irq_type. This removes the need
for defining this enum type completely.

Link: https://lore.kernel.org/r/20231122060406.14695-3-dlemoal@kernel.org


Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

parent 58ff9c5a

drivers/pci/controller/cadence/pcie-cadence-ep.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -532,25 +532,24 @@ static int cdns_pcie_ep_send_msix_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn,
		}

		static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,
		enum pci_epc_irq_type type,
		u16 interrupt_num)
		unsigned int type, u16 interrupt_num)
		{
		struct cdns_pcie_ep *ep = epc_get_drvdata(epc);
		struct cdns_pcie *pcie = &ep->pcie;
		struct device *dev = pcie->dev;

		switch (type) {
		case PCI_EPC_IRQ_LEGACY:
		case PCI_IRQ_INTX:
		if (vfn > 0) {
		dev_err(dev, "Cannot raise legacy interrupts for VF\n");
		return -EINVAL;
		}
		return cdns_pcie_ep_send_legacy_irq(ep, fn, vfn, 0);

		case PCI_EPC_IRQ_MSI:
		case PCI_IRQ_MSI:
		return cdns_pcie_ep_send_msi_irq(ep, fn, vfn, interrupt_num);

		case PCI_EPC_IRQ_MSIX:
		case PCI_IRQ_MSIX:
		return cdns_pcie_ep_send_msix_irq(ep, fn, vfn, interrupt_num);

		default:

drivers/pci/controller/dwc/pci-dra7xx.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -404,16 +404,16 @@ static void dra7xx_pcie_raise_msi_irq(struct dra7xx_pcie *dra7xx,
		}

		static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
		enum pci_epc_irq_type type, u16 interrupt_num)
		unsigned int type, u16 interrupt_num)
		{
		struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
		struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);

		switch (type) {
		case PCI_EPC_IRQ_LEGACY:
		case PCI_IRQ_INTX:
		dra7xx_pcie_raise_legacy_irq(dra7xx);
		break;
		case PCI_EPC_IRQ_MSI:
		case PCI_IRQ_MSI:
		dra7xx_pcie_raise_msi_irq(dra7xx, interrupt_num);
		break;
		default:

drivers/pci/controller/dwc/pci-imx6.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1058,17 +1058,16 @@ static void imx6_pcie_ep_init(struct dw_pcie_ep *ep)
		}

		static int imx6_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
		enum pci_epc_irq_type type,
		u16 interrupt_num)
		unsigned int type, u16 interrupt_num)
		{
		struct dw_pcie *pci = to_dw_pcie_from_ep(ep);

		switch (type) {
		case PCI_EPC_IRQ_LEGACY:
		case PCI_IRQ_INTX:
		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
		case PCI_EPC_IRQ_MSI:
		case PCI_IRQ_MSI:
		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
		case PCI_EPC_IRQ_MSIX:
		case PCI_IRQ_MSIX:
		return dw_pcie_ep_raise_msix_irq(ep, func_no, interrupt_num);
		default:
		dev_err(pci->dev, "UNKNOWN IRQ type\n");

drivers/pci/controller/dwc/pci-keystone.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -900,20 +900,19 @@ static void ks_pcie_am654_raise_legacy_irq(struct keystone_pcie *ks_pcie)
		}

		static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
		enum pci_epc_irq_type type,
		u16 interrupt_num)
		unsigned int type, u16 interrupt_num)
		{
		struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
		struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);

		switch (type) {
		case PCI_EPC_IRQ_LEGACY:
		case PCI_IRQ_INTX:
		ks_pcie_am654_raise_legacy_irq(ks_pcie);
		break;
		case PCI_EPC_IRQ_MSI:
		case PCI_IRQ_MSI:
		dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
		break;
		case PCI_EPC_IRQ_MSIX:
		case PCI_IRQ_MSIX:
		dw_pcie_ep_raise_msix_irq(ep, func_no, interrupt_num);
		break;
		default:

drivers/pci/controller/dwc/pci-layerscape-ep.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -166,16 +166,16 @@ static void ls_pcie_ep_init(struct dw_pcie_ep *ep)
		}

		static int ls_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
		enum pci_epc_irq_type type, u16 interrupt_num)
		unsigned int type, u16 interrupt_num)
		{
		struct dw_pcie *pci = to_dw_pcie_from_ep(ep);

		switch (type) {
		case PCI_EPC_IRQ_LEGACY:
		case PCI_IRQ_INTX:
		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
		case PCI_EPC_IRQ_MSI:
		case PCI_IRQ_MSI:
		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
		case PCI_EPC_IRQ_MSIX:
		case PCI_IRQ_MSIX:
		return dw_pcie_ep_raise_msix_irq_doorbell(ep, func_no,
		interrupt_num);
		default: