From 251b33c5bfb80c258fc9ee2574967774bcb1b4c2 Mon Sep 17 00:00:00 2001 From: Yousaf Kaukab Date: Apr 05 2023 15:20:03 +0000 Subject: Merge remote-tracking branch 'origin/users/tiwai/SLE15-SP5-GA/for-next' into SLE15-SP5-GA Pull wifi and supported.conf patches from Takashi Iwai --- diff --git a/patches.suse/ath11k-pci-Add-more-MODULE_FIRMWARE-entries.patch b/patches.suse/ath11k-pci-Add-more-MODULE_FIRMWARE-entries.patch new file mode 100644 index 0000000..e9badb5 --- /dev/null +++ b/patches.suse/ath11k-pci-Add-more-MODULE_FIRMWARE-entries.patch @@ -0,0 +1,36 @@ +From 962fc87f2c8d4a338c0ce9b7fcaed815fdfbca6a Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 30 Mar 2023 16:29:01 +0200 +Subject: [PATCH] ath11k: pci: Add more MODULE_FIRMWARE() entries +Patch-mainline: Submitted, linux-wireless ML +References: bsc#1209965 + +As there are a few more models supported by the driver, let's add the +missing MODULE_FIRMWARE() entries for them. The lack of them resulted +in the missing device enablement on some systems, such as the +installation image of openSUSE. + +While we are at it, use the wildcard instead of listing each firmware +files individually for each. + +Signed-off-by: Takashi Iwai + +--- + drivers/net/wireless/ath/ath11k/pci.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/pci.c ++++ b/drivers/net/wireless/ath/ath11k/pci.c +@@ -1037,7 +1037,8 @@ module_exit(ath11k_pci_exit); + MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11ax WLAN PCIe devices"); + MODULE_LICENSE("Dual BSD/GPL"); + +-/* QCA639x 2.0 firmware files */ +-MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_BOARD_API2_FILE); +-MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_AMSS_FILE); +-MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/" ATH11K_M3_FILE); ++/* firmware files */ ++MODULE_FIRMWARE(ATH11K_FW_DIR "/QCA6390/hw2.0/*"); ++MODULE_FIRMWARE(ATH11K_FW_DIR "/QCN9074/hw1.0/*"); ++MODULE_FIRMWARE(ATH11K_FW_DIR "/WCN6855/hw2.0/*"); ++MODULE_FIRMWARE(ATH11K_FW_DIR "/WCN6855/hw2.1/*"); diff --git a/series.conf b/series.conf index 6e06204..1bf86b7 100644 --- a/series.conf +++ b/series.conf @@ -37307,6 +37307,7 @@ patches.suse/0002-regulator-mt6358-Add-OF-match-table.patch patches.suse/0003-regulator-mt6323-Add-OF-match-table.patch patches.suse/rtl8188eu-fix-const-dev_addr_fallout.patch + patches.suse/ath11k-pci-Add-more-MODULE_FIRMWARE-entries.patch ######################################################## # USB diff --git a/supported.conf b/supported.conf index ed4b12a..bba2558 100644 --- a/supported.conf +++ b/supported.conf @@ -5416,8 +5416,8 @@ -!optional net/phonet/pn_pep net/psample/psample # netlink packet sampling interface -!optional net/qrtr/ns --!optional net/qrtr/qrtr --!optional net/qrtr/qrtr-mhi +- net/qrtr/qrtr +- net/qrtr/qrtr-mhi -!optional net/qrtr/qrtr-smd -!optional net/qrtr/qrtr-tun net/rds/rds # Reliable Datagram Sockets (RDS) protocol