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

Commit e12ba844 authored by Eran Harary's avatar Eran Harary Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: change CSR reset in family 8000 



This register is not present in 8000 family devices.
There is prph register instead.

Signed-off-by: default avatarEran Harary <eran.harary@intel.com>
Reviewed-by: default avatarDor Shaish <dor.shaish@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 3073d8c0

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

+7 −0
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ 
/* Device NMI register */

#define DEVICE_SET_NMI_REG 0x00a01c30



/*

 * Device reset for family 8000

 * write to bit 24 in order to reset the CPU

*/

#define RELEASE_CPU_RESET		(0x300C)

#define RELEASE_CPU_RESET_BIT		BIT(24)



/*****************************************************************************

 *                        7000/3000 series SHR DTS addresses                 *

 *****************************************************************************/

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

+6 −0
Original line number Diff line number Diff line
@@ -573,6 +573,12 @@ static int iwl_pcie_load_given_ucode(struct iwl_trans *trans, 
		}

	}



	/* release CPU reset */

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

		iwl_write_prph(trans, RELEASE_CPU_RESET, RELEASE_CPU_RESET_BIT);

	else

		iwl_write32(trans, CSR_RESET, 0);



	return 0;

}