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

Commit d43050c0 authored by Andrew Rybchenko's avatar Andrew Rybchenko Committed by Ben Hutchings
Browse files

sfc: Change efx_nic_type::rx_push_indir_table to push hash key as well 



The EF10 implementation already does this, and it makes more logical
sense to group the RSS hash key and indirection table together.
Rename the operation to rx_push_rss_config.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 48ce5634

drivers/net/ethernet/sfc/ef10.c

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct efx_ef10_filter_table { 
/* An arbitrary search limit for the software hash table */

#define EFX_EF10_FILTER_SEARCH_LIMIT 200



static void efx_ef10_rx_push_indir_table(struct efx_nic *efx);

static void efx_ef10_rx_push_rss_config(struct efx_nic *efx);

static void efx_ef10_rx_free_indir_table(struct efx_nic *efx);

static void efx_ef10_filter_table_remove(struct efx_nic *efx);
@@ -679,7 +679,7 @@ static int efx_ef10_init_nic(struct efx_nic *efx) 
		nic_data->must_restore_piobufs = false;

	}



	efx_ef10_rx_push_indir_table(efx);

	efx_ef10_rx_push_rss_config(efx);

	return 0;

}
@@ -1420,12 +1420,12 @@ static void efx_ef10_rx_free_indir_table(struct efx_nic *efx) 
	nic_data->rx_rss_context = EFX_EF10_RSS_CONTEXT_INVALID;

}



static void efx_ef10_rx_push_indir_table(struct efx_nic *efx)

static void efx_ef10_rx_push_rss_config(struct efx_nic *efx)

