Skip to content

Commit c6bdc45

Browse files
Murali Karicherigregkh
Murali Karicheri
authored andcommitted
PCI: designware: Check for iATU unroll only on platforms that use ATU
commit a782b5f upstream. Previously we checked for iATU unroll support by reading PCIE_ATU_VIEWPORT even on platforms, e.g., Keystone, that do not have ATU ports. This can cause bad behavior such as asynchronous external aborts: OF: PCI: MEM 0x60000000..0x6fffffff -> 0x60000000 Unhandled fault: asynchronous external abort (0x1211) at 0x00000000 pgd = c0003000 [00000000] *pgd=80000800004003, *pmd=00000000 Internal error: : 1211 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.9.0-00009-g6ff59d2-dirty #7 Hardware name: Keystone task: eb878000 task.stack: eb866000 PC is at dw_pcie_setup_rc+0x24/0x380 LR is at ks_pcie_host_init+0x10/0x170 Move the dw_pcie_iatu_unroll_enabled() check so we only call it on platforms that do not use the ATU. These platforms supply their own ->rd_other_conf() and ->wr_other_conf() methods. [bhelgaas: changelog] Fixes: a0601a4 ("PCI: designware: Add iATU Unroll feature") Fixes: 416379f ("PCI: designware: Check for iATU unroll support after initializing host") Tested-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Murali Karicheri <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Acked-By: Joao Pinto <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 07f0267 commit c6bdc45

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/pci/host/pcie-designware.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -807,11 +807,6 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
807807
{
808808
u32 val;
809809

810-
/* get iATU unroll support */
811-
pp->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pp);
812-
dev_dbg(pp->dev, "iATU unroll: %s\n",
813-
pp->iatu_unroll_enabled ? "enabled" : "disabled");
814-
815810
/* set the number of lanes */
816811
val = dw_pcie_readl_rc(pp, PCIE_PORT_LINK_CONTROL);
817812
val &= ~PORT_LINK_MODE_MASK;
@@ -882,6 +877,11 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
882877
* we should not program the ATU here.
883878
*/
884879
if (!pp->ops->rd_other_conf) {
880+
/* get iATU unroll support */
881+
pp->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pp);
882+
dev_dbg(pp->dev, "iATU unroll: %s\n",
883+
pp->iatu_unroll_enabled ? "enabled" : "disabled");
884+
885885
dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX0,
886886
PCIE_ATU_TYPE_MEM, pp->mem_base,
887887
pp->mem_bus_addr, pp->mem_size);

0 commit comments

Comments
 (0)