From bea7bb42db4f5a1f3f38b8c1d7a0484053b82a99 Mon Sep 17 00:00:00 2001 From: N-Storm Date: Mon, 23 Dec 2024 07:39:35 +0300 Subject: [PATCH] r46-nvme19. version/date bump. Delete dupe patch with typo. --- config-nstorm-bananapi-bpi-r4 | 4 +- ...tk_wed_assgin-not-base-on-pci-domain.patch | 64 ------------------- 2 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 target/linux/mediatek/patches-6.6/999-3003-refactor-mtk_wed_assgin-not-base-on-pci-domain.patch diff --git a/config-nstorm-bananapi-bpi-r4 b/config-nstorm-bananapi-bpi-r4 index 4368305c6263d8..51f1768eada2f6 100644 --- a/config-nstorm-bananapi-bpi-r4 +++ b/config-nstorm-bananapi-bpi-r4 @@ -766,7 +766,7 @@ CONFIG_USE_LTO=y CONFIG_USE_MOLD=y CONFIG_VERSIONOPT=y CONFIG_VERSION_BUG_URL="" -CONFIG_VERSION_CODE="20241220-r45-nvme18" +CONFIG_VERSION_CODE="20241223-r46-nvme19" CONFIG_VERSION_CODE_FILENAMES=y CONFIG_VERSION_DIST="OpenWrt" CONFIG_VERSION_FILENAMES=y @@ -774,7 +774,7 @@ CONFIG_VERSION_HOME_URL="https://github.com/N-Storm/openwrt" CONFIG_VERSION_HWREV="" CONFIG_VERSION_MANUFACTURER="Sinovoip" CONFIG_VERSION_MANUFACTURER_URL="" -CONFIG_VERSION_NUMBER="v24-SNAPSHOT-6.6.66" +CONFIG_VERSION_NUMBER="v24-SNAPSHOT-6.6.67" CONFIG_VERSION_PRODUCT="BananaPI BPI-R4" CONFIG_VERSION_REPO="https://downloads.openwrt.org/releases/24.10-SNAPSHOT" CONFIG_VERSION_SUPPORT_URL="" diff --git a/target/linux/mediatek/patches-6.6/999-3003-refactor-mtk_wed_assgin-not-base-on-pci-domain.patch b/target/linux/mediatek/patches-6.6/999-3003-refactor-mtk_wed_assgin-not-base-on-pci-domain.patch deleted file mode 100644 index 8836485fd7b6dc..00000000000000 --- a/target/linux/mediatek/patches-6.6/999-3003-refactor-mtk_wed_assgin-not-base-on-pci-domain.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 73c2090956a1aac2314c6003c35f958dfd0f3a8f Mon Sep 17 00:00:00 2001 -From: Rex Lu -Date: Fri, 27 Sep 2024 14:17:12 +0800 -Subject: [PATCH 2/6] refactor mtk_wed_assgin not base on pci domain - ---- - drivers/net/ethernet/mediatek/mtk_wed.c | 31 +++++++------------------ - 1 file changed, 8 insertions(+), 23 deletions(-) - ---- a/drivers/net/ethernet/mediatek/mtk_wed.c -+++ b/drivers/net/ethernet/mediatek/mtk_wed.c -@@ -488,34 +488,21 @@ void mtk_wed_fe_reset_complete(void) - static struct mtk_wed_hw * - mtk_wed_assign(struct mtk_wed_device *dev) - { -- struct mtk_wed_hw *hw; - int i; - -- if (dev->wlan.bus_type == MTK_WED_BUS_PCIE) { -- hw = hw_list[pci_domain_nr(dev->wlan.pci_dev->bus)]; -- if (!hw) -- return NULL; -+ for (i = 0; i < ARRAY_SIZE(hw_list); i++) { -+ struct mtk_wed_hw *hw = hw_list[i]; - -- if (!hw->wed_dev) -- goto out; -+ if (!hw || hw->wed_dev) -+ continue; - -- if (mtk_wed_is_v1(hw)) -- return NULL; -+ hw->wed_dev = dev; -+ hw->pcie_base = MTK_WED_PCIE_BASE; - -- /* MT7986 WED devices do not have any pcie slot restrictions */ -- } -- /* MT7986 PCIE or AXI */ -- for (i = 0; i < ARRAY_SIZE(hw_list); i++) { -- hw = hw_list[i]; -- if (hw && !hw->wed_dev) -- goto out; -+ return hw; - } - - return NULL; -- --out: -- hw->wed_dev = dev; -- return hw; - } - - static int -@@ -2403,9 +2390,7 @@ mtk_wed_attach(struct mtk_wed_device *de - RCU_LOCKDEP_WARN(!rcu_read_lock_held(), - "mtk_wed_attach without holding the RCU read lock"); - -- if ((dev->wlan.bus_type == MTK_WED_BUS_PCIE && -- pci_domain_nr(dev->wlan.pci_dev->bus) > 1) || -- !try_module_get(THIS_MODULE)) -+ if (!try_module_get(THIS_MODULE)) - ret = -ENODEV; - - rcu_read_unlock();