PCI: tegra194: Reset BARs when running in PCIe endpoint mode
PATCH 1/1 PCI: tegra194: Reset BARs when running in PCIe endpoint mode
Tegra already defines all BARs expect for BAR0 as BAR_RESERVED. This is sufficient for pci-epf-test to not allocate backing memory and to not call set_bar() for those BARs.
However, the host side driver, pci_endpoint_test, simply does an ioremap for all enabled BARs, and will run tests against all enabled BARs.
After running the BARs tests (which will write to all enabled BARs), the inbound address translation is broken.
This is because the tegra controller exposes the ATU Port Logic Structure in BAR4. So when BAR4 is written, the inbound address translation settings get overwritten.
To avoid this, implement the dw_pcie_ep_ops .init() callback and start off by disabling all BARs (pci-epf-test will later enable/configure BARs that are not defined as BAR_RESERVED).
This matches the behavior of other PCIe endpoint drivers:
dra7xx, imx6, layerscape-ep, artpec6, dw-rockchip, qcom-ep, rcar-gen4, and uniphier-ep.
With this, the PCI endpoint kselftest test case CONSECUTIVE_BAR_TEST (which was specifically made to detect address translation issues) passes.
--- drivers/pci/controller/dwc/pcie-tegra194.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pci/controller/dwc/pcie-tegra194.c +10 -0
@@ -1941,6 +1941,15 @@ static irqreturn_t tegra_pcie_ep_pex_rst_irq(int irq, void *arg)return IRQ_HANDLED ; } +static void tegra_pcie_ep_init (struct dw_pcie_ep *ep) +{ +struct dw_pcie *pci =to_dw_pcie_from_ep (ep); +enum pci_barno bar; + +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) +dw_pcie_ep_reset_bar (pci, bar); +}; +static int tegra_pcie_ep_raise_intx_irq (struct tegra_pcie_dw *pcie,u16 irq) {/* Tegra194 supports only INTA */
@@ -2017,6 +2026,7 @@ tegra_pcie_ep_get_features(struct dw_pcie_ep *ep) }static const struct dw_pcie_ep_ops pcie_ep_ops = { + .init = tegra_pcie_ep_init, .raise_irq = tegra_pcie_ep_raise_irq, .get_features = tegra_pcie_ep_get_features, };
Signature · 1 line
2.51.0
Manivannan Sadhasivam
maintainerQuoted 4 lines · Niklas Cassel
Tegra already defines all BARs expect for BAR0 as
BAR_RESERVED. This is sufficient for pci-epf-test to not allocate backing memory and to not callset_bar()for those BARs.
Quoted 9 lines
However, the host side driver,
pci_endpoint_test, simply does an ioremap for all enabled BARs, and will run tests against all enabled BARs.After running the BARs tests (which will write to all enabled BARs), the inbound address translation is broken.
This is because the tegra controller exposes the ATU Port Logic Structure in BAR4. So when BAR4 is written, the inbound address translation settings get overwritten.
BAR4 or BAR0?
- Mani
Quoted 47 lines
To avoid this, implement the
dw_pcie_ep_ops.init() callback and start off by disabling all BARs (pci-epf-test will later enable/configure BARs that are not defined asBAR_RESERVED).This matches the behavior of other PCIe endpoint drivers:
dra7xx, imx6, layerscape-ep, artpec6, dw-rockchip, qcom-ep, rcar-gen4, and uniphier-ep.With this, the PCI endpoint kselftest test case
CONSECUTIVE_BAR_TEST(which was specifically made to detect address translation issues) passes.Signed-off-by Niklas Cassel <[email protected]>--- drivers/pci/controller/dwc/pcie-tegra194.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/pci/controller/dwc/pcie-tegra194.c +10
-0@@ -1941,6 +1941,15 @@ static irqreturn_t tegra_pcie_ep_pex_rst_irq(int irq, void *arg)return IRQ_HANDLED ; } +static void tegra_pcie_ep_init (struct dw_pcie_ep *ep) +{ +struct dw_pcie *pci =to_dw_pcie_from_ep (ep); +enum pci_barno bar; + +for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) +dw_pcie_ep_reset_bar (pci, bar); +}; +static int tegra_pcie_ep_raise_intx_irq (struct tegra_pcie_dw *pcie,u16 irq) {/* Tegra194 supports only INTA */ @@ -2017,6 +2026,7 @@ tegra_pcie_ep_get_features(struct dw_pcie_ep *ep) }static const struct dw_pcie_ep_ops pcie_ep_ops = { + .init = tegra_pcie_ep_init, .raise_irq = tegra_pcie_ep_raise_irq, .get_features = tegra_pcie_ep_get_features, };Signature · 1 line
2.51.0
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Quoted 8 lines · Manivannan Sadhasivam
Quoted 7 lines · Niklas Cassel
Tegra already defines all BARs expect for BAR0 as
BAR_RESERVED. This is sufficient for pci-epf-test to not allocate backing memory and to not callset_bar()for those BARs.However, the host side driver,
pci_endpoint_test, simply does an ioremap for all enabled BARs, and will run tests against all enabled BARs.
Quoted 8 lines
Quoted 6 lines
After running the BARs tests (which will write to all enabled BARs), the inbound address translation is broken.
This is because the tegra controller exposes the ATU Port Logic Structure in BAR4. So when BAR4 is written, the inbound address translation settings get overwritten.BAR4 or BAR0?
BAR4.
Just because a BAR is marked as BAR_RESERVED does not mean that the BAR is disabled. Hence this patch.
I can make this clearer in V2.
I think a better solution would be for pci-epf-test to actually do something like call a .disable_bar() for BARs that are marked as BAR_RESERVED.
But, implementing this callback is non-trivial, especially for non-DWC based drivers where we dont have an equivalent to dw_pcie_ep_reset_bar(). Thus, I chose to keep with the existing convention of calling dw_pcie_ep_reset_bar() in the .init callback, like it is done for all other DWC-based EPC drivers.
Kind regards,
Niklas
Manivannan Sadhasivam
maintainerQuoted 16 lines · Niklas Cassel
Quoted 15 lines · Manivannan Sadhasivam
Quoted 13 lines · Niklas Cassel
Tegra already defines all BARs expect for BAR0 as
BAR_RESERVED. This is sufficient for pci-epf-test to not allocate backing memory and to not callset_bar()for those BARs.However, the host side driver,
pci_endpoint_test, simply does an ioremap for all enabled BARs, and will run tests against all enabled BARs.After running the BARs tests (which will write to all enabled BARs), the inbound address translation is broken.
This is because the tegra controller exposes the ATU Port Logic Structure in BAR4. So when BAR4 is written, the inbound address translation settings get overwritten.
Quoted 7 lines
Quoted 1 line
BAR4 or BAR0?
BAR4.
Just because a BAR is marked asBAR_RESERVEDdoes not mean that the BAR is disabled. Hence this patch.
I can make this clearer in V2.
First paragraph says that BAR0 is marked as BAR_RESERVED, and here you were saying BAR4, hence I asked the question without cross checking the driver. Now, I checked the driver and I think you mistakenly said BAR0 instead of BAR4.
Quoted 9 lines
I think a better solution would be for pci-epf-test to actually do something like call a .disable_bar() for BARs that are marked as
BAR_RESERVED.But, implementing this callback is non-trivial, especially for non-DWC based drivers where we dont have an equivalent to
dw_pcie_ep_reset_bar(). Thus, I chose to keep with the existing convention of callingdw_pcie_ep_reset_bar()in the .init callback, like it is done for all other DWC-based EPC drivers.
That's fine. I was just pointing out the discrepancy.
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Manivannan Sadhasivam
maintainerQuoted 25 lines · Manivannan Sadhasivam
Quoted 16 lines · Niklas Cassel
Quoted 15 lines · Manivannan Sadhasivam
Quoted 13 lines · Niklas Cassel
Tegra already defines all BARs expect for BAR0 as
BAR_RESERVED. This is sufficient for pci-epf-test to not allocate backing memory and to not callset_bar()for those BARs.However, the host side driver,
pci_endpoint_test, simply does an ioremap for all enabled BARs, and will run tests against all enabled BARs.After running the BARs tests (which will write to all enabled BARs), the inbound address translation is broken.
This is because the tegra controller exposes the ATU Port Logic Structure in BAR4. So when BAR4 is written, the inbound address translation settings get overwritten.Quoted 7 lines
Quoted 1 line
BAR4 or BAR0?
BAR4.
Just because a BAR is marked asBAR_RESERVEDdoes not mean that the BAR is disabled. Hence this patch.
I can make this clearer in V2.
Quoted 4 lines
First paragraph says that BAR0 is marked as
BAR_RESERVED, and here you were saying BAR4, hence I asked the question without cross checking the driver. Now, I checked the driver and I think you mistakenly said BAR0 instead of BAR4.
Oops.. I misread it, actually. All fine.
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்