Skip to contentSkip to conversation

soc: qcom: wcnss_ctrl: Fix increment in NV upload

PATCH New Bjorn Andersson 1 participant 1 message Feb 28, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: qcom: wcnss_ctrl: Fix increment in NV upload

hdr.len includes both the size of the header and the fragment, so using this when stepping through the firmware causes us to skip 16 bytes every chunk of 3072 bytes; causing only the first fragment to actually be valid data.

Instead use fragment size steps through the firmware blob.

Fixes ea7a1f275cf0 ("soc: qcom: Introduce WCNSS_CTRL SMD client")

---

It's worth noting that the firmware does not complain about the broken NV blob nor does fixing this seem to alter the behavior of BT or WLAN - perhaps because the WLAN driver uploads the NV blob as well?

 drivers/soc/qcom/wcnss_ctrl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/wcnss_ctrl.c +1 -1
index e968559b0fc4..5429c91440b1 100644
@@ -249,7 +249,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc)
 		/* Increment for next fragment */
 		req->seq++;
 
-		data += req->hdr.len;
+		data += NV_FRAGMENT_SIZE;
 		left -= NV_FRAGMENT_SIZE;
 	} while (left > 0);
 
Signature · 1 line
2.16.2