diff mbox series

[5.17,37/39] wcn36xx: Differentiate wcn3660 from wcn3620

Message ID	20220325150421.305865415@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Bryan ODonoghue <bryan.odonoghue@linaro.org>, Loic Poulain <loic.poulain@linaro.org>, Kalle Valo <quic_kvalo@quicinc.com> Subject: [PATCH 5.17 37/39] wcn36xx: Differentiate wcn3660 from wcn3620 Date: Fri, 25 Mar 2022 16:14:52 +0100 Message-Id: <20220325150421.305865415@linuxfoundation.org> In-Reply-To: <20220325150420.245733653@linuxfoundation.org> References: <20220325150420.245733653@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.17,02/39] Bluetooth: btusb: Add another Realtek 8761BU [5.17,03/39] llc: fix netdevice reference leaks in llc_ui_bind() [5.17,04/39] ASoC: sti: Fix deadlock via snd_pcm_stop_xrun() call [5.17,05/39] ALSA: oss: Fix PCM OSS buffer allocation overflow [5.17,06/39] ALSA: usb-audio: add mapping for new Corsair Virtuoso SE [5.17,07/39] ALSA: hda/realtek: Add quirk for Clevo NP70PNJ [5.17,08/39] ALSA: hda/realtek: Add quirk for Clevo NP50PNJ [5.17,09/39] ALSA: hda/realtek - Fix headset mic problem for a HP machine with alc671 [5.17,10/39] ALSA: hda/realtek: Add quirk for ASUS GA402 [5.17,11/39] ALSA: pcm: Fix races among concurrent hw_params and hw_free calls [5.17,12/39] ALSA: pcm: Fix races among concurrent read/write and buffer changes [5.17,13/39] ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls [5.17,14/39] ALSA: pcm: Fix races among concurrent prealloc proc writes [5.17,15/39] ALSA: pcm: Add stream lock during PCM reset ioctl operations [5.17,16/39] ALSA: usb-audio: Add mute TLV for playback volumes on RODE NT-USB [5.17,17/39] ALSA: cmipci: Restore aux vol on suspend/resume [5.17,18/39] ALSA: pci: fix reading of swapped values from pcmreg in AC97 codec [5.17,19/39] drivers: net: xgene: Fix regression in CRC stripping [5.17,20/39] netfilter: nf_tables: initialize registers in nft_do_chain() [5.17,21/39] netfilter: nf_tables: validate registers coming from userspace. [5.17,22/39] ACPI / x86: Work around broken XSDT on Advantech DAC-BJ01 board [5.17,23/39] ACPI: battery: Add device HID and quirk for Microsoft Surface Go 3 [5.17,24/39] ACPI: video: Force backlight native for Clevo NL5xRU and NL5xNU [5.17,25/39] crypto: qat - disable registration of algorithms [5.17,26/39] Bluetooth: btusb: Add one more Bluetooth part for the Realtek RTL8852AE [5.17,27/39] Bluetooth: hci_sync: Add a new quirk to skip HCI_FLT_CLEAR_ALL [5.17,28/39] Bluetooth: btusb: Use quirk to skip HCI_FLT_CLEAR_ALL on fake CSR controllers [5.17,29/39] Revert "ath: add support for special 0x0 regulatory domain" [5.17,30/39] drm/virtio: Ensure that objs is not NULL in virtio_gpu_array_put_free() [5.17,31/39] jbd2: fix use-after-free of transaction_t race [5.17,32/39] rcu: Dont deboost before reporting expedited quiescent state [5.17,33/39] uaccess: fix integer overflow on access_ok() [5.17,34/39] mac80211: fix potential double free on mesh join [5.17,35/39] tpm: fix reference counting for struct tpm_chip [5.17,36/39] tpm: use try_get_ops() in tpm-space.c [5.17,37/39] wcn36xx: Differentiate wcn3660 from wcn3620 [5.17,38/39] m68k: fix access_ok for coldfire [5.17,39/39] nds32: fix access_ok() checks in get/put_user

Commit Message

gregkh@linuxfoundation.org March 25, 2022, 3:14 p.m. UTC

From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

commit 98d504a82cc75840bec8e3c6ae0e4f411921962b upstream.

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>
Link: https://lore.kernel.org/r/20220125004046.4058284-1-bryan.odonoghue@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/wireless/ath/wcn36xx/main.c    |    3 +++
 drivers/net/wireless/ath/wcn36xx/wcn36xx.h |    1 +
 2 files changed, 4 insertions(+)

diff mbox series

Patch

--- 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_resource
 	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);
--- 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)