PCI: dwc: Restore ATU memory resource setup to use last entry
Rob Herring
reviewerPATCH 1/1 PCI: dwc: Restore ATU memory resource setup to use last entry
Prior to commit 0f71c60ffd26 ("PCI: dwc: Remove storing of PCI resources"), the DWC driver was setting up the last memory resource rather than the first memory resource. This doesn't matter for most platforms which only have 1 memory resource, but it broke Tegra194 which has a 2nd (prefetchable) memory region which requires an ATU entry. The first region on Tegra194 relies on the default 1:1 pass-thru of outbound transactions which doesn't need an ATU entry.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +6 -2
@@ -586,8 +586,12 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* ATU, so we should not program the ATU here. */ if (pp->bridge->child_ops == &dw_child_pcie_ops) { -struct resource_entry *entry = -resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +struct resource_entry *tmp, *entry =NULL ; + +/* Get last memory resource entry */ +resource_list_for_each_entry (tmp, &pp->bridge->windows) +if (resource_type (tmp->res) ==IORESOURCE_MEM ) + entry = tmp; dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX0, PCIE_ATU_TYPE_MEM, entry->res->start,
Signature · 1 line
2.25.1
Quoted 9 lines · Rob Herring
Prior to commit
0f71c60ffd26("PCI: dwc: Remove storing of PCI resources"), the DWC driver was setting up the last memory resource rather than the first memory resource. This doesn't matter for most platforms which only have 1 memory resource, but it broke Tegra194 which has a 2nd (prefetchable) memory region which requires an ATU entry. The first region on Tegra194 relies on the default 1:1 pass-thru of outbound transactions which doesn't need an ATU entry.
Quoted 3 lines
Fixes 0f71c60ffd26 ("PCI: dwc: Remove storing of PCI resources")Reported-by Vidya Sagar <[email protected]>Cc Jingoo Han <[email protected]>
Best regards,
Jingoo Han
Quoted 29 lines
Cc Gustavo Pimentel <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +6
-2@@ -586,8 +586,12 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* ATU, so we should not program the ATU here. */ if (pp->bridge->child_ops == &dw_child_pcie_ops) { -struct resource_entry *entry = -resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +struct resource_entry *tmp, *entry =NULL ; + +/* Get last memory resource entry */ +resource_list_for_each_entry (tmp, &pp->bridge->windows) +if (resource_type (tmp->res) ==IORESOURCE_MEM ) + entry = tmp; dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX0, PCIE_ATU_TYPE_MEM, entry->res->start,Signature · 1 line
2.25.1
Quoted 28 lines · Rob Herring
External email: Use caution opening links or attachments
Prior to commit
0f71c60ffd26("PCI: dwc: Remove storing of PCI resources"), the DWC driver was setting up the last memory resource rather than the first memory resource. This doesn't matter for most platforms which only have 1 memory resource, but it broke Tegra194 which has a 2nd (prefetchable) memory region which requires an ATU entry. The first region on Tegra194 relies on the default 1:1 pass-thru of outbound transactions which doesn't need an ATU entry.Fixes 0f71c60ffd26 ("PCI: dwc: Remove storing of PCI resources")Reported-by Vidya Sagar <[email protected]>Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +0
-0@@ -586,8 +586,12 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* ATU, so we should not program the ATU here.
drivers/pci/controller/dwc/pcie-designware-host.c void dw_pcie_setup_rc(struct pcie_port *pp) · line 594
Quoted 10 lines
drivers/pci/controller/dwc/pcie-designware-host.c +6
-2*/ if (pp->bridge->child_ops == &dw_child_pcie_ops) { -struct resource_entry *entry = -resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +struct resource_entry *tmp, *entry =NULL ; + +/* Get last memory resource entry */ +resource_list_for_each_entry (tmp, &pp->bridge->windows) +if (resource_type (tmp->res) ==IORESOURCE_MEM ) + entry = tmp;
This patch works for Tegra194 with its 'ranges' property in its current shape. But, this still doesn't work if ATU mapping needs to be set for both prefetchable and non-prefetchable regions. The series I pushed at http://patchwork.ozlabs.org/project/linux-pci/list/?series=209764 works for this condition as well. When it comes to configuring the ATU to handle multiple memory apertures (which is the ultimate goal), I think we need to understand the side effects of removing I/O mapping in platforms where the number of view ports available are not enough to have I/O mapping.
Quoted 6 lines
drivers/pci/controller/dwc/pcie-designware-host.c +0
-1dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX0, PCIE_ATU_TYPE_MEM, entry->res->start, --2.25.1
Rob Herring
reviewerQuoted 37 lines · Vidya Sagar
Quoted 33 lines · Rob Herring
External email: Use caution opening links or attachments
Prior to commit
0f71c60ffd26("PCI: dwc: Remove storing of PCI resources"), the DWC driver was setting up the last memory resource rather than the first memory resource. This doesn't matter for most platforms which only have 1 memory resource, but it broke Tegra194 which has a 2nd (prefetchable) memory region which requires an ATU entry. The first region on Tegra194 relies on the default 1:1 pass-thru of outbound transactions which doesn't need an ATU entry.Fixes 0f71c60ffd26 ("PCI: dwc: Remove storing of PCI resources")Reported-by Vidya Sagar <[email protected]>Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +1
-2@@ -586,8 +586,12 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* ATU, so we should not program the ATU here. */ if (pp->bridge->child_ops == &dw_child_pcie_ops) { -struct resource_entry *entry = -resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +struct resource_entry *tmp, *entry =NULL ;
Quoted 8 lines
drivers/pci/controller/dwc/pcie-designware-host.c void dw_pcie_setup_rc(struct pcie_port *pp) · line 594
Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-host.c +5
-0+ +/* Get last memory resource entry */ +resource_list_for_each_entry (tmp, &pp->bridge->windows) +if (resource_type (tmp->res) ==IORESOURCE_MEM ) + entry = tmp;This patch works for Tegra194 with its 'ranges' property in its current shape. But, this still doesn't work if ATU mapping needs to be set for both prefetchable and non-prefetchable regions.
Supporting both is not a current feature and therefore not 5.10 material. This patch is intended for 5.10. Adding support for multiple memory regions would be 5.11 material.
Quoted 3 lines
The series I pushed at
http://patchwork.ozlabs.org/project/linux-pci/list/?series=209764 works for this condition as well.
I have an alternative implementation that I'll send out shortly.
Quoted 4 lines
When it comes to configuring the ATU to handle multiple memory apertures (which is the ultimate goal), I think we need to understand the side effects of removing I/O mapping in platforms where the number of view ports available are not enough to have I/O mapping.
We don't have that case upstream AFAICT. Tegra is the only platform with more than 1 memory region which could cause a change in behavior. In any case, I'm not removing the sharing of ATU for config and i/o (though I think we should). I am adding a warning though.
Rob
Quoted 15 lines · Rob Herring
Prior to commit
0f71c60ffd26("PCI: dwc: Remove storing of PCI resources"), the DWC driver was setting up the last memory resource rather than the first memory resource. This doesn't matter for most platforms which only have 1 memory resource, but it broke Tegra194 which has a 2nd (prefetchable) memory region which requires an ATU entry. The first region on Tegra194 relies on the default 1:1 pass-thru of outbound transactions which doesn't need an ATU entry.Fixes 0f71c60ffd26 ("PCI: dwc: Remove storing of PCI resources")Reported-by Vidya Sagar <[email protected]>Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 3 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Bjorn, this is v5.10 material please pick it up for one of the upcoming -rc*:
Quoted 22 lines
drivers/pci/controller/dwc/pcie-designware-host.c +6
-2@@ -586,8 +586,12 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* ATU, so we should not program the ATU here. */ if (pp->bridge->child_ops == &dw_child_pcie_ops) { -struct resource_entry *entry = -resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +struct resource_entry *tmp, *entry =NULL ; + +/* Get last memory resource entry */ +resource_list_for_each_entry (tmp, &pp->bridge->windows) +if (resource_type (tmp->res) ==IORESOURCE_MEM ) + entry = tmp; dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX0, PCIE_ATU_TYPE_MEM, entry->res->start,Signature · 1 line
2.25.1
Quoted 8 lines · Rob Herring
Prior to commit
0f71c60ffd26("PCI: dwc: Remove storing of PCI resources"), the DWC driver was setting up the last memory resource rather than the first memory resource. This doesn't matter for most platforms which only have 1 memory resource, but it broke Tegra194 which has a 2nd (prefetchable) memory region which requires an ATU entry. The first region on Tegra194 relies on the default 1:1 pass-thru of outbound transactions which doesn't need an ATU entry.
Quoted 7 lines
Fixes 0f71c60ffd26 ("PCI: dwc: Remove storing of PCI resources")Reported-by Vidya Sagar <[email protected]>Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>
Applied with acks from Lorenzo and Jingoo to for-linus for v5.10, thanks!
Quoted 26 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +6
-2@@ -586,8 +586,12 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* ATU, so we should not program the ATU here. */ if (pp->bridge->child_ops == &dw_child_pcie_ops) { -struct resource_entry *entry = -resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +struct resource_entry *tmp, *entry =NULL ; + +/* Get last memory resource entry */ +resource_list_for_each_entry (tmp, &pp->bridge->windows) +if (resource_type (tmp->res) ==IORESOURCE_MEM ) + entry = tmp; dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX0, PCIE_ATU_TYPE_MEM, entry->res->start,Signature · 1 line
2.25.1