Commit dc14155d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/irq-clean-up' 

- Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX to be more explicit and match spec
  terminology (Bjorn Helgaas)

- Use existing PCI_IRQ_INTX, PCI_IRQ_MSI, PCI_IRQ_MSIX in artpec6, cadence,
  designware, designware-plat, dra7xx, imx6, keembay, keystone, layerscape,
  mhi, ntb, qcom, rcar, rcar-gen4, rockchip, tegra194, uniphier, vntb; drop
  the redundant pci_epc_irq_type enum with the same values (Damien Le Moal)

- Use "intx" instead of "leg" or "legacy" when describing INTx interrupts
  in endpoint core, endpoint tests, cadence, dra7xx, designware,
  dw-rockchip, dwc core, imx6, keystone, layerscape, qcom, rcar-gen4,
  rockchip, tegra194, uniphier, xilinx-nwl (Damien Le Moal)

* pci/irq-clean-up:
  PCI: xilinx-nwl: Use INTX instead of legacy
  PCI: rockchip-host: Rename rockchip_pcie_legacy_int_handler()
  PCI: rockchip-ep: Use INTX instead of legacy
  PCI: uniphier: Use INTX instead of legacy
  PCI: tegra194: Use INTX instead of legacy
  PCI: dw-rockchip: Rename rockchip_pcie_legacy_int_handler()
  PCI: keystone: Use INTX instead of legacy
  PCI: dwc: Rename dw_pcie_ep_raise_legacy_irq()
  PCI: cadence: Use INTX instead of legacy
  PCI: dra7xx: Rename dra7xx_pcie_raise_legacy_irq()
  misc: pci_endpoint_test: Use INTX instead of LEGACY
  PCI: endpoint: Rename LEGACY to INTX in test function driver
  PCI: endpoint: Use INTX instead of legacy
  PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions
  PCI: Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX
parents eb30ad41 354b2bd3

drivers/misc/pci_endpoint_test.c

+15 −15
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ 
#define DRV_MODULE_NAME				"pci-endpoint-test"



#define IRQ_TYPE_UNDEFINED			-1

#define IRQ_TYPE_LEGACY				0

#define IRQ_TYPE_INTX				0

#define IRQ_TYPE_MSI				1

#define IRQ_TYPE_MSIX				2



#define PCI_ENDPOINT_TEST_MAGIC			0x0



#define PCI_ENDPOINT_TEST_COMMAND		0x4

#define COMMAND_RAISE_LEGACY_IRQ		BIT(0)

#define COMMAND_RAISE_INTX_IRQ			BIT(0)

#define COMMAND_RAISE_MSI_IRQ			BIT(1)

#define COMMAND_RAISE_MSIX_IRQ			BIT(2)

#define COMMAND_READ				BIT(3)
@@ -183,8 +183,8 @@ static bool pci_endpoint_test_alloc_irq_vectors(struct pci_endpoint_test *test, 
	bool res = true;



	switch (type) {

	case IRQ_TYPE_LEGACY:

		irq = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_LEGACY);

	case IRQ_TYPE_INTX:

		irq = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_INTX);

		if (irq < 0)

			dev_err(dev, "Failed to get Legacy interrupt\n");

		break;
@@ -244,7 +244,7 @@ static bool pci_endpoint_test_request_irq(struct pci_endpoint_test *test) 


fail:

	switch (irq_type) {

	case IRQ_TYPE_LEGACY:

	case IRQ_TYPE_INTX:

		dev_err(dev, "Failed to request IRQ %d for Legacy\n",

			pci_irq_vector(pdev, i));

		break;
@@ -291,15 +291,15 @@ static bool pci_endpoint_test_bar(struct pci_endpoint_test *test, 
	return true;

}



static bool pci_endpoint_test_legacy_irq(struct pci_endpoint_test *test)

static bool pci_endpoint_test_intx_irq(struct pci_endpoint_test *test)

{

	u32 val;



	pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE,

				 IRQ_TYPE_LEGACY);

				 IRQ_TYPE_INTX);

	pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_NUMBER, 0);

	pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_COMMAND,

				 COMMAND_RAISE_LEGACY_IRQ);

				 COMMAND_RAISE_INTX_IRQ);

	val = wait_for_completion_timeout(&test->irq_raised,

					  msecs_to_jiffies(1000));

	if (!val)
