aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/falcon.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-11-28 22:43:33 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-29 19:46:31 -0500
commit0aa3fbaa3f2d29a14231ebb0c8e521c23701d41f (patch)
tree11ab228583d64eae81abe02f49e233fdab5cfb54 /drivers/net/sfc/falcon.c
parent9bfc4bb1f9b5863b177752b88e8bfa364e83a4fa (diff)
sfc: Add efx_nic_type operation for NVRAM self-test
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r--drivers/net/sfc/falcon.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index bcdc5452bfd0..d4d13c13f8ae 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -2345,7 +2345,8 @@ static void falcon_remove_port(struct efx_nic *efx)
2345 * 2345 *
2346 **************************************************************************/ 2346 **************************************************************************/
2347 2347
2348int falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out) 2348static int
2349falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
2349{ 2350{
2350 struct falcon_nvconfig *nvconfig; 2351 struct falcon_nvconfig *nvconfig;
2351 struct efx_spi_device *spi; 2352 struct efx_spi_device *spi;
@@ -2408,6 +2409,11 @@ int falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
2408 return rc; 2409 return rc;
2409} 2410}
2410 2411
2412static int falcon_test_nvram(struct efx_nic *efx)
2413{
2414 return falcon_read_nvram(efx, NULL);
2415}
2416
2411/* Registers tested in the falcon register test */ 2417/* Registers tested in the falcon register test */
2412static struct { 2418static struct {
2413 unsigned address; 2419 unsigned address;
@@ -3290,6 +3296,7 @@ struct efx_nic_type falcon_a1_nic_type = {
3290 .get_wol = falcon_get_wol, 3296 .get_wol = falcon_get_wol,
3291 .set_wol = falcon_set_wol, 3297 .set_wol = falcon_set_wol,
3292 .resume_wol = efx_port_dummy_op_void, 3298 .resume_wol = efx_port_dummy_op_void,
3299 .test_nvram = falcon_test_nvram,
3293 .default_mac_ops = &falcon_xmac_operations, 3300 .default_mac_ops = &falcon_xmac_operations,
3294 3301
3295 .revision = EFX_REV_FALCON_A1, 3302 .revision = EFX_REV_FALCON_A1,
@@ -3328,6 +3335,7 @@ struct efx_nic_type falcon_b0_nic_type = {
3328 .set_wol = falcon_set_wol, 3335 .set_wol = falcon_set_wol,
3329 .resume_wol = efx_port_dummy_op_void, 3336 .resume_wol = efx_port_dummy_op_void,
3330 .test_registers = falcon_b0_test_registers, 3337 .test_registers = falcon_b0_test_registers,
3338 .test_nvram = falcon_test_nvram,
3331 .default_mac_ops = &falcon_xmac_operations, 3339 .default_mac_ops = &falcon_xmac_operations,
3332 3340
3333 .revision = EFX_REV_FALCON_B0, 3341 .revision = EFX_REV_FALCON_B0,