diff --git a/srcpkgs/linux6.13/files/arm64-dotconfig b/srcpkgs/linux6.13/files/arm64-dotconfig index 193ff67665b..4c68f182914 100644 --- a/srcpkgs/linux6.13/files/arm64-dotconfig +++ b/srcpkgs/linux6.13/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.13.4 Kernel Configuration +# Linux/arm64 6.13.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/srcpkgs/linux6.13/files/i386-dotconfig b/srcpkgs/linux6.13/files/i386-dotconfig index 7ac51db3df9..558496f06b1 100644 --- a/srcpkgs/linux6.13/files/i386-dotconfig +++ b/srcpkgs/linux6.13/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.13.4 Kernel Configuration +# Linux/i386 6.13.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -2270,7 +2270,6 @@ CONFIG_EFI_EMBEDDED_FIRMWARE=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y -# CONFIG_IMX_SCMI_MISC_DRV is not set # # Qualcomm firmware drivers @@ -8777,7 +8776,6 @@ CONFIG_CROS_USBPD_NOTIFY=m CONFIG_CHROMEOS_PRIVACY_SCREEN=m CONFIG_CROS_TYPEC_SWITCH=m # CONFIG_WILCO_EC is not set -# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_SURFACE_PLATFORMS=y CONFIG_SURFACE3_WMI=m diff --git a/srcpkgs/linux6.13/files/x86_64-dotconfig b/srcpkgs/linux6.13/files/x86_64-dotconfig index b5bafae1d48..159b5ff8717 100644 --- a/srcpkgs/linux6.13/files/x86_64-dotconfig +++ b/srcpkgs/linux6.13/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.13.4 Kernel Configuration +# Linux/x86_64 6.13.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -2444,7 +2444,6 @@ CONFIG_EFI_EMBEDDED_FIRMWARE=y CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y -# CONFIG_IMX_SCMI_MISC_DRV is not set # # Qualcomm firmware drivers @@ -9124,7 +9123,6 @@ CONFIG_CROS_USBPD_NOTIFY=m CONFIG_CHROMEOS_PRIVACY_SCREEN=m CONFIG_CROS_TYPEC_SWITCH=m # CONFIG_WILCO_EC is not set -# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set CONFIG_SURFACE_PLATFORMS=y CONFIG_SURFACE3_WMI=m diff --git a/srcpkgs/linux6.13/patches/x13s-bluetooth-fw.patch b/srcpkgs/linux6.13/patches/x13s-bluetooth-fw.patch deleted file mode 100644 index c27a1fc1ced..00000000000 --- a/srcpkgs/linux6.13/patches/x13s-bluetooth-fw.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 12d8f091a79829e79dead7d87a353aa019415b2b Mon Sep 17 00:00:00 2001 -From: Zijun Hu -Date: Sat, 16 Nov 2024 07:49:23 -0800 -Subject: [PATCH] Bluetooth: qca: Support downloading board ID specific NVM for - WCN6855 - -For WCN6855, board ID specific NVM needs to be downloaded once board ID -is available, but the default NVM is always downloaded currently, and -the wrong NVM causes poor RF performance which effects user experience. - -Fix by downloading board ID specific NVM if board ID is available. - -Cc: Bjorn Andersson -Cc: Aiqun Yu (Maria) -Cc: Cheng Jiang -Cc: Johan Hovold -Cc: Jens Glathe -Cc: Steev Klimaszewski -Cc: Paul Menzel -Fixes: 095327fede00 ("Bluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855") -Cc: stable@vger.kernel.org # 6.4 -Reviewed-by: Johan Hovold -Tested-by: Johan Hovold -Tested-by: Steev Klimaszewski -Tested-by: Jens Glathe -Signed-off-by: Zijun Hu -Link: https://lore.kernel.org/r/20241116-x13s_wcn6855_fix-v2-1-c08c298d5fbf@quicinc.com -Signed-off-by: Johan Hovold ---- - drivers/bluetooth/btqca.c | 44 ++++++++++++++++++++++++++++++++++++--- - 1 file changed, 41 insertions(+), 3 deletions(-) - -diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c -index dfbbac92242a84..ddfe7e3c9b5003 100644 ---- a/drivers/bluetooth/btqca.c -+++ b/drivers/bluetooth/btqca.c -@@ -717,6 +717,29 @@ static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size, - snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid); - } - -+static void qca_get_hsp_nvm_name_generic(struct qca_fw_config *cfg, -+ struct qca_btsoc_version ver, -+ u8 rom_ver, u16 bid) -+{ -+ const char *variant; -+ -+ /* hsp gf chip */ -+ if ((le32_to_cpu(ver.soc_id) & QCA_HSP_GF_SOC_MASK) == QCA_HSP_GF_SOC_ID) -+ variant = "g"; -+ else -+ variant = ""; -+ -+ if (bid == 0x0) -+ snprintf(cfg->fwname, sizeof(cfg->fwname), "qca/hpnv%02x%s.bin", -+ rom_ver, variant); -+ else if (bid & 0xff00) -+ snprintf(cfg->fwname, sizeof(cfg->fwname), "qca/hpnv%02x%s.b%x", -+ rom_ver, variant, bid); -+ else -+ snprintf(cfg->fwname, sizeof(cfg->fwname), "qca/hpnv%02x%s.b%02x", -+ rom_ver, variant, bid); -+} -+ - static inline void qca_get_nvm_name_generic(struct qca_fw_config *cfg, - const char *stem, u8 rom_ver, u16 bid) - { -@@ -810,8 +833,15 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, - /* Give the controller some time to get ready to receive the NVM */ - msleep(10); - -- if (soc_type == QCA_QCA2066 || soc_type == QCA_WCN7850) -+ switch (soc_type) { -+ case QCA_QCA2066: -+ case QCA_WCN6855: -+ case QCA_WCN7850: - qca_read_fw_board_id(hdev, &boardid); -+ break; -+ default: -+ break; -+ } - - /* Download NVM configuration */ - config.type = TLV_TYPE_NVM; -@@ -848,8 +878,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, - "qca/msnv%02x.bin", rom_ver); - break; - case QCA_WCN6855: -- snprintf(config.fwname, sizeof(config.fwname), -- "qca/hpnv%02x.bin", rom_ver); -+ qca_get_hsp_nvm_name_generic(&config, ver, rom_ver, boardid); - break; - case QCA_WCN7850: - qca_get_nvm_name_generic(&config, "hmt", rom_ver, boardid); -@@ -861,9 +890,18 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, - } - } - -+download_nvm: - err = qca_download_firmware(hdev, &config, soc_type, rom_ver); - if (err < 0) { - bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err); -+ if (err == -ENOENT && boardid != 0 && -+ soc_type == QCA_WCN6855) { -+ boardid = 0; -+ qca_get_hsp_nvm_name_generic(&config, ver, -+ rom_ver, boardid); -+ bt_dev_warn(hdev, "QCA fallback to default NVM"); -+ goto download_nvm; -+ } - return err; - } - diff --git a/srcpkgs/linux6.13/template b/srcpkgs/linux6.13/template index 2f60b818a2e..fde77a79234 100644 --- a/srcpkgs/linux6.13/template +++ b/srcpkgs/linux6.13/template @@ -1,6 +1,6 @@ # Template file for 'linux6.13' pkgname=linux6.13 -version=6.13.4 +version=6.13.5 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Duncaen " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="e79dcc6eb86695c6babfb07c2861912b635d5075c6cd1cd0567d1ea155f80d6e - 2150bc51625fbf8fb051c11c31db8f2c69d6634c9a4754bdce59cd7657689428" + 98d619a056e0f007a3404f02430fdb5feeb6801170c40602a27e575dd207bd79" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR.