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

Commit 6ade262b authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2018-01-09' of... 

Merge tag 'wireless-drivers-for-davem-2018-01-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.15

Hopefully the last set of fixes for 4.15.

iwlwifi

* fix DMA mapping regression since v4.14

wcn36xx

* fix dynamic power save which has been broken since the driver was commited
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 95f566de 49fdde89

drivers/net/wireless/ath/wcn36xx/main.c

+12 −11
Original line number Diff line number Diff line
@@ -384,6 +384,18 @@ static int wcn36xx_config(struct ieee80211_hw *hw, u32 changed) 
		}

	}



	if (changed & IEEE80211_CONF_CHANGE_PS) {

		list_for_each_entry(tmp, &wcn->vif_list, list) {

			vif = wcn36xx_priv_to_vif(tmp);

			if (hw->conf.flags & IEEE80211_CONF_PS) {

				if (vif->bss_conf.ps) /* ps allowed ? */

					wcn36xx_pmc_enter_bmps_state(wcn, vif);

			} else {

				wcn36xx_pmc_exit_bmps_state(wcn, vif);

			}

		}

	}



	mutex_unlock(&wcn->conf_mutex);



	return 0;
@@ -747,17 +759,6 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw, 
		vif_priv->dtim_period = bss_conf->dtim_period;

	}



	if (changed & BSS_CHANGED_PS) {

		wcn36xx_dbg(WCN36XX_DBG_MAC,

			    "mac bss PS set %d\n",

			    bss_conf->ps);

		if (bss_conf->ps) {

			wcn36xx_pmc_enter_bmps_state(wcn, vif);

		} else {

			wcn36xx_pmc_exit_bmps_state(wcn, vif);

		}

	}



	if (changed & BSS_CHANGED_BSSID) {

		wcn36xx_dbg(WCN36XX_DBG_MAC, "mac bss changed_bssid %pM\n",

			    bss_conf->bssid);

drivers/net/wireless/ath/wcn36xx/pmc.c

+4 −2
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ int wcn36xx_pmc_exit_bmps_state(struct wcn36xx *wcn, 
	struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);



	if (WCN36XX_BMPS != vif_priv->pw_state) {

		wcn36xx_err("Not in BMPS mode, no need to exit from BMPS mode!\n");

		return -EINVAL;

		/* Unbalanced call or last BMPS enter failed */

		wcn36xx_dbg(WCN36XX_DBG_PMC,

			    "Not in BMPS mode, no need to exit\n");

		return -EALREADY;

	}

	wcn36xx_smd_exit_bmps(wcn, vif);

	vif_priv->pw_state = WCN36XX_FULL_POWER;

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+7 −3
Original line number Diff line number Diff line
@@ -670,11 +670,15 @@ static inline u8 iwl_pcie_get_cmd_index(struct iwl_txq *q, u32 index) 
	return index & (q->n_window - 1);

}



static inline void *iwl_pcie_get_tfd(struct iwl_trans_pcie *trans_pcie,

static inline void *iwl_pcie_get_tfd(struct iwl_trans *trans,

				     struct iwl_txq *txq, int idx)

{

	return txq->tfds + trans_pcie->tfd_size * iwl_pcie_get_cmd_index(txq,

									 idx);

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	if (trans->cfg->use_tfh)

		idx = iwl_pcie_get_cmd_index(txq, idx);



	return txq->tfds + trans_pcie->tfd_size * idx;

}



static inline void iwl_enable_rfkill_int(struct iwl_trans *trans)

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

+3 −8
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ static void iwl_pcie_gen2_tfd_unmap(struct iwl_trans *trans, 


static void iwl_pcie_gen2_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	/* rd_ptr is bounded by TFD_QUEUE_SIZE_MAX and

	 * idx is bounded by n_window

	 */
@@ -181,7 +179,7 @@ static void iwl_pcie_gen2_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq) 
	lockdep_assert_held(&txq->lock);



	iwl_pcie_gen2_tfd_unmap(trans, &txq->entries[idx].meta,

				iwl_pcie_get_tfd(trans_pcie, txq, idx));

				iwl_pcie_get_tfd(trans, txq, idx));



	/* free SKB */

	if (txq->entries) {
@@ -364,11 +362,9 @@ struct iwl_tfh_tfd *iwl_pcie_gen2_build_tfd(struct iwl_trans *trans, 
					    struct sk_buff *skb,

					    struct iwl_cmd_meta *out_meta)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	int idx = iwl_pcie_get_cmd_index(txq, txq->write_ptr);

	struct iwl_tfh_tfd *tfd =

		iwl_pcie_get_tfd(trans_pcie, txq, idx);

	struct iwl_tfh_tfd *tfd = iwl_pcie_get_tfd(trans, txq, idx);

	dma_addr_t tb_phys;

	bool amsdu;

	int i, len, tb1_len, tb2_len, hdr_len;
@@ -565,8 +561,7 @@ static int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, 
	u8 group_id = iwl_cmd_groupid(cmd->id);

	const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];

	u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];

	struct iwl_tfh_tfd *tfd =

		iwl_pcie_get_tfd(trans_pcie, txq, txq->write_ptr);

	struct iwl_tfh_tfd *tfd = iwl_pcie_get_tfd(trans, txq, txq->write_ptr);



	memset(tfd, 0, sizeof(*tfd));

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

+4 −4
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void iwl_pcie_tfd_unmap(struct iwl_trans *trans, 
{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	int i, num_tbs;

	void *tfd = iwl_pcie_get_tfd(trans_pcie, txq, index);

	void *tfd = iwl_pcie_get_tfd(trans, txq, index);



	/* Sanity check on number of chunks */

	num_tbs = iwl_pcie_tfd_get_num_tbs(trans, tfd);
@@ -2018,7 +2018,7 @@ static int iwl_fill_data_tbs(struct iwl_trans *trans, struct sk_buff *skb, 
	}



	trace_iwlwifi_dev_tx(trans->dev, skb,

			     iwl_pcie_get_tfd(trans_pcie, txq, txq->write_ptr),

			     iwl_pcie_get_tfd(trans, txq, txq->write_ptr),

			     trans_pcie->tfd_size,

			     &dev_cmd->hdr, IWL_FIRST_TB_SIZE + tb1_len,

			     hdr_len);
@@ -2092,7 +2092,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb, 
		IEEE80211_CCMP_HDR_LEN : 0;



	trace_iwlwifi_dev_tx(trans->dev, skb,

			     iwl_pcie_get_tfd(trans_pcie, txq, txq->write_ptr),

			     iwl_pcie_get_tfd(trans, txq, txq->write_ptr),

			     trans_pcie->tfd_size,

			     &dev_cmd->hdr, IWL_FIRST_TB_SIZE + tb1_len, 0);
@@ -2425,7 +2425,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
	memcpy(&txq->first_tb_bufs[txq->write_ptr], &dev_cmd->hdr,

	       IWL_FIRST_TB_SIZE);



	tfd = iwl_pcie_get_tfd(trans_pcie, txq, txq->write_ptr);

	tfd = iwl_pcie_get_tfd(trans, txq, txq->write_ptr);

	/* Set up entry for this TFD in Tx byte-count array */

	iwl_pcie_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len),

					 iwl_pcie_tfd_get_num_tbs(trans, tfd));