sfc: SFT9001: Include non-breaking cable diagnostics in online self-tests
Subsystems (2)
PATCH 1/9 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
@@ -679,12 +679,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)
@@ -692,18 +690,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 ); }
@@ -728,17 +730,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/9 sfc: Fix test for MDIO read failure
Commit 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
@@ -125,24 +125,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.
Re: [PATCH 2/9] sfc: Fix test for MDIO read failure
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:06:12 +0000
Quoted 7 lines
Commit
27dd2caca4eabe7c13a052b7456495ba75535e6achangedmdio_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.Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 3/9 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 | 20 +++++++--- drivers/net/sfc/tenxpress.c | 90 ++++++++++++++++++++++++++----------------- 3 files changed, 73 insertions(+), 41 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 +14 -6
@@ -399,6 +399,7 @@ static struct i2c_board_info sfn4111t_r5_hwmon_info = {int sfn4111t_init (struct efx_nic *efx) { +int i =0 ;int rc; efx->board_info.hwmon_client =
@@ -417,13 +418,20 @@ int sfn4111t_init(struct efx_nic *efx)if (rc) goto fail_hwmon; -if (efx->phy_mode &PHY_MODE_SPECIAL ) { -efx_stats_disable (efx); -sfn4111t_reset (efx); - } - -return 0 ; +do { +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 ; + 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.
Re: [PATCH 3/9] sfc: SFT9001/SFN4111T: Check PHY boot status during board initialisation
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:06:45 +0000
Quoted 7 lines
During 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().Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 4/9 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.
Re: [PATCH 4/9] sfc: Remove "XFP" from log messages that are not specific to XFP
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:06:58 +0000
Quoted 1 line
Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 5/9 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.
Re: [PATCH 5/9] sfc: Fix reporting of PHY id
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:07:15 +0000
Quoted 7 lines
Shuffle bits of the OUI into the conventional written order.
Replace PHY id component macros with functions.
Zero-pad PHY id components in log messages.
Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 6/9 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
@@ -450,6 +450,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.
Re: [PATCH 6/9] sfc: Add support for QT2025C PHY
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:07:33 +0000
Quoted 5 lines
This 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.
Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 7/9 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
@@ -385,13 +385,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.
Re: [PATCH 7/9] sfc: Delete unused efx_blinker::led_num field
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:07:42 +0000
Quoted 1 line
Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 8/9 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
@@ -1848,8 +1848,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
@@ -402,8 +402,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
@@ -419,9 +419,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.
Re: [PATCH 8/9] sfc: Clean up LED control
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:08:03 +0000
Quoted 6 lines
Reinitialise LEDs after overriding them for identification.
Rename
set_fault_ledmethod toset_id_ledsince we always use it for NIC identification and not faults.Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 9/9 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.
Re: [PATCH 9/9] sfc: Add support for SFN4112F SFP+ reference design
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:08:18 +0000
Quoted 1 line
Signed-off-by Ben Hutchings <[email protected]>
Applied.
From: Ben Hutchings <[email protected]>
Date: Fri, 27 Feb 2009 23:04:07 +0000
Quoted 1 line
Signed-off-by Ben Hutchings <[email protected]>
Applied.