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

Commit 6a08f514 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: pcie: newer platform needs a OS alive indication 



This is fully backward compatible with older platforms.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 01e58a28

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

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ 
#define CSR_UCODE_DRV_GP1_CLR   (CSR_BASE+0x05c)

#define CSR_UCODE_DRV_GP2       (CSR_BASE+0x060)



#define CSR_MBOX_SET_REG	(CSR_BASE + 0x88)



#define CSR_LED_REG             (CSR_BASE+0x094)

#define CSR_DRAM_INT_TBL_REG	(CSR_BASE+0x0A0)

#define CSR_MAC_SHADOW_REG_CTRL	(CSR_BASE+0x0A8) /* 6000 and up */
@@ -184,6 +186,8 @@ 
#define CSR_HW_IF_CONFIG_REG_PREPARE		  (0x08000000) /* WAKE_ME */

#define CSR_HW_IF_CONFIG_REG_PERSIST_MODE	  (0x40000000) /* PERSISTENCE */



#define CSR_MBOX_SET_REG_OS_ALIVE		BIT(5)



#define CSR_INT_PERIODIC_DIS			(0x00) /* disable periodic int*/

#define CSR_INT_PERIODIC_ENA			(0xFF) /* 255*32 usec ~ 8 msec*/

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

+3 −0
Original line number Diff line number Diff line
@@ -512,6 +512,9 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans) 
			   CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,

			   HW_READY_TIMEOUT);



	if (ret >= 0)

		iwl_set_bit(trans, CSR_MBOX_SET_REG, CSR_MBOX_SET_REG_OS_ALIVE);



	IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret < 0 ? " not" : "");

	return ret;

}