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

Commit 086ed117 authored by Mohamed Abbas's avatar Mohamed Abbas Committed by John W. Linville
Browse files

iwlagn: co-exist with AMT 



Enable using iwlwifi driver in AMT system.

Signed-off-by: default avatarMohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0324c14b

drivers/net/wireless/iwlwifi/iwl-agn.c

+56 −0
Original line number Diff line number Diff line
@@ -1792,6 +1792,49 @@ static void iwl_down(struct iwl_priv *priv) 
	iwl_cancel_deferred_work(priv);

}



#define HW_READY_TIMEOUT (50)



static int iwl_set_hw_ready(struct iwl_priv *priv)

{

	int ret = 0;



	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

		CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);



	/* See if we got it */

	ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,

				CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,

				CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,

				HW_READY_TIMEOUT);

	if (ret != -ETIMEDOUT)

		priv->hw_ready = true;

	else

		priv->hw_ready = false;



	IWL_DEBUG_INFO(priv, "hardware %s\n",

		      (priv->hw_ready == 1) ? "ready" : "not ready");

	return ret;

}



static int iwl_prepare_card_hw(struct iwl_priv *priv)

{

	int ret = 0;



	IWL_DEBUG_INFO(priv, "iwl_prepare_card_hw enter \n");



	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

			CSR_HW_IF_CONFIG_REG_PREPARE);



	ret = iwl_poll_bit(priv, CSR_HW_IF_CONFIG_REG,

			~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,

			CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);



	if (ret != -ETIMEDOUT)

		iwl_set_hw_ready(priv);



	return ret;

}



#define MAX_HW_RESTARTS 5



static int __iwl_up(struct iwl_priv *priv)
@@ -1809,6 +1852,13 @@ static int __iwl_up(struct iwl_priv *priv) 
		return -EIO;

	}



	iwl_prepare_card_hw(priv);



	if (!priv->hw_ready) {

		IWL_WARN(priv, "Exit HW not ready\n");

		return -EIO;

	}



	/* If platform's RF_KILL switch is NOT set to KILL */

	if (iwl_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)

		clear_bit(STATUS_RF_KILL_HW, &priv->status);
@@ -2896,6 +2946,12 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * PCI Tx retries from interfering with C3 CPU state */

	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);



	iwl_prepare_card_hw(priv);

	if (!priv->hw_ready) {

		IWL_WARN(priv, "Failed, HW not ready\n");

		goto out_iounmap;

	}



	/* amp init */

	err = priv->cfg->ops->lib->apm_ops.init(priv);

	if (err < 0) {

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

+3 −3
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ 


#define CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A		(0x00080000)

#define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM		(0x00200000)

#define CSR_HW_IF_CONFIG_REG_BIT_PCI_OWN_SEM		(0x00400000)

#define CSR_HW_IF_CONFIG_REG_BIT_ME_OWN			(0x02000000)

#define CSR_HW_IF_CONFIG_REG_BIT_WAKE_ME		(0x08000000)

#define CSR_HW_IF_CONFIG_REG_BIT_NIC_READY		(0x00400000)

#define CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE	(0x02000000)

#define CSR_HW_IF_CONFIG_REG_PREPARE			(0x08000000)



#define CSR_INT_PERIODIC_DIS			(0x00)

#define CSR_INT_PERIODIC_ENA			(0xFF)

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

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ struct iwl_priv { 
	u32 disable_tx_power_cal;

	struct work_struct run_time_calib_work;

	struct timer_list statistics_periodic;



	bool hw_ready;

	/*For 3945*/

#define IWL_DEFAULT_TX_POWER 0x0F