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

Commit f2fb5b8f authored by Shawn Lin's avatar Shawn Lin Committed by Bjorn Helgaas
Browse files

PCI: rockchip: Specify the link capability 



rk3399 supports PCIe 2.x link speeds marginally at best, and on some
boards, the link won't train at 5 GT/s at all.  Rather than sacrifice 500ms
waiting for training that will never happen, let's use the helper function,
of_pci_get_max_link_speed(), to get the max link speed from DT and specify
link capability.

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 45e9320f

drivers/pci/host/pcie-rockchip.c

+37 −23
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define   PCIE_CLIENT_ARI_ENABLE	  HIWORD_UPDATE_BIT(0x0008)

#define   PCIE_CLIENT_CONF_LANE_NUM(x)	  HIWORD_UPDATE(0x0030, ENCODE_LANES(x))

#define   PCIE_CLIENT_MODE_RC		  HIWORD_UPDATE_BIT(0x0040)

#define   PCIE_CLIENT_GEN_SEL_1		  HIWORD_UPDATE(0x0080, 0)

#define   PCIE_CLIENT_GEN_SEL_2		  HIWORD_UPDATE_BIT(0x0080)

#define PCIE_CLIENT_BASIC_STATUS1	(PCIE_CLIENT_BASE + 0x48)

#define   PCIE_CLIENT_LINK_STATUS_UP		0x00300000
@@ -208,6 +209,7 @@ struct rockchip_pcie { 
	struct	gpio_desc *ep_gpio;

	u32	lanes;

	u8	root_bus_nr;

	int	link_gen;

	struct	device *dev;

	struct	irq_domain *irq_domain;

};
@@ -518,13 +520,19 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) 
		return err;

	}



	if (rockchip->link_gen == 2)

		rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_2,

				    PCIE_CLIENT_CONFIG);

	else

		rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_1,

				    PCIE_CLIENT_CONFIG);



	rockchip_pcie_write(rockchip,

			    PCIE_CLIENT_CONF_ENABLE |

			    PCIE_CLIENT_LINK_TRAIN_ENABLE |

			    PCIE_CLIENT_ARI_ENABLE |

			    PCIE_CLIENT_CONF_LANE_NUM(rockchip->lanes) |

			    PCIE_CLIENT_MODE_RC |

			    PCIE_CLIENT_GEN_SEL_2,

			    PCIE_CLIENT_MODE_RC,

			    PCIE_CLIENT_CONFIG);



	err = phy_power_on(rockchip->phy);
@@ -609,6 +617,7 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) 
		msleep(20);

	}



	if (rockchip->link_gen == 2) {

		/*

		 * Enable retrain for gen2. This should be configured only after

		 * gen1 finished.
@@ -633,6 +642,7 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) 


			msleep(20);

		}

	}



	/* Check the final link width from negotiated lane counter from MGMT */

	status = rockchip_pcie_read(rockchip, PCIE_CORE_CTRL);
@@ -840,6 +850,10 @@ static int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) 
		rockchip->lanes = 1;

	}



	rockchip->link_gen = of_pci_get_max_link_speed(node);

	if (rockchip->link_gen < 0 || rockchip->link_gen > 2)

		rockchip->link_gen = 2;



	rockchip->core_rst = devm_reset_control_get(dev, "core");

	if (IS_ERR(rockchip->core_rst)) {

		if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER)