Commit cbeb1c1b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2023-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Kalle Valo says:

====================
wireless fixes for v6.3

mt76 has a fix for leaking cleartext frames on a certain scenario and
two firmware file handling related fixes. For brcmfmac we have a fix
for an older SDIO suspend regression and for ath11k avoiding a kernel
crash during hibernation with SUSE kernels.

* tag 'wireless-2023-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mt76: ignore key disable commands
  wifi: ath11k: reduce the MHI timeout to 20s
  wifi: mt76: mt7921: fix fw used for offload check for mt7922
  wifi: mt76: mt7921: Fix use-after-free in fw features query.
  wifi: brcmfmac: Fix SDIO suspend/resume regression
====================

Link: https://lore.kernel.org/r/20230405105536.4E946C433D2@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b97ee72a e6db67fa

drivers/net/wireless/ath/ath11k/mhi.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "pci.h"

#include "pcic.h"



#define MHI_TIMEOUT_DEFAULT_MS	90000

#define MHI_TIMEOUT_DEFAULT_MS	20000

#define RDDM_DUMP_SIZE	0x420000



static struct mhi_channel_config ath11k_mhi_channels_qca6390[] = {

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+26 −10
Original line number Diff line number Diff line
@@ -994,15 +994,34 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { 
MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);





static void brcmf_sdiod_acpi_set_power_manageable(struct device *dev,

						  int val)

static void brcmf_sdiod_acpi_save_power_manageable(struct brcmf_sdio_dev *sdiodev)

{

#if IS_ENABLED(CONFIG_ACPI)

	struct acpi_device *adev;



	adev = ACPI_COMPANION(dev);

	adev = ACPI_COMPANION(&sdiodev->func1->dev);

	if (adev)

		adev->flags.power_manageable = 0;

		sdiodev->func1_power_manageable = adev->flags.power_manageable;



	adev = ACPI_COMPANION(&sdiodev->func2->dev);

	if (adev)

		sdiodev->func2_power_manageable = adev->flags.power_manageable;

#endif

}



static void brcmf_sdiod_acpi_set_power_manageable(struct brcmf_sdio_dev *sdiodev,

						  int enable)

{

#if IS_ENABLED(CONFIG_ACPI)

	struct acpi_device *adev;



	adev = ACPI_COMPANION(&sdiodev->func1->dev);

	if (adev)

		adev->flags.power_manageable = enable ? sdiodev->func1_power_manageable : 0;



	adev = ACPI_COMPANION(&sdiodev->func2->dev);

	if (adev)

		adev->flags.power_manageable = enable ? sdiodev->func2_power_manageable : 0;

#endif

}
@@ -1012,7 +1031,6 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	int err;

	struct brcmf_sdio_dev *sdiodev;

	struct brcmf_bus *bus_if;

	struct device *dev;



	brcmf_dbg(SDIO, "Enter\n");

	brcmf_dbg(SDIO, "Class=%x\n", func->class);
@@ -1020,14 +1038,9 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);

	brcmf_dbg(SDIO, "Function#: %d\n", func->num);



	dev = &func->dev;



	/* Set MMC_QUIRK_LENIENT_FN0 for this card */

	func->card->quirks |= MMC_QUIRK_LENIENT_FN0;



	/* prohibit ACPI power management for this device */

	brcmf_sdiod_acpi_set_power_manageable(dev, 0);



	/* Consume func num 1 but dont do anything with it. */

	if (func->num == 1)

		return 0;
@@ -1059,6 +1072,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	dev_set_drvdata(&sdiodev->func1->dev, bus_if);

	sdiodev->dev = &sdiodev->func1->dev;



	brcmf_sdiod_acpi_save_power_manageable(sdiodev);

	brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_DOWN);



	brcmf_dbg(SDIO, "F2 found, calling brcmf_sdiod_probe...\n");
@@ -1124,6 +1138,8 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled) 


	if (sdiodev->settings->bus.sdio.oob_irq_supported ||

	    pm_caps & MMC_PM_WAKE_SDIO_IRQ) {

		/* Stop ACPI from turning off the device when wowl is enabled */

		brcmf_sdiod_acpi_set_power_manageable(sdiodev, !enabled);

		sdiodev->wowl_enabled = enabled;

		brcmf_dbg(SDIO, "Configuring WOWL, enabled=%d\n", enabled);

		return;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ struct brcmf_sdio_dev { 
	char nvram_name[BRCMF_FW_NAME_LEN];

	char clm_name[BRCMF_FW_NAME_LEN];

	bool wowl_enabled;

	bool func1_power_manageable;

	bool func2_power_manageable;

	enum brcmf_sdiod_state state;

	struct brcmf_sdiod_freezer *freezer;

	const struct firmware *clm_fw;

drivers/net/wireless/mediatek/mt76/mt7603/main.c

+5 −5
Original line number Diff line number Diff line
@@ -512,15 +512,15 @@ mt7603_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	    !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))

		return -EOPNOTSUPP;



	if (cmd == SET_KEY) {

		key->hw_key_idx = wcid->idx;

		wcid->hw_key_idx = idx;

	} else {

	if (cmd != SET_KEY) {

		if (idx == wcid->hw_key_idx)

			wcid->hw_key_idx = -1;



		key = NULL;

		return 0;

	}



	key->hw_key_idx = wcid->idx;

	wcid->hw_key_idx = idx;

	mt76_wcid_key_setup(&dev->mt76, wcid, key);



	return mt7603_wtbl_set_key(dev, wcid->idx, key);

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+21 −49
Original line number Diff line number Diff line
@@ -1193,8 +1193,7 @@ EXPORT_SYMBOL_GPL(mt7615_mac_enable_rtscts); 
static int

mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,

			   struct ieee80211_key_conf *key,

			   enum mt76_cipher_type cipher, u16 cipher_mask,

			   enum set_key_cmd cmd)

			   enum mt76_cipher_type cipher, u16 cipher_mask)

