From bef28b583702ec6d1155b8d4c3c67255f48b5531 Mon Sep 17 00:00:00 2001
From: Luis Guzman <ark@switnet.org>
Date: Tue, 17 Sep 2024 02:45:47 +0000
Subject: [PATCH] linux-hwe-5.15: update linux-libre tools and silent patch for
5.15-121
---
helpers/DATA/linux-hwe-5.15/deblob-check | 22 ++++++++++++++-----
.../silent-accept-firmware.patch | 14 ++++++++----
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/helpers/DATA/linux-hwe-5.15/deblob-check b/helpers/DATA/linux-hwe-5.15/deblob-check
index 99cba5f1..e6bae296 100644
--- a/helpers/DATA/linux-hwe-5.15/deblob-check
+++ b/helpers/DATA/linux-hwe-5.15/deblob-check
@@ -28,6 +28,9 @@
# modified with 2023-12-26 r19450 (partial)
# modified with 2024-03-01 r19492
# modified with 2023-06-12 r19329 (partial)
+# modified with 2023-12-26 r19450 (more partial)
+# modified with 2023-10-23 r19416 (more partial)
+# modified with 2024-07-05 r19593 (partial)
# Inspired in gNewSense's find-firmware script.
# Written by Alexandre Oliva <lxoliva@fsfla.org>
@@ -6336,6 +6339,10 @@ set_except () {
# Catch other names likely to appear in BRCMF_FW*_DEF strings in these files.
blobna 'brcmfmac43[^";) \t\n]*\(-sdio\|-pcie\)\?' drivers/net/wireless/broadcom/brcm80211/brcmfmac/'\(sdio\|pcie\|usb\)\.c'
+ # Trisquel changes for Aramo
+ blobname 'mediatek[/]WIFI_RAM_CODE_MT7922_1\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+ blobname 'mediatek[/]WIFI_MT7922_patch_mcu_1_1_hdr\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+
# New in 5.15.3-gnu and 5.14.19-gnu.
blobna '[/][*][ ]linux-firmware\.git[ ]hash[ ][0-9a-f]*[ ][*][/]' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6407,12 +6414,6 @@ set_except () {
# New in 5.15.121.
blobname 'qcom[/]apq8016[/]\(\(mba\|modem\|wcnss\)\.mbn\|WCNSS_qcom_wlan_nv_sbc\.bin\)' arch/arm64/boot/dts/qcom/apq8016-sbc.dts
- # Trisquel changes for Aramo
- blobname 'mediatek[/]WIFI_RAM_CODE_MT7922_1\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
- blobname 'mediatek[/]WIFI_MT7922_patch_mcu_1_1_hdr\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
- blobname 'qca[/]nvm_usb_%08x\.bin' drivers/bluetooth/btusb.c
- blobname 'qca[/]nvm_usb_%08x%s_%04x\.bin' drivers/bluetooth/btusb.c
-
# New in 6.4.6, 6.1.41, 5.15.122, 5.10.187, 5.4.250, 4.19.289.
blobna 'please[ ]update[ ]your[ ]microcode' arch/x86/kernel/cpu/amd.c
@@ -6434,6 +6435,15 @@ set_except () {
blobname 'qca[/]hpbtfw%02x\.tlv' drivers/bluetooth/btqca.c
blobname 'qca[/]hpnv%02x\.bin' drivers/bluetooth/btqca.c
+ # New in 5.15.162.
+ blobname 'qca[/]hpnv%02x%s\.\(bin\|%x\)' drivers/bluetooth/btqca.c
+ blobname 'qca[/]\(ap\|hmt\)btfw%02x\.tlv' drivers/bluetooth/btqca.c
+ blobname 'qca[/]\(ap\|hmt\)nv%02x\.bin' drivers/bluetooth/btqca.c
+
+ # New in 6.10-rc, 6.9.9, 6.6.39, 6.1.98, 5.15.163, 5.10.222.
+ blobname 'gsl1680-globalspace-solt-ivw116\.fw' drivers/platform/x86/touchscreen_dmi.c
+ blobname 'E\.WSA116_8\.E1\.042\.bin' drivers/platform/x86/touchscreen_dmi.c
+
;;
*/*freedo*.patch | */*logo*.patch)
diff --git a/helpers/DATA/linux-hwe-5.15/silent-accept-firmware.patch b/helpers/DATA/linux-hwe-5.15/silent-accept-firmware.patch
index d75cb8f8..85b4b097 100644
--- a/helpers/DATA/linux-hwe-5.15/silent-accept-firmware.patch
+++ b/helpers/DATA/linux-hwe-5.15/silent-accept-firmware.patch
@@ -1522,16 +1522,22 @@ diff -ru source.orig/drivers/bluetooth/ath3k.c source/drivers/bluetooth/ath3k.c
return ret;
}
-@@ -505,8 +505,7 @@
+@@ -502,11 +502,10 @@ static int ath3k_probe(struct usb_interface *intf,
ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
if (ret < 0) {
if (ret == -ENOENT)
- BT_ERR("Firmware file \"%s\" not found",
-- ATH3K_FIRMWARE);
+- ATH3K_FIRMWARE);
+ BT_ERR("Firmware file not found");
else
- BT_ERR("Firmware file \"%s\" request failed (err=%d)",
- ATH3K_FIRMWARE, ret);
+- BT_ERR("Firmware file \"%s\" request failed (err=%d)",
+- ATH3K_FIRMWARE, ret);
++ BT_ERR("Firmware file request failed (err=%d)",
++ ret);
+ return ret;
+ }
+
+
diff -ru source.orig/drivers/bluetooth/btbcm.c source/drivers/bluetooth/btbcm.c
--- source.orig/drivers/bluetooth/btbcm.c 2023-06-07 09:29:12.000000000 -0400
+++ source/drivers/bluetooth/btbcm.c 2023-06-07 10:07:36.541063483 -0400
--
GitLab