Commit 14ef766b authored by Mark Starovoytov's avatar Mark Starovoytov Committed by David S. Miller
Browse files

net: atlantic: automatically downgrade the number of queues if necessary 



This patch adds support for automatic queue number downgrade.

On A2: this is a must have, because only TC0/TC1 support more than 4Q.
Other TCs support 4Qs maximum.
Thus, on A2 we must downgrade the number of queues per TC to 4, if more
than 2 TCs are requested.

On A1: this allows using 8TCs even on systems with cpu count >= 8, when
we have 8 queues by default.
We will just automatically switch to 8TCx4Q mode in this case.

Signed-off-by: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7327699f

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+4 −11
Original line number Diff line number Diff line
@@ -793,8 +793,6 @@ static int aq_set_ringparam(struct net_device *ndev, 
		dev_close(ndev);

	}



	aq_nic_free_vectors(aq_nic);



	cfg->rxds = max(ring->rx_pending, hw_caps->rxds_min);

	cfg->rxds = min(cfg->rxds, hw_caps->rxds_max);

	cfg->rxds = ALIGN(cfg->rxds, AQ_HW_RXD_MULTIPLE);
@@ -803,15 +801,10 @@ static int aq_set_ringparam(struct net_device *ndev, 
	cfg->txds = min(cfg->txds, hw_caps->txds_max);

	cfg->txds = ALIGN(cfg->txds, AQ_HW_TXD_MULTIPLE);



	for (aq_nic->aq_vecs = 0; aq_nic->aq_vecs < cfg->vecs;

	     aq_nic->aq_vecs++) {

		aq_nic->aq_vec[aq_nic->aq_vecs] =

		    aq_vec_alloc(aq_nic, aq_nic->aq_vecs, cfg);

		if (unlikely(!aq_nic->aq_vec[aq_nic->aq_vecs])) {

			err = -ENOMEM;

	err = aq_nic_realloc_vectors(aq_nic);

	if (err)

		goto err_exit;

		}

	}



	if (ndev_running)

		err = dev_open(ndev, NULL);

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+4 −1
Original line number Diff line number Diff line
@@ -337,9 +337,12 @@ static int aq_validate_mqprio_opt(struct aq_nic_s *self, 
				  const unsigned int num_tc)

{

	const bool has_min_rate = !!(mqprio->flags & TC_MQPRIO_F_MIN_RATE);

	struct aq_nic_cfg_s *aq_nic_cfg = aq_nic_get_cfg(self);

	const unsigned int tcs_max = min_t(u8, aq_nic_cfg->aq_hw_caps->tcs_max,

					   AQ_CFG_TCS_MAX);

	int i;



	if (num_tc > aq_hw_num_tcs(self->aq_hw)) {

	if (num_tc > tcs_max) {

		netdev_err(self->ndev, "Too many TCs requested\n");

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+54 −24
Original line number Diff line number Diff line
@@ -65,6 +65,33 @@ static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues) 
		rss_params->indirection_table[i] = i & (num_rss_queues - 1);

}



/* Recalculate the number of vectors */

static void aq_nic_cfg_update_num_vecs(struct aq_nic_s *self)

{

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;



	cfg->vecs = min(cfg->aq_hw_caps->vecs, AQ_CFG_VECS_DEF);

	cfg->vecs = min(cfg->vecs, num_online_cpus());

	if (self->irqvecs > AQ_HW_SERVICE_IRQS)

		cfg->vecs = min(cfg->vecs, self->irqvecs - AQ_HW_SERVICE_IRQS);

	/* cfg->vecs should be power of 2 for RSS */

	cfg->vecs = rounddown_pow_of_two(cfg->vecs);



	if (ATL_HW_IS_CHIP_FEATURE(self->aq_hw, ANTIGUA)) {

		if (cfg->tcs > 2)

			cfg->vecs = min(cfg->vecs, 4U);

	}



	if (cfg->vecs <= 4)

		cfg->tc_mode = AQ_TC_MODE_8TCS;

	else

		cfg->tc_mode = AQ_TC_MODE_4TCS;



	/*rss rings */

	cfg->num_rss_queues = min(cfg->vecs, AQ_CFG_NUM_RSS_QUEUES_DEF);

	aq_nic_rss_init(self, cfg->num_rss_queues);

}



/* Checks hw_caps and 'corrects' aq_nic_cfg in runtime */

void aq_nic_cfg_start(struct aq_nic_s *self)

{
@@ -81,7 +108,6 @@ void aq_nic_cfg_start(struct aq_nic_s *self) 


	cfg->rxpageorder = AQ_CFG_RX_PAGEORDER;

	cfg->is_rss = AQ_CFG_IS_RSS_DEF;

	cfg->num_rss_queues = AQ_CFG_NUM_RSS_QUEUES_DEF;

	cfg->aq_rss.base_cpu_number = AQ_CFG_RSS_BASE_CPU_NUM_DEF;

	cfg->fc.req = AQ_CFG_FC_MODE;

	cfg->wol = AQ_CFG_WOL_MODES;
@@ -97,24 +123,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self) 
	cfg->rxds = min(cfg->aq_hw_caps->rxds_max, AQ_CFG_RXDS_DEF);

	cfg->txds = min(cfg->aq_hw_caps->txds_max, AQ_CFG_TXDS_DEF);



	/*rss rings */

	cfg->vecs = min(cfg->aq_hw_caps->vecs, AQ_CFG_VECS_DEF);

	cfg->vecs = min(cfg->vecs, num_online_cpus());

	if (self->irqvecs > AQ_HW_SERVICE_IRQS)

		cfg->vecs = min(cfg->vecs, self->irqvecs - AQ_HW_SERVICE_IRQS);

	/* cfg->vecs should be power of 2 for RSS */

	if (cfg->vecs >= 8U)

		cfg->vecs = 8U;

	else if (cfg->vecs >= 4U)

		cfg->vecs = 4U;

	else if (cfg->vecs >= 2U)

		cfg->vecs = 2U;

	else

		cfg->vecs = 1U;



	cfg->num_rss_queues = min(cfg->vecs, AQ_CFG_NUM_RSS_QUEUES_DEF);



	aq_nic_rss_init(self, cfg->num_rss_queues);

	aq_nic_cfg_update_num_vecs(self);



	cfg->irq_type = aq_pci_func_get_irq_type(self);
@@ -125,11 +134,6 @@ void aq_nic_cfg_start(struct aq_nic_s *self) 
		cfg->vecs = 1U;

	}



	if (cfg->vecs <= 4)

		cfg->tc_mode = AQ_TC_MODE_8TCS;

	else

		cfg->tc_mode = AQ_TC_MODE_4TCS;



	/* Check if we have enough vectors allocated for

	 * link status IRQ. If no - we'll know link state from

	 * slower service task.
@@ -1219,6 +1223,22 @@ void aq_nic_free_vectors(struct aq_nic_s *self) 
err_exit:;

}



int aq_nic_realloc_vectors(struct aq_nic_s *self)

{

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(self);



	aq_nic_free_vectors(self);



	for (self->aq_vecs = 0; self->aq_vecs < cfg->vecs; self->aq_vecs++) {

		self->aq_vec[self->aq_vecs] = aq_vec_alloc(self, self->aq_vecs,

							   cfg);

		if (unlikely(!self->aq_vec[self->aq_vecs]))

			return -ENOMEM;

	}



	return 0;

}



void aq_nic_shutdown(struct aq_nic_s *self)

{

	int err = 0;
@@ -1288,6 +1308,7 @@ void aq_nic_release_filter(struct aq_nic_s *self, enum aq_rx_filter_type type, 
int aq_nic_setup_tc_mqprio(struct aq_nic_s *self, u32 tcs, u8 *prio_tc_map)

{

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;

	const unsigned int prev_vecs = cfg->vecs;

	bool ndev_running;

	int err = 0;

	int i;
@@ -1319,9 +1340,18 @@ int aq_nic_setup_tc_mqprio(struct aq_nic_s *self, u32 tcs, u8 *prio_tc_map) 


	netdev_set_num_tc(self->ndev, cfg->tcs);



	/* Changing the number of TCs might change the number of vectors */

	aq_nic_cfg_update_num_vecs(self);

	if (prev_vecs != cfg->vecs) {

		err = aq_nic_realloc_vectors(self);

		if (err)

			goto err_exit;

	}



	if (ndev_running)

		err = dev_open(self->ndev, NULL);



err_exit:

	return err;

}

drivers/net/ethernet/aquantia/atlantic/aq_nic.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ void aq_nic_deinit(struct aq_nic_s *self, bool link_down); 
void aq_nic_set_power(struct aq_nic_s *self);

void aq_nic_free_hot_resources(struct aq_nic_s *self);

void aq_nic_free_vectors(struct aq_nic_s *self);

int aq_nic_realloc_vectors(struct aq_nic_s *self);

int aq_nic_set_mtu(struct aq_nic_s *self, int new_mtu);

int aq_nic_set_mac(struct aq_nic_s *self, struct net_device *ndev);

int aq_nic_set_packet_filter(struct aq_nic_s *self, unsigned int flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE