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

Commit c8177fed authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Luca Coelho
Browse files

iwlwifi: add force NMI for AX210 devices 



For AX210 devices, the periphry for forcing NMI
has changed.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent ea695b7c

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

+4 −1
Original line number Diff line number Diff line
@@ -307,9 +307,12 @@ void iwl_force_nmi(struct iwl_trans *trans) 
	if (trans->cfg->device_family < IWL_DEVICE_FAMILY_9000)

		iwl_write_prph(trans, DEVICE_SET_NMI_REG,

			       DEVICE_SET_NMI_VAL_DRV);

	else

	else if (trans->cfg->device_family < IWL_DEVICE_FAMILY_AX210)

		iwl_write_umac_prph(trans, UREG_NIC_SET_NMI_DRIVER,

				UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER_MSK);

	else

		iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,

				    UREG_DOORBELL_TO_ISR6_NMI_BIT);

}

IWL_EXPORT_SYMBOL(iwl_force_nmi);

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

+5 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018 - 2019 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
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -433,4 +433,7 @@ enum { 
#define HPM_DEBUG			0xA03440

#define PERSISTENCE_BIT			BIT(12)

#define PREG_WFPM_ACCESS		BIT(12)



#define UREG_DOORBELL_TO_ISR6		0xA05C04

#define UREG_DOORBELL_TO_ISR6_NMI_BIT	BIT(0)

#endif				/* __iwl_prph_h__ */