iwlwifi: pcie: indicate correct RB size to device (d8d66397) · Commits · 戴 / test

In the context info, we need to indicate the correct RB size to the device so that it will not think we have 4k when we only use 2k. This seems to not have caused any issues right now, likely because the hardware no longer supports putting multiple entries into a single RB, and practically all of the entries should be smaller than 2k. Nevertheless, it's a bug, and we must advertise the right size to the device. Note that right now we can only tell it 2k vs. 4k, so for the cases where we have more, still use 4k. This needs to be fixed by the firmware first. Signed-off-by:

Johannes Berg <johannes.berg@intel.com> Fixes: ("iwlwifi: pcie: use partial pages if applicable") Cc: stable@vger.kernel.org # v5.6 Signed-off-by:

Luca Coelho <luciano.coelho@intel.com> Signed-off-by:

Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/iwlwifi.20200417100405.ae6cd345764f.I0985c55223decf70182b9ef1d8edf4179f537853@changeid

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -129,6 +129,18 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,
		int cmdq_size = max_t(u32, IWL_CMD_QUEUE_SIZE,
		trans->cfg->min_txq_size);

		switch (trans_pcie->rx_buf_size) {
		case IWL_AMSDU_DEF:
		return -EINVAL;
		case IWL_AMSDU_2K:
		break;
		case IWL_AMSDU_4K:
		case IWL_AMSDU_8K:
		case IWL_AMSDU_12K:
		control_flags \|= IWL_PRPH_SCRATCH_RB_SIZE_4K;
		break;
		}

		/* Allocate prph scratch */
		prph_scratch = dma_alloc_coherent(trans->dev, sizeof(*prph_scratch),
		&trans_pcie->prph_scratch_dma_addr,
		@@ -143,10 +155,8 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans,
		cpu_to_le16((u16)iwl_read32(trans, CSR_HW_REV));
		prph_sc_ctrl->version.size = cpu_to_le16(sizeof(*prph_scratch) / 4);

		control_flags = IWL_PRPH_SCRATCH_RB_SIZE_4K \|
		IWL_PRPH_SCRATCH_MTR_MODE \|
		(IWL_PRPH_MTR_FORMAT_256B &
		IWL_PRPH_SCRATCH_MTR_FORMAT);
		control_flags \|= IWL_PRPH_SCRATCH_MTR_MODE;
		control_flags \|= IWL_PRPH_MTR_FORMAT_256B & IWL_PRPH_SCRATCH_MTR_FORMAT;

		/* initialize RX default queue */
		prph_sc_ctrl->rbd_cfg.free_rbd_addr =

Admin message