| Message ID | 1462986153-16318-2-git-send-email-greearb@candelatech.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8d0a0710ea0d22881fdb40eb79d346a98cc64ae6 |
| Delegated to: | Kalle Valo |
| Headers | show |
Ben Greear <greearb@candelatech.com> wrote: > From: Ben Greear <greearb@candelatech.com> > > This looks like a regression from > c4cdf753 (move fw_features to struct ath10k_fw_file) > > Signed-off-by: Ben Greear <greearb@candelatech.com> Thanks, 1 patch applied to ath-current branch of ath.git: 8d0a0710ea0d ath10k: fix crash related to printing features
On 05/11/2016 10:02 AM, greearb@candelatech.com wrote: > From: Ben Greear <greearb@candelatech.com> > > This looks like a regression from > c4cdf753 (move fw_features to struct ath10k_fw_file) Just FYI, this patch does not appear to be in 4.7-rc4 as of today, and so kernel crashes on startup when loading ath10k, at least when DBG_BOOT logging is enabled.... Thanks, Ben > > Signed-off-by: Ben Greear <greearb@candelatech.com> > --- > drivers/net/wireless/ath/ath10k/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c > index e94cb87..b7318b8 100644 > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -1078,7 +1078,7 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, > } > > ath10k_dbg_dump(ar, ATH10K_DBG_BOOT, "features", "", > - ar->running_fw->fw_file.fw_features, > + fw_file->fw_features, > sizeof(fw_file->fw_features)); > break; > case ATH10K_FW_IE_FW_IMAGE: >
Ben Greear <greearb@candelatech.com> writes: > On 05/11/2016 10:02 AM, greearb@candelatech.com wrote: >> From: Ben Greear <greearb@candelatech.com> >> >> This looks like a regression from >> c4cdf753 (move fw_features to struct ath10k_fw_file) > > Just FYI, this patch does not appear to be in 4.7-rc4 as of today, and > so kernel crashes on startup when loading ath10k, at least when > DBG_BOOT logging is enabled.... The fix is wireless-drivers.git now, I'm planning to send a pull request to Dave tomorrow.
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index e94cb87..b7318b8 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1078,7 +1078,7 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, } ath10k_dbg_dump(ar, ATH10K_DBG_BOOT, "features", "", - ar->running_fw->fw_file.fw_features, + fw_file->fw_features, sizeof(fw_file->fw_features)); break; case ATH10K_FW_IE_FW_IMAGE: