diff --git a/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 b/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 index ef2d5e6a51..4d44fdbdd6 100644 --- a/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 +++ b/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 @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/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) reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS; diff --git a/target/linux/rockchip/patches-5.15/114-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch b/target/linux/rockchip/patches-5.15/114-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch deleted file mode 100644 index c56547da2f..0000000000 --- a/target/linux/rockchip/patches-5.15/114-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch +++ /dev/null @@ -1,76 +0,0 @@ -From c335ab00b0cd70707291efaf9ff48ebb69dcf667 Mon Sep 17 00:00:00 2001 -From: Niklas Cassel -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 -Tested-by: Jianfeng Liu -Signed-off-by: Niklas Cassel -Signed-off-by: Krzysztof Wilczyński -Signed-off-by: Bjorn Helgaas -Reviewed-by: Heiko Stuebner -Reviewed-by: Manivannan Sadhasivam -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); - diff --git a/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch b/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch index 9037b3ea6a..2316f327d5 100644 --- a/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -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; enum mac_version chipset; struct net_device *dev; diff --git a/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch b/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch index d18e47e46c..5de0a15172 100644 --- a/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch @@ -1,6 +1,6 @@ --- a/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 stmmac_priv *priv; @@ -8,7 +8,7 @@ u32 rxq; 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) return -ENOMEM; diff --git a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch index c8f79c5666..e1505951da 100644 --- a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch +++ b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch @@ -83,7 +83,7 @@ Signed-off-by: XiaoDong Huang if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); 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; struct page *page; int err; @@ -91,7 +91,7 @@ Signed-off-by: XiaoDong Huang its_base = ioremap(res->start, SZ_64K); 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; diff --git a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 87cb236c3d..7f58b1ce0b 100644 --- a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -45,7 +45,7 @@ Signed-off-by: XiaoDong Huang if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { /* * 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); tmp = gits_read_cbaser(its->base + GITS_CBASER); diff --git a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index c0a6cf86a2..0d929f584c 100644 --- a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -42,7 +42,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc 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); if (of_machine_is_compatible("rockchip,rk3568") ||