aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/tenxpress.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-05-07 07:55:13 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-05-13 01:31:40 -0400
commit75f2d3eac93277fa022b2fbe51257e856575e757 (patch)
tree72c693ec5039e4c30b51713a6a550829fd17c1d1 /drivers/net/sfc/tenxpress.c
parentb9b39b625cf57cd0ea998717598b68963cbec3cb (diff)
[netdrvr] sfc: Add phy_flash_cfg module parameter and implementation
The 10Xpress PHY supports flash upgrades through MDIO, but needs to be put in upgrade mode at power-up. This adds a module parameter and other logic to support that. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc/tenxpress.c')
-rw-r--r--drivers/net/sfc/tenxpress.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index a2e9f79e47b1..d8df031c711d 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -199,10 +199,12 @@ static int tenxpress_phy_init(struct efx_nic *efx)
199 199
200 tenxpress_set_state(efx, TENXPRESS_STATUS_NORMAL); 200 tenxpress_set_state(efx, TENXPRESS_STATUS_NORMAL);
201 201
202 rc = mdio_clause45_wait_reset_mmds(efx, 202 if (!sfe4001_phy_flash_cfg) {
203 TENXPRESS_REQUIRED_DEVS); 203 rc = mdio_clause45_wait_reset_mmds(efx,
204 if (rc < 0) 204 TENXPRESS_REQUIRED_DEVS);
205 goto fail; 205 if (rc < 0)
206 goto fail;
207 }
206 208
207 rc = mdio_clause45_check_mmds(efx, TENXPRESS_REQUIRED_DEVS, 0); 209 rc = mdio_clause45_check_mmds(efx, TENXPRESS_REQUIRED_DEVS, 0);
208 if (rc < 0) 210 if (rc < 0)