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

Commit 12a17458 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: centralize 64 bit HW registers write 



Move the write_prph_64 of pcie to be transport agnostic.
Add direct write as well, as it is needed for a000 HW.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8de437c7

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

+35 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2016 Intel Deutschland GmbH

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as
@@ -83,6 +84,23 @@ TRACE_EVENT(iwlwifi_dev_iowrite32, 
		  __get_str(dev), __entry->offs, __entry->val)

);



TRACE_EVENT(iwlwifi_dev_iowrite64,

	TP_PROTO(const struct device *dev, u64 offs, u64 val),

	TP_ARGS(dev, offs, val),

	TP_STRUCT__entry(

		DEV_ENTRY

		__field(u64, offs)

		__field(u64, val)

	),

	TP_fast_assign(

		DEV_ASSIGN;

		__entry->offs = offs;

		__entry->val = val;

	),

	TP_printk("[%s] write io[%llu] = %llu)",

		  __get_str(dev), __entry->offs, __entry->val)

);



TRACE_EVENT(iwlwifi_dev_iowrite_prph32,

	TP_PROTO(const struct device *dev, u32 offs, u32 val),

	TP_ARGS(dev, offs, val),
@@ -100,6 +118,23 @@ TRACE_EVENT(iwlwifi_dev_iowrite_prph32, 
		  __get_str(dev), __entry->offs, __entry->val)

);



TRACE_EVENT(iwlwifi_dev_iowrite_prph64,

	TP_PROTO(const struct device *dev, u64 offs, u64 val),

	TP_ARGS(dev, offs, val),

	TP_STRUCT__entry(

		DEV_ENTRY

		__field(u64, offs)

		__field(u64, val)

	),

	TP_fast_assign(

		DEV_ASSIGN;

		__entry->offs = offs;

		__entry->val = val;

	),

	TP_printk("[%s] write PRPH[%llu] = %llu)",

		  __get_str(dev), __entry->offs, __entry->val)

);



TRACE_EVENT(iwlwifi_dev_ioread_prph32,

	TP_PROTO(const struct device *dev, u32 offs, u32 val),

	TP_ARGS(dev, offs, val),

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

+27 −0
Original line number Diff line number Diff line
@@ -51,6 +51,14 @@ void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val) 
}

IWL_EXPORT_SYMBOL(iwl_write32);



void iwl_write64(struct iwl_trans *trans, u64 ofs, u64 val)

{

	trace_iwlwifi_dev_iowrite64(trans->dev, ofs, val);

	iwl_trans_write32(trans, ofs, val & 0xffffffff);

	iwl_trans_write32(trans, ofs + 4, val >> 32);

}

IWL_EXPORT_SYMBOL(iwl_write64);



u32 iwl_read32(struct iwl_trans *trans, u32 ofs)

{

	u32 val = iwl_trans_read32(trans, ofs);
@@ -102,6 +110,17 @@ void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value) 
}

IWL_EXPORT_SYMBOL(iwl_write_direct32);



void iwl_write_direct64(struct iwl_trans *trans, u64 reg, u64 value)

{

	unsigned long flags;



	if (iwl_trans_grab_nic_access(trans, &flags)) {

		iwl_write64(trans, reg, value);

		iwl_trans_release_nic_access(trans, &flags);

	}

}

IWL_EXPORT_SYMBOL(iwl_write_direct64);



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

			int timeout)

{
@@ -133,6 +152,14 @@ void iwl_write_prph_no_grab(struct iwl_trans *trans, u32 ofs, u32 val) 
}

IWL_EXPORT_SYMBOL(iwl_write_prph_no_grab);



void iwl_write_prph64_no_grab(struct iwl_trans *trans, u64 ofs, u64 val)

{

	trace_iwlwifi_dev_iowrite_prph64(trans->dev, ofs, val);

	iwl_write_prph_no_grab(trans, ofs, val & 0xffffffff);

	iwl_write_prph_no_grab(trans, ofs + 4, val >> 32);

}

IWL_EXPORT_SYMBOL(iwl_write_prph64_no_grab);



u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs)

{

	unsigned long flags;

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

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val);

void iwl_write32(struct iwl_trans *trans, u32 ofs, u32 val);

void iwl_write64(struct iwl_trans *trans, u64 ofs, u64 val);

u32 iwl_read32(struct iwl_trans *trans, u32 ofs);



static inline void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask)
@@ -53,11 +54,13 @@ int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask, 


u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg);

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

void iwl_write_direct64(struct iwl_trans *trans, u64 reg, u64 value);





u32 iwl_read_prph_no_grab(struct iwl_trans *trans, u32 ofs);

u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs);

void iwl_write_prph_no_grab(struct iwl_trans *trans, u32 ofs, u32 val);

void iwl_write_prph64_no_grab(struct iwl_trans *trans, u64 ofs, u64 val);

void iwl_write_prph(struct iwl_trans *trans, u32 ofs, u32 val);

int iwl_poll_prph_bit(struct iwl_trans *trans, u32 addr,

		      u32 bits, u32 mask, int timeout);

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

+9 −16
Original line number Diff line number Diff line
@@ -161,13 +161,6 @@ static inline __le32 iwl_pcie_dma_addr2rbd_ptr(dma_addr_t dma_addr) 
	return cpu_to_le32((u32)(dma_addr >> 8));

}



static void iwl_pcie_write_prph_64_no_grab(struct iwl_trans *trans, u64 ofs,

					   u64 val)

{

	iwl_write_prph_no_grab(trans, ofs, val & 0xffffffff);

	iwl_write_prph_no_grab(trans, ofs + 4, val >> 32);

}



/*

 * iwl_pcie_rx_stop - stops the Rx DMA

 */
@@ -817,15 +810,15 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans) 


	for (i = 0; i < trans->num_rx_queues; i++) {

		/* Tell device where to find RBD free table in DRAM */

		iwl_pcie_write_prph_64_no_grab(trans,

		iwl_write_prph64_no_grab(trans,

					 RFH_Q_FRBDCB_BA_LSB(i),

					 trans_pcie->rxq[i].bd_dma);

		/* Tell device where to find RBD used table in DRAM */

		iwl_pcie_write_prph_64_no_grab(trans,

		iwl_write_prph64_no_grab(trans,

					 RFH_Q_URBDCB_BA_LSB(i),

					 trans_pcie->rxq[i].used_bd_dma);

		/* Tell device where in DRAM to update its Rx status */

		iwl_pcie_write_prph_64_no_grab(trans,

		iwl_write_prph64_no_grab(trans,

					 RFH_Q_URBD_STTS_WPTR_LSB(i),

					 trans_pcie->rxq[i].rb_stts_dma);

		/* Reset device indice tables */