| Message ID | 1460011051-8272-1-git-send-email-rmanohar@qti.qualcomm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
Rajkumar Manoharan <rmanohar@qti.qualcomm.com> writes: > pre-calibration is meant for qca4019 which contains only caldata > whereas calibration file is used by ar9888 and qca99x0 that contains > both board data and caldata. So by definition both pre-cal-file and > cal-file can not coexist. Keeping them in shared memory (union), is > breaking boot sequence of qca99x0. Fix it by storing both binaries > in separate memories. This issue is reported in ipq8064 platform which > includes caldata in flash memory. > > Fixes: 3d9195ea19e4 ("ath10k: incorporate qca4019 cal data download sequence") > Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> > Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> All three applied, thanks.
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index c23c37312ef7..d85b99164212 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -728,10 +728,8 @@ struct ath10k { const void *firmware_data; size_t firmware_len; - union { - const struct firmware *pre_cal_file; - const struct firmware *cal_file; - }; + const struct firmware *pre_cal_file; + const struct firmware *cal_file; struct { const void *firmware_codeswap_data;
pre-calibration is meant for qca4019 which contains only caldata whereas calibration file is used by ar9888 and qca99x0 that contains both board data and caldata. So by definition both pre-cal-file and cal-file can not coexist. Keeping them in shared memory (union), is breaking boot sequence of qca99x0. Fix it by storing both binaries in separate memories. This issue is reported in ipq8064 platform which includes caldata in flash memory. Fixes: 3d9195ea19e4 ("ath10k: incorporate qca4019 cal data download sequence") Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> --- v2: added fixes commit drivers/net/wireless/ath/ath10k/core.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)