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

--- a/drivers/pci/controller/pcie-mediatek-gen3.c
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
@@ -375,7 +375,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);
+
+	msleep(100);
+
+	/* De-assert PERST# signals */
+	val &= ~(PCIE_PE_RSTB);
 	writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
 
 	/* Check if the link is up or not */
mediatek: fix PCIe #PERST being de-asserted too early The driver for MediaTek gen3 PCIe hosts de-asserts all reset signals at the same time using a single register write operation. Delay the de-assertion of the #PERST signal by 100ms as some PCIe devices fail to come up otherwise. Signed-off-by: Daniel Golle <daniel@makrotopia.org> 2023-10-03 01:32:35 +00:00			`--- a/drivers/pci/controller/pcie-mediatek-gen3.c`
			`+++ b/drivers/pci/controller/pcie-mediatek-gen3.c`
kernel: bump 6.1 to 6.1.75 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.75 Removed upstreamed: generic/hack-6.1/321-powerpc_crtsavres_prereq.patch[1] generic/pending-6.1/540-ksmbd-only-v2-leases-handle-the-directory.patch[2] Rebased: bcm27xx/patches-6.1/950-0670-fbdev-Don-t-cancel-deferred-work-if-pagelist-empty.patch[3] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.75&id=16b88e68b85d5520c28498bb847358ff6300cb90 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/fs/smb?h=v6.1.75&id=c866866c795296d3637ab0d48a3d8a3ef5d6f4a3 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.75&id=81f444f22816a82ada2cc787a2845cffc8c584a6 Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me> 2024-01-26 21:09:33 +00:00			`@@ -375,7 +375,13 @@ static int mtk_pcie_startup_port(struct`
mediatek: fix PCIe #PERST being de-asserted too early The driver for MediaTek gen3 PCIe hosts de-asserts all reset signals at the same time using a single register write operation. Delay the de-assertion of the #PERST signal by 100ms as some PCIe devices fail to come up otherwise. Signed-off-by: Daniel Golle <daniel@makrotopia.org> 2023-10-03 01:32:35 +00:00			`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);`
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 <daniel@makrotopia.org> 2023-10-05 18:40:12 +00:00			`+ writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);`
			`+`
mediatek: fix PCIe #PERST being de-asserted too early The driver for MediaTek gen3 PCIe hosts de-asserts all reset signals at the same time using a single register write operation. Delay the de-assertion of the #PERST signal by 100ms as some PCIe devices fail to come up otherwise. Signed-off-by: Daniel Golle <daniel@makrotopia.org> 2023-10-03 01:32:35 +00:00			`+ msleep(100);`
			`+`
			`+ /* De-assert PERST# signals */`
			`+ val &= ~(PCIE_PE_RSTB);`
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 <daniel@makrotopia.org> 2023-10-05 18:40:12 +00:00			`writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);`

mediatek: fix PCIe #PERST being de-asserted too early The driver for MediaTek gen3 PCIe hosts de-asserts all reset signals at the same time using a single register write operation. Delay the de-assertion of the #PERST signal by 100ms as some PCIe devices fail to come up otherwise. Signed-off-by: Daniel Golle <daniel@makrotopia.org> 2023-10-03 01:32:35 +00:00			`/* Check if the link is up or not */`