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

Merge tag 'wireless-drivers-2021-08-17' of... 

Merge tag 'wireless-drivers-2021-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for v5.14

First set of fixes for v5.14 and nothing major this time. New devices
for iwlwifi and one fix for a compiler warning.

iwlwifi
 * support for new devices

mt76
 * fix compiler warning about MT_CIPHER_NONE

* tag 'wireless-drivers-2021-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers:
  mt76: fix enum type mismatch
  iwlwifi: add new so-jf devices
  iwlwifi: add new SoF with JF devices
  iwlwifi: pnvm: accept multiple HW-type TLVs
====================

Link: https://lore.kernel.org/r/20210817171027.EC1E6C43460@smtp.codeaurora.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0a298d13 abf3d98d

drivers/net/wireless/intel/iwlwifi/fw/pnvm.c

+16 −9
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
	u32 sha1 = 0;

	u16 mac_type = 0, rf_id = 0;

	u8 *pnvm_data = NULL, *tmp;

	bool hw_match = false;

	u32 size = 0;

	int ret;
@@ -83,6 +84,9 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
				break;

			}



			if (hw_match)

				break;



			mac_type = le16_to_cpup((__le16 *)data);

			rf_id = le16_to_cpup((__le16 *)(data + sizeof(__le16)));
@@ -90,15 +94,9 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
				     "Got IWL_UCODE_TLV_HW_TYPE mac_type 0x%0x rf_id 0x%0x\n",

				     mac_type, rf_id);



			if (mac_type != CSR_HW_REV_TYPE(trans->hw_rev) ||

			    rf_id != CSR_HW_RFID_TYPE(trans->hw_rf_id)) {

				IWL_DEBUG_FW(trans,

					     "HW mismatch, skipping PNVM section, mac_type 0x%0x, rf_id 0x%0x.\n",

					     CSR_HW_REV_TYPE(trans->hw_rev), trans->hw_rf_id);

				ret = -ENOENT;

				goto out;

			}



			if (mac_type == CSR_HW_REV_TYPE(trans->hw_rev) &&

			    rf_id == CSR_HW_RFID_TYPE(trans->hw_rf_id))

				hw_match = true;

			break;

		case IWL_UCODE_TLV_SEC_RT: {

			struct iwl_pnvm_section *section = (void *)data;
@@ -149,6 +147,15 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
	}



done:

	if (!hw_match) {

		IWL_DEBUG_FW(trans,

			     "HW mismatch, skipping PNVM section (need mac_type 0x%x rf_id 0x%x)\n",

			     CSR_HW_REV_TYPE(trans->hw_rev),

			     CSR_HW_RFID_TYPE(trans->hw_rf_id));

		ret = -ENOENT;

		goto out;

	}



	if (!size) {

		IWL_DEBUG_FW(trans, "Empty PNVM, skipping.\n");

		ret = -ENOENT;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+69 −1
Original line number Diff line number Diff line
@@ -1110,12 +1110,80 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_a0_mr_a0, iwl_ax211_name),



/* SoF with JF2 */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9560_160_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9560_name),



/* SoF with JF */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9461_160_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9462_160_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9461_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9462_name),



/* So with GF */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name)

		      iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name),



/* So with JF2 */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9560_160_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF2, IWL_CFG_RF_ID_JF,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9560_name),



/* So with JF */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9461_160_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9462_160_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9461_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1_DIV,

		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9462_name)



#endif /* CONFIG_IWLMVM */

};

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ mt7915_mcu_get_cipher(int cipher) 
	case WLAN_CIPHER_SUITE_SMS4:

		return MCU_CIPHER_WAPI;

	default:

		return MT_CIPHER_NONE;

		return MCU_CIPHER_NONE;

	}

}

drivers/net/wireless/mediatek/mt76/mt7915/mcu.h

+2 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,8 @@ enum { 
};



enum mcu_cipher_type {

	MCU_CIPHER_WEP40 = 1,

	MCU_CIPHER_NONE = 0,

	MCU_CIPHER_WEP40,

	MCU_CIPHER_WEP104,

	MCU_CIPHER_WEP128,

	MCU_CIPHER_TKIP,

drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ mt7921_mcu_get_cipher(int cipher) 
	case WLAN_CIPHER_SUITE_SMS4:

		return MCU_CIPHER_WAPI;

	default:

		return MT_CIPHER_NONE;

		return MCU_CIPHER_NONE;

	}

}