소스 검색

mediatek: fix wrong variable name in patch for Linux 6.1

The name of the variable holding the pointer to the private struct has
changed between Linux 5.15 and Linux 6.1 and adding the identical patch
fixing PCIe #PERST de-assert broke the build on Linux 6.1.
Also change the name in the patch to fix the build.

Fixes: 6a2e17d5c1 ("mediatek: fix PCIe #PERST being de-asserted too early")
Signed-off-by: Daniel Golle <[email protected]>
Daniel Golle 2 년 전
부모
커밋
ed3ccf44e6
1개의 변경된 파일5개의 추가작업 그리고 7개의 파일을 삭제
  1. 5 7
      target/linux/mediatek/patches-6.1/611-pcie-mediatek-gen3-PERST-for-100ms.patch

+ 5 - 7
target/linux/mediatek/patches-6.1/611-pcie-mediatek-gen3-PERST-for-100ms.patch

@@ -1,19 +1,17 @@
 --- a/drivers/pci/controller/pcie-mediatek-gen3.c
 +++ b/drivers/pci/controller/pcie-mediatek-gen3.c
-@@ -350,9 +350,15 @@ static int mtk_pcie_startup_port(struct
+@@ -350,7 +350,13 @@ static int mtk_pcie_startup_port(struct
  	msleep(100);
  
  	/* De-assert reset signals */
 -	val &= ~(PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB | PCIE_PE_RSTB);
 +	val &= ~(PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB);
- 	writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
- 
++	writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
++
 +	msleep(100);
 +
 +	/* De-assert PERST# signals */
 +	val &= ~(PCIE_PE_RSTB);
-+	writel_relaxed(val, port->base + PCIE_RST_CTRL_REG);
-+
+ 	writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
+ 
  	/* Check if the link is up or not */
- 	err = readl_poll_timeout(pcie->base + PCIE_LINK_STATUS_REG, val,
- 				 !!(val & PCIE_PORT_LINKUP), 20,