{

	struct efx_ef10_nic_data *nic_data = efx->nic_data;

	int rc;



	netif_dbg(efx, drv, efx->net_dev, "pushing RX indirection table\n");

	netif_dbg(efx, drv, efx->net_dev, "pushing RSS config\n");



	if (nic_data->rx_rss_context == EFX_EF10_RSS_CONTEXT_INVALID) {

		rc = efx_ef10_alloc_rss_context(efx, &nic_data->rx_rss_context);
@@ -3574,7 +3574,7 @@ const struct efx_nic_type efx_hunt_a0_nic_type = { 
	.tx_init = efx_ef10_tx_init,

	.tx_remove = efx_ef10_tx_remove,

	.tx_write = efx_ef10_tx_write,

	.rx_push_indir_table = efx_ef10_rx_push_indir_table,

	.rx_push_rss_config = efx_ef10_rx_push_rss_config,

	.rx_probe = efx_ef10_rx_probe,

	.rx_init = efx_ef10_rx_init,

	.rx_remove = efx_ef10_rx_remove,

drivers/net/ethernet/sfc/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ static int efx_ethtool_set_rxfh_indir(struct net_device *net_dev, 
	struct efx_nic *efx = netdev_priv(net_dev);



	memcpy(efx->rx_indir_table, indir, sizeof(efx->rx_indir_table));

	efx_nic_push_rx_indir_table(efx);

	efx->type->rx_push_rss_config(efx);

	return 0;

}

drivers/net/ethernet/sfc/falcon.c

+21 −5
Original line number Diff line number Diff line
@@ -467,6 +467,24 @@ static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) 
		efx_schedule_channel_irq(efx_get_channel(efx, 1));

	return IRQ_HANDLED;

}

/**************************************************************************

 *

 * RSS

 *

 **************************************************************************

 */



static void falcon_b0_rx_push_rss_config(struct efx_nic *efx)

{

	efx_oword_t temp;



	/* Set hash key for IPv4 */

	memcpy(&temp, efx->rx_hash_key, sizeof(temp));

	efx_writeo(efx, &temp, FR_BZ_RX_RSS_TKEY);



	efx_farch_rx_push_indir_table(efx);

}



/**************************************************************************

 *

 * EEPROM/flash
@@ -2484,9 +2502,7 @@ static int falcon_init_nic(struct efx_nic *efx) 
	falcon_init_rx_cfg(efx);



	if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {

		/* Set hash key for IPv4 */

		memcpy(&temp, efx->rx_hash_key, sizeof(temp));

		efx_writeo(efx, &temp, FR_BZ_RX_RSS_TKEY);

		falcon_b0_rx_push_rss_config(efx);



		/* Set destination of both TX and RX Flush events */

		EFX_POPULATE_OWORD_1(temp, FRF_BZ_FLS_EVQ_ID, 0);
@@ -2703,7 +2719,7 @@ const struct efx_nic_type falcon_a1_nic_type = { 
	.tx_init = efx_farch_tx_init,

	.tx_remove = efx_farch_tx_remove,

	.tx_write = efx_farch_tx_write,

	.rx_push_indir_table = efx_farch_rx_push_indir_table,

	.rx_push_rss_config = efx_port_dummy_op_void,

	.rx_probe = efx_farch_rx_probe,

	.rx_init = efx_farch_rx_init,

	.rx_remove = efx_farch_rx_remove,
@@ -2798,7 +2814,7 @@ const struct efx_nic_type falcon_b0_nic_type = { 
	.tx_init = efx_farch_tx_init,

	.tx_remove = efx_farch_tx_remove,

	.tx_write = efx_farch_tx_write,

	.rx_push_indir_table = efx_farch_rx_push_indir_table,

	.rx_push_rss_config = falcon_b0_rx_push_rss_config,

	.rx_probe = efx_farch_rx_probe,

	.rx_init = efx_farch_rx_init,

	.rx_remove = efx_farch_rx_remove,

drivers/net/ethernet/sfc/farch.c

+1 −4
Original line number Diff line number Diff line
@@ -1618,8 +1618,7 @@ void efx_farch_rx_push_indir_table(struct efx_nic *efx) 
	size_t i = 0;

	efx_dword_t dword;



	if (efx_nic_rev(efx) < EFX_REV_FALCON_B0)

		return;

	BUG_ON(efx_nic_rev(efx) < EFX_REV_FALCON_B0);



	BUILD_BUG_ON(ARRAY_SIZE(efx->rx_indir_table) !=

		     FR_BZ_RX_INDIRECTION_TBL_ROWS);
@@ -1745,8 +1744,6 @@ void efx_farch_init_common(struct efx_nic *efx) 
	EFX_INVERT_OWORD(temp);

	efx_writeo(efx, &temp, FR_AZ_FATAL_INTR_KER);



	efx_farch_rx_push_indir_table(efx);



	/* Disable the ugly timer-based TX DMA backoff and allow TX DMA to be

	 * controlled by the RX FIFO fill level. Set arbitration to one pkt/Q.

	 */

drivers/net/ethernet/sfc/net_driver.h

+2 −2
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ struct efx_mtd_partition { 
 * @tx_init: Initialise TX queue on the NIC

 * @tx_remove: Free resources for TX queue

 * @tx_write: Write TX descriptors and doorbell

 * @rx_push_indir_table: Write RSS indirection table to the NIC

 * @rx_push_rss_config: Write RSS hash key and indirection table to the NIC

 * @rx_probe: Allocate resources for RX queue

 * @rx_init: Initialise RX queue on the NIC

 * @rx_remove: Free resources for RX queue
@@ -1141,7 +1141,7 @@ struct efx_nic_type { 
	void (*tx_init)(struct efx_tx_queue *tx_queue);

	void (*tx_remove)(struct efx_tx_queue *tx_queue);

	void (*tx_write)(struct efx_tx_queue *tx_queue);

	void (*rx_push_indir_table)(struct efx_nic *efx);

	void (*rx_push_rss_config)(struct efx_nic *efx);

	int (*rx_probe)(struct efx_rx_queue *rx_queue);

	void (*rx_init)(struct efx_rx_queue *rx_queue);

	void (*rx_remove)(struct efx_rx_queue *rx_queue);