| Message ID | 20220125004046.4058284-1-bryan.odonoghue@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 98d504a82cc75840bec8e3c6ae0e4f411921962b |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wcn36xx: Differentiate wcn3660 from wcn3620 | expand |
On Tue, 25 Jan 2022 at 01:40, Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote: > > The spread of capability between the three WiFi silicon parts wcn36xx > supports is: > > wcn3620 - 802.11 a/b/g > wcn3660 - 802.11 a/b/g/n > wcn3680 - 802.11 a/b/g/n/ac > > We currently treat wcn3660 as wcn3620 thus limiting it to 2GHz channels. > Fix this regression by ensuring we differentiate between all three parts. > > Fixes: 8490987bdb9a ("wcn36xx: Hook and identify RF_IRIS_WCN3680") > Cc: stable@vger.kernel.org > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote: > The spread of capability between the three WiFi silicon parts wcn36xx > supports is: > > wcn3620 - 802.11 a/b/g > wcn3660 - 802.11 a/b/g/n > wcn3680 - 802.11 a/b/g/n/ac > > We currently treat wcn3660 as wcn3620 thus limiting it to 2GHz channels. > Fix this regression by ensuring we differentiate between all three parts. > > Fixes: 8490987bdb9a ("wcn36xx: Hook and identify RF_IRIS_WCN3680") > Cc: stable@vger.kernel.org > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Reviewed-by: Loic Poulain <loic.poulain@linaro.org> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. 98d504a82cc7 wcn36xx: Differentiate wcn3660 from wcn3620
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 9575d7373bf27..ac2813ed851c4 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -1513,6 +1513,9 @@ static int wcn36xx_platform_get_resources(struct wcn36xx *wcn, if (iris_node) { if (of_device_is_compatible(iris_node, "qcom,wcn3620")) wcn->rf_id = RF_IRIS_WCN3620; + if (of_device_is_compatible(iris_node, "qcom,wcn3660") || + of_device_is_compatible(iris_node, "qcom,wcn3660b")) + wcn->rf_id = RF_IRIS_WCN3660; if (of_device_is_compatible(iris_node, "qcom,wcn3680")) wcn->rf_id = RF_IRIS_WCN3680; of_node_put(iris_node); diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index fbd0558c2c196..5d3f8f56e5681 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -97,6 +97,7 @@ enum wcn36xx_ampdu_state { #define RF_UNKNOWN 0x0000 #define RF_IRIS_WCN3620 0x3620 +#define RF_IRIS_WCN3660 0x3660 #define RF_IRIS_WCN3680 0x3680 static inline void buff_to_be(u32 *buf, size_t len)
The spread of capability between the three WiFi silicon parts wcn36xx supports is: wcn3620 - 802.11 a/b/g wcn3660 - 802.11 a/b/g/n wcn3680 - 802.11 a/b/g/n/ac We currently treat wcn3660 as wcn3620 thus limiting it to 2GHz channels. Fix this regression by ensuring we differentiate between all three parts. Fixes: 8490987bdb9a ("wcn36xx: Hook and identify RF_IRIS_WCN3680") Cc: stable@vger.kernel.org Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- drivers/net/wireless/ath/wcn36xx/main.c | 3 +++ drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + 2 files changed, 4 insertions(+)