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

Commit 7b3e42ea authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Luca Coelho
Browse files

iwlwifi: support multiple tfd queue max sizes for different devices 



22560 devices tfd queue max size is 2^16. Allow a configurable
max size in the driver for supporting different devices.

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent f5955a6c

drivers/net/wireless/intel/iwlwifi/cfg/2000.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ 
static const struct iwl_base_params iwl2000_base_params = {

static const struct iwl_base_params iwl2000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

	.shadow_ram_support = true,

	.led_compensation = 51,

	.led_compensation = 51,
@@ -76,6 +77,7 @@ static const struct iwl_base_params iwl2000_base_params = { 
static const struct iwl_base_params iwl2030_base_params = {

static const struct iwl_base_params iwl2030_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.led_compensation = 57,

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+15 −1
Original line number Original line Diff line number Diff line
@@ -102,6 +102,19 @@ 
static const struct iwl_base_params iwl_22000_base_params = {

static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.num_of_queues = 512,

	.num_of_queues = 512,

	.max_tfd_queue_size = 256,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.shadow_reg_enable = true,

	.pcie_l1_allowed = true,

};



static const struct iwl_base_params iwl_22560_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_22000,

	.num_of_queues = 512,

	.max_tfd_queue_size = 65536,

	.shadow_ram_support = true,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.led_compensation = 57,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,
@@ -119,7 +132,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
#define IWL_DEVICE_22000_COMMON						\

#define IWL_DEVICE_22000_COMMON						\

	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.base_params = &iwl_22000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_22000,		\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_22000,		\

	.non_shared_ant = ANT_A,					\

	.non_shared_ant = ANT_A,					\
@@ -148,11 +160,13 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
#define IWL_DEVICE_22500						\

#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_22000,			\

	.device_family = IWL_DEVICE_FAMILY_22000,			\

	.base_params = &iwl_22000_base_params,				\

	.csr = &iwl_csr_v1

	.csr = &iwl_csr_v1





#define IWL_DEVICE_22560						\

#define IWL_DEVICE_22560						\

	IWL_DEVICE_22000_COMMON,					\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_22560,			\

	.device_family = IWL_DEVICE_FAMILY_22560,			\

	.base_params = &iwl_22560_base_params,				\

	.csr = &iwl_csr_v2

	.csr = &iwl_csr_v2





const struct iwl_cfg iwl22000_2ac_cfg_hr = {

const struct iwl_cfg iwl22000_2ac_cfg_hr = {

drivers/net/wireless/intel/iwlwifi/cfg/5000.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ 
static const struct iwl_base_params iwl5000_base_params = {

static const struct iwl_base_params iwl5000_base_params = {

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.pll_cfg = true,

	.pll_cfg = true,

	.led_compensation = 51,

	.led_compensation = 51,

	.wd_timeout = IWL_WATCHDOG_DISABLED,

	.wd_timeout = IWL_WATCHDOG_DISABLED,

drivers/net/wireless/intel/iwlwifi/cfg/6000.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,7 @@ 
static const struct iwl_base_params iwl6000_base_params = {

static const struct iwl_base_params iwl6000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.shadow_ram_support = true,

	.led_compensation = 51,

	.led_compensation = 51,
@@ -84,6 +85,7 @@ static const struct iwl_base_params iwl6000_base_params = { 
static const struct iwl_base_params iwl6050_base_params = {

static const struct iwl_base_params iwl6050_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,

	.shadow_ram_support = true,

	.shadow_ram_support = true,

	.led_compensation = 51,

	.led_compensation = 51,
@@ -96,6 +98,7 @@ static const struct iwl_base_params iwl6050_base_params = { 
static const struct iwl_base_params iwl6000_g2_base_params = {

static const struct iwl_base_params iwl6000_g2_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.max_tfd_queue_size = 256,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.led_compensation = 57,

drivers/net/wireless/intel/iwlwifi/cfg/7000.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -123,6 +123,7 @@ 
static const struct iwl_base_params iwl7000_base_params = {

static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,

	.num_of_queues = 31,

	.num_of_queues = 31,

	.max_tfd_queue_size = 256,

	.shadow_ram_support = true,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.led_compensation = 57,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,