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

Commit adca1235 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: check the SCD conf from ALIVE response 



The ALIVE response of new fw inclues the base address of
the SCD in SRAM. Until we read it from a prph register,
which was set by the fw. Since the fw might well stop
updating the prph register, add a WARN when there is an
inconsitency between the ALIVE response and the register
to catch any change in the behavior.

Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent e2b1930e

drivers/net/wireless/iwlwifi/dvm/ucode.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int iwl_alive_notify(struct iwl_priv *priv) 
	int ret;

	int i;



	iwl_trans_fw_alive(priv->trans);

	iwl_trans_fw_alive(priv->trans, 0);



	if (priv->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PAN &&

	    priv->eeprom_data->sku & EEPROM_SKU_CAP_IPAN_ENABLE) {

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

+5 −4
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ struct iwl_trans; 
 * @start_fw: allocates and inits all the resources for the transport

 *	layer. Also kick a fw image.

 *	May sleep

 * @fw_alive: called when the fw sends alive notification

 * @fw_alive: called when the fw sends alive notification. If the fw provides

 *	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)

 *	May sleep
@@ -394,7 +395,7 @@ struct iwl_trans_ops { 
	int (*start_hw)(struct iwl_trans *iwl_trans);

	void (*stop_hw)(struct iwl_trans *iwl_trans, bool op_mode_leaving);

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

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

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

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



	void (*wowlan_suspend)(struct iwl_trans *trans);
@@ -514,13 +515,13 @@ static inline void iwl_trans_stop_hw(struct iwl_trans *trans, 
	trans->state = IWL_TRANS_NO_FW;

}



static inline void iwl_trans_fw_alive(struct iwl_trans *trans)

static inline void iwl_trans_fw_alive(struct iwl_trans *trans, u32 scd_addr)

{

	might_sleep();



	trans->state = IWL_TRANS_FW_ALIVE;



	trans->ops->fw_alive(trans);

	trans->ops->fw_alive(trans, scd_addr);

}



static inline int iwl_trans_start_fw(struct iwl_trans *trans,

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

+7 −3
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ static void iwl_trans_txq_set_sched(struct iwl_trans *trans, u32 mask) 
	iwl_write_prph(trans, SCD_TXFACT, mask);

}



static void iwl_tx_start(struct iwl_trans *trans)

static void iwl_tx_start(struct iwl_trans *trans, u32 scd_base_addr)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	u32 a;
@@ -1092,6 +1092,10 @@ static void iwl_tx_start(struct iwl_trans *trans) 


	trans_pcie->scd_base_addr =

		iwl_read_prph(trans, SCD_SRAM_BASE_ADDR);



	WARN_ON(scd_base_addr != 0 &&

		scd_base_addr != trans_pcie->scd_base_addr);



	a = trans_pcie->scd_base_addr + SCD_CONTEXT_MEM_LOWER_BOUND;

	/* reset conext data memory */

	for (; a < trans_pcie->scd_base_addr + SCD_CONTEXT_MEM_UPPER_BOUND;
@@ -1137,10 +1141,10 @@ static void iwl_tx_start(struct iwl_trans *trans) 
			    APMG_PCIDEV_STT_VAL_L1_ACT_DIS);

}



static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans)

static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr)

{

	iwl_reset_ict(trans);

	iwl_tx_start(trans);

	iwl_tx_start(trans, scd_addr);

}



/**