Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93b226f9 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Bjorn Helgaas
Browse files

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



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: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarLucas 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
parent e6dcd87f

drivers/pci/dwc/pci-imx6.c

+26 −26
Original line number Diff line number Diff line
@@ -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_GEN2;

		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

	 * partners support can be negotiated.

		 * Start Directed Speed Change so the best possible

		 * speed both link partners support can be negotiated.

		 */

		tmp = dw_pcie_readl_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL);

		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");

			goto err_reset_phy;

		}

	} else {

		dev_info(dev, "Link: Gen2 disabled\n");

	}



	tmp = dw_pcie_readl_dbi(pci, PCIE_RC_LCSR);

	dev_info(dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf);