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

Commit bab3cb92 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: remove pm_runtime completely 



This means:
1) stop calling pm_runtime_resume when starting the hardware
2) removing the unneeded low_power parameter to start / stop hw / fw
   transport ops
3) squashing transport functions that are now the same
   _iwl_trans_pcie_start_hw / iwl_trans_pcie_start_hw

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 75dfa6d5

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+10 −23
Original line number Diff line number Diff line
@@ -452,9 +452,8 @@ struct iwl_trans_rxq_dma_data { 
 *

 * All the handlers MUST be implemented

 *

 * @start_hw: starts the HW. If low_power is true, the NIC needs to be taken

 *	out of a low power state. From that point on, the HW can send

 *	interrupts. May sleep.

 * @start_hw: starts the HW. From that point on, the HW can send interrupts.

 *	May sleep.

 * @op_mode_leave: Turn off the HW RF kill indication if on

 *	May sleep

 * @start_fw: allocates and inits all the resources for the transport
@@ -464,9 +463,8 @@ struct iwl_trans_rxq_dma_data { 
 *	the SCD base address in SRAM, then provide it here, or 0 otherwise.

 *	May sleep

 * @stop_device: stops the whole device (embedded CPU put to reset) and stops

 *	the HW. If low_power is true, the NIC will be put in low power state.

 *	From that point on, the HW will be stopped but will still issue an

 *	interrupt if the HW RF kill switch is triggered.

 *	the HW. From that point on, the HW will be stopped but will still issue

 *	an interrupt if the HW RF kill switch is triggered.

 *	This callback must do the right thing and not crash even if %start_hw()

 *	was called but not &start_fw(). May sleep.

 * @d3_suspend: put the device into the correct mode for WoWLAN during
@@ -532,12 +530,12 @@ struct iwl_trans_rxq_dma_data { 
 */

struct iwl_trans_ops {



	int (*start_hw)(struct iwl_trans *iwl_trans, bool low_power);

	int (*start_hw)(struct iwl_trans *iwl_trans);

	void (*op_mode_leave)(struct iwl_trans *iwl_trans);

	int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw,

			bool run_in_rfkill);

	void (*fw_alive)(struct iwl_trans *trans, u32 scd_addr);

	void (*stop_device)(struct iwl_trans *trans, bool low_power);

	void (*stop_device)(struct iwl_trans *trans);



	void (*d3_suspend)(struct iwl_trans *trans, bool test, bool reset);

	int (*d3_resume)(struct iwl_trans *trans, enum iwl_d3_status *status,
@@ -819,16 +817,11 @@ static inline void iwl_trans_configure(struct iwl_trans *trans, 
	WARN_ON(iwl_cmd_groups_verify_sorted(trans_cfg));

}



static inline int _iwl_trans_start_hw(struct iwl_trans *trans, bool low_power)

static inline int iwl_trans_start_hw(struct iwl_trans *trans)

{

	might_sleep();



	return trans->ops->start_hw(trans, low_power);

}



static inline int iwl_trans_start_hw(struct iwl_trans *trans)

{

	return trans->ops->start_hw(trans, true);

	return trans->ops->start_hw(trans);

}



static inline void iwl_trans_op_mode_leave(struct iwl_trans *trans)
@@ -864,21 +857,15 @@ static inline int iwl_trans_start_fw(struct iwl_trans *trans, 
	return trans->ops->start_fw(trans, fw, run_in_rfkill);

}



static inline void _iwl_trans_stop_device(struct iwl_trans *trans,

					  bool low_power)

static inline void iwl_trans_stop_device(struct iwl_trans *trans)

{

	might_sleep();



	trans->ops->stop_device(trans, low_power);

	trans->ops->stop_device(trans);



	trans->state = IWL_TRANS_NO_FW;

}



static inline void iwl_trans_stop_device(struct iwl_trans *trans)

{

	_iwl_trans_stop_device(trans, true);

}



static inline void iwl_trans_d3_suspend(struct iwl_trans *trans, bool test,

					bool reset)

{

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

+2 −7
Original line number Diff line number Diff line
@@ -1141,13 +1141,8 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm) 
	}



	iwl_fw_dbg_stop_sync(&mvm->fwrt);

	/*

	 * Stop and start the transport without entering low power

	 * mode. This will save the state of other components on the

	 * device that are triggered by the INIT firwmare (MFUART).

	 */

	_iwl_trans_stop_device(mvm->trans, false);

	ret = _iwl_trans_start_hw(mvm->trans, false);

	iwl_trans_stop_device(mvm->trans);

	ret = iwl_trans_start_hw(mvm->trans);

	if (ret)

		return ret;

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

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/pm_runtime.h>

#include <linux/pci.h>

#include <linux/acpi.h>

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

+2 −3
Original line number Diff line number Diff line
@@ -1109,9 +1109,8 @@ int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb, 
			   struct iwl_device_cmd *dev_cmd, int txq_id);

int iwl_trans_pcie_gen2_send_hcmd(struct iwl_trans *trans,

				  struct iwl_host_cmd *cmd);

void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans,

				     bool low_power);

void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power);

void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);

void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);

void iwl_pcie_gen2_txq_unmap(struct iwl_trans *trans, int txq_id);

void iwl_pcie_gen2_tx_free(struct iwl_trans *trans);

void iwl_pcie_gen2_tx_stop(struct iwl_trans *trans);

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

+3 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void iwl_pcie_gen2_apm_stop(struct iwl_trans *trans, bool op_mode_leave) 
		      BIT(trans->cfg->csr->flag_init_done));

}



void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)

void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -215,7 +215,7 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power) 
	iwl_pcie_prepare_card_hw(trans);

}



void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)

void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	bool was_in_rfkill;
@@ -223,7 +223,7 @@ void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power) 
	mutex_lock(&trans_pcie->mutex);

	trans_pcie->opmode_down = true;

	was_in_rfkill = test_bit(STATUS_RFKILL_OPMODE, &trans->status);

	_iwl_trans_pcie_gen2_stop_device(trans, low_power);

	_iwl_trans_pcie_gen2_stop_device(trans);

	iwl_trans_pcie_handle_stop_rfkill(trans, was_in_rfkill);

	mutex_unlock(&trans_pcie->mutex);

}