2022-12-02 13:21:28

by Christoph Hellwig

[permalink] [raw]
Subject: [PATCH] wifi: ath11k_pci: add a soft dependency on qrtr-mhi

While ath11k_pci can load without qrtr-mhi, probing the actual hardware
will fail when qrtr and qrtr-mhi aren't loaded with

failed to initialize qmi handle: -517

Add a MODULE_SOFTDEP statement to bring the module in (and as a hint
for kernel packaging) for those cases where it isn't autoloaded already
for some reason.

Signed-off-by: Christoph Hellwig <[email protected]>
---
drivers/net/wireless/ath/ath11k/pci.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index 99cf3357c66e16..9d58856cbf8a94 100644
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -1037,6 +1037,8 @@ module_exit(ath11k_pci_exit);
MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11ax WLAN PCIe devices");
MODULE_LICENSE("Dual BSD/GPL");

+MODULE_SOFTDEP("pre: qrtr-mhi");
+
/* 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);
--
2.30.2


2023-03-07 02:36:40

by Cyril Brulebois

[permalink] [raw]
Subject: Re: [PATCH] wifi: ath11k_pci: add a soft dependency on qrtr-mhi

Hallo Christoph,

Christoph Hellwig <[email protected]> (2022-12-02):
> While ath11k_pci can load without qrtr-mhi, probing the actual hardware
> will fail when qrtr and qrtr-mhi aren't loaded with
>
> failed to initialize qmi handle: -517
>
> Add a MODULE_SOFTDEP statement to bring the module in (and as a hint
> for kernel packaging) for those cases where it isn't autoloaded already
> for some reason.

That's indeed a very helpful hint, which helped us fix support for this
module in a Debian Installer context (where we don't ship each and every
module built in the linux-image package, but some limited selection).

https://salsa.debian.org/kernel-team/linux/-/merge_requests/667


Cheers,
--
Cyril Brulebois ([email protected]) <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant


Attachments:
(No filename) (836.00 B)
signature.asc (833.00 B)
Download all attachments