Re: [PATCH V2] PCI: dwc: Don't hard-code DBI/ATU offset

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 27/11/18 11:41 PM, Stephen Warren wrote:
On 11/26/18 8:52 PM, Vidya Sagar wrote:

On 11/26/2018 10:24 PM, Stephen Warren wrote:
On 11/25/18 10:51 PM, Vidya Sagar wrote:

On 11/20/2018 11:27 PM, Stephen Warren wrote:
From: Stephen Warren <swarren@xxxxxxxxxx>

The DWC PCIe core contains various separate register spaces: DBI, DBI2, ATU, DMA, etc. The relationship between the addresses of these register spaces is entirely determined by the implementation of the IP block, not
by the IP block design itself. Hence, the DWC driver must not make
assumptions that one register space can be accessed at a fixed offset from
any other register space. To avoid such assumptions, introduce an
explicit/separate register pointer for the ATU register space. In
particular, the current assumption is not valid for NVIDIA's T194 SoC.

The ATU register space is only used on systems that require unrolled ATU access. This property is detected at run-time for host controllers, and when this is detected, this patch provides a default value for atu_base that matches the previous assumption re: register layout. An alternative would be to update all drivers for HW that requires unrolled access to explicitly set atu_base. However, it's hard to tell which drivers would
require atu_base to be set. The unrolled property is not detected for
endpoint systems, and so any endpoint driver that requires unrolled access must explicitly set the iatu_unroll_enabled flag (none do at present), and so a check is added to require the driver to also set atu_base while at
it.

Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Gustavo Pimentel <gustavo.pimentel@xxxxxxxxxxxx>
---
v2:
* Modified patch subject
* Added missing outer brackets to PCIE_GET_ATU_INB_UNR_REG_OFFSET macro
---
  .../pci/controller/dwc/pcie-designware-ep.c   |  4 ++++
  .../pci/controller/dwc/pcie-designware-host.c |  3 +++
  drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++----
  drivers/pci/controller/dwc/pcie-designware.h  | 20 +++++++++++++++----
  4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 1e7b02221eac..880210366e71 100644
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -504,6 +504,10 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
          dev_err(dev, "dbi_base/dbi_base2 is not populated\n");
          return -EINVAL;
      }
+    if (pci->iatu_unroll_enabled && !pci->atu_base) {
+        dev_err(dev, "atu_base is not populated\n");
+        return -EINVAL;
+    }
      ret = of_property_read_u32(np, "num-ib-windows", &ep->num_ib_windows);
      if (ret < 0) {
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 29a05759a294..2ebb7f4768cf 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -699,6 +699,9 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
          dev_dbg(pci->dev, "iATU unroll: %s\n",
              pci->iatu_unroll_enabled ? "enabled" : "disabled");

I see that dw_pcie_setup_rc() API has code where pci->iatu_unroll_enabled gets set based on reading a viewport register.

IMO, we need a check like following to avoid pci->iatu_unroll_enabled getting modified (if already set)

if (!pci->iatu_unroll_enabled)
     pci->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pci);

That's only true if you believe that dw_pcie_iatu_unroll_enabled() will give the wrong answer in some circumstances. It's working OK right now, so I'm not sure why that function would start having problems?
>
Since dw_pcie_iatu_unroll_enabled() is reading PCIE_ATU_VIEWPORT register and in case of Nvidia's DWC based PCIe implementation, this register is not listed. In case, if it is returning '0', then, pci->iatu_unroll_enabled which was set by implementation specific driver gets overwritten with this value. Though it is working fine now, I'm not sure if we can take this for granted that it would always work.

For current hardware, I think we can assume this works, because it does now. The HW behaviour isn't going to suddenly change for a specific chip that's already designed. The behaviour seems to be a property of the core DWC HW since the driver already relies on it for multiple different vendor uses of the core DWC HW. If for some reason it turns out that this doesn't work for a future HW design, we can always fix it up then.

I don't think this patch affects this issue at all though. If you want to modify the DWC core and all DWC HW-specific drivers so that the HW-specific drivers always set iatu_unroll_enabled when required, rather than auto-detecting the value, that seems fine, but I think you should send a separate patch for that.

Fine. I'm convinced with the explanation.

Acked-by: Vidya Sagar <vidyas@xxxxxxxxxx>





[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux