Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: remove upstreamed patch

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-09-15 17:02:06 +08:00
parent 42668c51f5
commit 21ce07e56a
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 8 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/rockchip/patches-5.15/008-0017-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/usb/dwc3/core.c --- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c
@@ -1076,6 +1076,11 @@ static int dwc3_core_init(struct dwc3 *d @@ -1112,6 +1112,11 @@ static int dwc3_core_init(struct dwc3 *d
if (dwc->parkmode_disable_ss_quirk) if (dwc->parkmode_disable_ss_quirk)
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS; reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS;

76
target/linux/rockchip/patches-5.15/114-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch
View File

@ -1,76 +0,0 @@
From c335ab00b0cd70707291efaf9ff48ebb69dcf667 Mon Sep 17 00:00:00 2001
From: Niklas Cassel <cassel@kernel.org>
Date: Wed, 17 Apr 2024 18:42:26 +0200
Subject: [PATCH] PCI: dw-rockchip: Fix initial PERST# GPIO value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
PERST# is active low according to the PCIe specification.
However, the existing pcie-dw-rockchip.c driver does:
gpiod_set_value(..., 0); msleep(100); gpiod_set_value(..., 1);
when asserting + deasserting PERST#.
This is of course wrong, but because all the device trees for this
compatible string have also incorrectly marked this GPIO as ACTIVE_HIGH:
$ git grep -B 10 reset-gpios arch/arm64/boot/dts/rockchip/rk3568*
$ git grep -B 10 reset-gpios arch/arm64/boot/dts/rockchip/rk3588*
The actual toggling of PERST# is correct, and we cannot change it anyway,
since that would break device tree compatibility.
However, this driver does request the GPIO to be initialized as
GPIOD_OUT_HIGH, which does cause a silly sequence where PERST# gets
toggled back and forth for no good reason.
Fix this by requesting the GPIO to be initialized as GPIOD_OUT_LOW (which
for this driver means PERST# asserted).
This will avoid an unnecessary signal change where PERST# gets deasserted
(by devm_gpiod_get_optional()) and then gets asserted (by
rockchip_pcie_start_link()) just a few instructions later.
Before patch, debug prints on EP side, when booting RC:
[ 845.606810] pci: PERST# asserted by host!
[ 852.483985] pci: PERST# de-asserted by host!
[ 852.503041] pci: PERST# asserted by host!
[ 852.610318] pci: PERST# de-asserted by host!
After patch, debug prints on EP side, when booting RC:
[ 125.107921] pci: PERST# asserted by host!
[ 132.111429] pci: PERST# de-asserted by host!
This extra, very short, PERST# assertion + deassertion has been reported to
cause issues with certain WLAN controllers, e.g. RTL8822CE.
Fixes: 0e898eb8df4e ("PCI: rockchip-dwc: Add Rockchip RK356X host controller driver")
Link: https://lore.kernel.org/linux-pci/20240417164227.398901-1-cassel@kernel.org
Tested-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Jianfeng Liu <liujianfeng1994@gmail.com>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: stable@vger.kernel.org # v5.15+
---
drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c
+++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c
@@ -240,7 +240,7 @@ static int rockchip_pcie_resource_get(st
return PTR_ERR(rockchip->apb_base);
rockchip->rst_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
- GPIOD_OUT_HIGH);
+ GPIOD_OUT_LOW);
if (IS_ERR(rockchip->rst_gpio))
return PTR_ERR(rockchip->rst_gpio);

2
target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch
View File

@ -8,7 +8,7 @@
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
@@ -5319,12 +5320,16 @@ static int rtl_init_one(struct pci_dev * @@ -5315,12 +5316,16 @@ static int rtl_init_one(struct pci_dev *
int jumbo_max, region, rc; int jumbo_max, region, rc;
enum mac_version chipset; enum mac_version chipset;
struct net_device *dev; struct net_device *dev;

4
target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7134,6 +7134,7 @@ int stmmac_dvr_probe(struct device *devi @@ -7136,6 +7136,7 @@ int stmmac_dvr_probe(struct device *devi
{ {
struct net_device *ndev = NULL; struct net_device *ndev = NULL;
struct stmmac_priv *priv; struct stmmac_priv *priv;
@ -8,7 +8,7 @@
u32 rxq; u32 rxq;
int i, ret = 0; int i, ret = 0;
@@ -7142,6 +7143,9 @@ int stmmac_dvr_probe(struct device *devi @@ -7144,6 +7145,9 @@ int stmmac_dvr_probe(struct device *devi
if (!ndev) if (!ndev)
return -ENOMEM; return -ENOMEM;

4
target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch
View File

@ -83,7 +83,7 @@ Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
if (alloc_lpis) { if (alloc_lpis) {
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
if (lpi_map) if (lpi_map)
@@ -4990,6 +5006,7 @@ static int __init its_probe_one(struct r @@ -4988,6 +5004,7 @@ static int __init its_probe_one(struct r
u64 baser, tmp, typer; u64 baser, tmp, typer;
struct page *page; struct page *page;
int err; int err;
@ -91,7 +91,7 @@ Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
its_base = ioremap(res->start, SZ_64K); its_base = ioremap(res->start, SZ_64K);
if (!its_base) { if (!its_base) {
@@ -5058,7 +5075,10 @@ static int __init its_probe_one(struct r @@ -5056,7 +5073,10 @@ static int __init its_probe_one(struct r
its->numa_node = numa_node; its->numa_node = numa_node;

2
target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch
View File

@ -45,7 +45,7 @@ Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) {
/* /*
* The HW reports non-shareable, we must remove the * The HW reports non-shareable, we must remove the
@@ -5109,6 +5121,10 @@ static int __init its_probe_one(struct r @@ -5107,6 +5119,10 @@ static int __init its_probe_one(struct r
gits_write_cbaser(baser, its->base + GITS_CBASER); gits_write_cbaser(baser, its->base + GITS_CBASER);
tmp = gits_read_cbaser(its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER);

2
target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch
View File

@ -42,7 +42,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc
tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK; tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK;
if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) {
@@ -5126,7 +5129,8 @@ static int __init its_probe_one(struct r @@ -5124,7 +5127,8 @@ static int __init its_probe_one(struct r
tmp = gits_read_cbaser(its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER);
if (of_machine_is_compatible("rockchip,rk3568") || if (of_machine_is_compatible("rockchip,rk3568") ||