fix patch

Author: anaelorlinski

…hes-6.6/402-2-rk3399-fix-pci-lanes.patch …-Enable-all-four-lanes-if-required.patchopenwrt-24.10/patches/target/linux/rockchip/patches-6.6/402-2-rk3399-fix-pci-lanes.patch renamed to openwrt-24.10/patches/target/linux/rockchip/patches-6.6/032-06-v6.17-phy-rockchip-pcie-Enable-all-four-lanes-if-required.patch openwrt-24.10/patches/target/linux/rockchip/patches-6.6/402-2-rk3399-fix-pci-lanes.patch renamed to openwrt-24.10/patches/target/linux/rockchip/patches-6.6/032-06-v6.17-phy-rockchip-pcie-Enable-all-four-lanes-if-required.patch

@@ -1,31 +1,41 @@
-From 77f6dfcb20c2dc6a4a2f5303709c6fa0c7b65f30 Mon Sep 17 00:00:00 2001
+From c3fe7071e196e25789ecf90dbc9e8491a98884d7 Mon Sep 17 00:00:00 2001
 From: Valmantas Paliksa <walmis@gmail.com>
-Date: Thu, 12 Dec 2024 12:24:33 +0200
-Subject: [PATCH] Disable PHY_LANE_IDLE_OFF for each instance of rockchip_pcie_phy_power_one
+Date: Mon, 30 Jun 2025 19:25:14 -0300
+Subject: [PATCH] phy: rockchip-pcie: Enable all four lanes if required
 
-This patch fixes an issue in the Rockchip PCIe PHY driver where, after a warm restart of the rockchip_pcie_phy module, PCIe lanes other than lane 0 could remain stuck in the PHY_LANE_IDLE_OFF state. This resulted in the PCIe link being restricted to x1 mode, even in configurations designed to use multiple lanes.
+Current code enables only Lane 0 because pwr_cnt will be incremented on
+first call to the function. Let's reorder the enablement code to enable
+all 4 lanes through GRF.
+
+Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
+Reviewed-by: Robin Murphy <robin.murphy@arm.com>
 
 Signed-off-by: Valmantas Paliksa <walmis@gmail.com>
+Signed-off-by: Geraldo Nascimento <geraldogabriel@gmail.com>
+Reviewed-by: Robin Murphy <robin.murphy@arm.com>
+Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
+Link: https://lore.kernel.org/r/16b610aab34e069fd31d9f57260c10df2a968f80.1751322015.git.geraldogabriel@gmail.com
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
 ---
  drivers/phy/rockchip/phy-rockchip-pcie.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c
 +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
-@@ -166,6 +166,12 @@ static int rockchip_pcie_phy_power_on(st
- 	unsigned long timeout;
+@@ -165,6 +165,12 @@ static int rockchip_pcie_phy_power_on(st
 
  	mutex_lock(&rk_phy->pcie_mutex);
-+	
+ 
 +	regmap_write(rk_phy->reg_base,
 +		     rk_phy->phy_data->pcie_laneoff,
 +		     HIWORD_UPDATE(!PHY_LANE_IDLE_OFF,
 +				   PHY_LANE_IDLE_MASK,
 +				   PHY_LANE_IDLE_A_SHIFT + inst->index));
- 
++
  	if (rk_phy->pwr_cnt++)
  		goto err_out;
-@@ -181,12 +187,6 @@ static int rockchip_pcie_phy_power_on(st
+ 
+@@ -179,12 +185,6 @@ static int rockchip_pcie_phy_power_on(st
  				   PHY_CFG_ADDR_MASK,
  				   PHY_CFG_ADDR_SHIFT));