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

Commit ee8ba880 authored by Hsu, Kenny's avatar Hsu, Kenny Committed by Wey-Yi Guy
Browse files

iwlwifi: add IO function for continuous write of target memory 



Add new IO function _iwl_write_targ_mem_words() to support
target memory write for a continuous area. It will return
error code -EBUSY if iwl_grab_nic_access() fails to indicate
the memory write does not be performed. Meanwhile the existing
function iwl_write_targ_mem() also been updated by using
_iwl_write_targ_mem_words() in a single word case.

Signed-off-by: default avatarKenny Hsu <kenny.hsu@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 7a0b3b08

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

+16 −3
Original line number Diff line number Diff line
@@ -283,16 +283,29 @@ u32 iwl_read_targ_mem(struct iwl_bus *bus, u32 addr) 
	return value;

}



void iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val)

int _iwl_write_targ_mem_words(struct iwl_bus *bus, u32 addr,

				void *buf, int words)

{

	unsigned long flags;

	int offs, result = 0;

	u32 *vals = buf;



	spin_lock_irqsave(&bus->reg_lock, flags);

	if (!iwl_grab_nic_access(bus)) {

		iwl_write32(bus, HBUS_TARG_MEM_WADDR, addr);

		wmb();

		iwl_write32(bus, HBUS_TARG_MEM_WDAT, val);



		for (offs = 0; offs < words; offs++)

			iwl_write32(bus, HBUS_TARG_MEM_WDAT, vals[offs]);

		iwl_release_nic_access(bus);

	}

	} else

		result = -EBUSY;

	spin_unlock_irqrestore(&bus->reg_lock, flags);



	return result;

}



int iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val)

{

	return _iwl_write_targ_mem_words(bus, addr, &val, 1);

}

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

+4 −1
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ void _iwl_read_targ_mem_words(struct iwl_bus *bus, u32 addr, 
					 (bufsize) / sizeof(u32));\

	} while (0)



int _iwl_write_targ_mem_words(struct iwl_bus *bus, u32 addr,

			      void *buf, int words);



u32 iwl_read_targ_mem(struct iwl_bus *bus, u32 addr);

void iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val);

int iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val);

#endif