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

Commit c96b5eec authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: refactor NIC init sequence 



The typical sequence of setting INIT_DONE and then waiting
for clock stabilisation is going to need a new workarounds,
so first of all refactor it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent b8a7547d

drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c

+19 −28
Original line number Diff line number Diff line
@@ -193,19 +193,10 @@ static int iwl_init_otp_access(struct iwl_trans *trans) 
{

	int ret;



	/* Enable 40MHz radio clock */

	iwl_write32(trans, CSR_GP_CNTRL,

		    iwl_read32(trans, CSR_GP_CNTRL) |

		    BIT(trans->cfg->csr->flag_init_done));



	/* wait for clock to be ready */

	ret = iwl_poll_bit(trans, CSR_GP_CNTRL,

			   BIT(trans->cfg->csr->flag_mac_clock_ready),

			   BIT(trans->cfg->csr->flag_mac_clock_ready),

			   25000);

	if (ret < 0) {

		IWL_ERR(trans, "Time out access OTP\n");

	} else {

	ret = iwl_finish_nic_init(trans);

	if (ret)

		return ret;



	iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,

			  APMG_PS_CTRL_VAL_RESET_REQ);

	udelay(5);
@@ -219,8 +210,8 @@ static int iwl_init_otp_access(struct iwl_trans *trans) 
	if (trans->cfg->base_params->shadow_ram_support)

		iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,

			    CSR_RESET_LINK_PWR_MGMT_DISABLED);

	}

	return ret;



	return 0;

}



static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,

drivers/net/wireless/intel/iwlwifi/iwl-io.c

+30 −0
Original line number Diff line number Diff line
@@ -488,3 +488,33 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf) 


	return 0;

}



int iwl_finish_nic_init(struct iwl_trans *trans)

{

	int err;



	/*

	 * Set "initialization complete" bit to move adapter from

	 * D0U* --> D0A* (powered-up active) state.

	 */

	iwl_set_bit(trans, CSR_GP_CNTRL,

		    BIT(trans->cfg->csr->flag_init_done));



	if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)

		udelay(2);



	/*

	 * Wait for clock stabilization; once stabilized, access to

	 * device-internal resources is supported, e.g. iwl_write_prph()

	 * and accesses to uCode SRAM.

	 */

	err = iwl_poll_bit(trans, CSR_GP_CNTRL,

			   BIT(trans->cfg->csr->flag_mac_clock_ready),

			   BIT(trans->cfg->csr->flag_mac_clock_ready),

			   25000);

	if (err < 0)

		IWL_DEBUG_INFO(trans, "Failed to wake NIC\n");



	return err < 0 ? err : 0;

}

IWL_EXPORT_SYMBOL(iwl_finish_nic_init);

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

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright (C) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.
@@ -23,6 +25,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright (C) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -96,6 +99,8 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs, 
void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask);

void iwl_force_nmi(struct iwl_trans *trans);



int iwl_finish_nic_init(struct iwl_trans *trans);



/* Error handling */

int iwl_dump_fh(struct iwl_trans *trans, char **buf);

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

+2 −16
Original line number Diff line number Diff line
@@ -523,24 +523,10 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u8 lmac_num) 
		/* reset the device */

		iwl_trans_sw_reset(trans);



		/* set INIT_DONE flag */

		iwl_set_bit(trans, CSR_GP_CNTRL,

			    BIT(trans->cfg->csr->flag_init_done));



		/* and wait for clock stabilization */

		if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)

			udelay(2);



		err = iwl_poll_bit(trans, CSR_GP_CNTRL,

				   BIT(trans->cfg->csr->flag_mac_clock_ready),

				   BIT(trans->cfg->csr->flag_mac_clock_ready),

				   25000);

		if (err < 0) {

			IWL_DEBUG_INFO(trans,

				       "Failed to reset the card for the dump\n");

		err = iwl_finish_nic_init(trans);

		if (err)

			return;

	}

	}



	iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));

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

+2 −19
Original line number Diff line number Diff line
@@ -92,26 +92,9 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans) 


	iwl_pcie_apm_config(trans);



	/*

	 * Set "initialization complete" bit to move adapter from

	 * D0U* --> D0A* (powered-up active) state.

	 */

	iwl_set_bit(trans, CSR_GP_CNTRL,

		    BIT(trans->cfg->csr->flag_init_done));



	/*

	 * Wait for clock stabilization; once stabilized, access to

	 * device-internal resources is supported, e.g. iwl_write_prph()

	 * and accesses to uCode SRAM.

	 */

	ret = iwl_poll_bit(trans, CSR_GP_CNTRL,

			   BIT(trans->cfg->csr->flag_mac_clock_ready),

			   BIT(trans->cfg->csr->flag_mac_clock_ready),

			   25000);

	if (ret < 0) {

		IWL_DEBUG_INFO(trans, "Failed to init the card\n");

	ret = iwl_finish_nic_init(trans);

	if (ret)

		return ret;

	}



	set_bit(STATUS_DEVICE_ENABLED, &trans->status);