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

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

Merge tag 'wireless-drivers-for-davem-2015-06-01' of... 

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



Kalle Valo says:

====================
iwlwifi:

* fix OTP parsing 8260
* fix powersave handling for 8260

brcmfmac:

* fix null pointer crash
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ccd740cb 38fe44e6

drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c

+5 −7
Original line number Diff line number Diff line
@@ -511,11 +511,9 @@ static int brcmf_msgbuf_query_dcmd(struct brcmf_pub *drvr, int ifidx, 
				     msgbuf->rx_pktids,

				     msgbuf->ioctl_resp_pktid);

	if (msgbuf->ioctl_resp_ret_len != 0) {

		if (!skb) {

			brcmf_err("Invalid packet id idx recv'd %d\n",

				  msgbuf->ioctl_resp_pktid);

		if (!skb)

			return -EBADF;

		}



		memcpy(buf, skb->data, (len < msgbuf->ioctl_resp_ret_len) ?

				       len : msgbuf->ioctl_resp_ret_len);

	}
@@ -874,10 +872,8 @@ brcmf_msgbuf_process_txstatus(struct brcmf_msgbuf *msgbuf, void *buf) 
	flowid -= BRCMF_NROF_H2D_COMMON_MSGRINGS;

	skb = brcmf_msgbuf_get_pktid(msgbuf->drvr->bus_if->dev,

				     msgbuf->tx_pktids, idx);

	if (!skb) {

		brcmf_err("Invalid packet id idx recv'd %d\n", idx);

	if (!skb)

		return;

	}



	set_bit(flowid, msgbuf->txstatus_done_map);

	commonring = msgbuf->flowrings[flowid];
@@ -1156,6 +1152,8 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf) 


	skb = brcmf_msgbuf_get_pktid(msgbuf->drvr->bus_if->dev,

				     msgbuf->rx_pktids, idx);

	if (!skb)

		return;



	if (data_offset)

		skb_pull(skb, data_offset);

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int iwl_get_radio_cfg(const struct iwl_cfg *cfg, const __le16 *nvm_sw, 
	if (cfg->device_family != IWL_DEVICE_FAMILY_8000)

		return le16_to_cpup(nvm_sw + RADIO_CFG);



	return le32_to_cpup((__le32 *)(nvm_sw + RADIO_CFG_FAMILY_8000));

	return le32_to_cpup((__le32 *)(phy_sku + RADIO_CFG_FAMILY_8000));



}

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

+3 −3
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portions of the ieee80211 subsystem header files.
@@ -320,7 +320,7 @@ struct iwl_trans_pcie { 


	/*protect hw register */

	spinlock_t reg_lock;

	bool cmd_in_flight;

	bool cmd_hold_nic_awake;

	bool ref_cmd_in_flight;



	/* protect ref counter */

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

+2 −2
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent, 


	spin_lock_irqsave(&trans_pcie->reg_lock, *flags);



	if (trans_pcie->cmd_in_flight)

	if (trans_pcie->cmd_hold_nic_awake)

		goto out;



	/* this bit wakes up the NIC */
@@ -1438,7 +1438,7 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans, 
	 */

	__acquire(&trans_pcie->reg_lock);



	if (trans_pcie->cmd_in_flight)

	if (trans_pcie->cmd_hold_nic_awake)

		goto out;



	__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,

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

+9 −14
Original line number Diff line number Diff line
@@ -1039,18 +1039,14 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans, 
		iwl_trans_pcie_ref(trans);

	}



	if (trans_pcie->cmd_in_flight)

		return 0;



	trans_pcie->cmd_in_flight = true;



	/*

	 * wake up the NIC to make sure that the firmware will see the host

	 * command - we will let the NIC sleep once all the host commands

	 * returned. This needs to be done only on NICs that have

	 * apmg_wake_up_wa set.

	 */

	if (trans->cfg->base_params->apmg_wake_up_wa) {

	if (trans->cfg->base_params->apmg_wake_up_wa &&

	    !trans_pcie->cmd_hold_nic_awake) {

		__iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,

					 CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

		if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
@@ -1064,10 +1060,10 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans, 
		if (ret < 0) {

			__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,

					CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

			trans_pcie->cmd_in_flight = false;

			IWL_ERR(trans, "Failed to wake NIC for hcmd\n");

			return -EIO;

		}

		trans_pcie->cmd_hold_nic_awake = true;

	}



	return 0;
@@ -1085,15 +1081,14 @@ static int iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans) 
		iwl_trans_pcie_unref(trans);

	}



	if (WARN_ON(!trans_pcie->cmd_in_flight))

	if (trans->cfg->base_params->apmg_wake_up_wa) {

		if (WARN_ON(!trans_pcie->cmd_hold_nic_awake))

			return 0;



	trans_pcie->cmd_in_flight = false;



	if (trans->cfg->base_params->apmg_wake_up_wa)

		trans_pcie->cmd_hold_nic_awake = false;

		__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,

					   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);



	}

	return 0;

}