From 280b04ad26f3c0090d9f9d4c4e8e6b9a8ccd6869 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 6 Oct 2024 00:11:58 +0200 Subject: [PATCH] rpardini: config: rk35xx legacy reenable r8169 from vendor storage patch --- ...link_up-hook-from-struct-dw_pcie_ops.patch | 34 ++----------------- ...=> r8169_mac_from_rk_vendor_storage.patch} | 10 +++--- 2 files changed, 8 insertions(+), 36 deletions(-) rename userpatches/kernel/rk35xx-vendor-6.1/{r8169_mac_from_rk_vendor_storage.disabled => r8169_mac_from_rk_vendor_storage.patch} (91%) diff --git a/userpatches/kernel/rk35xx-vendor-6.1/3000-Reapply-PCI-rockchip-dw-remove-.link_up-hook-from-struct-dw_pcie_ops.patch b/userpatches/kernel/rk35xx-vendor-6.1/3000-Reapply-PCI-rockchip-dw-remove-.link_up-hook-from-struct-dw_pcie_ops.patch index 1165abf4ca8a..5b6aa4088a16 100644 --- a/userpatches/kernel/rk35xx-vendor-6.1/3000-Reapply-PCI-rockchip-dw-remove-.link_up-hook-from-struct-dw_pcie_ops.patch +++ b/userpatches/kernel/rk35xx-vendor-6.1/3000-Reapply-PCI-rockchip-dw-remove-.link_up-hook-from-struct-dw_pcie_ops.patch @@ -10,17 +10,10 @@ This reverts commit 16a7adc42e350ee3ff96298f295ae01f52f103bb. 1 file changed, 13 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c -index 94b221b5b6148..ba462061f6a0c 100644 +index 111111111111..222222222222 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c -@@ -267,32 +267,20 @@ static inline void rk_pcie_link_status_clear(struct rk_pcie *rk_pcie) - static inline void rk_pcie_disable_ltssm(struct rk_pcie *rk_pcie) - { - rk_pcie_writel_apb(rk_pcie, 0x0, 0xc0008); - } - - static inline void rk_pcie_enable_ltssm(struct rk_pcie *rk_pcie) - { +@@ -274,18 +274,6 @@ static inline void rk_pcie_enable_ltssm(struct rk_pcie *rk_pcie) rk_pcie_writel_apb(rk_pcie, 0x0, 0xC000C); } @@ -39,21 +32,7 @@ index 94b221b5b6148..ba462061f6a0c 100644 static void rk_pcie_enable_debug(struct rk_pcie *rk_pcie) { if (!IS_ENABLED(CONFIG_DEBUG_FS)) - return; - - rk_pcie_writel_apb(rk_pcie, PCIE_CLIENT_DBG_FIFO_PTN_HIT_D0, - PCIE_CLIENT_DBG_TRANSITION_DATA); - rk_pcie_writel_apb(rk_pcie, PCIE_CLIENT_DBG_FIFO_PTN_HIT_D1, - PCIE_CLIENT_DBG_TRANSITION_DATA); - rk_pcie_writel_apb(rk_pcie, PCIE_CLIENT_DBG_FIFO_TRN_HIT_D0, -@@ -819,21 +807,20 @@ static const struct of_device_id rk_pcie_of_match[] = { - .compatible = "rockchip,rk3588-pcie", - .data = NULL, - }, - {}, - }; - - MODULE_DEVICE_TABLE(of, rk_pcie_of_match); +@@ -826,7 +814,6 @@ MODULE_DEVICE_TABLE(of, rk_pcie_of_match); static const struct dw_pcie_ops dw_pcie_ops = { .start_link = rk_pcie_establish_link, @@ -61,13 +40,6 @@ index 94b221b5b6148..ba462061f6a0c 100644 }; static void rk_pcie_fast_link_setup(struct rk_pcie *rk_pcie) - { - u32 val; - - /* LTSSM EN ctrl mode */ - val = rk_pcie_readl_apb(rk_pcie, PCIE_CLIENT_HOT_RESET_CTRL); - val |= (PCIE_LTSSM_ENABLE_ENHANCE | PCIE_LTSSM_APP_DLY2_EN) - | ((PCIE_LTSSM_APP_DLY2_EN | PCIE_LTSSM_ENABLE_ENHANCE) << 16); -- Armbian diff --git a/userpatches/kernel/rk35xx-vendor-6.1/r8169_mac_from_rk_vendor_storage.disabled b/userpatches/kernel/rk35xx-vendor-6.1/r8169_mac_from_rk_vendor_storage.patch similarity index 91% rename from userpatches/kernel/rk35xx-vendor-6.1/r8169_mac_from_rk_vendor_storage.disabled rename to userpatches/kernel/rk35xx-vendor-6.1/r8169_mac_from_rk_vendor_storage.patch index 2ef5779aaf08..f32a9918aed3 100644 --- a/userpatches/kernel/rk35xx-vendor-6.1/r8169_mac_from_rk_vendor_storage.disabled +++ b/userpatches/kernel/rk35xx-vendor-6.1/r8169_mac_from_rk_vendor_storage.patch @@ -12,7 +12,7 @@ Signed-off-by: zhangping 1 file changed, 59 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index a4c7e8f5f893..0bd1faed0462 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -30,10 +30,18 @@ @@ -34,7 +34,7 @@ index a4c7e8f5f893..0bd1faed0462 100644 #define FIRMWARE_8168D_1 "rtl_nic/rtl8168d-1.fw" #define FIRMWARE_8168D_2 "rtl_nic/rtl8168d-2.fw" #define FIRMWARE_8168E_1 "rtl_nic/rtl8168e-1.fw" -@@ -4931,6 +4939,46 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) +@@ -4978,6 +4986,46 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags); } @@ -81,7 +81,7 @@ index a4c7e8f5f893..0bd1faed0462 100644 static void rtl_read_mac_address(struct rtl8169_private *tp, u8 mac_addr[ETH_ALEN]) { -@@ -4946,6 +4994,7 @@ static void rtl_read_mac_address(struct rtl8169_private *tp, +@@ -4993,6 +5041,7 @@ static void rtl_read_mac_address(struct rtl8169_private *tp, rtl_read_mac_from_reg(tp, mac_addr, MAC0_BKP); } } @@ -89,7 +89,7 @@ index a4c7e8f5f893..0bd1faed0462 100644 DECLARE_RTL_COND(rtl_link_list_ready_cond) { -@@ -5107,7 +5156,12 @@ static void rtl_init_mac_address(struct rtl8169_private *tp) +@@ -5154,7 +5203,12 @@ static void rtl_init_mac_address(struct rtl8169_private *tp) if (!rc) goto done; @@ -102,7 +102,7 @@ index a4c7e8f5f893..0bd1faed0462 100644 if (is_valid_ether_addr(mac_addr)) goto done; -@@ -5141,6 +5195,11 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -5188,6 +5242,11 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) struct net_device *dev; u16 xid;