Merge branch 'qualcommax-6.x-nss-wifi' of https://github.com/qosmio/o…

…penwrt-ipq into qosmio-qualcommax-6.x-nss-wifi

config/Config-ipq.in

@@ -32,7 +32,7 @@ config KERNEL_IPQ_MEM_PROFILE
 
 config KERNEL_SKB_RECYCLER
 	bool "Generic SKB recycling"
-	default y if KERNEL_IPQ_MEM_PROFILE < 1024
+	default y if KERNEL_IPQ_MEM_PROFILE > 256
 
 choice KERNEL_SKB_RECYCLE_SIZE
 	prompt "SKB recycler size"
@@ -61,9 +61,18 @@ config KERNEL_SKB_RECYCLER_MULTI_CPU
 	default y
 
 config KERNEL_SKB_RECYCLER_PREALLOC
-	bool "Enable preallocation of SKBs"
+	bool "Enable preallocation of SKBs (For SFE not NSS)"
 	depends on KERNEL_SKB_RECYCLER
 	default n
+	help
+	  NOTE: This is primarily for platforms utilizing SFE (Shortcut Forwarding Engine)
+	  and not NSS (Network Subsystem) offload.
+
+	  NSS offload platforms mostly utilize the SKB recycling feature when managing memory.
+	  Mostly when to "reclaim" it.
+
+	  This option enables preallocation of SKBs.
+	  The default is '16384' which means 16384 x 4096 (Size of SKB) = 64MB.
 
 config KERNEL_SKB_RECYCLE_MAX_PREALLOC_SKBS
 	int "Number of SKBs to be preallocated"
@@ -73,8 +82,9 @@ config KERNEL_SKB_RECYCLE_MAX_PREALLOC_SKBS
 config KERNEL_SKB_FIXED_SIZE_2K
 	bool "SKB size fixed at 2K"
 	default n
+	default y if KERNEL_IPQ_MEM_PROFILE < 512
 	help
-	   SKB size fixed at 2K.
+	   SKB size fixed at 2K. Primarily for platforms with less than 512MB memory.
 
 config KERNEL_ALLOC_SKB_PAGE_FRAG_DISABLE
 	depends on KERNEL_SKB_RECYCLER

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .97
-LINUX_KERNEL_HASH-6.1.97 = 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af
+LINUX_VERSION-6.1 = .98
+LINUX_KERNEL_HASH-6.1.98 = 97cdc9127c7700556ea0891267a0c24cf372f4b81636fb8203a914f3a69f3406

include/kernel-6.6

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .38
-LINUX_KERNEL_HASH-6.6.38 = 4ed403ffb550565d03485aeca9a52c128cdde43f4a373a1a9ee3a590524fe743
+LINUX_VERSION-6.6 = .40
+LINUX_KERNEL_HASH-6.6.40 = 5c3a3c03c055b8d601a6d7f80d1465ada6b83a12299f6ace2027b47f0baff538

package/boot/uboot-mediatek/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2024.01
-PKG_HASH:=b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3
+PKG_VERSION:=2024.07
+PKG_HASH:=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
 PKG_BUILD_DEPENDS:=!(TARGET_ramips||TARGET_mediatek_mt7623):arm-trusted-firmware-tools/host
 
 UBOOT_USE_INTREE_DTC:=1
@@ -776,6 +776,10 @@ UBOOT_TARGETS := \
 	mt7988_rfb-emmc \
 	mt7988_rfb-sd
 
+UBOOT_CUSTOMIZE_CONFIG := \
+	--disable TOOLS_KWBIMAGE \
+	--disable TOOLS_LIBCRYPTO
+
 ifdef CONFIG_TARGET_mediatek
 UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE:.fip=.bin)
 endif

package/boot/uboot-mediatek/patches/100-04-env-add-support-for-generic-MTD-device.patch

@@ -370,7 +370,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 +};
 --- a/include/env_internal.h
 +++ b/include/env_internal.h
