Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1615a743 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents cb601ffa e4775983

drivers/net/wireless/iwlwifi/iwl-devtrace.h

+4 −6
Original line number Diff line number Diff line
@@ -349,25 +349,23 @@ TRACE_EVENT(iwlwifi_dev_rx_data, 
TRACE_EVENT(iwlwifi_dev_hcmd,

	TP_PROTO(const struct device *dev,

		 struct iwl_host_cmd *cmd, u16 total_size,

		 const void *hdr, size_t hdr_len),

	TP_ARGS(dev, cmd, total_size, hdr, hdr_len),

		 struct iwl_cmd_header *hdr),

	TP_ARGS(dev, cmd, total_size, hdr),

	TP_STRUCT__entry(

		DEV_ENTRY

		__dynamic_array(u8, hcmd, total_size)

		__field(u32, flags)

	),

	TP_fast_assign(

		int i, offset = hdr_len;

		int i, offset = sizeof(*hdr);



		DEV_ASSIGN;

		__entry->flags = cmd->flags;

		memcpy(__get_dynamic_array(hcmd), hdr, hdr_len);

		memcpy(__get_dynamic_array(hcmd), hdr, sizeof(*hdr));



		for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {

			if (!cmd->len[i])

				continue;

			if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))

				continue;

			memcpy((u8 *)__get_dynamic_array(hcmd) + offset,

			       cmd->data[i], cmd->len[i]);

			offset += cmd->len[i];

drivers/net/wireless/iwlwifi/iwl-phy-db.c

+0 −16
Original line number Diff line number Diff line
@@ -136,12 +136,6 @@ struct iwl_calib_res_notif_phy_db { 
	u8 data[];

} __packed;



#define IWL_PHY_DB_STATIC_PIC cpu_to_le32(0x21436587)

static inline void iwl_phy_db_test_pic(__le32 pic)

{

	WARN_ON(IWL_PHY_DB_STATIC_PIC != pic);

}



struct iwl_phy_db *iwl_phy_db_init(struct iwl_trans *trans)

{

	struct iwl_phy_db *phy_db = kzalloc(sizeof(struct iwl_phy_db),
@@ -260,11 +254,6 @@ int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt, 
			(size - CHANNEL_NUM_SIZE) / phy_db->channel_num;

	}



	/* Test PIC */

	if (type != IWL_PHY_DB_CFG)

		iwl_phy_db_test_pic(*(((__le32 *)phy_db_notif->data) +

				      (size / sizeof(__le32)) - 1));



	IWL_DEBUG_INFO(phy_db->trans,

		       "%s(%d): [PHYDB]SET: Type %d , Size: %d\n",

		       __func__, __LINE__, type, size);
@@ -372,11 +361,6 @@ int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db, 
		*size = entry->size;

	}



	/* Test PIC */

	if (type != IWL_PHY_DB_CFG)

		iwl_phy_db_test_pic(*(((__le32 *)*data) +

				      (*size / sizeof(__le32)) - 1));



	IWL_DEBUG_INFO(phy_db->trans,

		       "%s(%d): [PHYDB] GET: Type %d , Size: %d\n",

		       __func__, __LINE__, type, *size);

drivers/net/wireless/iwlwifi/mvm/d3.c

+77 −27
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
 *

 *****************************************************************************/



#include <linux/etherdevice.h>

#include <net/cfg80211.h>

#include <net/ipv6.h>

#include "iwl-modparams.h"
@@ -192,6 +193,11 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw, 
					   sizeof(wkc), &wkc);

		data->error = ret != 0;



		mvm->ptk_ivlen = key->iv_len;

		mvm->ptk_icvlen = key->icv_len;

		mvm->gtk_ivlen = key->iv_len;

		mvm->gtk_icvlen = key->icv_len;



		/* don't upload key again */

		goto out_unlock;

	}
