| Message ID | 1459352551-11773-1-git-send-email-rmanohar@qti.qualcomm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| 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. > > Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> > Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> I added the fixes line in the pending branch: Fixes: 3d9195ea19e4 ("ath10k: incorporate qca4019 cal data download sequence")
On 2016-04-05 18:10, Valo, Kalle wrote: > 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. >> >> Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> >> Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> > > I added the fixes line in the pending branch: > > Fixes: 3d9195ea19e4 ("ath10k: incorporate qca4019 cal data download > sequence") Thanks. -Rajkumar
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index b6c157e..a7d04bc 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -725,10 +725,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. Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> --- drivers/net/wireless/ath/ath10k/core.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)