xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: imx6: Do not switch speed if Gen2 is disabled

Browse Source 
Save a bit of time and avoid going through link speed change procedure in
configuration where link max speed is limited to Gen1 in DT.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Cc: yurovsky@gmail.com
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Dong Aisheng <dongas86@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
This commit is contained in:
Andrey Smirnov
2017-03-28 08:42:52 -07:00
committed by Bjorn Helgaas
parent e6dcd87fff
commit 93b226f9c6
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pci/dwc/pci-imx6.c
View File

@@ -533,13 +533,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK; tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK;
tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2; tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2;
dw_pcie_writel_dbi(pci, PCIE_RC_LCR, tmp); dw_pcie_writel_dbi(pci, PCIE_RC_LCR, tmp);
} else {
dev_info(dev, "Link: Gen2 disabled\n");
}
/* /*
* Start Directed Speed Change so the best possible speed both link * Start Directed Speed Change so the best possible
* partners support can be negotiated. * speed both link partners support can be negotiated.
*/ */
tmp = dw_pcie_readl_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL); tmp = dw_pcie_readl_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL);
tmp |= PORT_LOGIC_SPEED_CHANGE; tmp |= PORT_LOGIC_SPEED_CHANGE;
@@ -568,6 +565,9 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
dev_err(dev, "Failed to bring link up!\n"); dev_err(dev, "Failed to bring link up!\n");
goto err_reset_phy; goto err_reset_phy;
} }
} else {
dev_info(dev, "Link: Gen2 disabled\n");
}
tmp = dw_pcie_readl_dbi(pci, PCIE_RC_LCSR); tmp = dw_pcie_readl_dbi(pci, PCIE_RC_LCSR);
dev_info(dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf); dev_info(dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf);