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

Commit f9477c17 authored by Amnon Paz's avatar Amnon Paz Committed by Johannes Berg
Browse files

iwlwifi: fix indirect write bug 



Fix a bug in writing to indirect (periphery) registers; although
writes seem successful the data is not written to the desired
address). Also fix address mask for HBUS_TARG_PRPH_RADDR and
HBUS_TARG_PRPH_WADDR registers.

Signed-off-by: default avatarAmnon Paz <amnonX.paz@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 490953ac

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

+3 −2
Original line number Diff line number Diff line
@@ -715,7 +715,8 @@ static u32 iwl_trans_pcie_read32(struct iwl_trans *trans, u32 ofs) 


static u32 iwl_trans_pcie_read_prph(struct iwl_trans *trans, u32 reg)

{

	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));

	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_RADDR,

			       ((reg & 0x000FFFFF) | (3 << 24)));

	return iwl_trans_pcie_read32(trans, HBUS_TARG_PRPH_RDAT);

}
@@ -723,7 +724,7 @@ static void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr, 
				      u32 val)

{

	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_WADDR,

			       ((addr & 0x0000FFFF) | (3 << 24)));

			       ((addr & 0x000FFFFF) | (3 << 24)));

	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_WDAT, val);

}