@@ -385,7 +385,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, 
	if (use_dma)

		flags |= FLAG_USE_DMA;



	if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {

	if (irq_type < IRQ_TYPE_INTX || irq_type > IRQ_TYPE_MSIX) {

		dev_err(dev, "Invalid IRQ type option\n");

		goto err;

	}
@@ -521,7 +521,7 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test, 
	if (use_dma)

		flags |= FLAG_USE_DMA;



	if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {

	if (irq_type < IRQ_TYPE_INTX || irq_type > IRQ_TYPE_MSIX) {

		dev_err(dev, "Invalid IRQ type option\n");

		goto err;

	}
@@ -621,7 +621,7 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test, 
	if (use_dma)

		flags |= FLAG_USE_DMA;



	if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {

	if (irq_type < IRQ_TYPE_INTX || irq_type > IRQ_TYPE_MSIX) {

		dev_err(dev, "Invalid IRQ type option\n");

		goto err;

	}
@@ -691,7 +691,7 @@ static bool pci_endpoint_test_set_irq(struct pci_endpoint_test *test, 
	struct pci_dev *pdev = test->pdev;

	struct device *dev = &pdev->dev;



	if (req_irq_type < IRQ_TYPE_LEGACY || req_irq_type > IRQ_TYPE_MSIX) {

	if (req_irq_type < IRQ_TYPE_INTX || req_irq_type > IRQ_TYPE_MSIX) {

		dev_err(dev, "Invalid IRQ type option\n");

		return false;

	}
@@ -737,8 +737,8 @@ static long pci_endpoint_test_ioctl(struct file *file, unsigned int cmd, 
			goto ret;

		ret = pci_endpoint_test_bar(test, bar);

		break;

	case PCITEST_LEGACY_IRQ:

		ret = pci_endpoint_test_legacy_irq(test);

	case PCITEST_INTX_IRQ:

		ret = pci_endpoint_test_intx_irq(test);

		break;

	case PCITEST_MSI:

	case PCITEST_MSIX:
@@ -801,7 +801,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, 
	test->irq_type = IRQ_TYPE_UNDEFINED;



	if (no_msi)

		irq_type = IRQ_TYPE_LEGACY;

		irq_type = IRQ_TYPE_INTX;



	data = (struct pci_endpoint_test_data *)ent->driver_data;

	if (data) {

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

+9 −10
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static void cdns_pcie_ep_assert_intx(struct cdns_pcie_ep *ep, u8 fn, u8 intx, 
	writel(0, ep->irq_cpu_addr + offset);

}



static int cdns_pcie_ep_send_legacy_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn,

static int cdns_pcie_ep_send_intx_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn,

				      u8 intx)

{

	u16 cmd;
@@ -371,7 +371,7 @@ static int cdns_pcie_ep_send_legacy_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn, 


	cdns_pcie_ep_assert_intx(ep, fn, intx, true);

	/*

	 * The mdelay() value was taken from dra7xx_pcie_raise_legacy_irq()

	 * The mdelay() value was taken from dra7xx_pcie_raise_intx_irq()

	 */

	mdelay(1);

	cdns_pcie_ep_assert_intx(ep, fn, intx, false);
@@ -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");

			dev_err(dev, "Cannot raise INTX interrupts for VF\n");

			return -EINVAL;

		}

		return cdns_pcie_ep_send_legacy_irq(ep, fn, vfn, 0);

		return cdns_pcie_ep_send_intx_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/cadence/pcie-cadence.h

+6 −6
Original line number Diff line number Diff line
@@ -347,16 +347,16 @@ struct cdns_pcie_epf { 
 * @max_regions: maximum number of regions supported by hardware

 * @ob_region_map: bitmask of mapped outbound regions

 * @ob_addr: base addresses in the AXI bus where the outbound regions start

 * @irq_phys_addr: base address on the AXI bus where the MSI/legacy IRQ

 * @irq_phys_addr: base address on the AXI bus where the MSI/INTX IRQ

 *		   dedicated outbound regions is mapped.

 * @irq_cpu_addr: base address in the CPU space where a write access triggers

 *		  the sending of a memory write (MSI) / normal message (legacy

 *		  the sending of a memory write (MSI) / normal message (INTX

 *		  IRQ) TLP through the PCIe bus.

 * @irq_pci_addr: used to save the current mapping of the MSI/legacy IRQ

 * @irq_pci_addr: used to save the current mapping of the MSI/INTX IRQ

 *		  dedicated outbound region.

 * @irq_pci_fn: the latest PCI function that has updated the mapping of

 *		the MSI/legacy IRQ dedicated outbound region.

 * @irq_pending: bitmask of asserted legacy IRQs.

 *		the MSI/INTX IRQ dedicated outbound region.

 * @irq_pending: bitmask of asserted INTX IRQs.

 * @lock: spin lock to disable interrupts while modifying PCIe controller

 *        registers fields (RMW) accessible by both remote RC and EP to

 *        minimize time between read and write
@@ -374,7 +374,7 @@ struct cdns_pcie_ep { 
	u64			irq_pci_addr;

	u8			irq_pci_fn;

	u8			irq_pending;

	/* protect writing to PCI_STATUS while raising legacy interrupts */

	/* protect writing to PCI_STATUS while raising INTX interrupts */

	spinlock_t		lock;

	struct cdns_pcie_epf	*epf;

	unsigned int		quirk_detect_quiet_flag:1;

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

+5 −5
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static void dra7xx_pcie_ep_init(struct dw_pcie_ep *ep) 
	dra7xx_pcie_enable_wrapper_interrupts(dra7xx);

}



static void dra7xx_pcie_raise_legacy_irq(struct dra7xx_pcie *dra7xx)

static void dra7xx_pcie_raise_intx_irq(struct dra7xx_pcie *dra7xx)

{

	dra7xx_pcie_writel(dra7xx, PCIECTRL_TI_CONF_INTX_ASSERT, 0x1);

	mdelay(1);
@@ -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:

		dra7xx_pcie_raise_legacy_irq(dra7xx);

	case PCI_IRQ_INTX:

		dra7xx_pcie_raise_intx_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

+5 −6
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:

		return dw_pcie_ep_raise_legacy_irq(ep, func_no);

	case PCI_EPC_IRQ_MSI:

	case PCI_IRQ_INTX:

		return dw_pcie_ep_raise_intx_irq(ep, func_no);

	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");