Commit fba58d37 authored by Matti Gottlieb's avatar Matti Gottlieb Committed by Luca Coelho
Browse files

iwlwifi: pcie: Adapt rx queue write pointer for Bz family 



Adapt rx queue write pointer for Bz family.
The register has moved to the same one as Tx.

Signed-off-by: default avatarMatti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220204122220.57bd62a4365c.I873aa9b3d13abf5633a4963c55c3a09a833254f0@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 5d19e208

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

+3 −0
Original line number Diff line number Diff line
@@ -533,6 +533,9 @@ enum { 
 * 11-8:  queue selector

 */

#define HBUS_TARG_WRPTR         (HBUS_BASE+0x060)

/* This register is common for Tx and Rx, Rx queues start from 512 */

#define HBUS_TARG_WRPTR_Q_SHIFT (16)

#define HBUS_TARG_WRPTR_RX_Q(q) (((q) + 512) << HBUS_TARG_WRPTR_Q_SHIFT)



/**********************************************************

 * CSR values

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

+6 −3
Original line number Diff line number Diff line
@@ -190,11 +190,14 @@ static void iwl_pcie_rxq_inc_wr_ptr(struct iwl_trans *trans, 
	}



	rxq->write_actual = round_down(rxq->write, 8);

	if (trans->trans_cfg->mq_rx_supported)

	if (!trans->trans_cfg->mq_rx_supported)

		iwl_write32(trans, FH_RSCSR_CHNL0_WPTR, rxq->write_actual);

	else if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)

		iwl_write32(trans, HBUS_TARG_WRPTR, rxq->write_actual |

			    HBUS_TARG_WRPTR_RX_Q(rxq->id));

	else

		iwl_write32(trans, RFH_Q_FRBDCB_WIDX_TRG(rxq->id),

			    rxq->write_actual);

	else

		iwl_write32(trans, FH_RSCSR_CHNL0_WPTR, rxq->write_actual);

}



static void iwl_pcie_rxq_check_wrptr(struct iwl_trans *trans)