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

Commit 2baa2e57 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: add iwl_set_bits_mask 



In a few cases we need to set a value in
a certain mask inside a register, add the
function iwl_set_bits_mask() to make such
code easy.

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 59c647b6

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

+18 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,24 @@ void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask) 
}

}

EXPORT_SYMBOL_GPL(iwl_clear_bit);

EXPORT_SYMBOL_GPL(iwl_clear_bit);





void iwl_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value)

{

	unsigned long flags;

	u32 v;



#ifdef CONFIG_IWLWIFI_DEBUG

	WARN_ON_ONCE(value & ~mask);

#endif



	spin_lock_irqsave(&trans->reg_lock, flags);

	v = iwl_read32(trans, reg);

	v &= ~mask;

	v |= value;

	iwl_write32(trans, reg, v);

	spin_unlock_irqrestore(&trans->reg_lock, flags);

}

EXPORT_SYMBOL_GPL(iwl_set_bits_mask);



int iwl_poll_bit(struct iwl_trans *trans, u32 addr,

int iwl_poll_bit(struct iwl_trans *trans, u32 addr,

		 u32 bits, u32 mask, int timeout)

		 u32 bits, u32 mask, int timeout)

{

{

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,8 @@ static inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs) 
void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask);

void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask);

void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask);

void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask);





void iwl_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value);



int iwl_poll_bit(struct iwl_trans *trans, u32 addr,

int iwl_poll_bit(struct iwl_trans *trans, u32 addr,

		 u32 bits, u32 mask, int timeout);

		 u32 bits, u32 mask, int timeout);

int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,

int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,