Commit 61ce5809 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/cadence' 

  - Fix Cadence PHY handling during probe (Alan Douglas)

  - Signal Cadence Endpoint interrupts via AXI region 0 instead of last
    region (Alan Douglas)

  - Write Cadence Endpoint MSI interrupts with 32 bits of data (Alan
    Douglas)

* remotes/lorenzo/pci/cadence:
  PCI: cadence: Write MSI data with 32bits
  PCI: cadence: Use AXI region 0 to signal interrupts from EP
  PCI: cadence: Correct probe behaviour when failing to get PHY
parents 6aa0459e e81e36a9

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

+7 −6
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ static void cdns_pcie_ep_assert_intx(struct cdns_pcie_ep *ep, u8 fn, 
				     u8 intx, bool is_asserted)

{

	struct cdns_pcie *pcie = &ep->pcie;

	u32 r = ep->max_regions - 1;

	u32 offset;

	u16 status;

	u8 msg_code;
@@ -268,8 +267,8 @@ static void cdns_pcie_ep_assert_intx(struct cdns_pcie_ep *ep, u8 fn, 
	/* Set the outbound region if needed. */

	if (unlikely(ep->irq_pci_addr != CDNS_PCIE_EP_IRQ_PCI_ADDR_LEGACY ||

		     ep->irq_pci_fn != fn)) {

		/* Last region was reserved for IRQ writes. */

		cdns_pcie_set_outbound_region_for_normal_msg(pcie, fn, r,

		/* First region was reserved for IRQ writes. */

		cdns_pcie_set_outbound_region_for_normal_msg(pcie, fn, 0,

							     ep->irq_phys_addr);

		ep->irq_pci_addr = CDNS_PCIE_EP_IRQ_PCI_ADDR_LEGACY;

		ep->irq_pci_fn = fn;
@@ -347,8 +346,8 @@ static int cdns_pcie_ep_send_msi_irq(struct cdns_pcie_ep *ep, u8 fn, 
	/* Set the outbound region if needed. */

	if (unlikely(ep->irq_pci_addr != (pci_addr & ~pci_addr_mask) ||

		     ep->irq_pci_fn != fn)) {

		/* Last region was reserved for IRQ writes. */

		cdns_pcie_set_outbound_region(pcie, fn, ep->max_regions - 1,

		/* First region was reserved for IRQ writes. */

		cdns_pcie_set_outbound_region(pcie, fn, 0,

					      false,

					      ep->irq_phys_addr,

					      pci_addr & ~pci_addr_mask,
@@ -356,7 +355,7 @@ static int cdns_pcie_ep_send_msi_irq(struct cdns_pcie_ep *ep, u8 fn, 
		ep->irq_pci_addr = (pci_addr & ~pci_addr_mask);

		ep->irq_pci_fn = fn;

	}

	writew(data, ep->irq_cpu_addr + (pci_addr & pci_addr_mask));

	writel(data, ep->irq_cpu_addr + (pci_addr & pci_addr_mask));



	return 0;

}
@@ -517,6 +516,8 @@ static int cdns_pcie_ep_probe(struct platform_device *pdev) 
		goto free_epc_mem;

	}

	ep->irq_pci_addr = CDNS_PCIE_EP_IRQ_PCI_ADDR_NONE;

	/* Reserve region 0 for IRQs */

	set_bit(0, &ep->ob_region_map);



	return 0;

drivers/pci/controller/pcie-cadence.c

+12 −8
Original line number Diff line number Diff line
@@ -190,14 +190,16 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns_pcie *pcie) 


	for (i = 0; i < phy_count; i++) {

		of_property_read_string_index(np, "phy-names", i, &name);

		phy[i] = devm_phy_optional_get(dev, name);

		if (IS_ERR(phy))

			return PTR_ERR(phy);



		phy[i] = devm_phy_get(dev, name);

		if (IS_ERR(phy[i])) {

			ret = PTR_ERR(phy[i]);

			goto err_phy;

		}

		link[i] = device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS);

		if (!link[i]) {

			devm_phy_put(dev, phy[i]);

			ret = -EINVAL;

			goto err_link;

			goto err_phy;

		}

	}
@@ -207,13 +209,15 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns_pcie *pcie) 


	ret =  cdns_pcie_enable_phy(pcie);

	if (ret)

		goto err_link;

		goto err_phy;



	return 0;



err_link:

	while (--i >= 0)

err_phy:

	while (--i >= 0) {

		device_link_del(link[i]);

		devm_phy_put(dev, phy[i]);

	}



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE