sfc: Fixes and new PHY support for 2.6.29
Subsystems (2)
cover sfc: Fixes and new PHY support for 2.6.29
Please take the following changes for 2.6.29.
The changes are made up of:
- Bug fixes based on internal QA for version 2.3
- Addition of one new PHY and board
- A small feature addition for the SFT9001 (which is itself new for .29)
Ben.
Ben Hutchings (14):
sfc: SFT9001: Include non-breaking cable diagnostics in online
self-tests
sfc: Fix test for MDIO read failure
sfc: SFT9001/SFN4111T: Check PHY boot status during board
initialisation
sfc: SFN4111T: Fix GPIO sharing between I2C and FLASH_CFG_1
sfc: Update board info for hardware monitor on SFN4111T-R5 and later
sfc: SFT9001: Always enable XNP exchange on SFT9001 rev B
sfc: SFX7101/SFT9001: Fix AN advertisements
sfc: Remove "XFP" from log messages that are not specific to XFP
sfc: Fix reporting of PHY id
sfc: Add support for QT2025C PHY
sfc: Delete unused efx_blinker::led_num field
sfc: Clean up LED control
sfc: Add support for SFN4112F SFP+ reference design
sfc: Replace stats_enabled flag with a disable count
Steve Hodgson (6):
sfc: SFT9001: Enable robust link training
sfc: SFX7101: Remove workaround for bad link training
sfc: SFT9001: Fix speed reporting in 1G PHY loopback
sfc: Fix post-reset MAC selection
sfc: Reinitialise the PHY completely in case of a PHY or NIC reset
sfc: Test for PHYXS faults whenever we cannot test link state bits
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.
PATCH 1/20 sfc: SFT9001: Include non-breaking cable diagnostics in online self-tests
--- drivers/net/sfc/tenxpress.c | 45 ++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 21 deletions(-)
drivers/net/sfc/tenxpress.c +24 -21
@@ -708,12 +708,10 @@ static int sft9001_run_tests(struct efx_nic *efx, int *results, unsigned flags) {struct ethtool_cmd ecmd;int phy_id = efx->mii.phy_id; -int rc =0 , rc2, i, res_reg; +int rc =0 , rc2, i, ctrl_reg, res_reg; -if (!(flags Ð_TEST_FL_OFFLINE )) -return 0 ; - - efx->phy_op->get_settings (efx, &ecmd); +if (flags Ð_TEST_FL_OFFLINE ) + efx->phy_op->get_settings (efx, &ecmd);/* Initialise cable diagnostic results to unknown failure */ for (i =1 ; i <9 ; ++i)
@@ -721,18 +719,22 @@ static int sft9001_run_tests(struct efx_nic *efx, int *results, unsigned flags)/* Run cable diagnostics; wait up to 5 seconds for them to complete. * A cable fault is not a self-test failure, but a timeout is. */ + ctrl_reg = ((1 <<CDIAG_CTRL_IMMED_LBN ) | + (CDIAG_CTRL_LEN_METRES <<CDIAG_CTRL_LEN_UNIT_LBN )); +if (flags Ð_TEST_FL_OFFLINE ) { +/* Break the link in order to run full diagnostics. We +* must reset the PHY to resume normal service. */ + ctrl_reg |= (1 <<CDIAG_CTRL_BRK_LINK_LBN ); + }mdio_clause45_write (efx, phy_id,MDIO_MMD_PMAPMD , -PMA_PMD_CDIAG_CTRL_REG , - (1 <<CDIAG_CTRL_IMMED_LBN ) | - (1 <<CDIAG_CTRL_BRK_LINK_LBN ) | - (CDIAG_CTRL_LEN_METRES <<CDIAG_CTRL_LEN_UNIT_LBN )); +PMA_PMD_CDIAG_CTRL_REG , ctrl_reg); i =0 ;while (mdio_clause45_read (efx, phy_id,MDIO_MMD_PMAPMD ,PMA_PMD_CDIAG_CTRL_REG ) & (1 <<CDIAG_CTRL_IN_PROG_LBN )) {if (++i ==50 ) { rc = -ETIMEDOUT ; - goto reset; + goto out; }msleep (100 ); }
@@ -757,17 +759,18 @@ static int sft9001_run_tests(struct efx_nic *efx, int *results, unsigned flags) results[5 + i] = len_reg; } -/* We must reset to exit cable diagnostic mode. The BIST will -* also run when we do this. */ -reset: - rc2 =tenxpress_special_reset (efx); - results[0 ] = rc2 ?-1 :1 ; -if (!rc) - rc = rc2; - - rc2 = efx->phy_op->set_settings (efx, &ecmd); -if (!rc) - rc = rc2; +out: +if (flags Ð_TEST_FL_OFFLINE ) { +/* Reset, running the BIST and then resuming normal service. */ + rc2 =tenxpress_special_reset (efx); + results[0 ] = rc2 ?-1 :1 ; +if (!rc) + rc = rc2; + + rc2 = efx->phy_op->set_settings (efx, &ecmd); +if (!rc) + rc = rc2; + }return rc; }
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.
PATCH 2/20 sfc: Fix test for MDIO read failure
In reply to Ben HutchingsCommit 27dd2caca4eabe7c13a052b7456495ba75535e6a changed mdio_clause45_check_mmds() to read both DEVS0 and DEVS1 registers and to combine their values into an unsigned 32-bit mask. This made the following test for a negative (failure) value useless. Fix it to check whether either read failed.
--- drivers/net/sfc/mdio_10g.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/sfc/mdio_10g.c +7 -6
@@ -124,24 +124,25 @@ int mdio_clause45_wait_reset_mmds(struct efx_nic *efx,int mdio_clause45_check_mmds (struct efx_nic *efx,unsigned int mmd_mask,unsigned int fatal_mask) { +int mmd =0 , probe_mmd, devs0, devs1;u32 devices; -int mmd =0 , probe_mmd;/* Historically we have probed the PHYXS to find out what devices are * present,but that doesn't work so well if the PHYXS isn't expected * to exist, if so just find the first item in the list supplied. */ probe_mmd = (mmd_mask &MDIO_MMDREG_DEVS_PHYXS ) ?MDIO_MMD_PHYXS :__ffs (mmd_mask); - devices = (mdio_clause45_read (efx, efx->mii.phy_id, - probe_mmd,MDIO_MMDREG_DEVS0 ) | -mdio_clause45_read (efx, efx->mii.phy_id, - probe_mmd,MDIO_MMDREG_DEVS1 ) <<16 );/* Check all the expected MMDs are present */ -if (devices <0 ) { + devs0 =mdio_clause45_read (efx, efx->mii.phy_id, + probe_mmd,MDIO_MMDREG_DEVS0 ); + devs1 =mdio_clause45_read (efx, efx->mii.phy_id, + probe_mmd,MDIO_MMDREG_DEVS1 ); +if (devs0 <0 || devs1 <0 ) {EFX_ERR (efx,"failed to read devices present\n" );return -EIO ; } + devices = devs0 | (devs1 <<16 );if ((devices & mmd_mask) != mmd_mask) {EFX_ERR (efx,"required MMDs not present: got %x, " "wanted %x\n" , devices, mmd_mask);
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.
PATCH 3/20 sfc: SFT9001: Enable robust link training
In reply to Ben HutchingsEnable a firmware option that appears to be necessary for reliable operation.
--- drivers/net/sfc/tenxpress.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/net/sfc/tenxpress.c +5 -1
@@ -67,6 +67,8 @@#define PMA_PMD_EXT_CLK312_WIDTH 1#define PMA_PMD_EXT_LPOWER_LBN 12#define PMA_PMD_EXT_LPOWER_WIDTH 1 +#define PMA_PMD_EXT_ROBUST_LBN 14 +#define PMA_PMD_EXT_ROBUST_WIDTH 1#define PMA_PMD_EXT_SSR_LBN 15#define PMA_PMD_EXT_SSR_WIDTH 1
@@ -284,7 +286,9 @@ static int tenxpress_init(struct efx_nic *efx) PMA_PMD_XCONTROL_REG); reg |= ((1 <<PMA_PMD_EXT_GMII_EN_LBN ) | (1 <<PMA_PMD_EXT_CLK_OUT_LBN ) | - (1 <<PMA_PMD_EXT_CLK312_LBN )); + (1 <<PMA_PMD_EXT_CLK312_LBN ) | + (1 <<PMA_PMD_EXT_ROBUST_LBN )); +mdio_clause45_write (efx, phy_id,MDIO_MMD_PMAPMD ,PMA_PMD_XCONTROL_REG , reg); mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_C22EXT,
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.
Re: [PATCH 03/20] sfc: SFT9001: Enable robust link training
Quoted 2 lines · Ben Hutchings
Enable a firmware option that appears to be necessary for reliable operation.
Should actually be attributed as:
From: Steve Hodgson <[email protected]>
Ben.
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.
PATCH 4/20 sfc: SFX7101: Remove workaround for bad link training
In reply to Ben HutchingsEarly versions of the SFX7101 firmware could complete link training in a state where it would not adequately cancel noise (Solarflare bug 10750). We previously worked around this by resetting the PHY after seeing many Ethernet CRC errors. This workaround is unsafe since it takes no account of the interval between errors; it also appears to be unnecessary with production firmware. Therefore remove it.
--- drivers/net/sfc/falcon.c | 4 ---- drivers/net/sfc/phy.h | 1 - drivers/net/sfc/tenxpress.c | 20 -------------------- drivers/net/sfc/workarounds.h | 3 --- 4 files changed, 0 insertions(+), 28 deletions(-)
drivers/net/sfc/falcon.c +0 -4
@@ -824,10 +824,6 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue, rx_ev_pause_frm ? " [PAUSE]" : ""); }#endif - -if (unlikely (rx_ev_eth_crc_err &&EFX_WORKAROUND_10750 (efx) && - efx->phy_type ==PHY_TYPE_SFX7101 )) -tenxpress_crc_err (efx); }/* Handle receive events that are not in-order. */
drivers/net/sfc/phy.h +0 -1
@@ -17,7 +17,6 @@ extern struct efx_phy_operations falcon_sfx7101_phy_ops;extern struct efx_phy_operations falcon_sft9001_phy_ops;extern void tenxpress_phy_blink (struct efx_nic *efx,bool blink); -extern void tenxpress_crc_err (struct efx_nic *efx);/**************************************************************************** * Exported functions from the driver for XFP optical PHYs
drivers/net/sfc/tenxpress.c +0 -20
@@ -189,25 +189,12 @@* rails */ #define LNPGA_PDOWN_WAIT (HZ / 5) -static int crc_error_reset_threshold =100 ; -module_param (crc_error_reset_threshold, int,0644 ); -MODULE_PARM_DESC (crc_error_reset_threshold, -"Max number of CRC errors before XAUI reset" ); -struct tenxpress_phy_data {enum efx_loopback_mode loopback_mode; -atomic_t bad_crc_count;enum efx_phy_mode phy_mode;int bad_lp_tries; }; -void tenxpress_crc_err (struct efx_nic *efx) -{ -struct tenxpress_phy_data *phy_data = efx->phy_data; -if (phy_data !=NULL ) -atomic_inc (&phy_data->bad_crc_count); -} -static ssize_t show_phy_short_reach (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -627,13 +614,6 @@ static void tenxpress_phy_poll(struct efx_nic *efx)if (phy_data->phy_mode !=PHY_MODE_NORMAL )return ; - -if (EFX_WORKAROUND_10750 (efx) && -atomic_read (&phy_data->bad_crc_count) > crc_error_reset_threshold) { -EFX_ERR (efx,"Resetting XAUI due to too many CRC errors\n" ); -falcon_reset_xaui (efx); -atomic_set (&phy_data->bad_crc_count,0 ); - } }static void tenxpress_phy_fini (struct efx_nic *efx)
drivers/net/sfc/workarounds.h +0 -3
@@ -18,7 +18,6 @@#define EFX_WORKAROUND_ALWAYS (efx) 1#define EFX_WORKAROUND_FALCON_A (efx) (falcon_rev(efx) <= FALCON_REV_A1)#define EFX_WORKAROUND_10G (efx) EFX_IS10G(efx) -#define EFX_WORKAROUND_SFX7101 (efx) ((efx)->phy_type == PHY_TYPE_SFX7101)#define EFX_WORKAROUND_SFT9001A (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A)/* XAUI resets if link not detected */
@@ -29,8 +28,6 @@#define EFX_WORKAROUND_7884 EFX_WORKAROUND_10G/* TX pkt parser problem with <= 16 byte TXes */ #define EFX_WORKAROUND_9141 EFX_WORKAROUND_ALWAYS -/* Low rate CRC errors require XAUI reset */ -#define EFX_WORKAROUND_10750 EFX_WORKAROUND_SFX7101/* TX_EV_PKT_ERR can be caused by a dangling TX descriptor * or a PCIe error (bug 11028) */ #define EFX_WORKAROUND_10727 EFX_WORKAROUND_ALWAYS
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.
Re: [PATCH 04/20] sfc: SFX7101: Remove workaround for bad link training
Quoted 6 lines · Ben Hutchings
Early versions of the SFX7101 firmware could complete link training in a state where it would not adequately cancel noise (Solarflare bug 10750). We previously worked around this by resetting the PHY after seeing many Ethernet CRC errors. This workaround is unsafe since it takes no account of the interval between errors; it also appears to be unnecessary with production firmware. Therefore remove it.
Should actually be attributed as:
From: Steve Hodgson <[email protected]>
Ben.
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.
PATCH 5/20 sfc: SFT9001/SFN4111T: Check PHY boot status during board initialisation
In reply to Ben HutchingsDuring SFN4111T initialisation, check whether the PHY boot status indicates a bad firmware checksum. If so, prepare to reflash rather than continuing with normal initialisation.
Remove redundant PHY boot status check from tenxpress_phy_init().
--- drivers/net/sfc/phy.h | 4 ++ drivers/net/sfc/sfe4001.c | 14 +++++-- drivers/net/sfc/tenxpress.c | 90 ++++++++++++++++++++++++++----------------- 3 files changed, 69 insertions(+), 39 deletions(-)
drivers/net/sfc/phy.h +4 -0
@@ -18,6 +18,10 @@ extern struct efx_phy_operations falcon_sft9001_phy_ops;extern void tenxpress_phy_blink (struct efx_nic *efx,bool blink); +/* Wait for the PHY to boot. Return 0 on success, -EINVAL if the PHY failed +* to boot due to corrupt flash, or some other negative error code. */ +extern int sft9001_wait_boot (struct efx_nic *efx); +/**************************************************************************** * Exported functions from the driver for XFP optical PHYs */
drivers/net/sfc/sfe4001.c +10 -4
@@ -379,6 +379,7 @@ static struct i2c_board_info sfn4111t_hwmon_info = {int sfn4111t_init (struct efx_nic *efx) { +int i =0 ;int rc; efx->board_info.hwmon_client =
@@ -394,11 +395,16 @@ int sfn4111t_init(struct efx_nic *efx)if (rc) goto fail_hwmon; -if (efx->phy_mode &PHY_MODE_SPECIAL ) -sfn4111t_reset (efx); - -return 0 ; +do { +if (efx->phy_mode &PHY_MODE_SPECIAL ) +sfn4111t_reset (efx); + rc =sft9001_wait_boot (efx); +if (rc ==0 ) +return 0 ; + efx->phy_mode =PHY_MODE_SPECIAL ; + }while (rc == -EINVAL && ++i <2 ); +device_remove_file (&efx->pci_dev->dev, &dev_attr_phy_flash_cfg); fail_hwmon:i2c_unregister_device (efx->board_info.hwmon_client);return rc;
drivers/net/sfc/tenxpress.c +54 -34
125 lines not on this page · raw message
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.
PATCH 6/20 sfc: SFT9001: Fix speed reporting in 1G PHY loopback
In reply to Ben HutchingsInstead of disabling AN in loopback, just prevent restarting AN and override the speed in sft9001_get_settings().
--- drivers/net/sfc/mdio_10g.c | 4 ++++ drivers/net/sfc/tenxpress.c | 27 +++++++++------------------ drivers/net/sfc/workarounds.h | 5 +++++ 3 files changed, 18 insertions(+), 18 deletions(-)
drivers/net/sfc/mdio_10g.c +4 -0
@@ -15,6 +15,7 @@#include "net_driver.h" #include "mdio_10g.h" #include "boards.h" +#include "workarounds.h" int mdio_clause45_reset_mmd (struct efx_nic *port,int mmd,int spins,int spintime)
@@ -518,6 +519,9 @@ int mdio_clause45_set_settings(struct efx_nic *efx, reg |=BMCR_ANENABLE |BMCR_ANRESTART ; else reg &= ~BMCR_ANENABLE; +if (EFX_WORKAROUND_15195 (efx) + &&LOOPBACK_MASK (efx) & efx->phy_op->loopbacks) + reg &= ~BMCR_ANRESTART ;if (xnp) reg |=1 <<MDIO_AN_CTRL_XNP_LBN ;else
drivers/net/sfc/tenxpress.c +9 -18
@@ -531,7 +531,7 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) {struct tenxpress_phy_data *phy_data = efx->phy_data;struct ethtool_cmd ecmd; -bool phy_mode_change, loop_reset, loop_toggle, loopback; +bool phy_mode_change, loop_reset;if (efx->phy_mode & (PHY_MODE_OFF |PHY_MODE_SPECIAL )) { phy_data->phy_mode = efx->phy_mode;
@@ -542,12 +542,10 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) phy_mode_change = (efx->phy_mode ==PHY_MODE_NORMAL && phy_data->phy_mode !=PHY_MODE_NORMAL ); - loopback =LOOPBACK_MASK (efx) & efx->phy_op->loopbacks; - loop_toggle =LOOPBACK_CHANGED (phy_data, efx, efx->phy_op->loopbacks); loop_reset = (LOOPBACK_OUT_OF (phy_data, efx, efx->phy_op->loopbacks) ||LOOPBACK_CHANGED (phy_data, efx,1 <<LOOPBACK_GPHY )); -if (loop_reset || loop_toggle || loopback || phy_mode_change) { +if (loop_reset || phy_mode_change) {int rc; efx->phy_op->get_settings (efx, &ecmd);
@@ -562,20 +560,6 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)falcon_reset_xaui (efx); } -if (efx->phy_type !=PHY_TYPE_SFX7101 ) { -/* Only change autoneg once, on coming out or -* going into loopback */ -if (loop_toggle) - ecmd.autoneg = !loopback; -if (loopback) { - ecmd.duplex =DUPLEX_FULL ; -if (efx->loopback_mode ==LOOPBACK_GPHY ) - ecmd.speed =SPEED_1000 ; -else - ecmd.speed =SPEED_10000 ; - } - } - rc = efx->phy_op->set_settings (efx, &ecmd);WARN_ON (rc); }
@@ -836,6 +820,13 @@ static void sft9001_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd) ecmd->duplex = (reg & (1 <<GPHY_DUPLEX_LBN ) ?DUPLEX_FULL :DUPLEX_HALF ); } + +/* In loopback, the PHY automatically brings up the correct interface, +* but doesn't advertise the correct speed. So override it */ +if (efx->loopback_mode ==LOOPBACK_GPHY ) + ecmd->speed =SPEED_1000 ; +else if (LOOPBACK_MASK (efx) &SFT9001_LOOPBACKS ) + ecmd->speed =SPEED_10000 ; }static int sft9001_set_settings (struct efx_nic *efx,struct ethtool_cmd *ecmd)
drivers/net/sfc/workarounds.h +5 -0
@@ -19,6 +19,8 @@#define EFX_WORKAROUND_FALCON_A (efx) (falcon_rev(efx) <= FALCON_REV_A1)#define EFX_WORKAROUND_10G (efx) EFX_IS10G(efx)#define EFX_WORKAROUND_SFT9001A (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A) +#define EFX_WORKAROUND_SFT9001 (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A || \ + (efx)->phy_type == PHY_TYPE_SFT9001B)/* XAUI resets if link not detected */ #define EFX_WORKAROUND_5147 EFX_WORKAROUND_ALWAYS
@@ -56,4 +58,7 @@/* Need to keep AN enabled */ #define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A +/* Don't restart AN in near-side loopback */ +#define EFX_WORKAROUND_15195 EFX_WORKAROUND_SFT9001 +#endif /* EFX_WORKAROUNDS_H */
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.
PATCH 7/20 sfc: SFN4111T: Fix GPIO sharing between I2C and FLASH_CFG_1
In reply to Ben HutchingsChange sfn4111t_reset() to change only GPIO output enables so that it doesn't break subsequent I2C operations.
Update comments to explain exactly what we're doing.
Add a short sleep to make sure the FLASH_CFG_1 value is latched before any subsequent I2C operations.
--- drivers/net/sfc/sfe4001.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/sfc/sfe4001.c +9 -6
@@ -186,19 +186,22 @@ static int sfn4111t_reset(struct efx_nic *efx) {efx_oword_t reg; -/* GPIO pins are also used for I2C, so block that temporarily */ +/* GPIO 3 and the GPIO register are shared with I2C, so block that */ mutex_lock (&efx->i2c_adap.bus_lock); +/* Pull RST_N (GPIO 2) low then let it up again, setting the +* FLASH_CFG_1 strap (GPIO 3) appropriately. Only change the +* output enables; the output levels should always be 0 (low) +* and we rely on external pull-ups. */ falcon_read (efx, ®,GPIO_CTL_REG_KER );EFX_SET_OWORD_FIELD (reg,GPIO2_OEN , true); -EFX_SET_OWORD_FIELD (reg,GPIO2_OUT , false);falcon_write (efx, ®,GPIO_CTL_REG_KER );msleep (1000 ); -EFX_SET_OWORD_FIELD (reg,GPIO2_OUT , true); -EFX_SET_OWORD_FIELD (reg,GPIO3_OEN , true); -EFX_SET_OWORD_FIELD (reg,GPIO3_OUT , - !(efx->phy_mode &PHY_MODE_SPECIAL )); +EFX_SET_OWORD_FIELD (reg,GPIO2_OEN , false); +EFX_SET_OWORD_FIELD (reg,GPIO3_OEN , + !!(efx->phy_mode &PHY_MODE_SPECIAL ));falcon_write (efx, ®,GPIO_CTL_REG_KER ); +msleep (1 );mutex_unlock (&efx->i2c_adap.bus_lock);
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.
PATCH 8/20 sfc: Fix post-reset MAC selection
In reply to Ben HutchingsFrom: Steve Hodgson <[email protected]>
Modify falcon_switch_mac() to always set NIC_STAT_REG, even if the the MAC is the same as it was before. This ensures that the value is correct after an online reset.
--- drivers/net/sfc/falcon.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/sfc/falcon.c +8 -7
@@ -2283,16 +2283,12 @@ int falcon_switch_mac(struct efx_nic *efx) efx->link_fd = true; } +WARN_ON (!mutex_is_locked (&efx->mac_lock)); efx->mac_op = (EFX_IS10G (efx) ? &falcon_xmac_operations : &falcon_gmac_operations); -if (old_mac_op == efx->mac_op) -return 0 ; - -WARN_ON (!mutex_is_locked (&efx->mac_lock)); - -/* Not all macs support a mac-level link state */ - efx->mac_up = true; +/* Always push the NIC_STAT_REG setting even if the mac hasn't +* changed, because this function is run post online reset */ falcon_read (efx, &nic_stat,NIC_STAT_REG ); strap_val =EFX_IS10G (efx) ?5 :3 ;if (falcon_rev (efx) >=FALCON_REV_B0 ) {
@@ -2305,8 +2301,13 @@ int falcon_switch_mac(struct efx_nic *efx)BUG_ON (EFX_OWORD_FIELD (nic_stat,STRAP_PINS ) != strap_val); } +if (old_mac_op == efx->mac_op) +return 0 ;EFX_LOG (efx,"selected %cMAC\n" ,EFX_IS10G (efx) ?'X' :'G' ); +/* Not all macs support a mac-level link state */ + efx->mac_up = true; +return falcon_reset_macs (efx); }
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.
PATCH 9/20 sfc: Reinitialise the PHY completely in case of a PHY or NIC reset
In reply to Ben HutchingsFrom: Steve Hodgson <[email protected]>
In particular, set pause advertising bits properly.
A PHY reset is not necessary to recover from the register self-test, so use a "invisible" reset there instead.
--- drivers/net/sfc/efx.c | 26 +++++++++++++++++++------- drivers/net/sfc/efx.h | 7 ++++--- drivers/net/sfc/selftest.c | 7 ++++--- drivers/net/sfc/tenxpress.c | 1 + 4 files changed, 28 insertions(+), 13 deletions(-)
drivers/net/sfc/efx.c +19 -7
@@ -676,9 +676,8 @@ static int efx_init_port(struct efx_nic *efx) rc = efx->phy_op->init (efx);if (rc)return rc; - efx->phy_op->reconfigure (efx); -mutex_lock (&efx->mac_lock); + efx->phy_op->reconfigure (efx); rc =falcon_switch_mac (efx);mutex_unlock (&efx->mac_lock);if (rc)
@@ -1622,7 +1621,8 @@ static void efx_unregister_netdev(struct efx_nic *efx)/* Tears down the entire software state and most of the hardware state * before reset. */ -void efx_reset_down (struct efx_nic *efx,struct ethtool_cmd *ecmd) +void efx_reset_down (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd) {EFX_ASSERT_RESET_SERIALISED (efx);
@@ -1639,6 +1639,8 @@ void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd) efx->phy_op->get_settings (efx, ecmd);efx_fini_channels (efx); +if (efx->port_initialized && method !=RESET_TYPE_INVISIBLE ) + efx->phy_op->fini (efx); }/* This function will always ensure that the locks acquired in
@@ -1646,7 +1648,8 @@ void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd)* that we were unable to reinitialise the hardware, and the * driver should be disabled. If ok is false, then the rx and tx * engines are not restarted, pending a RESET_DISABLE. */ -int efx_reset_up (struct efx_nic *efx,struct ethtool_cmd *ecmd,bool ok) +int efx_reset_up (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd,bool ok) {int rc;
@@ -1658,6 +1661,15 @@ int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd, bool ok) ok = false; } +if (efx->port_initialized && method !=RESET_TYPE_INVISIBLE ) { +if (ok) { + rc = efx->phy_op->init (efx); +if (rc) + ok = false; + }else + efx->port_initialized = false; + } +if (ok) {efx_init_channels (efx);
@@ -1702,7 +1714,7 @@ static int efx_reset(struct efx_nic *efx)EFX_INFO (efx,"resetting (%d)\n" , method); -efx_reset_down (efx, &ecmd); +efx_reset_down (efx, method, &ecmd); rc =falcon_reset_hw (efx, method);if (rc) {
@@ -1721,10 +1733,10 @@ static int efx_reset(struct efx_nic *efx)/* Leave device stopped if necessary */ if (method ==RESET_TYPE_DISABLE ) { -efx_reset_up (efx, &ecmd, false); +efx_reset_up (efx, method, &ecmd, false); rc = -EIO ; }else { - rc =efx_reset_up (efx, &ecmd, true); + rc =efx_reset_up (efx, method, &ecmd, true); } out_disable:
drivers/net/sfc/efx.h +4 -3
@@ -40,9 +40,10 @@ extern void efx_reconfigure_port(struct efx_nic *efx);extern void __efx_reconfigure_port (struct efx_nic *efx);/* Reset handling */ -extern void efx_reset_down (struct efx_nic *efx,struct ethtool_cmd *ecmd); -extern int efx_reset_up (struct efx_nic *efx,struct ethtool_cmd *ecmd, -bool ok); +extern void efx_reset_down (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd); +extern int efx_reset_up (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd,bool ok);/* Global */ extern void efx_schedule_reset (struct efx_nic *efx,enum reset_type type);
drivers/net/sfc/selftest.c +4 -3
@@ -665,6 +665,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests, {enum efx_loopback_mode loopback_mode = efx->loopback_mode;int phy_mode = efx->phy_mode; +enum reset_type reset_method =RESET_TYPE_INVISIBLE ;struct ethtool_cmd ecmd;struct efx_channel *channel;int rc_test =0 , rc_reset =0 , rc;
@@ -718,21 +719,21 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,mutex_unlock (&efx->mac_lock);/* free up all consumers of SRAM (including all the queues) */ -efx_reset_down (efx, &ecmd); +efx_reset_down (efx, reset_method, &ecmd); rc =efx_test_chip (efx, tests);if (rc && !rc_test) rc_test = rc;/* reset the chip to recover from the register test */ - rc_reset =falcon_reset_hw (efx,RESET_TYPE_ALL ); + rc_reset =falcon_reset_hw (efx, reset_method);/* Ensure that the phy is powered and out of loopback * for the bist and loopback tests */ efx->phy_mode &= ~PHY_MODE_LOW_POWER ; efx->loopback_mode =LOOPBACK_NONE ; - rc =efx_reset_up (efx, &ecmd, rc_reset ==0 ); + rc =efx_reset_up (efx, reset_method, &ecmd, rc_reset ==0 );if (rc && !rc_reset) rc_reset = rc;
drivers/net/sfc/tenxpress.c +1 -0
@@ -357,6 +357,7 @@ static int tenxpress_phy_init(struct efx_nic *efx) rc =tenxpress_init (efx);if (rc <0 ) goto fail; +mdio_clause45_set_pause (efx);if (efx->phy_type ==PHY_TYPE_SFT9001B ) { rc = device_create_file(&efx->pci_dev->dev,
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.
PATCH 10/20 sfc: Test for PHYXS faults whenever we cannot test link state bits
In reply to Ben HutchingsFrom: Steve Hodgson <[email protected]>
Depending on the loopback mode, there may be no pertinent link state bits. In this case we test the PHYXS RX fault bit instead. Make sure to do this in all cases where there are no link state bits.
--- drivers/net/sfc/mdio_10g.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
drivers/net/sfc/mdio_10g.c +9 -7
@@ -181,17 +181,12 @@ bool mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)return false; else if (efx_phy_mode_disabled(efx->phy_mode)) return false; - else if (efx->loopback_mode == LOOPBACK_PHYXS) { + else if (efx->loopback_mode == LOOPBACK_PHYXS) mmd_mask &= ~(MDIO_MMDREG_DEVS_PHYXS |MDIO_MMDREG_DEVS_PCS |MDIO_MMDREG_DEVS_PMAPMD |MDIO_MMDREG_DEVS_AN ); -if (!mmd_mask) { - reg =mdio_clause45_read (efx, phy_id,MDIO_MMD_PHYXS , -MDIO_PHYXS_STATUS2 ); -return !(reg & (1 <<MDIO_PHYXS_STATUS2_RX_FAULT_LBN )); - } - } else if (efx->loopback_mode == LOOPBACK_PCS) + else if (efx->loopback_mode == LOOPBACK_PCS) mmd_mask &= ~(MDIO_MMDREG_DEVS_PCS |MDIO_MMDREG_DEVS_PMAPMD |MDIO_MMDREG_DEVS_AN );
@@ -199,6 +194,13 @@ bool mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask) mmd_mask &= ~(MDIO_MMDREG_DEVS_PMAPMD |MDIO_MMDREG_DEVS_AN ); +if (!mmd_mask) { +/* Use presence of XGMII faults in leui of link state */ + reg =mdio_clause45_read (efx, phy_id,MDIO_MMD_PHYXS , +MDIO_PHYXS_STATUS2 ); +return !(reg & (1 <<MDIO_PHYXS_STATUS2_RX_FAULT_LBN )); + } +while (mmd_mask) {if (mmd_mask &1 ) {/* Double reads because link state is latched, and a
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.
PATCH 11/20 sfc: Update board info for hardware monitor on SFN4111T-R5 and later
In reply to Ben Hutchings--- drivers/net/sfc/sfe4001.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/sfc/sfe4001.c +10 -2
@@ -375,18 +375,26 @@ static void sfn4111t_fini(struct efx_nic *efx)i2c_unregister_device (efx->board_info.hwmon_client); } -static struct i2c_board_info sfn4111t_hwmon_info = { +static struct i2c_board_info sfn4111t_a0_hwmon_info = {I2C_BOARD_INFO ("max6647" ,0x4e ), .irq =-1 , }; +static struct i2c_board_info sfn4111t_r5_hwmon_info = { +I2C_BOARD_INFO ("max6646" ,0x4d ), + .irq =-1 , +}; +int sfn4111t_init (struct efx_nic *efx) {int i =0 ;int rc; efx->board_info.hwmon_client = -i2c_new_device (&efx->i2c_adap, &sfn4111t_hwmon_info); +i2c_new_device (&efx->i2c_adap, + (efx->board_info.minor <5 ) ? + &sfn4111t_a0_hwmon_info : + &sfn4111t_r5_hwmon_info);if (!efx->board_info.hwmon_client)return -EIO ;
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.
PATCH 12/20 sfc: SFT9001: Always enable XNP exchange on SFT9001 rev B
In reply to Ben HutchingsThis workaround is not specific to rev A.
--- drivers/net/sfc/workarounds.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sfc/workarounds.h +1 -1
@@ -54,7 +54,7 @@#define EFX_WORKAROUND_8071 EFX_WORKAROUND_FALCON_A/* Need to send XNP pages for 100BaseT */ -#define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001A +#define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001/* Need to keep AN enabled */ #define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A
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.
PATCH 13/20 sfc: SFX7101/SFT9001: Fix AN advertisements
In reply to Ben HutchingsAll 10Xpress PHYs require autonegotiation all the time; enforce this in the set_settings() method and do not treat it as a workaround.
Remove claimed support for 100M HD mode since it is not supported by current firmware.
Do not set speed override bits when AN is enabled, and do not use register 1.49192 for AN configuration as it can override what we set elsewhere.
Always set the AN selector bits to 1 (802.3).
Fix confusion between Next Page and Extended Next Page.
--- drivers/net/sfc/ethtool.c | 3 - drivers/net/sfc/mdio_10g.c | 177 ++++++++++++++++++----------------------- drivers/net/sfc/mdio_10g.h | 3 +- drivers/net/sfc/net_driver.h | 4 +- drivers/net/sfc/tenxpress.c | 151 +++++++++++++--------------------- drivers/net/sfc/workarounds.h | 4 - 6 files changed, 141 insertions(+), 201 deletions(-)
drivers/net/sfc/ethtool.c +0 -3
@@ -219,9 +219,6 @@ int efx_ethtool_set_settings(struct net_device *net_dev,struct efx_nic *efx =netdev_priv (net_dev);int rc; -if (EFX_WORKAROUND_13963 (efx) && !ecmd->autoneg) -return -EINVAL ; -/* Falcon GMAC does not support 1000Mbps HD */ if (ecmd->speed ==SPEED_1000 && ecmd->duplex !=DUPLEX_FULL ) { EFX_LOG(efx, "rejecting unsupported 1000Mbps HD"
drivers/net/sfc/mdio_10g.c +79 -98
246 lines not on this page · raw message
drivers/net/sfc/mdio_10g.h +2 -1
@@ -155,7 +155,8 @@#define MDIO_AN_XNP 22#define MDIO_AN_LPA_XNP 25 -#define MDIO_AN_10GBT_ADVERTISE 32 +#define MDIO_AN_10GBT_CTRL 32 +#define MDIO_AN_10GBT_CTRL_ADV_10G_LBN 12#define MDIO_AN_10GBT_STATUS (33)#define MDIO_AN_10GBT_STATUS_MS_FLT_LBN (15)/* MASTER/SLAVE config fault */ #define MDIO_AN_10GBT_STATUS_MS_LBN (14)/* MASTER/SLAVE config */
drivers/net/sfc/net_driver.h +2 -2
@@ -566,7 +566,7 @@ struct efx_mac_operations {* @poll: Poll for hardware state. Serialised by the mac_lock. * @get_settings: Get ethtool settings. Serialised by the mac_lock. * @set_settings: Set ethtool settings. Serialised by the mac_lock. -* @set_xnp_advertise: Set abilities advertised in Extended Next Page +* @set_npage_adv: Set abilities advertised in (Extended) Next Page * (only needed where AN bit is set in mmds) * @num_tests: Number of PHY-specific tests/results * @test_names: Names of the tests/results
@@ -586,7 +586,7 @@ struct efx_phy_operations { struct ethtool_cmd *ecmd);int (*set_settings) (struct efx_nic *efx,struct ethtool_cmd *ecmd); -bool (*set_xnp_advertise) (struct efx_nic *efx,u32 ); +void (*set_npage_adv) (struct efx_nic *efx,u32 );u32 num_tests;const char *const *test_names;int (*run_tests) (struct efx_nic *efx,int *results,unsigned flags);
drivers/net/sfc/tenxpress.c +58 -93
200 lines not on this page · raw message
drivers/net/sfc/workarounds.h +0 -4
@@ -18,7 +18,6 @@#define EFX_WORKAROUND_ALWAYS (efx) 1#define EFX_WORKAROUND_FALCON_A (efx) (falcon_rev(efx) <= FALCON_REV_A1)#define EFX_WORKAROUND_10G (efx) EFX_IS10G(efx) -#define EFX_WORKAROUND_SFT9001A (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A)#define EFX_WORKAROUND_SFT9001 (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A || \ (efx)->phy_type == PHY_TYPE_SFT9001B)
@@ -55,9 +54,6 @@/* Need to send XNP pages for 100BaseT */ #define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001 -/* Need to keep AN enabled */ -#define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A -/* Don't restart AN in near-side loopback */ #define EFX_WORKAROUND_15195 EFX_WORKAROUND_SFT9001
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.
PATCH 14/20 sfc: Remove "XFP" from log messages that are not specific to XFP
In reply to Ben Hutchings--- drivers/net/sfc/xfp_phy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/sfc/xfp_phy.c +4 -4
@@ -73,7 +73,7 @@ static int xfp_reset_phy(struct efx_nic *efx)return rc; fail: -EFX_ERR (efx,"XFP: reset timed out!\n" ); +EFX_ERR (efx,"PHY reset timed out\n" );return rc; }
@@ -88,15 +88,15 @@ static int xfp_phy_init(struct efx_nic *efx)return -ENOMEM ; efx->phy_data = phy_data; -EFX_INFO (efx,"XFP: PHY ID reg %x (OUI %x model %x revision" -" %x)\n" , devid,MDIO_ID_OUI (devid),MDIO_ID_MODEL (devid), +EFX_INFO (efx,"PHY ID reg %x (OUI %x model %x revision %x)\n" , + devid,MDIO_ID_OUI (devid),MDIO_ID_MODEL (devid),MDIO_ID_REV (devid)); phy_data->phy_mode = efx->phy_mode; rc =xfp_reset_phy (efx); -EFX_INFO (efx,"XFP: PHY init %s.\n" , +EFX_INFO (efx,"PHY init %s.\n" , rc ?"failed" :"successful" );if (rc <0 ) goto fail;
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.
PATCH 15/20 sfc: Fix reporting of PHY id
In reply to Ben HutchingsShuffle bits of the OUI into the conventional written order.
Replace PHY id component macros with functions.
Zero-pad PHY id components in log messages.
--- drivers/net/sfc/mdio_10g.c | 15 +++++++++++++++ drivers/net/sfc/mdio_10g.h | 8 ++++---- drivers/net/sfc/xfp_phy.c | 6 +++--- 3 files changed, 22 insertions(+), 7 deletions(-)
drivers/net/sfc/mdio_10g.c +15 -0
@@ -17,6 +17,21 @@#include "boards.h" #include "workarounds.h" +unsigned mdio_id_oui (u32 id) +{ +unsigned oui =0 ; +int i; + +/* The bits of the OUI are designated a..x, with a=0 and b variable. +* In the id register c is the MSB but the OUI is conventionally +* written as bytes h..a, p..i, x..q. Reorder the bits accordingly. */ +for (i =0 ; i <22 ; ++i) +if (id & (1 << (i +10 ))) + oui |=1 << (i ^7 ); + +return oui; +} +int mdio_clause45_reset_mmd (struct efx_nic *port,int mmd,int spins,int spintime) {
drivers/net/sfc/mdio_10g.h +4 -4
@@ -70,10 +70,10 @@#define MDIO_MMDREG_STAT1_LPABLE_LBN (1)#define MDIO_MMDREG_STAT1_LPABLE_WIDTH (1) -/* Bits in ID reg */ -#define MDIO_ID_REV (_id32) (_id32 & 0xf) -#define MDIO_ID_MODEL (_id32) ((_id32 >> 4) & 0x3f) -#define MDIO_ID_OUI (_id32) (_id32 >> 10) +/* Bits in combined ID regs */ +static inline unsigned mdio_id_rev (u32 id) {return id &0xf ; } +static inline unsigned mdio_id_model (u32 id) {return (id >>4 ) &0x3f ; } +extern unsigned mdio_id_oui (u32 id);/* Bits in MMDREG_DEVS0/1. Someone thoughtfully layed things out * so the 'bit present' bit number of an MMD is the number of
drivers/net/sfc/xfp_phy.c +3 -3
@@ -88,9 +88,9 @@ static int xfp_phy_init(struct efx_nic *efx)return -ENOMEM ; efx->phy_data = phy_data; -EFX_INFO (efx,"PHY ID reg %x (OUI %x model %x revision %x)\n" , - devid,MDIO_ID_OUI (devid),MDIO_ID_MODEL (devid), -MDIO_ID_REV (devid)); +EFX_INFO (efx,"PHY ID reg %x (OUI %06x model %02x revision %x)\n" , + devid,mdio_id_oui (devid),mdio_id_model (devid), +mdio_id_rev (devid)); phy_data->phy_mode = efx->phy_mode;
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.
PATCH 16/20 sfc: Add support for QT2025C PHY
In reply to Ben HutchingsThis is a new PHY supporting SFP+ modules, used in the SFN4112F reference design. It is similar to the QT2022C2 and shares much of its support code.
--- drivers/net/sfc/falcon.c | 1 + drivers/net/sfc/net_driver.h | 1 + drivers/net/sfc/phy.h | 4 +- drivers/net/sfc/xfp_phy.c | 95 ++++++++++++++++++++++++++++++++++++++---- 4 files changed, 91 insertions(+), 10 deletions(-)
drivers/net/sfc/falcon.c +1 -0
@@ -2249,6 +2249,7 @@ static int falcon_probe_phy(struct efx_nic *efx) efx->phy_op = &falcon_sft9001_phy_ops;break ;case PHY_TYPE_QT2022C2 : +case PHY_TYPE_QT2025C : efx->phy_op = &falcon_xfp_phy_ops;break ;default :
drivers/net/sfc/net_driver.h +1 -0
@@ -459,6 +459,7 @@ enum phy_type {PHY_TYPE_QT2022C2 =4 ,PHY_TYPE_PM8358 =6 ,PHY_TYPE_SFT9001A =8 , +PHY_TYPE_QT2025C =9 ,PHY_TYPE_SFT9001B =10 , PHY_TYPE_MAX /* Insert any new items before this */ };
drivers/net/sfc/phy.h +2 -2
@@ -23,11 +23,11 @@ extern void tenxpress_phy_blink(struct efx_nic *efx, bool blink);extern int sft9001_wait_boot (struct efx_nic *efx);/**************************************************************************** -* Exported functions from the driver for XFP optical PHYs +* AMCC/Quake QT20xx PHYs */ extern struct efx_phy_operations falcon_xfp_phy_ops; -/* The QUAKE XFP PHY provides various H/W control states for LEDs */ +/* These PHYs provide various H/W control states for LEDs */ #define QUAKE_LED_LINK_INVAL (0)#define QUAKE_LED_LINK_STAT (1)#define QUAKE_LED_LINK_ACT (2)
drivers/net/sfc/xfp_phy.c +87 -8
126 lines not on this page · raw message
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.
PATCH 17/20 sfc: Delete unused efx_blinker::led_num field
In reply to Ben Hutchings--- drivers/net/sfc/boards.c | 1 - drivers/net/sfc/net_driver.h | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-)
drivers/net/sfc/boards.c +0 -1
@@ -194,7 +194,6 @@ static int sfe4002_init_leds(struct efx_nic *efx)xfp_set_led (efx,SFE4002_RX_LED ,QUAKE_LED_RXLINK |QUAKE_LED_LINK_ACTSTAT );xfp_set_led (efx,SFE4002_FAULT_LED ,QUAKE_LED_OFF ); - efx->board_info.blinker.led_num =SFE4002_FAULT_LED ;return 0 ; }
drivers/net/sfc/net_driver.h +0 -2
@@ -394,13 +394,11 @@ struct efx_channel {/** * struct efx_blinker - S/W LED blinking context -* @led_num: LED ID (board-specific meaning) * @state: Current state - on or off * @resubmit: Timer resubmission flag * @timer: Control timer for blinking */ struct efx_blinker { -int led_num;bool state;bool resubmit;struct timer_list timer;
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.
PATCH 18/20 sfc: Clean up LED control
In reply to Ben HutchingsReinitialise LEDs after overriding them for identification.
Rename set_fault_led method to set_id_led since we always use it for NIC identification and not faults.
--- drivers/net/sfc/boards.c | 11 +++++------ drivers/net/sfc/efx.c | 4 ++-- drivers/net/sfc/net_driver.h | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-)
drivers/net/sfc/boards.c +5 -6
@@ -26,7 +26,7 @@ static void blink_led_timer(unsigned long context) {struct efx_nic *efx = (struct efx_nic *)context;struct efx_blinker *bl = &efx->board_info.blinker; - efx->board_info.set_fault_led (efx, bl->state); + efx->board_info.set_id_led (efx, bl->state); bl->state = !bl->state;if (bl->resubmit)mod_timer (&bl->timer, jiffies +BLINK_INTERVAL );
@@ -48,7 +48,7 @@ static void board_blink(struct efx_nic *efx, bool blink) blinker->resubmit = false;if (blinker->timer.function)del_timer_sync (&blinker->timer); - efx->board_info.set_fault_led (efx, false); + efx->board_info.init_leds (efx); } }
@@ -185,7 +185,7 @@ static struct i2c_board_info sfe4002_hwmon_info = {#define SFE4002_RX_LED (0)/* Green */ #define SFE4002_TX_LED (1)/* Amber */ -static int sfe4002_init_leds (struct efx_nic *efx) +static void sfe4002_init_leds (struct efx_nic *efx) {/* Set the TX and RX LEDs to reflect status and activity, and the * fault LED off */
@@ -194,10 +194,9 @@ static int sfe4002_init_leds(struct efx_nic *efx)xfp_set_led (efx,SFE4002_RX_LED ,QUAKE_LED_RXLINK |QUAKE_LED_LINK_ACTSTAT );xfp_set_led (efx,SFE4002_FAULT_LED ,QUAKE_LED_OFF ); -return 0 ; } -static void sfe4002_fault_led (struct efx_nic *efx,bool state) +static void sfe4002_set_id_led (struct efx_nic *efx,bool state) {xfp_set_led (efx,SFE4002_FAULT_LED , state ?QUAKE_LED_ON :QUAKE_LED_OFF );
@@ -221,7 +220,7 @@ static int sfe4002_init(struct efx_nic *efx)return rc; efx->board_info.monitor = sfe4002_check_hw; efx->board_info.init_leds = sfe4002_init_leds; - efx->board_info.set_fault_led = sfe4002_fault_led; + efx->board_info.set_id_led = sfe4002_set_id_led; efx->board_info.blink = board_blink; efx->board_info.fini = efx_fini_lm87;return 0 ;
drivers/net/sfc/efx.c +2 -2
@@ -1847,8 +1847,8 @@ static struct efx_phy_operations efx_dummy_phy_operations = {static struct efx_board efx_dummy_board_info = { .init = efx_port_dummy_op_int, - .init_leds = efx_port_dummy_op_int, - .set_fault_led = efx_port_dummy_op_blink, + .init_leds = efx_port_dummy_op_void, + .set_id_led = efx_port_dummy_op_blink, .monitor = efx_port_dummy_op_int, .blink = efx_port_dummy_op_blink, .fini = efx_port_dummy_op_void,
drivers/net/sfc/net_driver.h +4 -4
@@ -411,8 +411,8 @@ struct efx_blinker {* @major: Major rev. ('A', 'B' ...) * @minor: Minor rev. (0, 1, ...) * @init: Initialisation function -* @init_leds: Sets up board LEDs -* @set_fault_led: Turns the fault LED on or off +* @init_leds: Sets up board LEDs. May be called repeatedly. +* @set_id_led: Turns the identification LED on or off * @blink: Starts/stops blinking * @monitor: Board-specific health check function * @fini: Cleanup function
@@ -428,9 +428,9 @@ struct efx_board {/* As the LEDs are typically attached to the PHY, LEDs * have a separate init callback that happens later than * board init. */ -int (*init_leds)(struct efx_nic *efx); +void (*init_leds)(struct efx_nic *efx); +void (*set_id_led) (struct efx_nic *efx,bool state);int (*monitor) (struct efx_nic *nic); -void (*set_fault_led) (struct efx_nic *efx,bool state);void (*blink) (struct efx_nic *efx,bool start);void (*fini) (struct efx_nic *nic);struct efx_blinker blinker;
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.
PATCH 19/20 sfc: Add support for SFN4112F SFP+ reference design
In reply to Ben Hutchings--- drivers/net/sfc/boards.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/sfc/boards.h | 1 + 2 files changed, 63 insertions(+), 0 deletions(-)
drivers/net/sfc/boards.c +62 -0
@@ -226,6 +226,66 @@ static int sfe4002_init(struct efx_nic *efx)return 0 ; } +/***************************************************************************** +* Support for the SFN4112F +* +*/ +static u8 sfn4112f_lm87_channel =0x03 ;/* use AIN not FAN inputs */ + +static const u8 sfn4112f_lm87_regs[] = { +LM87_IN_LIMITS (0 ,0x83 ,0x91 ),/* 2.5V: 1.8V +/- 5% */ +LM87_IN_LIMITS (1 ,0x51 ,0x5a ),/* Vccp1: 1.2V +/- 5% */ +LM87_IN_LIMITS (2 ,0xb6 ,0xca ),/* 3.3V: 3.3V +/- 5% */ +LM87_IN_LIMITS (4 ,0xb0 ,0xe0 ),/* 12V: 11-14V */ +LM87_IN_LIMITS (5 ,0x44 ,0x4b ),/* Vccp2: 1.0V +/- 5% */ +LM87_AIN_LIMITS (1 ,0x91 ,0xa1 ),/* AIN2: 1.5V +/- 5% */ +LM87_TEMP_INT_LIMITS (10 ,60 ),/* board */ +LM87_TEMP_EXT1_LIMITS (10 ,70 ),/* Falcon */ +0 +}; + +static struct i2c_board_info sfn4112f_hwmon_info = { +I2C_BOARD_INFO ("lm87" ,0x2e ), + .platform_data = &sfn4112f_lm87_channel, + .irq =-1 , +}; + +#define SFN4112F_ACT_LED 0 +#define SFN4112F_LINK_LED 1 + +static void sfn4112f_init_leds (struct efx_nic *efx) +{ +xfp_set_led (efx,SFN4112F_ACT_LED , +QUAKE_LED_RXLINK |QUAKE_LED_LINK_ACT ); +xfp_set_led (efx,SFN4112F_LINK_LED , +QUAKE_LED_RXLINK |QUAKE_LED_LINK_STAT ); +} + +static void sfn4112f_set_id_led (struct efx_nic *efx,bool state) +{ +xfp_set_led (efx,SFN4112F_LINK_LED , + state ?QUAKE_LED_ON :QUAKE_LED_OFF ); +} + +static int sfn4112f_check_hw (struct efx_nic *efx) +{ +/* Mask out unused sensors */ +return efx_check_lm87 (efx, ~0x48 ); +} + +static int sfn4112f_init (struct efx_nic *efx) +{ +int rc =efx_init_lm87 (efx, &sfn4112f_hwmon_info, sfn4112f_lm87_regs); +if (rc) +return rc; + efx->board_info.monitor = sfn4112f_check_hw; + efx->board_info.init_leds = sfn4112f_init_leds; + efx->board_info.set_id_led = sfn4112f_set_id_led; + efx->board_info.blink = board_blink; + efx->board_info.fini = efx_fini_lm87; +return 0 ; +} +/* This will get expanded as board-specific details get moved out of the * PHY drivers. */ struct efx_board_data {
@@ -241,6 +301,8 @@ static struct efx_board_data board_data[] = { { EFX_BOARD_SFE4002, "SFE4002", "XFP adapter", sfe4002_init }, { EFX_BOARD_SFN4111T, "SFN4111T", "100/1000/10GBASE-T adapter", sfn4111t_init }, + { EFX_BOARD_SFN4112F, "SFN4112F", "SFP+ adapter", + sfn4112f_init }, };void efx_set_board_info (struct efx_nic *efx,u16 revision_info)
drivers/net/sfc/boards.h +1 -0
@@ -15,6 +15,7 @@ enum efx_board_type {EFX_BOARD_SFE4001 =1 ,EFX_BOARD_SFE4002 =2 ,EFX_BOARD_SFN4111T =0x51 , + EFX_BOARD_SFN4112F = 0x52, };extern void efx_set_board_info (struct efx_nic *efx,u16 revision_info);
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.
PATCH 20/20 sfc: Replace stats_enabled flag with a disable count
In reply to Ben HutchingsCurrently we use a spin-lock to serialise statistics fetches and also to inhibit them for short periods of time, plus a flag to enable/disable statistics fetches for longer periods of time, during online reset. This was apparently insufficient to deal with the several reasons for stats being disabled.
--- drivers/net/sfc/efx.c | 33 ++++++++++++++++++++++----------- drivers/net/sfc/efx.h | 2 ++ drivers/net/sfc/falcon.c | 15 +++++++++++---- drivers/net/sfc/net_driver.h | 5 ++--- drivers/net/sfc/sfe4001.c | 17 ++++++++++++++++- drivers/net/sfc/tenxpress.c | 12 ++++++------ 6 files changed, 59 insertions(+), 25 deletions(-)
drivers/net/sfc/efx.c +22 -11
@@ -685,7 +685,7 @@ static int efx_init_port(struct efx_nic *efx) efx->mac_op->reconfigure (efx); efx->port_initialized = true; - efx->stats_enabled = true; +efx_stats_enable (efx);return 0 ; fail:
@@ -734,6 +734,7 @@ static void efx_fini_port(struct efx_nic *efx)if (!efx->port_initialized)return ; +efx_stats_disable (efx); efx->phy_op->fini (efx); efx->port_initialized = false;
@@ -1360,6 +1361,20 @@ static int efx_net_stop(struct net_device *net_dev)return 0 ; } +void efx_stats_disable (struct efx_nic *efx) +{ +spin_lock (&efx->stats_lock); + ++efx->stats_disable_count; +spin_unlock (&efx->stats_lock); +} + +void efx_stats_enable (struct efx_nic *efx) +{ +spin_lock (&efx->stats_lock); + --efx->stats_disable_count; +spin_unlock (&efx->stats_lock); +} +/* Context: process, dev_base_lock or RTNL held, non-blocking. */ static struct net_device_stats *efx_net_stats (struct net_device *net_dev) {
@@ -1368,12 +1383,12 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)struct net_device_stats *stats = &net_dev->stats;/* Update stats if possible, but do not wait if another thread -* is updating them (or resetting the NIC); slightly stale -* stats are acceptable. +* is updating them or if MAC stats fetches are temporarily +* disabled; slightly stale stats are acceptable. */ if (!spin_trylock (&efx->stats_lock))return stats; -if (efx->stats_enabled) { +if (!efx->stats_disable_count) { efx->mac_op->update_stats (efx);falcon_update_nic_stats (efx); }
@@ -1626,12 +1641,7 @@ void efx_reset_down(struct efx_nic *efx, enum reset_type method, {EFX_ASSERT_RESET_SERIALISED (efx); -/* The net_dev->get_stats handler is quite slow, and will fail -* if a fetch is pending over reset. Serialise against it. */ -spin_lock (&efx->stats_lock); - efx->stats_enabled = false; -spin_unlock (&efx->stats_lock); - +efx_stats_disable (efx);efx_stop_all (efx);mutex_lock (&efx->mac_lock);mutex_lock (&efx->spi_lock);
@@ -1682,7 +1692,7 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method,if (ok) {efx_start_all (efx); - efx->stats_enabled = true; +efx_stats_enable (efx); }return rc; }
@@ -1888,6 +1898,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type, efx->rx_checksum_enabled = true;spin_lock_init (&efx->netif_stop_lock);spin_lock_init (&efx->stats_lock); + efx->stats_disable_count =1 ;mutex_init (&efx->mac_lock); efx->mac_op = &efx_dummy_mac_operations; efx->phy_op = &efx_dummy_phy_operations;
drivers/net/sfc/efx.h +2 -0
@@ -36,6 +36,8 @@ extern void efx_process_channel_now(struct efx_channel *channel);extern void efx_flush_queues (struct efx_nic *efx);/* Ports */ +extern void efx_stats_disable (struct efx_nic *efx); +extern void efx_stats_enable (struct efx_nic *efx);extern void efx_reconfigure_port (struct efx_nic *efx);extern void __efx_reconfigure_port (struct efx_nic *efx);
drivers/net/sfc/falcon.c +11 -4
@@ -1883,7 +1883,7 @@ static int falcon_reset_macs(struct efx_nic *efx)/* MAC stats will fail whilst the TX fifo is draining. Serialise * the drain sequence with the statistics fetch */ -spin_lock (&efx->stats_lock); +efx_stats_disable (efx);falcon_read (efx, ®,MAC0_CTRL_REG_KER );EFX_SET_OWORD_FIELD (reg,TXFIFO_DRAIN_EN_B0 ,1 );
@@ -1913,7 +1913,7 @@ static int falcon_reset_macs(struct efx_nic *efx)udelay (10 ); } -spin_unlock (&efx->stats_lock); +efx_stats_enable (efx);/* If we've reset the EM block and the link is up, then * we'll have to kick the XAUI link so the PHY can recover */
@@ -2274,6 +2274,10 @@ int falcon_switch_mac(struct efx_nic *efx)struct efx_mac_operations *old_mac_op = efx->mac_op;efx_oword_t nic_stat;unsigned strap_val; +int rc =0 ; + +/* Don't try to fetch MAC stats while we're switching MACs */ +efx_stats_disable (efx);/* Internal loopbacks override the phy speed setting */ if (efx->loopback_mode ==LOOPBACK_GMAC ) {
@@ -2303,13 +2307,16 @@ int falcon_switch_mac(struct efx_nic *efx) }if (old_mac_op == efx->mac_op) -return 0 ; + goto out;EFX_LOG (efx,"selected %cMAC\n" ,EFX_IS10G (efx) ?'X' :'G' );/* Not all macs support a mac-level link state */ efx->mac_up = true; -return falcon_reset_macs (efx); + rc =falcon_reset_macs (efx); +out: +efx_stats_enable (efx); +return rc; }/* This call is responsible for hooking in the MAC and PHY operations */
drivers/net/sfc/net_driver.h +2 -3
@@ -753,8 +753,7 @@ union efx_multicast_hash {* &struct net_device_stats. * @stats_buffer: DMA buffer for statistics * @stats_lock: Statistics update lock. Serialises statistics fetches -* @stats_enabled: Temporarily disable statistics fetches. -* Serialised by @stats_lock +* @stats_disable_count: Nest count for disabling statistics fetches * @mac_op: MAC interface * @mac_address: Permanent MAC address * @phy_type: PHY type
@@ -836,7 +835,7 @@ struct efx_nic {struct efx_mac_stats mac_stats;struct efx_buffer stats_buffer;spinlock_t stats_lock; -bool stats_enabled; +unsigned int stats_disable_count;struct efx_mac_operations *mac_op;unsigned char mac_address[ETH_ALEN ];
drivers/net/sfc/sfe4001.c +16 -1
@@ -235,12 +235,18 @@ static ssize_t set_phy_flash_cfg(struct device *dev, }else if (efx->state !=STATE_RUNNING ||netif_running (efx->net_dev)) { err = -EBUSY ; }else { +/* Reset the PHY, reconfigure the MAC and enable/disable +* MAC stats accordingly. */ efx->phy_mode = new_mode; +if (new_mode &PHY_MODE_SPECIAL ) +efx_stats_disable (efx);if (efx->board_info.type ==EFX_BOARD_SFE4001 ) err =sfe4001_poweron (efx);else err =sfn4111t_reset (efx);efx_reconfigure_port (efx); +if (!(new_mode &PHY_MODE_SPECIAL )) +efx_stats_enable (efx); }rtnl_unlock ();
@@ -329,6 +335,11 @@ int sfe4001_init(struct efx_nic *efx) efx->board_info.monitor = sfe4001_check_hw; efx->board_info.fini = sfe4001_fini; +if (efx->phy_mode &PHY_MODE_SPECIAL ) { +/* PHY won't generate a 156.25 MHz clock and MAC stats fetch +* will fail. */ +efx_stats_disable (efx); + } rc =sfe4001_poweron (efx);if (rc) goto fail_ioexp;
@@ -407,8 +418,12 @@ int sfn4111t_init(struct efx_nic *efx) goto fail_hwmon; do { - if (efx->phy_mode & PHY_MODE_SPECIAL) + if (efx->phy_mode & PHY_MODE_SPECIAL) { + /* PHY may not generate a 156.25 MHz clock and MAC + * stats fetch will fail. */ + efx_stats_disable(efx); sfn4111t_reset(efx); + } rc = sft9001_wait_boot(efx); if (rc == 0) return 0;
drivers/net/sfc/tenxpress.c +6 -6
@@ -390,8 +390,8 @@ static int tenxpress_special_reset(struct efx_nic *efx)/* The XGMAC clock is driven from the SFC7101/SFT9001 312MHz clock, so * a special software reset can glitch the XGMAC sufficiently for stats -* requests to fail. Since we don't often special_reset, just lock. */ -spin_lock (&efx->stats_lock); +* requests to fail. */ +efx_stats_disable (efx);/* Initiate reset */ reg = mdio_clause45_read(efx, efx->mii.phy_id,
@@ -406,17 +406,17 @@ static int tenxpress_special_reset(struct efx_nic *efx) rc =mdio_clause45_wait_reset_mmds (efx,TENXPRESS_REQUIRED_DEVS );if (rc <0 ) - goto unlock; + goto out;/* Try and reconfigure the device */ rc =tenxpress_init (efx);if (rc <0 ) - goto unlock; + goto out;/* Wait for the XGXS state machine to churn */ mdelay (10 ); -unlock: -spin_unlock (&efx->stats_lock); +out: +efx_stats_enable (efx);return rc; }
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.
David Miller
maintainerI'm not taking a blob of 20 patches to a driver outside of the merge window, no freakin' way.
Quoted 3 lines · David Miller
I'm not taking a blob of 20 patches to a driver outside of the merge window, no freakin' way.
Sorry about that; I should have separated them out more clearly.
1. Patches 3, 6-13 and 20 fix bugs introduced or exposed by the changes already accepted for .29. I regret that I couldn't send these earlier but I simply didn't have near-production hardware or firmware to test against until the last couple of weeks.
2. Patches 16 and 19 add new hardware support without affecting the behaviour on old hardware.
3. Patches 14, 15, 17 and 18 are fairly trivial fixes supporting those.
4. Patches 2 and 4 fix longstanding bugs.
5. Patches 1 and 5 add features.
Please take at least the patches in group 1. I will re-send if you wish.
Ben.
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.
David Miller
maintainerFrom: Ben Hutchings <[email protected]>
Date: Fri, 30 Jan 2009 01:05:43 +0000
Quoted 2 lines
Please take at least the patches in group 1. I will re-send if you wish.
Please resend the pure bug fixes. Thank you.
PATCH 1/11 sfc: SFT9001: Enable robust link training
From: Steve Hodgson <[email protected]>
Enable a firmware option that appears to be necessary for reliable operation.
--- drivers/net/sfc/tenxpress.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/net/sfc/tenxpress.c +5 -1
@@ -67,6 +67,8 @@#define PMA_PMD_EXT_CLK312_WIDTH 1#define PMA_PMD_EXT_LPOWER_LBN 12#define PMA_PMD_EXT_LPOWER_WIDTH 1 +#define PMA_PMD_EXT_ROBUST_LBN 14 +#define PMA_PMD_EXT_ROBUST_WIDTH 1#define PMA_PMD_EXT_SSR_LBN 15#define PMA_PMD_EXT_SSR_WIDTH 1
@@ -284,7 +286,9 @@ static int tenxpress_init(struct efx_nic *efx) PMA_PMD_XCONTROL_REG); reg |= ((1 <<PMA_PMD_EXT_GMII_EN_LBN ) | (1 <<PMA_PMD_EXT_CLK_OUT_LBN ) | - (1 <<PMA_PMD_EXT_CLK312_LBN )); + (1 <<PMA_PMD_EXT_CLK312_LBN ) | + (1 <<PMA_PMD_EXT_ROBUST_LBN )); +mdio_clause45_write (efx, phy_id,MDIO_MMD_PMAPMD ,PMA_PMD_XCONTROL_REG , reg); mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_C22EXT,
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.
David Miller
maintainerRe: [PATCH 01/11] sfc: SFT9001: Enable robust link training
From: Ben Hutchings <[email protected]>
Date: Fri, 30 Jan 2009 03:48:10 +0000
Quoted 6 lines
From: Steve Hodgson <[email protected]>
Enable a firmware option that appears to be necessary for reliable operation.
Signed-off-by Ben Hutchings <[email protected]>
I applied all of these patches but:
1) When you get changes written by other people, such as Steve Hodgson here and in the next few patches, you need to get Signed-off-by lines from them too.
2) Outside of the merge window I do not want to see totally irrelevant stuff like PHY loopback fixes.
Those kinds of fixes are totally inappropriate at this time.
You have been warned :-)
Re: [PATCH 01/11] sfc: SFT9001: Enable robust link training
Quoted 8 lines · David Miller
From: Ben Hutchings <[email protected]>
Date: Fri, 30 Jan 2009 03:48:10 +0000Quoted 5 lines
From: Steve Hodgson <[email protected]>
Enable a firmware option that appears to be necessary for reliable operation.
Quoted 7 lines
Quoted 1 line
Signed-off-by Ben Hutchings <[email protected]>I applied all of these patches but:
1) When you get changes written by other people, such as Steve Hodgson here and in the next few patches, you need to get Signed-off-by lines from them too.
I have been attributing changes to my colleagues for some time and never heard this. In any case the copyright lies with my employer and I am authorised to release these changes; isn't that what my initial sign- off means?
Quoted 4 lines
2) Outside of the merge window I do not want to see totally irrelevant stuff like PHY loopback fixes.
Those kinds of fixes are totally inappropriate at this time.
Are you saying that a spurious self-test failure is not a serious bug?
Quoted 1 line
You have been warned :-)
Ben.
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.
David Miller
maintainerRe: [PATCH 01/11] sfc: SFT9001: Enable robust link training
From: Ben Hutchings <[email protected]>
Date: Sat, 31 Jan 2009 00:04:15 +0000
Quoted 13 lines · David Miller
Quoted 12 lines
From: Ben Hutchings <[email protected]>
Date: Fri, 30 Jan 2009 03:48:10 +0000Quoted 6 lines
From: Steve Hodgson <[email protected]>
Enable a firmware option that appears to be necessary for reliable operation.
Signed-off-by Ben Hutchings <[email protected]>I applied all of these patches but:
Quoted 8 lines
Quoted 3 lines
1) When you get changes written by other people, such as Steve Hodgson here and in the next few patches, you need to get Signed-off-by lines from them too.
I have been attributing changes to my colleagues for some time and never heard this. In any case the copyright lies with my employer and I am authorised to release these changes; isn't that what my initial sign- off means?
Sure, but it is even more meaningful if the person who actually wrote the changes signs off on it too.
Quoted 6 lines
Quoted 4 lines
2) Outside of the merge window I do not want to see totally irrelevant stuff like PHY loopback fixes.
Those kinds of fixes are totally inappropriate at this time.
Are you saying that a spurious self-test failure is not a serious bug?
Normal users will not run the self-test giblet, and it has not been reported as a 2.6.29 regression on lkml.
PATCH 2/11 sfc: SFX7101: Remove workaround for bad link training
In reply to David MillerFrom: Steve Hodgson <[email protected]>
Early versions of the SFX7101 firmware could complete link training in a state where it would not adequately cancel noise (Solarflare bug 10750). We previously worked around this by resetting the PHY after seeing many Ethernet CRC errors. This workaround is unsafe since it takes no account of the interval between errors; it also appears to be unnecessary with production firmware. Therefore remove it.
--- drivers/net/sfc/falcon.c | 4 ---- drivers/net/sfc/phy.h | 1 - drivers/net/sfc/tenxpress.c | 20 -------------------- drivers/net/sfc/workarounds.h | 3 --- 4 files changed, 0 insertions(+), 28 deletions(-)
drivers/net/sfc/falcon.c +0 -4
@@ -824,10 +824,6 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue, rx_ev_pause_frm ? " [PAUSE]" : ""); }#endif - -if (unlikely (rx_ev_eth_crc_err &&EFX_WORKAROUND_10750 (efx) && - efx->phy_type ==PHY_TYPE_SFX7101 )) -tenxpress_crc_err (efx); }/* Handle receive events that are not in-order. */
drivers/net/sfc/phy.h +0 -1
@@ -17,7 +17,6 @@ extern struct efx_phy_operations falcon_sfx7101_phy_ops;extern struct efx_phy_operations falcon_sft9001_phy_ops;extern void tenxpress_phy_blink (struct efx_nic *efx,bool blink); -extern void tenxpress_crc_err (struct efx_nic *efx);/**************************************************************************** * Exported functions from the driver for XFP optical PHYs
drivers/net/sfc/tenxpress.c +0 -20
@@ -189,25 +189,12 @@* rails */ #define LNPGA_PDOWN_WAIT (HZ / 5) -static int crc_error_reset_threshold =100 ; -module_param (crc_error_reset_threshold, int,0644 ); -MODULE_PARM_DESC (crc_error_reset_threshold, -"Max number of CRC errors before XAUI reset" ); -struct tenxpress_phy_data {enum efx_loopback_mode loopback_mode; -atomic_t bad_crc_count;enum efx_phy_mode phy_mode;int bad_lp_tries; }; -void tenxpress_crc_err (struct efx_nic *efx) -{ -struct tenxpress_phy_data *phy_data = efx->phy_data; -if (phy_data !=NULL ) -atomic_inc (&phy_data->bad_crc_count); -} -static ssize_t show_phy_short_reach (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -627,13 +614,6 @@ static void tenxpress_phy_poll(struct efx_nic *efx)if (phy_data->phy_mode !=PHY_MODE_NORMAL )return ; - -if (EFX_WORKAROUND_10750 (efx) && -atomic_read (&phy_data->bad_crc_count) > crc_error_reset_threshold) { -EFX_ERR (efx,"Resetting XAUI due to too many CRC errors\n" ); -falcon_reset_xaui (efx); -atomic_set (&phy_data->bad_crc_count,0 ); - } }static void tenxpress_phy_fini (struct efx_nic *efx)
drivers/net/sfc/workarounds.h +0 -3
@@ -18,7 +18,6 @@#define EFX_WORKAROUND_ALWAYS (efx) 1#define EFX_WORKAROUND_FALCON_A (efx) (falcon_rev(efx) <= FALCON_REV_A1)#define EFX_WORKAROUND_10G (efx) EFX_IS10G(efx) -#define EFX_WORKAROUND_SFX7101 (efx) ((efx)->phy_type == PHY_TYPE_SFX7101)#define EFX_WORKAROUND_SFT9001A (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A)/* XAUI resets if link not detected */
@@ -29,8 +28,6 @@#define EFX_WORKAROUND_7884 EFX_WORKAROUND_10G/* TX pkt parser problem with <= 16 byte TXes */ #define EFX_WORKAROUND_9141 EFX_WORKAROUND_ALWAYS -/* Low rate CRC errors require XAUI reset */ -#define EFX_WORKAROUND_10750 EFX_WORKAROUND_SFX7101/* TX_EV_PKT_ERR can be caused by a dangling TX descriptor * or a PCIe error (bug 11028) */ #define EFX_WORKAROUND_10727 EFX_WORKAROUND_ALWAYS
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.
PATCH 3/11 sfc: SFT9001: Fix speed reporting in 1G PHY loopback
In reply to David MillerFrom: Steve Hodgson <[email protected]>
Instead of disabling AN in loopback, just prevent restarting AN and override the speed in sft9001_get_settings().
--- drivers/net/sfc/mdio_10g.c | 4 ++++ drivers/net/sfc/tenxpress.c | 27 +++++++++------------------ drivers/net/sfc/workarounds.h | 5 +++++ 3 files changed, 18 insertions(+), 18 deletions(-)
drivers/net/sfc/mdio_10g.c +4 -0
@@ -15,6 +15,7 @@#include "net_driver.h" #include "mdio_10g.h" #include "boards.h" +#include "workarounds.h" int mdio_clause45_reset_mmd (struct efx_nic *port,int mmd,int spins,int spintime)
@@ -517,6 +518,9 @@ int mdio_clause45_set_settings(struct efx_nic *efx, reg |=BMCR_ANENABLE |BMCR_ANRESTART ; else reg &= ~BMCR_ANENABLE; +if (EFX_WORKAROUND_15195 (efx) + &&LOOPBACK_MASK (efx) & efx->phy_op->loopbacks) + reg &= ~BMCR_ANRESTART ;if (xnp) reg |=1 <<MDIO_AN_CTRL_XNP_LBN ;else
drivers/net/sfc/tenxpress.c +9 -18
@@ -511,7 +511,7 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) {struct tenxpress_phy_data *phy_data = efx->phy_data;struct ethtool_cmd ecmd; -bool phy_mode_change, loop_reset, loop_toggle, loopback; +bool phy_mode_change, loop_reset;if (efx->phy_mode & (PHY_MODE_OFF |PHY_MODE_SPECIAL )) { phy_data->phy_mode = efx->phy_mode;
@@ -522,12 +522,10 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) phy_mode_change = (efx->phy_mode ==PHY_MODE_NORMAL && phy_data->phy_mode !=PHY_MODE_NORMAL ); - loopback =LOOPBACK_MASK (efx) & efx->phy_op->loopbacks; - loop_toggle =LOOPBACK_CHANGED (phy_data, efx, efx->phy_op->loopbacks); loop_reset = (LOOPBACK_OUT_OF (phy_data, efx, efx->phy_op->loopbacks) ||LOOPBACK_CHANGED (phy_data, efx,1 <<LOOPBACK_GPHY )); -if (loop_reset || loop_toggle || loopback || phy_mode_change) { +if (loop_reset || phy_mode_change) {int rc; efx->phy_op->get_settings (efx, &ecmd);
@@ -542,20 +540,6 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)falcon_reset_xaui (efx); } -if (efx->phy_type !=PHY_TYPE_SFX7101 ) { -/* Only change autoneg once, on coming out or -* going into loopback */ -if (loop_toggle) - ecmd.autoneg = !loopback; -if (loopback) { - ecmd.duplex =DUPLEX_FULL ; -if (efx->loopback_mode ==LOOPBACK_GPHY ) - ecmd.speed =SPEED_1000 ; -else - ecmd.speed =SPEED_10000 ; - } - } - rc = efx->phy_op->set_settings (efx, &ecmd);WARN_ON (rc); }
@@ -813,6 +797,13 @@ static void sft9001_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd) ecmd->duplex = (reg & (1 <<GPHY_DUPLEX_LBN ) ?DUPLEX_FULL :DUPLEX_HALF ); } + +/* In loopback, the PHY automatically brings up the correct interface, +* but doesn't advertise the correct speed. So override it */ +if (efx->loopback_mode ==LOOPBACK_GPHY ) + ecmd->speed =SPEED_1000 ; +else if (LOOPBACK_MASK (efx) &SFT9001_LOOPBACKS ) + ecmd->speed =SPEED_10000 ; }static int sft9001_set_settings (struct efx_nic *efx,struct ethtool_cmd *ecmd)
drivers/net/sfc/workarounds.h +5 -0
@@ -19,6 +19,8 @@#define EFX_WORKAROUND_FALCON_A (efx) (falcon_rev(efx) <= FALCON_REV_A1)#define EFX_WORKAROUND_10G (efx) EFX_IS10G(efx)#define EFX_WORKAROUND_SFT9001A (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A) +#define EFX_WORKAROUND_SFT9001 (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A || \ + (efx)->phy_type == PHY_TYPE_SFT9001B)/* XAUI resets if link not detected */ #define EFX_WORKAROUND_5147 EFX_WORKAROUND_ALWAYS
@@ -56,4 +58,7 @@/* Need to keep AN enabled */ #define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A +/* Don't restart AN in near-side loopback */ +#define EFX_WORKAROUND_15195 EFX_WORKAROUND_SFT9001 +#endif /* EFX_WORKAROUNDS_H */
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.
PATCH 4/11 sfc: SFN4111T: Fix GPIO sharing between I2C and FLASH_CFG_1
In reply to David MillerChange sfn4111t_reset() to change only GPIO output enables so that it doesn't break subsequent I2C operations.
Update comments to explain exactly what we're doing.
Add a short sleep to make sure the FLASH_CFG_1 value is latched before any subsequent I2C operations.
--- drivers/net/sfc/sfe4001.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/sfc/sfe4001.c +9 -6
@@ -186,19 +186,22 @@ static int sfn4111t_reset(struct efx_nic *efx) {efx_oword_t reg; -/* GPIO pins are also used for I2C, so block that temporarily */ +/* GPIO 3 and the GPIO register are shared with I2C, so block that */ mutex_lock (&efx->i2c_adap.bus_lock); +/* Pull RST_N (GPIO 2) low then let it up again, setting the +* FLASH_CFG_1 strap (GPIO 3) appropriately. Only change the +* output enables; the output levels should always be 0 (low) +* and we rely on external pull-ups. */ falcon_read (efx, ®,GPIO_CTL_REG_KER );EFX_SET_OWORD_FIELD (reg,GPIO2_OEN , true); -EFX_SET_OWORD_FIELD (reg,GPIO2_OUT , false);falcon_write (efx, ®,GPIO_CTL_REG_KER );msleep (1000 ); -EFX_SET_OWORD_FIELD (reg,GPIO2_OUT , true); -EFX_SET_OWORD_FIELD (reg,GPIO3_OEN , true); -EFX_SET_OWORD_FIELD (reg,GPIO3_OUT , - !(efx->phy_mode &PHY_MODE_SPECIAL )); +EFX_SET_OWORD_FIELD (reg,GPIO2_OEN , false); +EFX_SET_OWORD_FIELD (reg,GPIO3_OEN , + !!(efx->phy_mode &PHY_MODE_SPECIAL ));falcon_write (efx, ®,GPIO_CTL_REG_KER ); +msleep (1 );mutex_unlock (&efx->i2c_adap.bus_lock);
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.
PATCH 5/11 sfc: Fix post-reset MAC selection
In reply to David MillerFrom: Steve Hodgson <[email protected]>
Modify falcon_switch_mac() to always set NIC_STAT_REG, even if the the MAC is the same as it was before. This ensures that the value is correct after an online reset.
--- drivers/net/sfc/falcon.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/sfc/falcon.c +8 -7
@@ -2283,16 +2283,12 @@ int falcon_switch_mac(struct efx_nic *efx) efx->link_fd = true; } +WARN_ON (!mutex_is_locked (&efx->mac_lock)); efx->mac_op = (EFX_IS10G (efx) ? &falcon_xmac_operations : &falcon_gmac_operations); -if (old_mac_op == efx->mac_op) -return 0 ; - -WARN_ON (!mutex_is_locked (&efx->mac_lock)); - -/* Not all macs support a mac-level link state */ - efx->mac_up = true; +/* Always push the NIC_STAT_REG setting even if the mac hasn't +* changed, because this function is run post online reset */ falcon_read (efx, &nic_stat,NIC_STAT_REG ); strap_val =EFX_IS10G (efx) ?5 :3 ;if (falcon_rev (efx) >=FALCON_REV_B0 ) {
@@ -2305,8 +2301,13 @@ int falcon_switch_mac(struct efx_nic *efx)BUG_ON (EFX_OWORD_FIELD (nic_stat,STRAP_PINS ) != strap_val); } +if (old_mac_op == efx->mac_op) +return 0 ;EFX_LOG (efx,"selected %cMAC\n" ,EFX_IS10G (efx) ?'X' :'G' ); +/* Not all macs support a mac-level link state */ + efx->mac_up = true; +return falcon_reset_macs (efx); }
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.
PATCH 6/11 sfc: Reinitialise the PHY completely in case of a PHY or NIC reset
In reply to David MillerFrom: Steve Hodgson <[email protected]>
In particular, set pause advertising bits properly.
A PHY reset is not necessary to recover from the register self-test, so use a "invisible" reset there instead.
--- drivers/net/sfc/efx.c | 26 +++++++++++++++++++------- drivers/net/sfc/efx.h | 7 ++++--- drivers/net/sfc/selftest.c | 7 ++++--- drivers/net/sfc/tenxpress.c | 1 + 4 files changed, 28 insertions(+), 13 deletions(-)
drivers/net/sfc/efx.c +19 -7
@@ -676,9 +676,8 @@ static int efx_init_port(struct efx_nic *efx) rc = efx->phy_op->init (efx);if (rc)return rc; - efx->phy_op->reconfigure (efx); -mutex_lock (&efx->mac_lock); + efx->phy_op->reconfigure (efx); rc =falcon_switch_mac (efx);mutex_unlock (&efx->mac_lock);if (rc)
@@ -1622,7 +1621,8 @@ static void efx_unregister_netdev(struct efx_nic *efx)/* Tears down the entire software state and most of the hardware state * before reset. */ -void efx_reset_down (struct efx_nic *efx,struct ethtool_cmd *ecmd) +void efx_reset_down (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd) {EFX_ASSERT_RESET_SERIALISED (efx);
@@ -1639,6 +1639,8 @@ void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd) efx->phy_op->get_settings (efx, ecmd);efx_fini_channels (efx); +if (efx->port_initialized && method !=RESET_TYPE_INVISIBLE ) + efx->phy_op->fini (efx); }/* This function will always ensure that the locks acquired in
@@ -1646,7 +1648,8 @@ void efx_reset_down(struct efx_nic *efx, struct ethtool_cmd *ecmd)* that we were unable to reinitialise the hardware, and the * driver should be disabled. If ok is false, then the rx and tx * engines are not restarted, pending a RESET_DISABLE. */ -int efx_reset_up (struct efx_nic *efx,struct ethtool_cmd *ecmd,bool ok) +int efx_reset_up (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd,bool ok) {int rc;
@@ -1658,6 +1661,15 @@ int efx_reset_up(struct efx_nic *efx, struct ethtool_cmd *ecmd, bool ok) ok = false; } +if (efx->port_initialized && method !=RESET_TYPE_INVISIBLE ) { +if (ok) { + rc = efx->phy_op->init (efx); +if (rc) + ok = false; + }else + efx->port_initialized = false; + } +if (ok) {efx_init_channels (efx);
@@ -1702,7 +1714,7 @@ static int efx_reset(struct efx_nic *efx)EFX_INFO (efx,"resetting (%d)\n" , method); -efx_reset_down (efx, &ecmd); +efx_reset_down (efx, method, &ecmd); rc =falcon_reset_hw (efx, method);if (rc) {
@@ -1721,10 +1733,10 @@ static int efx_reset(struct efx_nic *efx)/* Leave device stopped if necessary */ if (method ==RESET_TYPE_DISABLE ) { -efx_reset_up (efx, &ecmd, false); +efx_reset_up (efx, method, &ecmd, false); rc = -EIO ; }else { - rc =efx_reset_up (efx, &ecmd, true); + rc =efx_reset_up (efx, method, &ecmd, true); } out_disable:
drivers/net/sfc/efx.h +4 -3
@@ -40,9 +40,10 @@ extern void efx_reconfigure_port(struct efx_nic *efx);extern void __efx_reconfigure_port (struct efx_nic *efx);/* Reset handling */ -extern void efx_reset_down (struct efx_nic *efx,struct ethtool_cmd *ecmd); -extern int efx_reset_up (struct efx_nic *efx,struct ethtool_cmd *ecmd, -bool ok); +extern void efx_reset_down (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd); +extern int efx_reset_up (struct efx_nic *efx,enum reset_type method, +struct ethtool_cmd *ecmd,bool ok);/* Global */ extern void efx_schedule_reset (struct efx_nic *efx,enum reset_type type);
drivers/net/sfc/selftest.c +4 -3
@@ -665,6 +665,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests, {enum efx_loopback_mode loopback_mode = efx->loopback_mode;int phy_mode = efx->phy_mode; +enum reset_type reset_method =RESET_TYPE_INVISIBLE ;struct ethtool_cmd ecmd;struct efx_channel *channel;int rc_test =0 , rc_reset =0 , rc;
@@ -718,21 +719,21 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,mutex_unlock (&efx->mac_lock);/* free up all consumers of SRAM (including all the queues) */ -efx_reset_down (efx, &ecmd); +efx_reset_down (efx, reset_method, &ecmd); rc =efx_test_chip (efx, tests);if (rc && !rc_test) rc_test = rc;/* reset the chip to recover from the register test */ - rc_reset =falcon_reset_hw (efx,RESET_TYPE_ALL ); + rc_reset =falcon_reset_hw (efx, reset_method);/* Ensure that the phy is powered and out of loopback * for the bist and loopback tests */ efx->phy_mode &= ~PHY_MODE_LOW_POWER ; efx->loopback_mode =LOOPBACK_NONE ; - rc =efx_reset_up (efx, &ecmd, rc_reset ==0 ); + rc =efx_reset_up (efx, reset_method, &ecmd, rc_reset ==0 );if (rc && !rc_reset) rc_reset = rc;
drivers/net/sfc/tenxpress.c +1 -0
@@ -337,6 +337,7 @@ static int tenxpress_phy_init(struct efx_nic *efx) rc =tenxpress_init (efx);if (rc <0 ) goto fail; +mdio_clause45_set_pause (efx);if (efx->phy_type ==PHY_TYPE_SFT9001B ) { rc = device_create_file(&efx->pci_dev->dev,
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.
PATCH 7/11 sfc: Test for PHYXS faults whenever we cannot test link state bits
In reply to David MillerFrom: Steve Hodgson <[email protected]>
Depending on the loopback mode, there may be no pertinent link state bits. In this case we test the PHYXS RX fault bit instead. Make sure to do this in all cases where there are no link state bits.
--- drivers/net/sfc/mdio_10g.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
drivers/net/sfc/mdio_10g.c +9 -7
@@ -180,17 +180,12 @@ bool mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask)return false; else if (efx_phy_mode_disabled(efx->phy_mode)) return false; - else if (efx->loopback_mode == LOOPBACK_PHYXS) { + else if (efx->loopback_mode == LOOPBACK_PHYXS) mmd_mask &= ~(MDIO_MMDREG_DEVS_PHYXS |MDIO_MMDREG_DEVS_PCS |MDIO_MMDREG_DEVS_PMAPMD |MDIO_MMDREG_DEVS_AN ); -if (!mmd_mask) { - reg =mdio_clause45_read (efx, phy_id,MDIO_MMD_PHYXS , -MDIO_PHYXS_STATUS2 ); -return !(reg & (1 <<MDIO_PHYXS_STATUS2_RX_FAULT_LBN )); - } - } else if (efx->loopback_mode == LOOPBACK_PCS) + else if (efx->loopback_mode == LOOPBACK_PCS) mmd_mask &= ~(MDIO_MMDREG_DEVS_PCS |MDIO_MMDREG_DEVS_PMAPMD |MDIO_MMDREG_DEVS_AN );
@@ -198,6 +193,13 @@ bool mdio_clause45_links_ok(struct efx_nic *efx, unsigned int mmd_mask) mmd_mask &= ~(MDIO_MMDREG_DEVS_PMAPMD |MDIO_MMDREG_DEVS_AN ); +if (!mmd_mask) { +/* Use presence of XGMII faults in leui of link state */ + reg =mdio_clause45_read (efx, phy_id,MDIO_MMD_PHYXS , +MDIO_PHYXS_STATUS2 ); +return !(reg & (1 <<MDIO_PHYXS_STATUS2_RX_FAULT_LBN )); + } +while (mmd_mask) {if (mmd_mask &1 ) {/* Double reads because link state is latched, and a
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.
PATCH 8/11 sfc: Update board info for hardware monitor on SFN4111T-R5 and later
In reply to David Miller--- drivers/net/sfc/sfe4001.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/sfc/sfe4001.c +10 -2
@@ -375,17 +375,25 @@ static void sfn4111t_fini(struct efx_nic *efx)i2c_unregister_device (efx->board_info.hwmon_client); } -static struct i2c_board_info sfn4111t_hwmon_info = { +static struct i2c_board_info sfn4111t_a0_hwmon_info = {I2C_BOARD_INFO ("max6647" ,0x4e ), .irq =-1 , }; +static struct i2c_board_info sfn4111t_r5_hwmon_info = { +I2C_BOARD_INFO ("max6646" ,0x4d ), + .irq =-1 , +}; +int sfn4111t_init (struct efx_nic *efx) {int rc; efx->board_info.hwmon_client = -i2c_new_device (&efx->i2c_adap, &sfn4111t_hwmon_info); +i2c_new_device (&efx->i2c_adap, + (efx->board_info.minor <5 ) ? + &sfn4111t_a0_hwmon_info : + &sfn4111t_r5_hwmon_info);if (!efx->board_info.hwmon_client)return -EIO ;
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.
PATCH 9/11 sfc: SFT9001: Always enable XNP exchange on SFT9001 rev B
In reply to David MillerThis workaround is not specific to rev A.
--- drivers/net/sfc/workarounds.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sfc/workarounds.h +1 -1
@@ -54,7 +54,7 @@#define EFX_WORKAROUND_8071 EFX_WORKAROUND_FALCON_A/* Need to send XNP pages for 100BaseT */ -#define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001A +#define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001/* Need to keep AN enabled */ #define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A
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.
PATCH 10/11 sfc: SFX7101/SFT9001: Fix AN advertisements
In reply to David MillerAll 10Xpress PHYs require autonegotiation all the time; enforce this in the set_settings() method and do not treat it as a workaround.
Remove claimed support for 100M HD mode since it is not supported by current firmware.
Do not set speed override bits when AN is enabled, and do not use register 1.49192 for AN configuration as it can override what we set elsewhere.
Always set the AN selector bits to 1 (802.3).
Fix confusion between Next Page and Extended Next Page.
---
Sorry this is so large, but my original auto-negotiation support code was fairly wrong-headed and does require all these changes to work correctly.
Ben.
drivers/net/sfc/ethtool.c | 3 - drivers/net/sfc/mdio_10g.c | 177 ++++++++++++++++++----------------------- drivers/net/sfc/mdio_10g.h | 3 +- drivers/net/sfc/net_driver.h | 4 +- drivers/net/sfc/tenxpress.c | 151 +++++++++++++--------------------- drivers/net/sfc/workarounds.h | 4 - 6 files changed, 141 insertions(+), 201 deletions(-)
drivers/net/sfc/ethtool.c +0 -3
@@ -219,9 +219,6 @@ int efx_ethtool_set_settings(struct net_device *net_dev,struct efx_nic *efx =netdev_priv (net_dev);int rc; -if (EFX_WORKAROUND_13963 (efx) && !ecmd->autoneg) -return -EINVAL ; -/* Falcon GMAC does not support 1000Mbps HD */ if (ecmd->speed ==SPEED_1000 && ecmd->duplex !=DUPLEX_FULL ) { EFX_LOG(efx, "rejecting unsupported 1000Mbps HD"
drivers/net/sfc/mdio_10g.c +79 -98
246 lines not on this page · raw message
drivers/net/sfc/mdio_10g.h +2 -1
@@ -155,7 +155,8 @@#define MDIO_AN_XNP 22#define MDIO_AN_LPA_XNP 25 -#define MDIO_AN_10GBT_ADVERTISE 32 +#define MDIO_AN_10GBT_CTRL 32 +#define MDIO_AN_10GBT_CTRL_ADV_10G_LBN 12#define MDIO_AN_10GBT_STATUS (33)#define MDIO_AN_10GBT_STATUS_MS_FLT_LBN (15)/* MASTER/SLAVE config fault */ #define MDIO_AN_10GBT_STATUS_MS_LBN (14)/* MASTER/SLAVE config */
drivers/net/sfc/net_driver.h +2 -2
@@ -566,7 +566,7 @@ struct efx_mac_operations {* @poll: Poll for hardware state. Serialised by the mac_lock. * @get_settings: Get ethtool settings. Serialised by the mac_lock. * @set_settings: Set ethtool settings. Serialised by the mac_lock. -* @set_xnp_advertise: Set abilities advertised in Extended Next Page +* @set_npage_adv: Set abilities advertised in (Extended) Next Page * (only needed where AN bit is set in mmds) * @num_tests: Number of PHY-specific tests/results * @test_names: Names of the tests/results
@@ -586,7 +586,7 @@ struct efx_phy_operations { struct ethtool_cmd *ecmd);int (*set_settings) (struct efx_nic *efx,struct ethtool_cmd *ecmd); -bool (*set_xnp_advertise) (struct efx_nic *efx,u32 ); +void (*set_npage_adv) (struct efx_nic *efx,u32 );u32 num_tests;const char *const *test_names;int (*run_tests) (struct efx_nic *efx,int *results,unsigned flags);
drivers/net/sfc/tenxpress.c +58 -93
200 lines not on this page · raw message
drivers/net/sfc/workarounds.h +0 -4
@@ -18,7 +18,6 @@#define EFX_WORKAROUND_ALWAYS (efx) 1#define EFX_WORKAROUND_FALCON_A (efx) (falcon_rev(efx) <= FALCON_REV_A1)#define EFX_WORKAROUND_10G (efx) EFX_IS10G(efx) -#define EFX_WORKAROUND_SFT9001A (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A)#define EFX_WORKAROUND_SFT9001 (efx) ((efx)->phy_type == PHY_TYPE_SFT9001A || \ (efx)->phy_type == PHY_TYPE_SFT9001B)
@@ -55,9 +54,6 @@/* Need to send XNP pages for 100BaseT */ #define EFX_WORKAROUND_13204 EFX_WORKAROUND_SFT9001 -/* Need to keep AN enabled */ -#define EFX_WORKAROUND_13963 EFX_WORKAROUND_SFT9001A -/* Don't restart AN in near-side loopback */ #define EFX_WORKAROUND_15195 EFX_WORKAROUND_SFT9001
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.
PATCH 11/11 sfc: Replace stats_enabled flag with a disable count
In reply to David MillerCurrently we use a spin-lock to serialise statistics fetches and also to inhibit them for short periods of time, plus a flag to enable/disable statistics fetches for longer periods of time, during online reset. This was apparently insufficient to deal with the several reasons for stats being disabled.
--- drivers/net/sfc/efx.c | 33 ++++++++++++++++++++++----------- drivers/net/sfc/efx.h | 2 ++ drivers/net/sfc/falcon.c | 15 +++++++++++---- drivers/net/sfc/net_driver.h | 5 ++--- drivers/net/sfc/sfe4001.c | 15 ++++++++++++++- drivers/net/sfc/tenxpress.c | 12 ++++++------ 6 files changed, 57 insertions(+), 25 deletions(-)
drivers/net/sfc/efx.c +22 -11
@@ -685,7 +685,7 @@ static int efx_init_port(struct efx_nic *efx) efx->mac_op->reconfigure (efx); efx->port_initialized = true; - efx->stats_enabled = true; +efx_stats_enable (efx);return 0 ; fail:
@@ -734,6 +734,7 @@ static void efx_fini_port(struct efx_nic *efx)if (!efx->port_initialized)return ; +efx_stats_disable (efx); efx->phy_op->fini (efx); efx->port_initialized = false;
@@ -1360,6 +1361,20 @@ static int efx_net_stop(struct net_device *net_dev)return 0 ; } +void efx_stats_disable (struct efx_nic *efx) +{ +spin_lock (&efx->stats_lock); + ++efx->stats_disable_count; +spin_unlock (&efx->stats_lock); +} + +void efx_stats_enable (struct efx_nic *efx) +{ +spin_lock (&efx->stats_lock); + --efx->stats_disable_count; +spin_unlock (&efx->stats_lock); +} +/* Context: process, dev_base_lock or RTNL held, non-blocking. */ static struct net_device_stats *efx_net_stats (struct net_device *net_dev) {
@@ -1368,12 +1383,12 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)struct net_device_stats *stats = &net_dev->stats;/* Update stats if possible, but do not wait if another thread -* is updating them (or resetting the NIC); slightly stale -* stats are acceptable. +* is updating them or if MAC stats fetches are temporarily +* disabled; slightly stale stats are acceptable. */ if (!spin_trylock (&efx->stats_lock))return stats; -if (efx->stats_enabled) { +if (!efx->stats_disable_count) { efx->mac_op->update_stats (efx);falcon_update_nic_stats (efx); }
@@ -1626,12 +1641,7 @@ void efx_reset_down(struct efx_nic *efx, enum reset_type method, {EFX_ASSERT_RESET_SERIALISED (efx); -/* The net_dev->get_stats handler is quite slow, and will fail -* if a fetch is pending over reset. Serialise against it. */ -spin_lock (&efx->stats_lock); - efx->stats_enabled = false; -spin_unlock (&efx->stats_lock); - +efx_stats_disable (efx);efx_stop_all (efx);mutex_lock (&efx->mac_lock);mutex_lock (&efx->spi_lock);
@@ -1682,7 +1692,7 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method,if (ok) {efx_start_all (efx); - efx->stats_enabled = true; +efx_stats_enable (efx); }return rc; }
@@ -1888,6 +1898,7 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type, efx->rx_checksum_enabled = true;spin_lock_init (&efx->netif_stop_lock);spin_lock_init (&efx->stats_lock); + efx->stats_disable_count =1 ;mutex_init (&efx->mac_lock); efx->mac_op = &efx_dummy_mac_operations; efx->phy_op = &efx_dummy_phy_operations;
drivers/net/sfc/efx.h +2 -0
@@ -36,6 +36,8 @@ extern void efx_process_channel_now(struct efx_channel *channel);extern void efx_flush_queues (struct efx_nic *efx);/* Ports */ +extern void efx_stats_disable (struct efx_nic *efx); +extern void efx_stats_enable (struct efx_nic *efx);extern void efx_reconfigure_port (struct efx_nic *efx);extern void __efx_reconfigure_port (struct efx_nic *efx);
drivers/net/sfc/falcon.c +11 -4
@@ -1883,7 +1883,7 @@ static int falcon_reset_macs(struct efx_nic *efx)/* MAC stats will fail whilst the TX fifo is draining. Serialise * the drain sequence with the statistics fetch */ -spin_lock (&efx->stats_lock); +efx_stats_disable (efx);falcon_read (efx, ®,MAC0_CTRL_REG_KER );EFX_SET_OWORD_FIELD (reg,TXFIFO_DRAIN_EN_B0 ,1 );
@@ -1913,7 +1913,7 @@ static int falcon_reset_macs(struct efx_nic *efx)udelay (10 ); } -spin_unlock (&efx->stats_lock); +efx_stats_enable (efx);/* If we've reset the EM block and the link is up, then * we'll have to kick the XAUI link so the PHY can recover */
@@ -2273,6 +2273,10 @@ int falcon_switch_mac(struct efx_nic *efx)struct efx_mac_operations *old_mac_op = efx->mac_op;efx_oword_t nic_stat;unsigned strap_val; +int rc =0 ; + +/* Don't try to fetch MAC stats while we're switching MACs */ +efx_stats_disable (efx);/* Internal loopbacks override the phy speed setting */ if (efx->loopback_mode ==LOOPBACK_GMAC ) {
@@ -2302,13 +2306,16 @@ int falcon_switch_mac(struct efx_nic *efx) }if (old_mac_op == efx->mac_op) -return 0 ; + goto out;EFX_LOG (efx,"selected %cMAC\n" ,EFX_IS10G (efx) ?'X' :'G' );/* Not all macs support a mac-level link state */ efx->mac_up = true; -return falcon_reset_macs (efx); + rc =falcon_reset_macs (efx); +out: +efx_stats_enable (efx); +return rc; }/* This call is responsible for hooking in the MAC and PHY operations */
drivers/net/sfc/net_driver.h +2 -3
@@ -754,8 +754,7 @@ union efx_multicast_hash {* &struct net_device_stats. * @stats_buffer: DMA buffer for statistics * @stats_lock: Statistics update lock. Serialises statistics fetches -* @stats_enabled: Temporarily disable statistics fetches. -* Serialised by @stats_lock +* @stats_disable_count: Nest count for disabling statistics fetches * @mac_op: MAC interface * @mac_address: Permanent MAC address * @phy_type: PHY type
@@ -837,7 +836,7 @@ struct efx_nic {struct efx_mac_stats mac_stats;struct efx_buffer stats_buffer;spinlock_t stats_lock; -bool stats_enabled; +unsigned int stats_disable_count;struct efx_mac_operations *mac_op;unsigned char mac_address[ETH_ALEN ];
drivers/net/sfc/sfe4001.c +14 -1
@@ -235,12 +235,18 @@ static ssize_t set_phy_flash_cfg(struct device *dev, }else if (efx->state !=STATE_RUNNING ||netif_running (efx->net_dev)) { err = -EBUSY ; }else { +/* Reset the PHY, reconfigure the MAC and enable/disable +* MAC stats accordingly. */ efx->phy_mode = new_mode; +if (new_mode &PHY_MODE_SPECIAL ) +efx_stats_disable (efx);if (efx->board_info.type ==EFX_BOARD_SFE4001 ) err =sfe4001_poweron (efx);else err =sfn4111t_reset (efx);efx_reconfigure_port (efx); +if (!(new_mode &PHY_MODE_SPECIAL )) +efx_stats_enable (efx); }rtnl_unlock ();
@@ -329,6 +335,11 @@ int sfe4001_init(struct efx_nic *efx) efx->board_info.monitor = sfe4001_check_hw; efx->board_info.fini = sfe4001_fini; +if (efx->phy_mode &PHY_MODE_SPECIAL ) { +/* PHY won't generate a 156.25 MHz clock and MAC stats fetch +* will fail. */ +efx_stats_disable (efx); + } rc =sfe4001_poweron (efx);if (rc) goto fail_ioexp;
@@ -405,8 +416,10 @@ int sfn4111t_init(struct efx_nic *efx)if (rc) goto fail_hwmon; -if (efx->phy_mode &PHY_MODE_SPECIAL ) +if (efx->phy_mode &PHY_MODE_SPECIAL ) { +efx_stats_disable (efx);sfn4111t_reset (efx); + }return 0 ;
drivers/net/sfc/tenxpress.c +6 -6
@@ -370,8 +370,8 @@ static int tenxpress_special_reset(struct efx_nic *efx)/* The XGMAC clock is driven from the SFC7101/SFT9001 312MHz clock, so * a special software reset can glitch the XGMAC sufficiently for stats -* requests to fail. Since we don't often special_reset, just lock. */ -spin_lock (&efx->stats_lock); +* requests to fail. */ +efx_stats_disable (efx);/* Initiate reset */ reg = mdio_clause45_read(efx, efx->mii.phy_id,
@@ -386,17 +386,17 @@ static int tenxpress_special_reset(struct efx_nic *efx) rc =mdio_clause45_wait_reset_mmds (efx,TENXPRESS_REQUIRED_DEVS );if (rc <0 ) - goto unlock; + goto out;/* Try and reconfigure the device */ rc =tenxpress_init (efx);if (rc <0 ) - goto unlock; + goto out;/* Wait for the XGXS state machine to churn */ mdelay (10 ); -unlock: -spin_unlock (&efx->stats_lock); +out: +efx_stats_enable (efx);return rc; }
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.