Skip to content

Commit 25bde57

Browse files
ihuguetkuba-moo
authored andcommitted
sfc/siena: fix wrong tx channel offset with efx_separate_tx_channels
tx_channel_offset is calculated in efx_allocate_msix_channels, but it is also calculated again in efx_set_channels because it was originally done there, and when efx_allocate_msix_channels was introduced it was forgotten to be removed from efx_set_channels. Moreover, the old calculation is wrong when using efx_separate_tx_channels because now we can have XDP channels after the TX channels, so n_channels - n_tx_channels doesn't point to the first TX channel. Remove the old calculation from efx_set_channels, and add the initialization of this variable if MSI or legacy interrupts are used, next to the initialization of the rest of the related variables, where it was missing. This has been already done for sfc, do it also for sfc_siena. Fixes: 3990a8f ("sfc: allocate channels for XDP tx queues") Reported-by: Tianhao Zhao <tizhao@redhat.com> Signed-off-by: Íñigo Huguet <ihuguet@redhat.com> Acked-by: Martin Habets <habetsm.xilinx@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 183614b commit 25bde57

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/net/ethernet/sfc/siena/efx_channels.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ int efx_siena_probe_interrupts(struct efx_nic *efx)
299299
efx->n_channels = 1;
300300
efx->n_rx_channels = 1;
301301
efx->n_tx_channels = 1;
302+
efx->tx_channel_offset = 0;
302303
efx->n_xdp_channels = 0;
303304
efx->xdp_channel_offset = efx->n_channels;
304305
rc = pci_enable_msi(efx->pci_dev);
@@ -319,6 +320,7 @@ int efx_siena_probe_interrupts(struct efx_nic *efx)
319320
efx->n_channels = 1 + (efx_siena_separate_tx_channels ? 1 : 0);
320321
efx->n_rx_channels = 1;
321322
efx->n_tx_channels = 1;
323+
efx->tx_channel_offset = 1;
322324
efx->n_xdp_channels = 0;
323325
efx->xdp_channel_offset = efx->n_channels;
324326
efx->legacy_irq = efx->pci_dev->irq;
@@ -958,10 +960,6 @@ int efx_siena_set_channels(struct efx_nic *efx)
958960
struct efx_channel *channel;
959961
int rc;
960962

961-
efx->tx_channel_offset =
962-
efx_siena_separate_tx_channels ?
963-
efx->n_channels - efx->n_tx_channels : 0;
964-
965963
if (efx->xdp_tx_queue_count) {
966964
EFX_WARN_ON_PARANOID(efx->xdp_tx_queues);
967965

0 commit comments

Comments
 (0)