Commit 03f92093 authored by Hans Zhang's avatar Hans Zhang Committed by Manivannan Sadhasivam
Browse files

PCI: controller: Validate max-link-speed 



Add validation for the "max-link-speed" DT property in three more
drivers, using the pcie_get_link_speed() helper.

- brcmstb: If the value is missing or invalid, fall back to no
  limitation (pcie->gen = 0).  Fix the previous incorrect logic.
- mediatek-gen3: If the value is missing or invalid, use the maximum
  speed supported by the controller.
- rzg3s-host: If the value is missing or invalid, fall back to Gen2.

This ensures that all users of of_pci_get_max_link_speed() are ready
for the removal of the central range check.

Signed-off-by: default avatarHans Zhang <18255117159@163.com>
Signed-off-by: default avatarManivannan Sadhasivam <mani@kernel.org>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20260313165522.123518-5-18255117159@163.com
parent 126d0439

drivers/pci/controller/pcie-brcmstb.c

+3 −2
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie) 
	cls = FIELD_GET(PCI_EXP_LNKSTA_CLS, lnksta);

	nlw = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta);

	dev_info(dev, "link up, %s x%u %s\n",

		 pci_speed_string(pcie_link_speed[cls]), nlw,

		 pci_speed_string(pcie_get_link_speed(cls)), nlw,

		 ssc_good ? "(SSC)" : "(!SSC)");



	return 0;
@@ -2072,7 +2072,8 @@ static int brcm_pcie_probe(struct platform_device *pdev) 
		return PTR_ERR(pcie->clk);



	ret = of_pci_get_max_link_speed(np);

	pcie->gen = (ret < 0) ? 0 : ret;

	if (pcie_get_link_speed(ret) == PCI_SPEED_UNKNOWN)

		pcie->gen = 0;



	pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");

drivers/pci/controller/pcie-mediatek-gen3.c

+1 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ static int mtk_pcie_setup(struct mtk_gen3_pcie *pcie) 
		return err;



	err = of_pci_get_max_link_speed(pcie->dev->of_node);

	if (err) {

	if (pcie_get_link_speed(err) != PCI_SPEED_UNKNOWN) {

		/* Get the maximum speed supported by the controller */

		max_speed = mtk_pcie_get_controller_max_link_speed(pcie);

drivers/pci/controller/pcie-rzg3s-host.c

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static int rzg3s_pcie_set_max_link_speed(struct rzg3s_pcie_host *host) 
	ls = readw_relaxed(host->pcie + pcie_cap + PCI_EXP_LNKSTA);

	cs2 = readl_relaxed(host->axi + RZG3S_PCI_PCSTAT2);



	switch (pcie_link_speed[host->max_link_speed]) {

	switch (pcie_get_link_speed(host->max_link_speed)) {

	case PCIE_SPEED_5_0GT:

		max_supported_link_speeds = GENMASK(PCI_EXP_LNKSTA_CLS_5_0GB - 1, 0);

		link_speed = PCI_EXP_LNKCTL2_TLS_5_0GT;