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

Commit 09600dd8 authored by Edward Cree's avatar Edward Cree Committed by Sasha Levin
Browse files

sfc: on MC reset, clear PIO buffer linkage in TXQs 



[ Upstream commit c0795bf64cba4d1b796fdc5b74b33772841ed1bb ]

Otherwise, if we fail to allocate new PIO buffers, our TXQs will try to
use the old ones, which aren't there any more.

Fixes: 183233be "sfc: Allocate and link PIO buffers; map them with write-combining"
Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent a9c12c90

drivers/net/ethernet/sfc/ef10.c

+16 −0
Original line number Diff line number Diff line
@@ -452,6 +452,17 @@ fail: 
	return rc;

}



static void efx_ef10_forget_old_piobufs(struct efx_nic *efx)

{

	struct efx_channel *channel;

	struct efx_tx_queue *tx_queue;



	/* All our existing PIO buffers went away */

	efx_for_each_channel(channel, efx)

		efx_for_each_channel_tx_queue(tx_queue, channel)

			tx_queue->piobuf = NULL;

}



#else /* !EFX_USE_PIO */



static int efx_ef10_alloc_piobufs(struct efx_nic *efx, unsigned int n)
@@ -468,6 +479,10 @@ static void efx_ef10_free_piobufs(struct efx_nic *efx) 
{

}



static void efx_ef10_forget_old_piobufs(struct efx_nic *efx)

{

}



#endif /* EFX_USE_PIO */



static void efx_ef10_remove(struct efx_nic *efx)
@@ -699,6 +714,7 @@ static void efx_ef10_reset_mc_allocations(struct efx_nic *efx) 
	nic_data->must_realloc_vis = true;

	nic_data->must_restore_filters = true;

	nic_data->must_restore_piobufs = true;

	efx_ef10_forget_old_piobufs(efx);

	nic_data->rx_rss_context = EFX_EF10_RSS_CONTEXT_INVALID;

}