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

Commit 9f17b318 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: differentiate 4965 and 5000 hw ampdu queues number 



This patch asks to allocate the correct amount of sw queues according
to hw ampdu queues number.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1ff50bda

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

+1 −0
Original line number Diff line number Diff line
@@ -819,6 +819,7 @@ enum { 
#define IWL49_NUM_FIFOS 	7

#define IWL49_CMD_FIFO_NUM	4

#define IWL49_NUM_QUEUES	16

#define IWL49_NUM_AMPDU_QUEUES	8



/**

 * struct iwl_tfd_frame_data

drivers/net/wireless/iwlwifi/iwl-4965.c

+13 −6
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static int iwl4965_hw_get_temperature(const struct iwl_priv *priv); 
/* module parameters */

static struct iwl_mod_params iwl4965_mod_params = {

	.num_of_queues = IWL49_NUM_QUEUES,

	.num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES,

	.enable_qos = 1,

	.amsdu_size_8K = 1,

	.restart_fw = 1,
@@ -1943,9 +1944,11 @@ static int iwl4965_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, 
{

	int ret = 0;



	if (IWL49_FIRST_AMPDU_QUEUE > txq_id) {

		IWL_WARNING("queue number too small: %d, must be > %d\n",

				txq_id, IWL49_FIRST_AMPDU_QUEUE);

	if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL49_FIRST_AMPDU_QUEUE,

			IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;

	}
@@ -2012,9 +2015,13 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id, 
	int ret;

	u16 ra_tid;



	if (IWL49_FIRST_AMPDU_QUEUE > txq_id)

		IWL_WARNING("queue number too small: %d, must be > %d\n",

			txq_id, IWL49_FIRST_AMPDU_QUEUE);

	if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL49_FIRST_AMPDU_QUEUE,

			IWL49_FIRST_AMPDU_QUEUE + IWL49_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;

	}



	ra_tid = BUILD_RAxTID(sta_id, tid);

drivers/net/wireless/iwlwifi/iwl-5000-hw.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
#define IWL50_QUEUE_SIZE                 256

#define IWL50_CMD_FIFO_NUM                 7

#define IWL50_NUM_QUEUES                  20

#define IWL50_NUM_AMPDU_QUEUES		  10

#define IWL50_FIRST_AMPDU_QUEUE		  10



#define IWL_sta_id_POS 12

drivers/net/wireless/iwlwifi/iwl-5000.c

+13 −6
Original line number Diff line number Diff line
@@ -1016,9 +1016,13 @@ static int iwl5000_txq_agg_enable(struct iwl_priv *priv, int txq_id, 
	int ret;

	u16 ra_tid;



	if (IWL50_FIRST_AMPDU_QUEUE > txq_id)

		IWL_WARNING("queue number too small: %d, must be > %d\n",

			txq_id, IWL50_FIRST_AMPDU_QUEUE);

	if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL50_FIRST_AMPDU_QUEUE,

			IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;

	}



	ra_tid = BUILD_RAxTID(sta_id, tid);
@@ -1077,9 +1081,11 @@ static int iwl5000_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, 
{

	int ret;



	if (IWL50_FIRST_AMPDU_QUEUE > txq_id) {

		IWL_WARNING("queue number too small: %d, must be > %d\n",

				txq_id, IWL50_FIRST_AMPDU_QUEUE);

	if ((IWL50_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES <= txq_id)) {

		IWL_WARNING("queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL50_FIRST_AMPDU_QUEUE,

			IWL50_FIRST_AMPDU_QUEUE + IWL50_NUM_AMPDU_QUEUES - 1);

		return -EINVAL;

	}
@@ -1501,6 +1507,7 @@ static struct iwl_ops iwl5000_ops = { 


static struct iwl_mod_params iwl50_mod_params = {

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.enable_qos = 1,

	.amsdu_size_8K = 1,

	.restart_fw = 1,

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ int iwl_setup_mac(struct iwl_priv *priv) 
	hw->queues = 4;

	/* queues to support 11n aggregation */

	if (priv->cfg->sku & IWL_SKU_N)

		hw->ampdu_queues = 12;

		hw->ampdu_queues = priv->cfg->mod_params->num_of_ampdu_queues;



	hw->conf.beacon_int = 100;