| Message ID | 20191106233130.2169-1-jeffrey.l.hugo@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 501d4152b0184b7f0a4df03a1dc748b381410a11 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath10k: Handle when FW doesn't support QMI_WLFW_HOST_CAP_REQ_V01 | expand |
On Wed 06 Nov 15:31 PST 2019, Jeffrey Hugo wrote: > Firmware with the build id QC_IMAGE_VERSION_STRING=WLAN.HL.1.0.2-XXXX does > not support the QMI_WLFW_HOST_CAP_REQ_V01 message and will return the > QMI not supported error to the ath10k driver. Since not supporting this > message is not fatal to the firmware nor the ath10k driver, lets catch > this particular scenario and ignore it so that we can still bring up > wifi services successfully. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> > --- > drivers/net/wireless/ath/ath10k/qmi.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c > index 545ac1f06997..eb618a2652db 100644 > --- a/drivers/net/wireless/ath/ath10k/qmi.c > +++ b/drivers/net/wireless/ath/ath10k/qmi.c > @@ -614,7 +614,9 @@ static int ath10k_qmi_host_cap_send_sync(struct ath10k_qmi *qmi) > if (ret < 0) > goto out; > > - if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { > + /* older FW didn't support this request, which is not fatal */ > + if (resp.resp.result != QMI_RESULT_SUCCESS_V01 && > + resp.resp.error != QMI_ERR_NOT_SUPPORTED_V01) { > ath10k_err(ar, "host capability request rejected: %d\n", resp.resp.error); > ret = -EINVAL; > goto out; > -- > 2.17.1 >
Jeffrey Hugo <jeffrey.l.hugo@gmail.com> wrote: > Firmware with the build id QC_IMAGE_VERSION_STRING=WLAN.HL.1.0.2-XXXX does > not support the QMI_WLFW_HOST_CAP_REQ_V01 message and will return the > QMI not supported error to the ath10k driver. Since not supporting this > message is not fatal to the firmware nor the ath10k driver, lets catch > this particular scenario and ignore it so that we can still bring up > wifi services successfully. > > Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Patch applied to ath-next branch of ath.git, thanks. 501d4152b018 ath10k: Handle when FW doesn't support QMI_WLFW_HOST_CAP_REQ_V01
diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c index 545ac1f06997..eb618a2652db 100644 --- a/drivers/net/wireless/ath/ath10k/qmi.c +++ b/drivers/net/wireless/ath/ath10k/qmi.c @@ -614,7 +614,9 @@ static int ath10k_qmi_host_cap_send_sync(struct ath10k_qmi *qmi) if (ret < 0) goto out; - if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + /* older FW didn't support this request, which is not fatal */ + if (resp.resp.result != QMI_RESULT_SUCCESS_V01 && + resp.resp.error != QMI_ERR_NOT_SUPPORTED_V01) { ath10k_err(ar, "host capability request rejected: %d\n", resp.resp.error); ret = -EINVAL; goto out;
Firmware with the build id QC_IMAGE_VERSION_STRING=WLAN.HL.1.0.2-XXXX does not support the QMI_WLFW_HOST_CAP_REQ_V01 message and will return the QMI not supported error to the ath10k driver. Since not supporting this message is not fatal to the firmware nor the ath10k driver, lets catch this particular scenario and ignore it so that we can still bring up wifi services successfully. Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> --- drivers/net/wireless/ath/ath10k/qmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)