forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfc: Reconfigure the XAUI serdes after an EM reset

Browse source 
Fix a regression introduced in d3245b28ef
"sfc: Refactor link configuration".

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Steve Hodgson 2010-04-28 09:28:10 +00:00 • committed by David S. Miller
parent ef524f2e74
commit b7b40eeb0f
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/sfc/falcon.c
View file

@ -507,6 +507,9 @@ static void falcon_reset_macs(struct efx_nic *efx)
/* Ensure the correct MAC is selected before statistics /* Ensure the correct MAC is selected before statistics
* are re-enabled by the caller */ * are re-enabled by the caller */
efx_writeo(efx, &mac_ctrl, FR_AB_MAC_CTRL); efx_writeo(efx, &mac_ctrl, FR_AB_MAC_CTRL);
/* This can run even when the GMAC is selected */
falcon_setup_xaui(efx);
} }
void falcon_drain_tx_fifo(struct efx_nic *efx) void falcon_drain_tx_fifo(struct efx_nic *efx)

2
drivers/net/sfc/falcon_xmac.c
View file

@ -26,7 +26,7 @@
*************************************************************************/ *************************************************************************/
/* Configure the XAUI driver that is an output from Falcon */ /* Configure the XAUI driver that is an output from Falcon */
static void falcon_setup_xaui(struct efx_nic *efx) void falcon_setup_xaui(struct efx_nic *efx)
{ {
efx_oword_t sdctl, txdrv; efx_oword_t sdctl, txdrv;

1
drivers/net/sfc/nic.h
View file

@ -203,6 +203,7 @@ extern void falcon_irq_ack_a1(struct efx_nic *efx);
extern int efx_nic_flush_queues(struct efx_nic *efx); extern int efx_nic_flush_queues(struct efx_nic *efx);
extern void falcon_start_nic_stats(struct efx_nic *efx); extern void falcon_start_nic_stats(struct efx_nic *efx);
extern void falcon_stop_nic_stats(struct efx_nic *efx); extern void falcon_stop_nic_stats(struct efx_nic *efx);
extern void falcon_setup_xaui(struct efx_nic *efx);
extern int falcon_reset_xaui(struct efx_nic *efx); extern int falcon_reset_xaui(struct efx_nic *efx);
extern void efx_nic_init_common(struct efx_nic *efx); extern void efx_nic_init_common(struct efx_nic *efx);