-@@ -109,6 +109,7 @@ enum env_location {
+@@ -108,6 +108,7 @@ enum env_location {
  	ENVL_FAT,
  	ENVL_FLASH,
  	ENVL_MMC,

package/boot/uboot-mediatek/patches/100-06-mtd-add-core-facility-code-of-NMBM.patch

@@ -31,12 +31,14 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -274,4 +274,6 @@ source "drivers/mtd/ubi/Kconfig"
+@@ -274,6 +274,8 @@ source "drivers/mtd/ubi/Kconfig"
 
  source "drivers/mtd/nvmxip/Kconfig"
 
 +source "drivers/mtd/nmbm/Kconfig"
 +
+ endif
+
  endmenu
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile

package/boot/uboot-mediatek/patches/100-08-common-board_r-add-support-to-initialize-NMBM-after-.patch

@@ -34,7 +34,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  #if defined(CONFIG_CMD_ONENAND)
  /* go init the NAND */
  static int initr_onenand(void)
-@@ -675,6 +689,9 @@ static init_fnc_t init_sequence_r[] = {
+@@ -664,6 +678,9 @@ static init_fnc_t init_sequence_r[] = {
  #ifdef CONFIG_CMD_ONENAND
  	initr_onenand,
  #endif

package/boot/uboot-mediatek/patches/100-09-cmd-add-nmbm-command.patch

@@ -15,7 +15,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/cmd/Kconfig
 +++ b/cmd/Kconfig
-@@ -1392,6 +1392,12 @@ config CMD_NAND_TORTURE
+@@ -1450,6 +1450,12 @@ config CMD_NAND_TORTURE
 
  endif # CMD_NAND
 
@@ -36,8 +36,8 @@ Signed-off-by: Weijie Gao <[email protected]>
  obj-$(CONFIG_CMD_NAND) += nand.o
 +obj-$(CONFIG_CMD_NMBM) += nmbm.o
  obj-$(CONFIG_CMD_NET) += net.o
+ obj-$(CONFIG_ENV_SUPPORT) += nvedit.o
  obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o
- obj-$(CONFIG_CMD_ONENAND) += onenand.o
 --- /dev/null
 +++ b/cmd/nmbm.c
 @@ -0,0 +1,327 @@

package/boot/uboot-mediatek/patches/100-10-cmd-mtd-add-markbad-subcommand-for-NMBM-testing.patch

@@ -20,7 +20,7 @@ Signed-off-by: SkyLake.Huang <[email protected]>
 
 --- a/cmd/mtd.c
 +++ b/cmd/mtd.c
-@@ -504,6 +504,42 @@ out_put_mtd:
+@@ -722,6 +722,42 @@ out_put_mtd:
  	return CMD_RET_SUCCESS;
  }
 
@@ -63,15 +63,15 @@ Signed-off-by: SkyLake.Huang <[email protected]>
  #ifdef CONFIG_AUTO_COMPLETE
  static int mtd_name_complete(int argc, char *const argv[], char last_char,
  			     int maxv, char *cmdv[])
-@@ -551,6 +587,7 @@ U_BOOT_LONGHELP(mtd,
+@@ -769,6 +805,7 @@ U_BOOT_LONGHELP(mtd,
  	"\n"
  	"Specific functions:\n"
  	"mtd bad                               <name>\n"
 +	"mtd markbad                           <name> <off>\n"
- 	"\n"
- 	"With:\n"
- 	"\t<name>: NAND partition/chip name (or corresponding DM device name or OF path)\n"
-@@ -575,4 +612,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils"
+ #if CONFIG_IS_ENABLED(CMD_MTD_OTP)
+ 	"mtd otpread                           <name> [u|f] <off> <size>\n"
+ 	"mtd otpwrite                          <name> <off> <hex string>\n"
+@@ -809,4 +846,6 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils"
  		U_BOOT_SUBCMD_MKENT_COMPLETE(erase, 4, 0, do_mtd_erase,
  					     mtd_name_complete),
  		U_BOOT_SUBCMD_MKENT_COMPLETE(bad, 2, 1, do_mtd_bad,

package/boot/uboot-mediatek/patches/100-11-env-add-support-for-NMBM-upper-MTD-layer.patch

@@ -240,7 +240,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 +};
 --- a/include/env_internal.h
 +++ b/include/env_internal.h
-@@ -111,6 +111,7 @@ enum env_location {
+@@ -110,6 +110,7 @@ enum env_location {
  	ENVL_MMC,
  	ENVL_MTD,
  	ENVL_NAND,

package/boot/uboot-mediatek/patches/100-13-cmd-add-a-new-command-for-NAND-flash-debugging.patch

@@ -26,7 +26,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/cmd/Kconfig
 +++ b/cmd/Kconfig
-@@ -1392,6 +1392,14 @@ config CMD_NAND_TORTURE
+@@ -1450,6 +1450,14 @@ config CMD_NAND_TORTURE
 
  endif # CMD_NAND
 
@@ -50,7 +50,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 +obj-$(CONFIG_CMD_NAND_EXT) += nand-ext.o
  obj-$(CONFIG_CMD_NMBM) += nmbm.o
  obj-$(CONFIG_CMD_NET) += net.o
- obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o
+ obj-$(CONFIG_ENV_SUPPORT) += nvedit.o
 --- /dev/null
 +++ b/cmd/nand-ext.c
 @@ -0,0 +1,1062 @@

package/boot/uboot-mediatek/patches/100-14-mtd-spi-nor-add-support-to-read-flash-unique-ID.patch

@@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/drivers/mtd/spi/spi-nor-core.c
 +++ b/drivers/mtd/spi/spi-nor-core.c
-@@ -2854,6 +2854,100 @@ static int spi_nor_init_params(struct sp
+@@ -2908,6 +2908,100 @@ static int spi_nor_init_params(struct sp
  	return 0;
  }
 
@@ -114,7 +114,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  static int spi_nor_hwcaps2cmd(u32 hwcaps, const int table[][2], size_t size)
  {
  	size_t i;
-@@ -4051,6 +4145,7 @@ int spi_nor_scan(struct spi_nor *nor)
+@@ -4027,6 +4121,7 @@ int spi_nor_scan(struct spi_nor *nor)
  	nor->write = spi_nor_write_data;
  	nor->read_reg = spi_nor_read_reg;
  	nor->write_reg = spi_nor_write_reg;
@@ -132,7 +132,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  #define SNOR_MFR_CYPRESS	0x34
 
  /*
-@@ -571,6 +572,7 @@ struct spi_nor {
+@@ -567,6 +568,7 @@ struct spi_nor {
  	void (*unprepare)(struct spi_nor *nor, enum spi_nor_ops ops);
  	int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);
  	int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);

package/boot/uboot-mediatek/patches/100-15-cmd-sf-add-support-to-read-flash-unique-ID.patch

@@ -12,7 +12,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/cmd/sf.c
 +++ b/cmd/sf.c
-@@ -412,6 +412,14 @@ static int do_spi_protect(int argc, char
+@@ -413,6 +413,14 @@ static int do_spi_protect(int argc, char
  	return ret == 0 ? 0 : 1;
  }
 
@@ -27,7 +27,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  enum {
  	STAGE_ERASE,
  	STAGE_CHECK,
-@@ -606,6 +614,8 @@ static int do_spi_flash(struct cmd_tbl *
+@@ -607,6 +615,8 @@ static int do_spi_flash(struct cmd_tbl *
  		ret = do_spi_flash_erase(argc, argv);
  	else if (IS_ENABLED(CONFIG_SPI_FLASH_LOCK) && strcmp(cmd, "protect") == 0)
  		ret = do_spi_protect(argc, argv);
@@ -36,7 +36,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  	else if (IS_ENABLED(CONFIG_CMD_SF_TEST) && !strcmp(cmd, "test"))
  		ret = do_spi_flash_test(argc, argv);
  	else
-@@ -636,6 +646,7 @@ U_BOOT_LONGHELP(sf,
+@@ -637,6 +647,7 @@ U_BOOT_LONGHELP(sf,
  #ifdef CONFIG_CMD_SF_TEST
  	"\nsf test offset len		- run a very basic destructive test"
  #endif

package/boot/uboot-mediatek/patches/100-16-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch

@@ -94,10 +94,10 @@ Signed-off-by: Weijie Gao <[email protected]>
  	if (default_str)
 @@ -369,9 +393,9 @@ static struct bootmenu_data *bootmenu_cr
 
- 		/* Add Quit entry if entering U-Boot console is disabled */
+ 		/* Add Quit entry if exiting bootmenu is disabled */
  		if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
--			entry->title = strdup("U-Boot console");
-+			entry->title = strdup("0. U-Boot console");
+-			entry->title = strdup("Exit");
++			entry->title = strdup("0. Exit");
  		else
 -			entry->title = strdup("Quit");
 +			entry->title = strdup("0. Quit");
@@ -301,7 +301,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
  		switch (key) {
  		case BKEY_UP:
-@@ -1838,7 +1838,7 @@ char *eficonfig_choice_change_boot_order
+@@ -1839,7 +1839,7 @@ char *eficonfig_choice_change_boot_order
 
  	cli_ch_init(cch);
  	while (1) {
@@ -312,7 +312,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  		case BKEY_PLUS:
 --- a/boot/bootflow_menu.c
 +++ b/boot/bootflow_menu.c
-@@ -235,7 +235,7 @@ int bootflow_menu_run(struct bootstd_pri
+@@ -234,7 +234,7 @@ int bootflow_menu_run(struct bootstd_pri
 
  		key = 0;
  		if (ichar) {

package/boot/uboot-mediatek/patches/100-17-common-spl-spl_nand-enable-CONFIG_SYS_NAND_U_BOOT_OF.patch

@@ -14,7 +14,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/common/spl/spl_nand.c
 +++ b/common/spl/spl_nand.c
-@@ -17,7 +17,11 @@
+@@ -19,7 +19,11 @@
 
  uint32_t __weak spl_nand_get_uboot_raw_page(void)
  {

package/boot/uboot-mediatek/patches/100-18-board-mt7629-add-support-for-booting-from-SPI-NAND.patch

@@ -89,7 +89,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  		reg = <0x11014000 0x1000>;
 --- a/arch/arm/mach-mediatek/Kconfig
 +++ b/arch/arm/mach-mediatek/Kconfig
-@@ -144,9 +144,11 @@ config SYS_CONFIG_NAME
+@@ -147,9 +147,11 @@ config SYS_CONFIG_NAME
 
  config MTK_BROM_HEADER_INFO
  	string

package/boot/uboot-mediatek/patches/100-19-board-mt7622-use-new-spi-nand-driver.patch

@@ -55,19 +55,18 @@ Signed-off-by: Weijie Gao <[email protected]>
  		reg = <0x11014000 0x1000>;
 --- a/configs/mt7622_rfb_defconfig
 +++ b/configs/mt7622_rfb_defconfig
-@@ -22,6 +22,7 @@ CONFIG_SYS_MAXARGS=8
- CONFIG_SYS_PBSIZE=1049
+@@ -22,6 +22,7 @@ CONFIG_SYS_PROMPT="MT7622> "
+ CONFIG_SYS_MAXARGS=8
  CONFIG_CMD_BOOTMENU=y
  CONFIG_CMD_MMC=y
 +CONFIG_CMD_MTD=y
  CONFIG_CMD_PCI=y
  CONFIG_CMD_SF_TEST=y
  CONFIG_CMD_PING=y
-@@ -41,6 +42,10 @@ CONFIG_SYSCON=y
- CONFIG_CLK=y
+@@ -42,6 +43,9 @@ CONFIG_CLK=y
  CONFIG_MMC_HS200_SUPPORT=y
  CONFIG_MMC_MTK=y
-+CONFIG_MTD=y
+ CONFIG_MTD=y
 +CONFIG_DM_MTD=y
 +CONFIG_MTK_SPI_NAND=y
 +CONFIG_MTK_SPI_NAND_MTD=y

package/boot/uboot-mediatek/patches/100-20-board-mt7981-add-reference-board-using-new-spi-nand-.patch

@@ -18,7 +18,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -1425,6 +1425,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
+@@ -1225,6 +1225,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
  	mt7623n-bananapi-bpi-r2.dtb \
  	mt7629-rfb.dtb \
  	mt7981-rfb.dtb \

package/boot/uboot-mediatek/patches/100-21-mtd-spi-nor-add-more-flash-ids.patch

@@ -13,7 +13,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/drivers/mtd/spi/spi-nor-core.c
 +++ b/drivers/mtd/spi/spi-nor-core.c
-@@ -674,6 +674,7 @@ static int set_4byte(struct spi_nor *nor
+@@ -698,6 +698,7 @@ static int set_4byte(struct spi_nor *nor
  	case SNOR_MFR_ISSI:
  	case SNOR_MFR_MACRONIX:
  	case SNOR_MFR_WINBOND:
@@ -23,7 +23,7 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/drivers/mtd/spi/spi-nor-ids.c
 +++ b/drivers/mtd/spi/spi-nor-ids.c
-@@ -83,7 +83,8 @@ const struct flash_info spi_nor_ids[] =
+@@ -84,7 +84,8 @@ const struct flash_info spi_nor_ids[] =
  	{ INFO("en25q32b",   0x1c3016, 0, 64 * 1024,   64, 0) },
  	{ INFO("en25q64",    0x1c3017, 0, 64 * 1024,  128, SECT_4K) },
  	{ INFO("en25q128b",  0x1c3018, 0, 64 * 1024,  256, 0) },
@@ -33,7 +33,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  	{ INFO("en25s64",    0x1c3817, 0, 64 * 1024,  128, SECT_4K) },
  #endif
  #ifdef CONFIG_SPI_FLASH_GIGADEVICE	/* GIGADEVICE */
-@@ -149,6 +150,11 @@ const struct flash_info spi_nor_ids[] =
+@@ -150,6 +151,11 @@ const struct flash_info spi_nor_ids[] =
  	{INFO("gd55x02g", 0xc8481C, 0, 64 * 1024, 4096,	SECT_4K |
  	SPI_NOR_OCTAL_READ | SPI_NOR_4B_OPCODES)},
  	{
@@ -45,7 +45,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  		INFO("gd25lq128", 0xc86018, 0, 64 * 1024, 256,
  			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
  			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-@@ -474,6 +480,16 @@ const struct flash_info spi_nor_ids[] =
+@@ -489,6 +495,16 @@ const struct flash_info spi_nor_ids[] =
  			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
  	},
  	{
@@ -62,7 +62,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  		INFO("w25q128jw", 0xef8018, 0, 64 * 1024, 256,
  			SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
  			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
-@@ -523,6 +539,11 @@ const struct flash_info spi_nor_ids[] =
+@@ -548,6 +564,11 @@ const struct flash_info spi_nor_ids[] =
  			SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
  	},
  	{ INFO("w25q256", 0xef4019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

package/boot/uboot-mediatek/patches/100-22-mtd-spi-nand-backport-from-upstream-kernel.patch

@@ -22,11 +22,12 @@ Signed-off-by: Weijie Gao <[email protected]>
 
 --- a/drivers/mtd/nand/spi/Makefile
 +++ b/drivers/mtd/nand/spi/Makefile
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
  # SPDX-License-Identifier: GPL-2.0
 
--spinand-objs := core.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o
-+spinand-objs := core.o etron.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o
+-spinand-objs := core.o esmt.o gigadevice.o macronix.o micron.o paragon.o
++spinand-objs := core.o esmt.o etron.o gigadevice.o macronix.o micron.o paragon.o
+ spinand-objs += toshiba.o winbond.o xtx.o
  obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
 --- a/drivers/mtd/nand/spi/core.c
 +++ b/drivers/mtd/nand/spi/core.c
@@ -539,7 +540,7 @@ Signed-off-by: Weijie Gao <[email protected]>
  static int winbond_spinand_init(struct spinand_device *spinand)
 --- a/include/linux/mtd/spinand.h
 +++ b/include/linux/mtd/spinand.h
-@@ -245,6 +245,7 @@ struct spinand_manufacturer {
+@@ -244,6 +244,7 @@ struct spinand_manufacturer {
  };
 
  /* SPI NAND manufacturers */