From 6b3737be323f702d5c1c5533db7d7351603dad0f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 26 Jul 2023 13:20:43 +0200 Subject: [PATCH 01/15] mt76: update to the latest version bdf7ca5db707 wifi: mt76: mt7921: move common register definition in mt792x_regs.h ae15d5c6b567 wifi: mt76: mt7921: convert acpisar and clc pointers to void 02515b6b90f0 wifi: mt76: mt7921: rename mt7921_vif in mt792x_vif 6ed8a8bdc7b6 wifi: mt76: mt7921: rename mt7921_sta in mt792x_sta 80234e64e7c5 wifi: mt76: mt7921: rename mt7921_phy in mt792x_phy 2485b4222d3d wifi: mt76: mt7921: rename mt7921_dev in mt792x_dev c6fd7cde77e0 wifi: mt76: mt7921: rename mt7921_hif_ops in mt792x_hif_ops 1a1a57b5f8c4 wifi: mt76: mt792x: move shared structure definition in mt792x.h 68508aab4241 wifi: mt76: mt7921: move mt792x_mutex_{acquire/release} in mt792x.h ff306af07e65 wifi: mt76: mt7921: move mt792x_hw_dev in mt792x.h 4b49d659acab wifi: mt76: mt7921: Replace fake flex-arrays with flexible-array members 93f821cce8f5 wifi: mt76: mt792x: introduce mt792x-lib module de7b90721280 wifi: mt76: mt7921: move mac shared code in mt792x-lib module c68ee8a64bef wifi: mt76: mt7921: move dma shared code in mt792x-lib module 8d561811f271 wifi: mt76: mt7921: move debugfs shared code in mt792x-lib module 0034ae289046 wifi: mt76: mt7921: move init shared code in mt792x-lib module 8419c4e793a7 wifi: mt76: mt792x: introduce mt792x_irq_map b7c7fadf228c wifi: mt76: mt792x: move more dma shared code in mt792x_dma 0b1603ce707c wifi: mt76: mt7921: move hif_ops macro in mt792x.h e07540abe87a wifi: mt76: mt7921: move shared runtime-pm code on mt792x-lib 3d65cd7a8dad wifi: mt76: mt7921: move runtime-pm pci code in mt792x-lib 4551f8c838e6 wifi: mt76: mt7921: move acpi_sar code in mt792x-lib module bd84b8ebaff8 wifi: mt76: mt792x: introduce mt792x-usb module 7067ea0f1bab wifi: mt76: mt792x: move mt7921_load_firmware in mt792x-lib module cf752af84c35 wifi: mt76: mt76_connac3: move lmac queue enumeration in mt76_connac3_mac.h 700041dcf773 wifi: mt76: mt792x: move MT7921_PM_TIMEOUT and MT7921_HW_SCAN_TIMEOUT in common code 58b2b90ad89b wifi: mt76: mt7921: move mt7921_dma_init in pci.c 9e4cb87a04cf wifi: mt76: mt7921: move mt7921u_disconnect mt792x-lib c19b62fe6b68 wifi: mt76: testmode: add nla_policy for MT76_TM_ATTR_TX_LENGTH 4904ab2f87cd wifi: mt76: fix return value check in mt76x02_mac_process_rx 1f0fbbee359c wifi: mt76: mt7915: fix tlv length of mt7915_mcu_get_chan_mib_info 24a54ee3a5ec wifi: mt76: mt7915: fix power-limits while chan_switch 80b8bcf0e3ea wifi: mt76: mt7603: rework/fix rx pse hang check a8d9553d8fc4 wifi: mt76: mt7603: improve watchdog reset reliablity c03d84c0d018 wifi: mt76: mt7603: improve stuck beacon handling 85cc58378d25 wifi: mt76: mt7603: add missing register initialization for MT7628 b14c2351ddb8 wifi: mt76: mt7603: disable A-MSDU tx support on MT7628 Signed-off-by: Felix Fietkau --- package/kernel/mt76/Makefile | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 42d0e6a070f..78f01c119fb 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2023-07-26 -PKG_SOURCE_VERSION:=cd3dfe39276905307cc028ac8edf2c06963cda23 -PKG_MIRROR_HASH:=413d2d0faa81d834ba13cb9e503e1e3a61e3e071014da6b525a123e5da053f90 +PKG_SOURCE_DATE:=2023-08-14 +PKG_SOURCE_VERSION:=b14c2351ddb8601c322576d84029e463d456caef +PKG_MIRROR_HASH:=62b5e157ad525424b6857e77ed373e8d39d03af71b057f8b309d8b293d6eac5f PKG_MAINTAINER:=Felix Fietkau PKG_USE_NINJA:=0 @@ -262,18 +262,34 @@ define KernelPackage/mt7921-firmware TITLE:=MediaTek MT7921 firmware endef +define KernelPackage/mt792x-common + $(KernelPackage/mt76-default) + TITLE:=MediaTek MT792x wireless driver common code + HIDDEN:=1 + DEPENDS+=+kmod-mt76-connac +@DRIVER_11AX_SUPPORT + FILES:= $(PKG_BUILD_DIR)/mt792x-lib.ko +endef + +define KernelPackage/mt792x-usb + $(KernelPackage/mt76-default) + TITLE:=MediaTek MT792x wireless driver USB code + HIDDEN:=1 + DEPENDS+=+kmod-mt792x-common +kmod-mt76-usb +@DRIVER_11AX_SUPPORT + FILES:= $(PKG_BUILD_DIR)/mt792x-usb.ko +endef + define KernelPackage/mt7921-common $(KernelPackage/mt76-default) - TITLE:=MediaTek MT7615 wireless driver common code + TITLE:=MediaTek MT7921 wireless driver common code HIDDEN:=1 - DEPENDS+=+kmod-mt76-connac +kmod-mt7921-firmware +@DRIVER_11AX_SUPPORT +kmod-hwmon-core + DEPENDS+=+kmod-mt792x-common +kmod-mt7921-firmware +@DRIVER_11AX_SUPPORT +kmod-hwmon-core FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921-common.ko endef define KernelPackage/mt7921u $(KernelPackage/mt76-default) TITLE:=MediaTek MT7921U wireless driver - DEPENDS+=+kmod-mt76-usb +kmod-mt7921-common + DEPENDS+=+kmod-mt792x-usb +kmod-mt7921-common FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921u.ko AUTOLOAD:=$(call AutoProbe,mt7921u) endef @@ -384,6 +400,12 @@ ifdef CONFIG_PACKAGE_kmod-mt7915e NOSTDINC_FLAGS += -DCONFIG_MT798X_WMAC endif endif +ifdef CONFIG_PACKAGE_kmod-mt792x-common + PKG_MAKE_FLAGS += CONFIG_MT792x_LIB=m +endif +ifdef CONFIG_PACKAGE_kmod-mt792x-usb + PKG_MAKE_FLAGS += CONFIG_MT792x_USB=m +endif ifdef CONFIG_PACKAGE_kmod-mt7921-common PKG_MAKE_FLAGS += CONFIG_MT7921_COMMON=m endif @@ -566,6 +588,8 @@ $(eval $(call KernelPackage,mt7916-firmware)) $(eval $(call KernelPackage,mt7981-firmware)) $(eval $(call KernelPackage,mt7986-firmware)) $(eval $(call KernelPackage,mt7921-firmware)) +$(eval $(call KernelPackage,mt792x-common)) +$(eval $(call KernelPackage,mt792x-usb)) $(eval $(call KernelPackage,mt7921-common)) $(eval $(call KernelPackage,mt7921u)) $(eval $(call KernelPackage,mt7921s)) From 6dc0675e5b9d59a882972b8d478ee9fa8496ae51 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 25 Aug 2023 21:38:13 +0200 Subject: [PATCH 02/15] mediatek: enable NMBM remapping for NWA50AX Pro UBI Don't skip remapping of the UBI area for the ZyXEL NWA50AX Pro. This is due to the kernel being loaded from the UBI partition by U-Boot. Link: https://github.com/openwrt/openwrt/pull/13335 Signed-off-by: David Bauer --- target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts index 6b50dde4e2a..419c0d4f9dc 100644 --- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts +++ b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts @@ -115,10 +115,6 @@ mediatek,bmt-max-ratio = <1>; mediatek,bmt-max-reserved-blocks = <64>; - mediatek,bmt-remap-range = - <0x0 0x580000>, - <0xef00000 0xef80000>; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; From 96727397ef429fbf75b3773dcd1f2d90fb79ace7 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 21 Aug 2023 14:58:05 +0200 Subject: [PATCH 03/15] uboot-envtools: fix parallel building Recent envtools update to 2023.07.02 has introduced a breakage when trying to parallel build with the following error: /bin/sh: line 1: scripts/basic/fixdep: No such file or directory Luckily it can easily be reproduced locally via a simple script so it was not hard to bisect it down to upstream commit [1]. However, its not that commits fault, it just uncovered an issue with the way we have been building envtools for a long time, maybe even from the package introduction. The issue is that we are trying to build envtools as one of the U-Boot no-dot-config-targets but envtools was newer a valid target for it but since we were creating the config headers that were not actually used it was actually building all this time. Since the blamed commit [1] a tool called printinitialenv is built and now a proper config is actually required in order for prerequisites to get built properly. So, in order to properly fix this (Hopefully for good) lets stop pretending that envtools are a valid no-dot-config-targets target and use the tools-only defconfig which is meant exactly for just building the tools. This will make a minimal config for the U-Boot sandbox target and then envtools will build just fine in parallel mode (I tested with 32 threads). We do hovewer need to override the ARCH passed by OpenWrt and set it to sandbox as otherwise U-Boot will not find the required headers because the ARCH is being overriden to an incorrect one. [1] https://source.denx.de/u-boot/u-boot/-/commit/40b77f2a3ac13a7547c1b7c9c51a4090869de8f4 Fixes: 9db033005210 ("uboot-envtools: update to 2023.07.02") Signed-off-by: Robert Marko --- package/boot/uboot-envtools/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 991497d20e1..f4063ed362c 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-envtools PKG_DISTNAME:=u-boot PKG_VERSION:=2023.07.02 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -45,18 +45,19 @@ define Package/uboot-envtools/description endef define Build/Configure - touch $(PKG_BUILD_DIR)/include/config.h - mkdir -p $(PKG_BUILD_DIR)/include/config - touch $(PKG_BUILD_DIR)/include/config/auto.conf - mkdir -p $(PKG_BUILD_DIR)/include/generated - touch $(PKG_BUILD_DIR)/include/generated/autoconf.h + $(call Build/Compile/Default,tools-only_defconfig) endef +define Build/Compile + $(call Build/Compile/Default,envtools) +endef + +# We need to override the ARCH passed by buildsystem as otherwise the defconfig +# for tools-only wont match and the includes for sandbox will be dropped MAKE_FLAGS += \ + ARCH="sandbox" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - no-dot-config-targets=envtools \ - envtools + TARGET_LDFLAGS="$(TARGET_LDFLAGS)" define Package/uboot-envtools/conffiles /etc/config/ubootenv From adcd0326797ffe4061c74a9c4eecadbeb9384266 Mon Sep 17 00:00:00 2001 From: Jacob Aharon Date: Tue, 22 Aug 2023 15:03:45 +1000 Subject: [PATCH 04/15] mac80211: Add ath11k to the help text of ATH_DEBUG ATH_DEBUG package is required to debug ath11k. Fixes: 93ae4353cdf6 ("mac80211: add ath11k PCI support") Signed-off-by: Jacob Aharon --- package/kernel/mac80211/ath.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index c75630a8bb0..881c89db253 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -98,7 +98,7 @@ define KernelPackage/ath/config bool "Atheros wireless debugging" help Say Y, if you want to debug atheros wireless drivers. - Only ath9k & ath10k make use of this. + Only ath9k & ath10k & ath11k make use of this. config PACKAGE_ATH_DFS bool "Enable DFS support" From 4b3e3c3fd7d20918bdc0ebdfda5108a78d0edcab Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 23 Aug 2023 14:59:59 -0400 Subject: [PATCH 05/15] kernel: bump 6.1 to 6.1.47 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.47 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia --- include/kernel-6.1 | 4 ++-- .../950-0111-MMC-added-alternative-MMC-driver.patch | 6 +++--- ...y-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch | 6 +++--- .../950-0427-Populate-phy-driver-block-for-BCM54213PE.patch | 2 +- .../801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch | 2 +- ...-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch | 2 +- ...t-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch | 2 +- .../711-net-dsa-mv88e6xxx-disable-ATU-violation.patch | 2 +- ...sa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch | 2 +- .../patches-6.1/500-gsw-rtl8367s-mt7622-support.patch | 2 +- ...t-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch | 2 +- .../733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/kernel-6.1 b/include/kernel-6.1 index 580219c70f8..61bad0e5ca7 100644 --- a/include/kernel-6.1 +++ b/include/kernel-6.1 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.1 = .46 -LINUX_KERNEL_HASH-6.1.46 = f5f67bcfccd47f8d9db2d5ba24e33af7778f40a777577d1fba424f4a1712a296 +LINUX_VERSION-6.1 = .47 +LINUX_KERNEL_HASH-6.1.47 = 93d58b6af007a5f44dd26831ff310707deb1ab9380c5136a534287eb3fddfcab diff --git a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch index ace12078da7..b1a5dbfe2df 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch @@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, -@@ -2969,6 +2976,8 @@ static int mmc_blk_probe(struct mmc_card +@@ -2970,6 +2977,8 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md; int ret = 0; @@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell /* * Check that the card supports the command class(es) we need. -@@ -2976,7 +2985,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2977,7 +2986,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2991,6 +3009,17 @@ static int mmc_blk_probe(struct mmc_card +@@ -2992,6 +3010,17 @@ static int mmc_blk_probe(struct mmc_card goto out_free; } diff --git a/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch index 98f8350c4c9..ec4cd0993e3 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell return; val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3); -@@ -894,7 +895,7 @@ static struct phy_driver broadcom_driver +@@ -905,7 +906,7 @@ static struct phy_driver broadcom_driver .link_change_notify = bcm54xx_link_change_notify, }, { .phy_id = PHY_ID_BCM54210E, @@ -35,7 +35,7 @@ Signed-off-by: Jonathan Bell .name = "Broadcom BCM54210E", /* PHY_GBIT_FEATURES */ .get_sset_count = bcm_phy_get_sset_count, -@@ -908,6 +909,13 @@ static struct phy_driver broadcom_driver +@@ -919,6 +920,13 @@ static struct phy_driver broadcom_driver .suspend = bcm54xx_suspend, .resume = bcm54xx_resume, }, { @@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell .phy_id = PHY_ID_BCM5461, .phy_id_mask = 0xfffffff0, .name = "Broadcom BCM5461", -@@ -1142,7 +1150,8 @@ module_phy_driver(broadcom_drivers); +@@ -1155,7 +1163,8 @@ module_phy_driver(broadcom_drivers); static struct mdio_device_id __maybe_unused broadcom_tbl[] = { { PHY_ID_BCM5411, 0xfffffff0 }, { PHY_ID_BCM5421, 0xfffffff0 }, diff --git a/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch b/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch index 5eeeda4eac7..18e654071c3 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch @@ -16,7 +16,7 @@ Signed-off-by: Jonathan Lemon --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c -@@ -921,8 +921,14 @@ static struct phy_driver broadcom_driver +@@ -932,8 +932,14 @@ static struct phy_driver broadcom_driver .phy_id_mask = 0xffffffff, .name = "Broadcom BCM54213PE", /* PHY_GBIT_FEATURES */ diff --git a/target/linux/generic/backport-6.1/801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch b/target/linux/generic/backport-6.1/801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch index 8df0ed1f7f5..a3184513ee3 100644 --- a/target/linux/generic/backport-6.1/801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch +++ b/target/linux/generic/backport-6.1/801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch @@ -131,7 +131,7 @@ Signed-off-by: David S. Miller /** * fwnode_mdio_find_device - Given a fwnode, find the mdio_device * @fwnode: pointer to the mdio_device's fwnode -@@ -3107,6 +3178,11 @@ static int phy_probe(struct device *dev) +@@ -3109,6 +3180,11 @@ static int phy_probe(struct device *dev) /* Set the state to READY by default */ phydev->state = PHY_READY; diff --git a/target/linux/generic/backport-6.1/820-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch b/target/linux/generic/backport-6.1/820-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch index 09a84201b59..1de086417b6 100644 --- a/target/linux/generic/backport-6.1/820-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch +++ b/target/linux/generic/backport-6.1/820-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch @@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski tristate "MDIO Bus/PHY emulation with fixed speed/link PHYs" --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -3208,7 +3208,8 @@ static int phy_probe(struct device *dev) +@@ -3210,7 +3210,8 @@ static int phy_probe(struct device *dev) /* Get the LEDs from the device tree, and instantiate standard * LEDs for them. */ diff --git a/target/linux/generic/backport-6.1/822-v6.4-net-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch b/target/linux/generic/backport-6.1/822-v6.4-net-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch index 04939deb6e3..8f076be640c 100644 --- a/target/linux/generic/backport-6.1/822-v6.4-net-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch +++ b/target/linux/generic/backport-6.1/822-v6.4-net-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch @@ -55,7 +55,7 @@ Signed-off-by: David S. Miller return err; } } -@@ -3229,6 +3239,9 @@ static int phy_remove(struct device *dev +@@ -3231,6 +3241,9 @@ static int phy_remove(struct device *dev cancel_delayed_work_sync(&phydev->state_queue); diff --git a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 59235ea00a2..9c45115ebb0 100644 --- a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3472,6 +3472,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -3480,6 +3480,9 @@ static int mv88e6xxx_setup_port(struct m else reg = 1 << port; diff --git a/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 230ad2d036a..ac59b4b5ea6 100644 --- a/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -6980,6 +6980,7 @@ static int mv88e6xxx_register_switch(str +@@ -6988,6 +6988,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/mediatek/patches-6.1/500-gsw-rtl8367s-mt7622-support.patch b/target/linux/mediatek/patches-6.1/500-gsw-rtl8367s-mt7622-support.patch index cdfe79ebad7..e37705f388c 100644 --- a/target/linux/mediatek/patches-6.1/500-gsw-rtl8367s-mt7622-support.patch +++ b/target/linux/mediatek/patches-6.1/500-gsw-rtl8367s-mt7622-support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -382,6 +382,12 @@ config ROCKCHIP_PHY +@@ -389,6 +389,12 @@ config ROCKCHIP_PHY help Currently supports the integrated Ethernet PHY. diff --git a/target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch b/target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch index cba76ad77c3..eb2a40f5c1f 100644 --- a/target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch +++ b/target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller L: linux-i2c@vger.kernel.org --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -307,6 +307,18 @@ config MEDIATEK_GE_PHY +@@ -314,6 +314,18 @@ config MEDIATEK_GE_PHY help Supports the MediaTek Gigabit Ethernet PHYs. diff --git a/target/linux/mediatek/patches-6.1/733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch b/target/linux/mediatek/patches-6.1/733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch index c3baafa2bbb..125bd9b0b38 100644 --- a/target/linux/mediatek/patches-6.1/733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch +++ b/target/linux/mediatek/patches-6.1/733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch @@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -319,6 +319,13 @@ config MEDIATEK_GE_SOC_PHY +@@ -326,6 +326,13 @@ config MEDIATEK_GE_SOC_PHY present in the SoCs efuse and will dynamically calibrate VCM (common-mode voltage) during startup. From ebbcfd095d5c77bc67087854a696e887dec99769 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 18 Aug 2023 12:46:48 +0200 Subject: [PATCH 06/15] arm-trusted-firmware-mvebu: bump a3700-utils to current version Changes: a3e1c67 wtmi: Fix linker output sections f65e3bf wtmi: Remove usage of non-existant string.h file and memcpy() function Signed-off-by: Robert Marko --- package/boot/arm-trusted-firmware-mvebu/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index a644ee1e477..37a18ae8b39 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -138,15 +138,15 @@ TFA_MAKE_FLAGS += \ mrvl_uart A3700_UTILS_NAME:=a3700-utils -A3700_UTILS_RELEASE:=1d977157 +A3700_UTILS_RELEASE:=a3e1c67 A3700_UTILS_SOURCE=$(A3700_UTILS_NAME)-$(A3700_UTILS_RELEASE).tar.bz2 define Download/a3700-utils FILE:=$(A3700_UTILS_SOURCE) PROTO:=git URL:=https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell.git - VERSION:=1d977157e37151b272f88f2406a245c833fb2d8c - MIRROR_HASH:=322821ec8c04afea260254e927c59cd1ec0bd84e7ec6507cc1f155f18afb8eb9 + VERSION:=a3e1c67bb378e1d8a938e1b826cb602af83628d2 + MIRROR_HASH:=0e6b8ef6423dcb52a5e282669a8aeebc6eea2d45a7c3a2c9a2fc7a749b3275a7 SUBDIR:=$(A3700_UTILS_NAME) endef From ff671d318cfbec0d7c920f70e4b8565955e2994e Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 18 Aug 2023 12:51:28 +0200 Subject: [PATCH 07/15] arm-trusted-firmware-mvebu: bump mv-ddr-marvell to current version Changes: 1de442d Convert floating point operations to integer operations ce6770d Modify mv_ddr4_calibration_validate function body to match function header Signed-off-by: Robert Marko --- package/boot/arm-trusted-firmware-mvebu/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index 37a18ae8b39..16541d6be52 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -164,15 +164,15 @@ define Download/cryptopp endef MV_DDR_NAME:=mv-ddr-marvell -MV_DDR_RELEASE:=d5acc10c +MV_DDR_RELEASE:=541616b MV_DDR_SOURCE:=$(MV_DDR_NAME)-$(MV_DDR_RELEASE).tar.bz2 define Download/mv-ddr-marvell FILE:=$(MV_DDR_SOURCE) PROTO:=git URL:=https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git - VERSION:=d5acc10c287e40cc2feeb28710b92e45c93c702c - MIRROR_HASH:=c149ab737935b5fb822f48da8e2d7fba4388f48e645f9f6da857bee20f0333ea + VERSION:=541616bc5d25a0167c9901546255c55973e2c0f0 + MIRROR_HASH:=9e86a986c7400ed1a72165a88150b6c494ebd87303b16314b43e5785e3f13068 SUBDIR:=$(MV_DDR_NAME) endef From ef82e26d353fca8116d9dd0b49a6a0df811ab951 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 21 Aug 2023 11:46:29 +0200 Subject: [PATCH 08/15] arm-trusted-firmware-mvebu: bump mox-boot-builder to current version We have to move to use git clone as there are no newer tagged releases. Changes: 604f8f5 Default CROSS_CM3 to arm-none-eabi- instead of armv7m-softfloat-eabi- b9b9419 Tidy up license information 0290b2c wtmi: Fix typo a10b8e9 Makefile: fix a53-firmware.bin generation (maximum size is not optimal) f654082 wtmi: Add const qualifier to isr_vector 4a43a3b wtmi: Improve detection of ESPRESSObin boards with Topaz 189e629 wtmi: Improve detection of boards with insufficient MDIO pull-up 3dac4fe wtmi: Fix detection of Armada 3720 Devel Board 3ca4dfa Bump mox-imager commit Signed-off-by: Robert Marko --- .../boot/arm-trusted-firmware-mvebu/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index 16541d6be52..a0149123125 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -123,7 +123,7 @@ TFA_MAKE_FLAGS += \ BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \ MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \ WTP=$(BUILD_DIR)/$(A3700_UTILS_NAME) \ - WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE)/wtmi_app.bin \ + WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)/wtmi_app.bin \ CRYPTOPP_PATH=$(BUILD_DIR)/$(CRYPTOPP_NAME) \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \ HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \ @@ -177,13 +177,17 @@ define Download/mv-ddr-marvell endef MOX_BB_NAME:=mox-boot-builder -MOX_BB_RELEASE:=v2022.06.11 +MOX_BB_RELEASE:=604f8f51 MOX_BB_SOURCE:=$(MOX_BB_NAME)-$(MOX_BB_RELEASE).tar.bz2 define Download/mox-boot-builder FILE:=$(MOX_BB_SOURCE) - URL:=https://gitlab.nic.cz/turris/mox-boot-builder/-/archive/$(MOX_BB_RELEASE) - HASH:=75e7661c38f4f5e6d8910dd789d6d9ffd8652455548b68c98e5bf45eaab5b6eb + PROTO:=git + SUBMODULES:=skip + URL:=https://gitlab.nic.cz/turris/mox-boot-builder.git + VERSION:=604f8f51d97b4e59fa6d1e579101daa194d6ed2d + MIRROR_HASH:=b09337a7dde140f57e40133b6e7b7e1eb338e7cea9b15a3af6874824462f15f7 + SUBDIR:=$(MOX_BB_NAME) endef CM3_GCC_NAME:=gcc-arm @@ -206,7 +210,7 @@ define Build/Clean $(BUILD_DIR)/$(CRYPTOPP_NAME) \ $(BUILD_DIR)/$(A3700_UTILS_NAME) \ $(BUILD_DIR)/$(MV_DDR_NAME) \ - $(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \ + $(BUILD_DIR)/$(MOX_BB_NAME) \ $(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION) endef @@ -226,7 +230,7 @@ define Build/Prepare $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MV_DDR_SOURCE) $(call PatchDir/Default,$(BUILD_DIR)/$(MV_DDR_NAME),./patches-mv-ddr-marvell) $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MOX_BB_SOURCE) - $(call PatchDir/Default,$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE),./patches-mox-boot-builder) + $(call PatchDir/Default,$(BUILD_DIR)/$(MOX_BB_NAME),./patches-mox-boot-builder) $(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(CM3_GCC_SOURCE) endef @@ -235,7 +239,7 @@ define Build/Compile CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \ WTMI_VERSION=$(MOX_BB_RELEASE) \ CRYPTOPP_PATH=$PWD/cryptopp/ \ - -C $(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \ + -C $(BUILD_DIR)/$(MOX_BB_NAME) \ wtmi_app.bin $(call Build/Compile/Default) endef From 84e9d49452b119b9b1ba61d1ae919d58f9632059 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 18 Aug 2023 12:39:04 +0200 Subject: [PATCH 09/15] arm-trusted-firmware-mvebu: bump cryptopp to version 8.8 We are using the outdated Crypto++ version 8.5, so lets update to the current version 8.8. Signed-off-by: Robert Marko --- package/boot/arm-trusted-firmware-mvebu/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index a0149123125..08e783d0168 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -151,14 +151,14 @@ define Download/a3700-utils endef CRYPTOPP_NAME:=cryptopp -CRYPTOPP_RELEASE:=f210224 +CRYPTOPP_RELEASE:=4d0cad5 CRYPTOPP_SOURCE=$(CRYPTOPP_NAME)-$(CRYPTOPP_RELEASE).tar.bz2 define Download/cryptopp FILE:=$(CRYPTOPP_SOURCE) PROTO:=git URL:=https://github.com/weidai11/cryptopp.git - VERSION:=f2102243e6fdd48c0b2a393a0993cca228f20573 + VERSION:=4d0cad5401d1a2c998b314bc89288c9620d3021d MIRROR_HASH:=74ec9e48ee04b9f2d9a1d8c4f2392ed0ab52780d7af0f70405d7bbb23d1504fa SUBDIR:=$(CRYPTOPP_NAME) endef From f6ca36df84da2476acc6c76b8c7438fc18984c5f Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 18 Aug 2023 12:40:27 +0200 Subject: [PATCH 10/15] arm-trusted-firmware-mvebu: update CM3 GCC to 12.3rel1 We are using the outdated 11.2 GCC for CM3, lets update to the current 12.3rel1 version from ARM [1]. [1] https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Robert Marko --- package/boot/arm-trusted-firmware-mvebu/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index 08e783d0168..d3e029dd570 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -190,8 +190,8 @@ define Download/mox-boot-builder SUBDIR:=$(MOX_BB_NAME) endef -CM3_GCC_NAME:=gcc-arm -CM3_GCC_RELEASE:=11.2-2022.02 +CM3_GCC_NAME:=arm-gnu-toolchain +CM3_GCC_RELEASE:=12.3.rel1 CM3_GCC_VERSION:=$(HOST_ARCH)-arm-none-eabi CM3_GCC_SOURCE=$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION).tar.xz @@ -199,9 +199,9 @@ define Download/cm3-gcc FILE:=$(CM3_GCC_SOURCE) URL:=https://developer.arm.com/-/media/Files/downloads/gnu/$(CM3_GCC_RELEASE)/binrel ifeq ($(HOST_ARCH),aarch64) - HASH:=ef1d82e5894e3908cb7ed49c5485b5b95deefa32872f79c2b5f6f5447cabf55f + HASH:=14c0487d5753f6071d24e568881f7c7e67f80dd83165dec5164b3731394af431 else - HASH:=8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326 + HASH:=12a2815644318ebcceaf84beabb665d0924b6e79e21048452c5331a56332b309 endif endef From 67dacdd652538f2cf7e43a24c4b54694b96be284 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 18 Aug 2023 12:42:03 +0200 Subject: [PATCH 11/15] arm-trusted-firmware-mvebu: bump to v2.9 We are using the outdated 2.7 TF-A, so lets update to current v2.9 version. Signed-off-by: Robert Marko --- package/boot/arm-trusted-firmware-mvebu/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index d3e029dd570..05e276aaaf7 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2.7 -PKG_RELEASE:=6 -PKG_HASH:=53422dc649153838e03820330ba17cb10afe3e330ecde0db11e4d5f1361a33e6 +PKG_VERSION:=2.9 +PKG_RELEASE:=1 +PKG_HASH:=76a66a1de0c01aeb83dfc7b72b51173fe62c6e51d6fca17cc562393117bed08b PKG_MAINTAINER:=Vladimir Vid From c1ef10c8d873254ce7c1f3019d821c4a87227474 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 16 Aug 2023 11:22:30 +0200 Subject: [PATCH 12/15] prereq: make existing binary check work for sdk as well To avoid replacing host built binaries with symlinks again, a check for an appropriate stamp was added in 729909c07f ("prereq-build: do not replace binaries with symlinks"). Unfortunately the stamp directory does not exist in the SDK, so the fix was ineffective there. This caused the packages builders to e.g. use the host tar again, which in turn made the tarballs created different since it may lack reproducibility fixes, or implement these differently, causing spurious hash failures on source repository based packages. Fix this by dropping the stamp dir check, and just check that the file is usable. Fixes: 729909c07f ("prereq-build: do not replace binaries with symlinks") Signed-off-by: Jonas Gorski --- include/prereq.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/include/prereq.mk b/include/prereq.mk index 546f36b8e3e..a4a07c223fa 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -111,7 +111,6 @@ define SetupHostCommand [ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \ ;; \ "-"*) \ - find "$(STAGING_DIR_HOST)/stamp" | grep $(strip $(1)) && \ [ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \ ;; \ *" -> /"*) \ From 3210aa8e0a113cc4354628b08b608c5c8f792941 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 23 Aug 2023 09:47:57 +0200 Subject: [PATCH 13/15] prereq: merge common cases in SetupHostCommand Now that most cases do the same thing in SetupHostCommand, merge them together into one. To allow moving the generic symlink check, invert the check and let it check for relative links by matching on link targets that do not start with a slash. This then allows us to also drop the absolute link case, shortening the case statement further. This reorders the check to * if it is not a symlink, do not change it * if it is a symlink and it points to the found command, do not change it * if it is a symlink with a relative path, do not change it * else, update/replace it Signed-off-by: Jonas Gorski --- include/prereq.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/include/prereq.mk b/include/prereq.mk index a4a07c223fa..1039c5540c6 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -107,15 +107,9 @@ define SetupHostCommand bin="$$$$$$$$(command -v "$$$$$$$${cmd%% *}")"; \ if [ -x "$$$$$$$$bin" ] && eval "$$$$$$$$cmd" >/dev/null 2>/dev/null; then \ case "$$$$$$$$(ls -dl -- $(STAGING_DIR_HOST)/bin/$(strip $(1)))" in \ - *" -> $$$$$$$$bin"*) \ - [ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \ - ;; \ - "-"*) \ - [ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \ - ;; \ - *" -> /"*) \ - ;; \ - *" -> "*) \ + "-"* | \ + *" -> $$$$$$$$bin"* | \ + *" -> "[!/]*) \ [ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \ ;; \ esac; \ From d188db8aed74547f98b905254d4f57baf225f1d6 Mon Sep 17 00:00:00 2001 From: Mathew McBride Date: Mon, 21 Aug 2023 06:10:35 +0000 Subject: [PATCH 14/15] kernel: add vhost-net module vhost-net is used to accelerate traffic to virtualisation guests that use the virtio-net network card in QEMU. Generally it is invoked by specifying "vhost=on" to a QEMU -netdev device: qemu-system-aarch64 -nographic -M virt -cpu host \ --enable-kvm -bios u-boot.bin -smp 1 -m 2048 \ -drive file=openwrt-armsr-armv8.img,format=raw,index=0,media=disk \ -device "virtio-net,netdev=landev,disable-legacy=off,disable-modern=off" \ -netdev "tap,id=landev,helper=/usr/lib/qemu-bridge-helper --br=br-lan,vhost=on" Signed-off-by: Mathew McBride --- package/kernel/linux/modules/virt.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk index 90226b48063..1d9caa9bc8f 100644 --- a/package/kernel/linux/modules/virt.mk +++ b/package/kernel/linux/modules/virt.mk @@ -117,3 +117,27 @@ define KernelPackage/vfio-pci/description endef $(eval $(call KernelPackage,vfio-pci)) + + +define KernelPackage/vhost + SUBMENU:=Virtualization + TITLE:=Host kernel accelerator for virtio (base) + KCONFIG:=CONFIG_VHOST + FILES:=$(LINUX_DIR)/drivers/vhost/vhost.ko \ + $(LINUX_DIR)/drivers/vhost/vhost_iotlb.ko + AUTOLOAD:=$(call AutoProbe,vhost vhost_iotlb) +endef + +$(eval $(call KernelPackage,vhost)) + + +define KernelPackage/vhost-net + SUBMENU:=Virtualization + TITLE:=Host kernel accelerator for virtio-net + DEPENDS:=+kmod-tun +kmod-vhost + KCONFIG:=CONFIG_VHOST_NET + FILES:=$(LINUX_DIR)/drivers/vhost/vhost_net.ko + AUTOLOAD:=$(call AutoProbe,vhost_net) +endef + +$(eval $(call KernelPackage,vhost-net)) From 8b1cc1582ad9c9b12d52870e0c7f9cb828aa0fbf Mon Sep 17 00:00:00 2001 From: Mathew McBride Date: Tue, 22 Aug 2023 04:49:32 +0000 Subject: [PATCH 15/15] x86: remove built-in vhost-net driver This is now available as a kmod package (kmod-vhost-net). Signed-off-by: Mathew McBride --- target/linux/x86/generic/config-5.15 | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/linux/x86/generic/config-5.15 b/target/linux/x86/generic/config-5.15 index 06f00080216..c10e1b610b1 100644 --- a/target/linux/x86/generic/config-5.15 +++ b/target/linux/x86/generic/config-5.15 @@ -399,9 +399,6 @@ CONFIG_TREE_SRCU=y CONFIG_UCS2_STRING=y CONFIG_USB_STORAGE=y CONFIG_USER_RETURN_NOTIFIER=y -CONFIG_VHOST=y -CONFIG_VHOST_IOTLB=y -CONFIG_VHOST_NET=y CONFIG_VIRTIO=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_BLK=y