{

	u32 addr = mt7615_mac_wtbl_addr(dev, wcid->idx) + 30 * 4;

	u8 data[32] = {};
@@ -1203,7 +1202,6 @@ mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid, 
		return -EINVAL;



	mt76_rr_copy(dev, addr, data, sizeof(data));

	if (cmd == SET_KEY) {

	if (cipher == MT_CIPHER_TKIP) {

		/* Rx/Tx MIC keys are swapped */

		memcpy(data, key->key, 16);
@@ -1217,14 +1215,6 @@ mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid, 
		if (cipher == MT_CIPHER_BIP_CMAC_128)

			memcpy(data + 16, key->key, 16);

	}

	} else {

		if (cipher == MT_CIPHER_BIP_CMAC_128)

			memset(data + 16, 0, 16);

		else if (cipher_mask)

			memset(data, 0, 16);

		if (!cipher_mask)

			memset(data, 0, sizeof(data));

	}



	mt76_wr_copy(dev, addr, data, sizeof(data));
@@ -1234,7 +1224,7 @@ mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, struct mt76_wcid *wcid, 
static int

mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid,

			  enum mt76_cipher_type cipher, u16 cipher_mask,

			  int keyidx, enum set_key_cmd cmd)

			  int keyidx)

{

	u32 addr = mt7615_mac_wtbl_addr(dev, wcid->idx), w0, w1;
@@ -1253,9 +1243,7 @@ mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid, 
	else

		w0 &= ~MT_WTBL_W0_RX_IK_VALID;



	if (cmd == SET_KEY &&

	    (cipher != MT_CIPHER_BIP_CMAC_128 ||

	     cipher_mask == BIT(cipher))) {

	if (cipher != MT_CIPHER_BIP_CMAC_128 || cipher_mask == BIT(cipher)) {

		w0 &= ~MT_WTBL_W0_KEY_IDX;

		w0 |= FIELD_PREP(MT_WTBL_W0_KEY_IDX, keyidx);

	}
@@ -1272,19 +1260,10 @@ mt7615_mac_wtbl_update_pk(struct mt7615_dev *dev, struct mt76_wcid *wcid, 


static void

mt7615_mac_wtbl_update_cipher(struct mt7615_dev *dev, struct mt76_wcid *wcid,

			      enum mt76_cipher_type cipher, u16 cipher_mask,

			      enum set_key_cmd cmd)

			      enum mt76_cipher_type cipher, u16 cipher_mask)

{

	u32 addr = mt7615_mac_wtbl_addr(dev, wcid->idx);



	if (!cipher_mask) {

		mt76_clear(dev, addr + 2 * 4, MT_WTBL_W2_KEY_TYPE);

		return;

	}



	if (cmd != SET_KEY)

		return;



	if (cipher == MT_CIPHER_BIP_CMAC_128 &&

	    cipher_mask & ~BIT(MT_CIPHER_BIP_CMAC_128))

		return;
@@ -1295,8 +1274,7 @@ mt7615_mac_wtbl_update_cipher(struct mt7615_dev *dev, struct mt76_wcid *wcid, 


int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,

			      struct mt76_wcid *wcid,

			      struct ieee80211_key_conf *key,

			      enum set_key_cmd cmd)

			      struct ieee80211_key_conf *key)

{

	enum mt76_cipher_type cipher;

	u16 cipher_mask = wcid->cipher;
@@ -1306,19 +1284,14 @@ int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, 
	if (cipher == MT_CIPHER_NONE)

		return -EOPNOTSUPP;



	if (cmd == SET_KEY)

	cipher_mask |= BIT(cipher);

	else

		cipher_mask &= ~BIT(cipher);



	mt7615_mac_wtbl_update_cipher(dev, wcid, cipher, cipher_mask, cmd);

	err = mt7615_mac_wtbl_update_key(dev, wcid, key, cipher, cipher_mask,

					 cmd);

	mt7615_mac_wtbl_update_cipher(dev, wcid, cipher, cipher_mask);

	err = mt7615_mac_wtbl_update_key(dev, wcid, key, cipher, cipher_mask);

	if (err < 0)

		return err;



	err = mt7615_mac_wtbl_update_pk(dev, wcid, cipher, cipher_mask,

					key->keyidx, cmd);

					key->keyidx);

	if (err < 0)

		return err;
@@ -1329,13 +1302,12 @@ int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, 


int mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,

			    struct mt76_wcid *wcid,

			    struct ieee80211_key_conf *key,

			    enum set_key_cmd cmd)

			    struct ieee80211_key_conf *key)

{

	int err;



	spin_lock_bh(&dev->mt76.lock);

	err = __mt7615_mac_wtbl_set_key(dev, wcid, key, cmd);

	err = __mt7615_mac_wtbl_set_key(dev, wcid, key);

	spin_unlock_bh(&dev->mt76.lock);



	return err;