.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,
};
-/*
- * If the device doesn't support HE, no need to have that many buffers.
- * 22000 devices can split multiple frames into a single RB, so fewer are
- * needed; AX210 cannot (but use smaller RBs by default) - these sizes
- * were picked according to 8 MSDUs inside 256 A-MSDUs in an A-MPDU, with
- * additional overhead to account for processing time.
- */
-#define IWL_NUM_RBDS_NON_HE 512
-#define IWL_NUM_RBDS_22000_HE 2048
-
/*
* All JF radio modules are part of the 9000 series, but the MAC part
* looks more like 22000. That's why this device is here, but called
const struct iwl_cfg iwl_qu_hr1 = {
IWL_DEVICE_22500,
.tx_with_siso_diversity = true,
- .num_rbds = IWL_NUM_RBDS_22000_HE,
+ .num_rbds = IWL_NUM_RBDS_HE,
};
const struct iwl_cfg iwl_qu_hr = {
IWL_DEVICE_22500,
- .num_rbds = IWL_NUM_RBDS_22000_HE,
+ .num_rbds = IWL_NUM_RBDS_HE,
};
const struct iwl_cfg iwl_qu_hr_80mhz = {
IWL_DEVICE_22500,
- .num_rbds = IWL_NUM_RBDS_22000_HE,
+ .num_rbds = IWL_NUM_RBDS_HE,
.bw_limit = 80,
};
.dccm2_offset = IWL9000_DCCM2_OFFSET, \
.dccm2_len = IWL9000_DCCM2_LEN, \
.thermal_params = &iwl9000_tt_params, \
- .num_rbds = 512, \
+ .num_rbds = IWL_NUM_RBDS_NON_HE, \
.vht_mu_mimo_supported = true, \
.nvm_type = IWL_NVM_EXT, \
.ht_params = { \
.imr_enabled = true,
};
-/*
- * If the device doesn't support HE, no need to have that many buffers.
- * AX210 devices can split multiple frames into a single RB, so fewer are
- * needed; AX210 cannot (but use smaller RBs by default) - these sizes
- * were picked according to 8 MSDUs inside 256 A-MSDUs in an A-MPDU, with
- * additional overhead to account for processing time.
- */
-#define IWL_NUM_RBDS_NON_HE 512
-#define IWL_NUM_RBDS_AX210_HE 4096
-
const struct iwl_mac_cfg iwl_ma_mac_cfg = {
.device_family = IWL_DEVICE_FAMILY_AX210,
.base = &iwl_ax210_base,
const struct iwl_cfg iwl_cfg_ma = {
.uhb_supported = true,
IWL_DEVICE_AX210,
- .num_rbds = IWL_NUM_RBDS_AX210_HE,
+ .num_rbds = IWL_NUM_RBDS_HE,
};
const struct iwl_cfg iwl_cfg_so_a0_hr_a0 = {
IWL_DEVICE_AX210,
- .num_rbds = IWL_NUM_RBDS_AX210_HE,
+ .num_rbds = IWL_NUM_RBDS_HE,
};
const struct iwl_cfg iwl_cfg_so_a0_hr_a0_80mhz = {
IWL_DEVICE_AX210,
- .num_rbds = IWL_NUM_RBDS_AX210_HE,
+ .num_rbds = IWL_NUM_RBDS_HE,
.bw_limit = 80,
};
.nvm_ver = IWL_BZ_NVM_VERSION, \
.nvm_type = IWL_NVM_EXT
-/*
- * This size was picked according to 8 MSDUs inside 512 A-MSDUs in an
- * A-MPDU, with additional overhead to account for processing time.
- */
-#define IWL_NUM_RBDS_BZ_EHT (512 * 16)
-
const struct iwl_mac_cfg iwl_bz_mac_cfg = {
.device_family = IWL_DEVICE_FAMILY_BZ,
.base = &iwl_bz_base,
const struct iwl_cfg iwl_cfg_bz = {
.uhb_supported = true,
IWL_DEVICE_BZ,
- .num_rbds = IWL_NUM_RBDS_BZ_EHT,
+ .num_rbds = IWL_NUM_RBDS_EHT,
};
const struct iwl_cfg iwl_cfg_bz_160mhz = {
.uhb_supported = true,
IWL_DEVICE_BZ,
- .num_rbds = IWL_NUM_RBDS_BZ_EHT,
+ .num_rbds = IWL_NUM_RBDS_EHT,
.bw_limit = 160,
};
.nvm_ver = IWL_DR_NVM_VERSION, \
.nvm_type = IWL_NVM_EXT, \
.uhb_supported = true, \
- .num_rbds = IWL_NUM_RBDS_DR_EHT, \
+ .num_rbds = IWL_NUM_RBDS_EHT, \
.ht_params = { \
.stbc = true, \
.ldpc = true, \
BIT(NL80211_BAND_5GHZ), \
}
-/*
- * This size was picked according to 8 MSDUs inside 512 A-MSDUs in an
- * A-MPDU, with additional overhead to account for processing time.
- */
-#define IWL_NUM_RBDS_DR_EHT (512 * 16)
-
const struct iwl_mac_cfg iwl_dr_mac_cfg = {
.device_family = IWL_DEVICE_FAMILY_DR,
.base = &iwl_dr_base,
.nvm_ver = IWL_SC_NVM_VERSION, \
.nvm_type = IWL_NVM_EXT, \
.uhb_supported = true, \
- .num_rbds = IWL_NUM_RBDS_SC_EHT, \
+ .num_rbds = IWL_NUM_RBDS_EHT, \
.ht_params = { \
.stbc = true, \
.ldpc = true, \
BIT(NL80211_BAND_5GHZ), \
}
-/*
- * This size was picked according to 8 MSDUs inside 512 A-MSDUs in an
- * A-MPDU, with additional overhead to account for processing time.
- */
-#define IWL_NUM_RBDS_SC_EHT (512 * 16)
-
const struct iwl_mac_cfg iwl_sc_mac_cfg = {
.device_family = IWL_DEVICE_FAMILY_SC,
.base = &iwl_sc_base,
imr_enabled:1;
};
+/*
+ * These sizes were picked according to 8 MSDUs inside 64/256/612 A-MSDUs
+ * in an A-MPDU, with additional overhead to account for processing time.
+ * They will be doubled for MACs starting from So/Ty that don't support
+ * putting multiple frames into a single buffer.
+ */
+#define IWL_NUM_RBDS_NON_HE (64 * 8)
+#define IWL_NUM_RBDS_HE (256 * 8)
+#define IWL_NUM_RBDS_EHT (512 * 8)
+
/**
* struct iwl_cfg
* @fw_name_pre: Firmware filename prefix. The api version and extension
void iwl_trans_free_restart_list(void);
+static inline u16 iwl_trans_get_num_rbds(struct iwl_trans *trans)
+{
+ u16 result = trans->cfg->num_rbds;
+
+ /*
+ * Since AX210 family (So/Ty) the device cannot put mutliple
+ * frames into the same buffer, so double the value for them.
+ */
+ if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_AX210)
+ return 2 * result;
+ return result;
+}
+
/*****************************************************
* PCIe handling
*****************************************************/
ctxt_info_gen3->mtr_size =
cpu_to_le16(TFD_QUEUE_CB_SIZE(cmdq_size));
ctxt_info_gen3->mcr_size =
- cpu_to_le16(RX_QUEUE_CB_SIZE(trans->cfg->num_rbds));
+ cpu_to_le16(RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans)));
trans_pcie->ctxt_info_gen3 = ctxt_info_gen3;
trans_pcie->prph_info = prph_info;
rb_size = IWL_CTXT_INFO_RB_SIZE_4K;
}
- WARN_ON(RX_QUEUE_CB_SIZE(trans->cfg->num_rbds) > 12);
+ WARN_ON(RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans)) > 12);
control_flags = IWL_CTXT_INFO_TFD_FORMAT_LONG;
control_flags |=
- u32_encode_bits(RX_QUEUE_CB_SIZE(trans->cfg->num_rbds),
+ u32_encode_bits(RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans)),
IWL_CTXT_INFO_RB_CB_SIZE);
control_flags |= u32_encode_bits(rb_size, IWL_CTXT_INFO_RB_SIZE);
ctxt_info->control.control_flags = cpu_to_le32(control_flags);
ret = -EINVAL;
goto out_free_trans;
}
- trans_pcie->num_rx_bufs = iwl_trans->cfg->num_rbds;
+ trans_pcie->num_rx_bufs = iwl_trans_get_num_rbds(iwl_trans);
} else {
trans_pcie->num_rx_bufs = RX_QUEUE_SIZE;
}
spin_lock_init(&rxq->lock);
if (trans->mac_cfg->mq_rx_supported)
- rxq->queue_size = trans->cfg->num_rbds;
+ rxq->queue_size = iwl_trans_get_num_rbds(trans);
else
rxq->queue_size = RX_QUEUE_SIZE;
projects / linux-block.git / commitdiff