Commit 90343f57 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-fixes' 



Íñigo Huguet says:

====================
sfc: fix some efx_separate_tx_channels errors

Trying to load sfc driver with modparam efx_separate_tx_channels=1
resulted in errors during initialization and not being able to use the
NIC. This patches fix a few bugs and make it work again.

v2:
* added Martin's patch instead of a previous mine. Mine one solved some
of the initialization errors, but Martin's solves them also in all
possible cases.
* removed whitespaces cleanup, as requested by Jakub
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 18eeb4de c308dfd1

drivers/net/ethernet/sfc/efx_channels.c

+2 −4
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ int efx_probe_interrupts(struct efx_nic *efx) 
		efx->n_channels = 1;

		efx->n_rx_channels = 1;

		efx->n_tx_channels = 1;

		efx->tx_channel_offset = 0;

		efx->n_xdp_channels = 0;

		efx->xdp_channel_offset = efx->n_channels;

		rc = pci_enable_msi(efx->pci_dev);
@@ -318,6 +319,7 @@ int efx_probe_interrupts(struct efx_nic *efx) 
		efx->n_channels = 1 + (efx_separate_tx_channels ? 1 : 0);

		efx->n_rx_channels = 1;

		efx->n_tx_channels = 1;

		efx->tx_channel_offset = 1;

		efx->n_xdp_channels = 0;

		efx->xdp_channel_offset = efx->n_channels;

		efx->legacy_irq = efx->pci_dev->irq;
@@ -954,10 +956,6 @@ int efx_set_channels(struct efx_nic *efx) 
	struct efx_channel *channel;

	int rc;



	efx->tx_channel_offset =

		efx_separate_tx_channels ?

		efx->n_channels - efx->n_tx_channels : 0;



	if (efx->xdp_tx_queue_count) {

		EFX_WARN_ON_PARANOID(efx->xdp_tx_queues);

drivers/net/ethernet/sfc/net_driver.h

+1 −1
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ static inline bool efx_channel_is_xdp_tx(struct efx_channel *channel) 


static inline bool efx_channel_has_tx_queues(struct efx_channel *channel)

{

	return true;

	return channel && channel->channel >= channel->efx->tx_channel_offset;

}



static inline unsigned int efx_channel_num_tx_queues(struct efx_channel *channel)