@@ -304,9 +310,13 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw, 
	 */

	if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) {

		key->hw_key_idx = 0;

		mvm->ptk_ivlen = key->iv_len;

		mvm->ptk_icvlen = key->icv_len;

	} else {

		data->gtk_key_idx++;

		key->hw_key_idx = data->gtk_key_idx;

		mvm->gtk_ivlen = key->iv_len;

		mvm->gtk_icvlen = key->icv_len;

	}



	ret = iwl_mvm_set_sta_key(mvm, vif, sta, key, true);
@@ -649,6 +659,11 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 
	/* We reprogram keys and shouldn't allocate new key indices */

	memset(mvm->fw_key_table, 0, sizeof(mvm->fw_key_table));



	mvm->ptk_ivlen = 0;

	mvm->ptk_icvlen = 0;

	mvm->ptk_ivlen = 0;

	mvm->ptk_icvlen = 0;



	/*

	 * The D3 firmware still hardcodes the AP station ID for the

	 * BSS we're associated with as 0. As a result, we have to move
@@ -783,7 +798,6 @@ static void iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
	struct iwl_wowlan_status *status;

	u32 reasons;

	int ret, len;

	bool pkt8023 = false;

	struct sk_buff *pkt = NULL;



	iwl_trans_read_mem_bytes(mvm->trans, base,
@@ -824,7 +838,8 @@ static void iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
	status = (void *)cmd.resp_pkt->data;



	if (len - sizeof(struct iwl_cmd_header) !=

	    sizeof(*status) + le32_to_cpu(status->wake_packet_bufsize)) {

	    sizeof(*status) +

	    ALIGN(le32_to_cpu(status->wake_packet_bufsize), 4)) {

		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");

		goto out;

	}
@@ -836,61 +851,96 @@ static void iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm, 
		goto report;

	}



	if (reasons & IWL_WOWLAN_WAKEUP_BY_MAGIC_PACKET) {

	if (reasons & IWL_WOWLAN_WAKEUP_BY_MAGIC_PACKET)

		wakeup.magic_pkt = true;

		pkt8023 = true;

	}



	if (reasons & IWL_WOWLAN_WAKEUP_BY_PATTERN) {

	if (reasons & IWL_WOWLAN_WAKEUP_BY_PATTERN)

		wakeup.pattern_idx =

			le16_to_cpu(status->pattern_number);

		pkt8023 = true;

	}



	if (reasons & (IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_MISSED_BEACON |

		       IWL_WOWLAN_WAKEUP_BY_DISCONNECTION_ON_DEAUTH))

		wakeup.disconnect = true;



	if (reasons & IWL_WOWLAN_WAKEUP_BY_GTK_REKEY_FAILURE) {

	if (reasons & IWL_WOWLAN_WAKEUP_BY_GTK_REKEY_FAILURE)

		wakeup.gtk_rekey_failure = true;

		pkt8023 = true;

	}



	if (reasons & IWL_WOWLAN_WAKEUP_BY_RFKILL_DEASSERTED) {

	if (reasons & IWL_WOWLAN_WAKEUP_BY_RFKILL_DEASSERTED)

		wakeup.rfkill_release = true;

		pkt8023 = true;

	}



	if (reasons & IWL_WOWLAN_WAKEUP_BY_EAPOL_REQUEST) {

	if (reasons & IWL_WOWLAN_WAKEUP_BY_EAPOL_REQUEST)

		wakeup.eap_identity_req = true;

		pkt8023 = true;

	}



	if (reasons & IWL_WOWLAN_WAKEUP_BY_FOUR_WAY_HANDSHAKE) {

	if (reasons & IWL_WOWLAN_WAKEUP_BY_FOUR_WAY_HANDSHAKE)

		wakeup.four_way_handshake = true;

		pkt8023 = true;

	}



	if (status->wake_packet_bufsize) {

		u32 pktsize = le32_to_cpu(status->wake_packet_bufsize);

		u32 pktlen = le32_to_cpu(status->wake_packet_length);

		int pktsize = le32_to_cpu(status->wake_packet_bufsize);

		int pktlen = le32_to_cpu(status->wake_packet_length);

		const u8 *pktdata = status->wake_packet;

		struct ieee80211_hdr *hdr = (void *)pktdata;

		int truncated = pktlen - pktsize;



		/* this would be a firmware bug */

		if (WARN_ON_ONCE(truncated < 0))

			truncated = 0;



		if (ieee80211_is_data(hdr->frame_control)) {

			int hdrlen = ieee80211_hdrlen(hdr->frame_control);

			int ivlen = 0, icvlen = 4; /* also FCS */



		if (pkt8023) {

			pkt = alloc_skb(pktsize, GFP_KERNEL);

			if (!pkt)

				goto report;

			memcpy(skb_put(pkt, pktsize), status->wake_packet,

			       pktsize);



			memcpy(skb_put(pkt, hdrlen), pktdata, hdrlen);

			pktdata += hdrlen;

			pktsize -= hdrlen;



			if (ieee80211_has_protected(hdr->frame_control)) {

				if (is_multicast_ether_addr(hdr->addr1)) {

					ivlen = mvm->gtk_ivlen;

					icvlen += mvm->gtk_icvlen;

				} else {

					ivlen = mvm->ptk_ivlen;

					icvlen += mvm->ptk_icvlen;

				}

			}



			/* if truncated, FCS/ICV is (partially) gone */

			if (truncated >= icvlen) {

				icvlen = 0;

				truncated -= icvlen;

			} else {

				icvlen -= truncated;

				truncated = 0;

			}



			pktsize -= ivlen + icvlen;

			pktdata += ivlen;



			memcpy(skb_put(pkt, pktsize), pktdata, pktsize);



			if (ieee80211_data_to_8023(pkt, vif->addr, vif->type))

				goto report;

			wakeup.packet = pkt->data;

			wakeup.packet_present_len = pkt->len;

			wakeup.packet_len = pkt->len - (pktlen - pktsize);

			wakeup.packet_len = pkt->len - truncated;

			wakeup.packet_80211 = false;

		} else {

			int fcslen = 4;



			if (truncated >= 4) {

				truncated -= 4;

				fcslen = 0;

			} else {

				fcslen -= truncated;

				truncated = 0;

			}

			pktsize -= fcslen;

			wakeup.packet = status->wake_packet;

			wakeup.packet_present_len = pktsize;

			wakeup.packet_len = pktlen;

			wakeup.packet_len = pktlen - truncated;

			wakeup.packet_80211 = true;

		}

	}

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+14 −5
Original line number Diff line number Diff line
@@ -557,11 +557,9 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
	return ret;

}



