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

Commit e455ecaf authored by Sara Sharon's avatar Sara Sharon Committed by Greg Kroah-Hartman
Browse files

iwlwifi: pcie: read correct prph address for newer devices 



[ Upstream commit 84fb372c892e231e9a2ffdaa5c2df52d94aa536c ]

For newer devices we have higher range of periphery
addresses. Currently it is masked out, so we end up
reading another address.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c5eafde0

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

+14 −2
Original line number Diff line number Diff line
@@ -1830,18 +1830,30 @@ static u32 iwl_trans_pcie_read32(struct iwl_trans *trans, u32 ofs) 
	return readl(IWL_TRANS_GET_PCIE_TRANS(trans)->hw_base + ofs);

}



static u32 iwl_trans_pcie_prph_msk(struct iwl_trans *trans)

{

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

		return 0x00FFFFFF;

	else

		return 0x000FFFFF;

}



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

{

	u32 mask = iwl_trans_pcie_prph_msk(trans);



	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_RADDR,

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

			       ((reg & mask) | (3 << 24)));

	return iwl_trans_pcie_read32(trans, HBUS_TARG_PRPH_RDAT);

}



static void iwl_trans_pcie_write_prph(struct iwl_trans *trans, u32 addr,

				      u32 val)

{

	u32 mask = iwl_trans_pcie_prph_msk(trans);



	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_WADDR,

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

			       ((addr & mask) | (3 << 24)));

	iwl_trans_pcie_write32(trans, HBUS_TARG_PRPH_WDAT, val);

}