On 30.01.2024 17:38, Dmitry Baryshkov wrote: > Different Qualcomm platforms using WCN3990 WiFI chip use SoC-specific > firmware versions with different features. For example firmware for > SDM845 doesn't use single-chan-info-per-channel feature, while firmware > for QRB2210 / QRB4210 requires that feature. Allow board DT files to > override the subdir of the fw dir used to lookup the firmware-N.bin file > decribing corresponding WiFi firmware. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> > --- > drivers/net/wireless/ath/ath10k/core.c | 11 ++++++++++- > drivers/net/wireless/ath/ath10k/core.h | 2 ++ > drivers/net/wireless/ath/ath10k/snoc.c | 3 +++ > 3 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c > index 0032f8aa892f..ef7ce8b3f8fb 100644 > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -942,11 +942,20 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar, > if (dir == NULL) > dir = "."; > > + if (ar->board_name) { > + snprintf(filename, sizeof(filename), "%s/%s/%s", > + dir, ar->board_name, file); > + ret = firmware_request_nowarn(&fw, filename, ar->dev); > + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", > + filename, ret); Perhaps it'd be useful to move to a more noisy loglevel Konrad