static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,

static void iwl_mvm_prepare_mac_removal(struct iwl_mvm *mvm,

					struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	u32 tfd_msk = 0, ac;



	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
@@ -594,12 +592,21 @@ static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw, 
		 */

		flush_work(&mvm->sta_drained_wk);

	}

}



static void iwl_mvm_mac_remove_interface(struct ieee80211_hw *hw,

					 struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	iwl_mvm_prepare_mac_removal(mvm, vif);



	mutex_lock(&mvm->mutex);



	/*

	 * For AP/GO interface, the tear down of the resources allocated to the

	 * interface should be handled as part of the bss_info_changed flow.

	 * interface is be handled as part of the stop_ap flow.

	 */

	if (vif->type == NL80211_IFTYPE_AP) {

		iwl_mvm_dealloc_int_sta(mvm, &mvmvif->bcast_sta);
@@ -763,6 +770,8 @@ static void iwl_mvm_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	iwl_mvm_prepare_mac_removal(mvm, vif);



	mutex_lock(&mvm->mutex);



	mvmvif->ap_active = false;

drivers/net/wireless/iwlwifi/mvm/mvm.h

+4 −0
Original line number Diff line number Diff line
@@ -327,6 +327,10 @@ struct iwl_mvm { 
	struct led_classdev led;



	struct ieee80211_vif *p2p_device_vif;



#ifdef CONFIG_PM_SLEEP

	int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;

#endif

};



/* Extract MVM priv from op_mode and _hw */