sfc: Simplify XMAC link polling
Subsystems (2)
PATCH 13/16 sfc: Simplify XMAC link polling
From: Steve Hodgson <[email protected]>
Only the XMAC on Falcon needs help from the driver to poll and reset the MAC-PHY link (XAUI); GMII is a simple parallel bus and on later NICs firmware takes care of the XAUI link. Also, an XMAC interrupt currently schedules a work item which simply clears a flag (efx_nic::mac_up) to be checked by the regular monitor (or the next link reconfiguration, if that is sooner).
Rename the flag to xmac_poll_required, changing its sense. Remove the needless indirection and just set the flag immediately. Call falcon_xmac_poll() directly where required.
Add a new generic operation mac_op::check_fault to check the link outside of regular monitoring, as required during self-tests.
(Note that this leaves us with an unused work item, but we will immediately have another use for it.)
--- drivers/net/sfc/efx.c | 5 ---- drivers/net/sfc/falcon.c | 7 +++-- drivers/net/sfc/falcon.h | 2 + drivers/net/sfc/falcon_boards.c | 4 +- drivers/net/sfc/falcon_gmac.c | 8 ++++- drivers/net/sfc/falcon_xmac.c | 50 +++++++++++++++----------------------- drivers/net/sfc/net_driver.h | 10 +++---- drivers/net/sfc/selftest.c | 9 ++---- 8 files changed, 41 insertions(+), 54 deletions(-)
drivers/net/sfc/efx.c +0 -5
@@ -693,8 +693,6 @@ static void efx_mac_work(struct work_struct *data) struct efx_nic *efx = container_of(data, struct efx_nic, mac_work);mutex_lock (&efx->mac_lock); -if (efx->port_enabled) - efx->mac_op->irq (efx);mutex_unlock (&efx->mac_lock); }
@@ -774,7 +772,6 @@ static void efx_start_port(struct efx_nic *efx)mutex_lock (&efx->mac_lock); efx->port_enabled = true;__efx_reconfigure_port (efx); - efx->mac_op->irq (efx);mutex_unlock (&efx->mac_lock); }
@@ -1903,8 +1900,6 @@ void efx_port_dummy_op_set_id_led(struct efx_nic *efx, enum efx_led_mode mode)static struct efx_mac_operations efx_dummy_mac_operations = { .reconfigure = efx_port_dummy_op_void, - .poll = efx_port_dummy_op_void, - .irq = efx_port_dummy_op_void, };static struct efx_phy_operations efx_dummy_phy_operations = {
drivers/net/sfc/falcon.c +4 -3
@@ -900,7 +900,7 @@ static void falcon_handle_global_event(struct efx_channel *channel,if ((falcon_rev (efx) >=FALCON_REV_B0 ) &&EFX_QWORD_FIELD (*event,FSF_BB_GLB_EV_XG_MGT_INTR )) { -queue_work (efx->workqueue, &efx->mac_work); + efx->xmac_poll_required = true; handled = true; }
@@ -2251,7 +2251,7 @@ int falcon_switch_mac(struct efx_nic *efx)EFX_LOG (efx,"selected %cMAC\n" ,EFX_IS10G (efx) ?'X' :'G' );/* Not all macs support a mac-level link state */ - efx->mac_up = true; + efx->xmac_poll_required = false; rc =falcon_reset_macs (efx); out:
@@ -2624,7 +2624,8 @@ void falcon_monitor(struct efx_nic *efx)falcon_sim_phy_event (efx); } efx->phy_op->poll (efx); - efx->mac_op->poll (efx); +if (EFX_IS10G (efx)) +falcon_poll_xmac (efx); }/* Zeroes out the SRAM contents. This routine must be called in
drivers/net/sfc/falcon.h +2 -0
@@ -209,4 +209,6 @@ extern int falcon_test_registers(struct efx_nic *efx);extern void falcon_generate_event (struct efx_channel *channel,efx_qword_t *event); +extern void falcon_poll_xmac (struct efx_nic *efx); +#endif /* EFX_FALCON_H */
drivers/net/sfc/falcon_boards.c +2 -2
@@ -380,7 +380,7 @@ static int sfe4001_check_hw(struct efx_nic *efx)s32 status;/* If XAUI link is up then do not monitor */ -if (EFX_WORKAROUND_7884 (efx) && efx->mac_up) +if (EFX_WORKAROUND_7884 (efx) && !efx->xmac_poll_required)return 0 ;/* Check the powered status of the PHY. Lack of power implies that
@@ -468,7 +468,7 @@ static int sfn4111t_check_hw(struct efx_nic *efx)s32 status;/* If XAUI link is up then do not monitor */ -if (EFX_WORKAROUND_7884 (efx) && efx->mac_up) +if (EFX_WORKAROUND_7884 (efx) && !efx->xmac_poll_required)return 0 ;/* Test LHIGH, RHIGH, FAULT, EOT and IOT alarms */
drivers/net/sfc/falcon_gmac.c +6 -2
@@ -216,9 +216,13 @@ static void falcon_update_stats_gmac(struct efx_nic *efx) mac_stats->rx_lt64 = mac_stats->rx_good_lt64 + mac_stats->rx_bad_lt64; } +static bool falcon_gmac_check_fault (struct efx_nic *efx) +{ +return false; +} +struct efx_mac_operations falcon_gmac_operations = { .reconfigure = falcon_reconfigure_gmac, .update_stats = falcon_update_stats_gmac, - .irq = efx_port_dummy_op_void, - .poll = efx_port_dummy_op_void, + .check_fault = falcon_gmac_check_fault, };
drivers/net/sfc/falcon_xmac.c +20 -30
98 lines not on this page · raw message
drivers/net/sfc/net_driver.h +4 -6
@@ -507,14 +507,12 @@ struct efx_link_state {* struct efx_mac_operations - Efx MAC operations table * @reconfigure: Reconfigure MAC. Serialised by the mac_lock * @update_stats: Update statistics -* @irq: Hardware MAC event callback. Serialised by the mac_lock -* @poll: Poll for hardware state. Serialised by the mac_lock +* @check_fault: Check fault state. True if fault present. */ struct efx_mac_operations {void (*reconfigure) (struct efx_nic *efx);void (*update_stats) (struct efx_nic *efx); -void (*irq) (struct efx_nic *efx); -void (*poll) (struct efx_nic *efx); +bool (*check_fault)(struct efx_nic *efx); };/**
@@ -725,7 +723,7 @@ union efx_multicast_hash {* @phy_data: PHY private data (including PHY-specific stats) * @mdio: PHY MDIO interface * @phy_mode: PHY operating mode. Serialised by @mac_lock. -* @mac_up: MAC link state +* @xmac_poll_required: XMAC link state needs polling * @link_state: Current state of the link * @n_link_state_changes: Number of times the link has changed state * @promiscuous: Promiscuous flag. Protected by netif_tx_lock.
@@ -810,7 +808,7 @@ struct efx_nic {struct mdio_if_info mdio;enum efx_phy_mode phy_mode; -bool mac_up; +bool xmac_poll_required;struct efx_link_state link_state;unsigned int n_link_state_changes;
drivers/net/sfc/selftest.c +3 -6
@@ -610,13 +610,10 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,flush_workqueue (efx->workqueue);rmb (); -/* We need both the phy and xaui links to be ok. -* rather than relying on the falcon_xmac irq/poll -* regime, just poll xaui directly */ +/* We need both the PHY and MAC-PHY links to be OK */ link_up = efx->link_state.up; -if (link_up &&EFX_IS10G (efx) && - !falcon_xaui_link_ok (efx)) - link_up = false; +if (link_up) + link_up = !efx->mac_op->check_fault (efx); }while ((++count <20 ) && !link_up);
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.