Merge tag 'wireless-drivers-for-davem-2019-08-21' of... (4df0d839) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+30 −3

Original line number	Diff line number	Diff line
		@@ -554,7 +554,7 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
		cpu_to_le32(vif->bss_conf.use_short_slot ?
		MAC_FLG_SHORT_SLOT : 0);

		cmd->filter_flags = cpu_to_le32(MAC_FILTER_ACCEPT_GRP);
		cmd->filter_flags = 0;

		for (i = 0; i < IEEE80211_NUM_ACS; i++) {
		u8 txf = iwl_mvm_mac_ac_to_tx_fifo(mvm, i);
		@@ -623,6 +623,8 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
		/* We need the dtim_period to set the MAC as associated */
		if (vif->bss_conf.assoc && vif->bss_conf.dtim_period &&
		!force_assoc_off) {
		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
		u8 ap_sta_id = mvmvif->ap_sta_id;
		u32 dtim_offs;

		/*
		@@ -658,6 +660,29 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
		dtim_offs);

		ctxt_sta->is_assoc = cpu_to_le32(1);

		/*
		* allow multicast data frames only as long as the station is
		* authorized, i.e., GTK keys are already installed (if needed)
		*/
		if (ap_sta_id < IWL_MVM_STATION_COUNT) {
		struct ieee80211_sta *sta;

		rcu_read_lock();

		sta = rcu_dereference(mvm->fw_id_to_mac_id[ap_sta_id]);
		if (!IS_ERR_OR_NULL(sta)) {
		struct iwl_mvm_sta *mvmsta =
		iwl_mvm_sta_from_mac80211(sta);

		if (mvmsta->sta_state ==
		IEEE80211_STA_AUTHORIZED)
		cmd.filter_flags \|=
		cpu_to_le32(MAC_FILTER_ACCEPT_GRP);
		}

		rcu_read_unlock();
		}
		} else {
		ctxt_sta->is_assoc = cpu_to_le32(0);

		@@ -703,7 +728,8 @@ static int iwl_mvm_mac_ctxt_cmd_listener(struct iwl_mvm *mvm,
		MAC_FILTER_IN_CONTROL_AND_MGMT \|
		MAC_FILTER_IN_BEACON \|
		MAC_FILTER_IN_PROBE_REQUEST \|
		MAC_FILTER_IN_CRC32);
		MAC_FILTER_IN_CRC32 \|
		MAC_FILTER_ACCEPT_GRP);
		ieee80211_hw_set(mvm->hw, RX_INCLUDES_FCS);

		/* Allocate sniffer station */
		@@ -727,7 +753,8 @@ static int iwl_mvm_mac_ctxt_cmd_ibss(struct iwl_mvm *mvm,
		iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, NULL, action);

		cmd.filter_flags = cpu_to_le32(MAC_FILTER_IN_BEACON \|
		MAC_FILTER_IN_PROBE_REQUEST);
		MAC_FILTER_IN_PROBE_REQUEST \|
		MAC_FILTER_ACCEPT_GRP);

		/* cmd.ibss.beacon_time/cmd.ibss.beacon_tsf are curently ignored */
		cmd.ibss.bi = cpu_to_le32(vif->bss_conf.beacon_int);

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -3327,10 +3327,20 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
		/* enable beacon filtering */
		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));

		/*
		* Now that the station is authorized, i.e., keys were already
		* installed, need to indicate to the FW that
		* multicast data frames can be forwarded to the driver
		*/
		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,
		true);
		} else if (old_state == IEEE80211_STA_AUTHORIZED &&
		new_state == IEEE80211_STA_ASSOC) {
		/* Multicast data frames are no longer allowed */
		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

		/* disable beacon filtering */
		ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);
		WARN_ON(ret &&

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -1063,6 +1063,23 @@ static int iwl_pci_probe(struct pci_dev pdev, const struct pci_device_id ent)
		else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
		iwl_trans->cfg = &iwl9560_2ac_160_cfg_qu_c0_jf_b0;
		}

		/* same thing for QuZ... */
		if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
		if (cfg == &iwl_ax101_cfg_qu_hr)
		cfg = &iwl_ax101_cfg_quz_hr;
		else if (cfg == &iwl_ax201_cfg_qu_hr)
		cfg = &iwl_ax201_cfg_quz_hr;
		else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
		cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
		else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
		cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
		else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
		cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
		else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
		cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
		}

		#endif

		pci_set_drvdata(pdev, iwl_trans);

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -3603,6 +3603,7 @@ struct iwl_trans iwl_trans_pcie_alloc(struct pci_dev pdev,
		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
		CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
		((trans->cfg != &iwl_ax200_cfg_cc &&
		trans->cfg != &iwl_ax201_cfg_qu_hr &&
		trans->cfg != &killer1650x_2ax_cfg &&
		trans->cfg != &killer1650w_2ax_cfg &&
		trans->cfg != &iwl_ax201_cfg_quz_hr) \|\|

drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c

+13 −7

Original line number	Diff line number	Diff line
		@@ -99,10 +99,7 @@ void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,
		u16 len = byte_cnt;
		__le16 bc_ent;

		if (trans_pcie->bc_table_dword)
		len = DIV_ROUND_UP(len, 4);

		if (WARN_ON(len > 0xFFF \|\| idx >= txq->n_window))
		if (WARN(idx >= txq->n_window, "%d >= %d\n", idx, txq->n_window))
		return;

		filled_tfd_size = offsetof(struct iwl_tfh_tfd, tbs) +
		@@ -117,12 +114,21 @@ void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,
		*/
		num_fetch_chunks = DIV_ROUND_UP(filled_tfd_size, 64) - 1;

		bc_ent = cpu_to_le16(len \| (num_fetch_chunks << 12));
		if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
		if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560) {
		/* Starting from 22560, the HW expects bytes */
		WARN_ON(trans_pcie->bc_table_dword);
		WARN_ON(len > 0x3FFF);
		bc_ent = cpu_to_le16(len \| (num_fetch_chunks << 14));
		scd_bc_tbl_gen3->tfd_offset[idx] = bc_ent;
		else
		} else {
		/* Until 22560, the HW expects DW */
		WARN_ON(!trans_pcie->bc_table_dword);
		len = DIV_ROUND_UP(len, 4);
		WARN_ON(len > 0xFFF);
		bc_ent = cpu_to_le16(len \| (num_fetch_chunks << 12));
		scd_bc_tbl->tfd_offset[idx] = bc_ent;
		}
		}

		/*
		* iwl_pcie_gen2_txq_inc_wr_ptr - Send new write index to hardware

Admin message