Skip to content

Commit

Permalink
sfc_ef100: PHY probe stub
Browse files Browse the repository at this point in the history
We can't actually do the MCDI to probe it fully until we have working
 MCDI, which comes later, but we need efx->phy_data to be allocated so
 that when we get MCDI events the link-state change handler doesn't
 NULL-dereference.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Edward Cree authored and David S. Miller committed Jul 27, 2020
1 parent c027f2a commit aa86a75
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions drivers/net/ethernet/sfc/ef100_nic.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,16 @@ static irqreturn_t ef100_msi_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}

static int ef100_phy_probe(struct efx_nic *efx)
{
/* stub: allocate the phy_data */
efx->phy_data = kzalloc(sizeof(struct efx_mcdi_phy_data), GFP_KERNEL);
if (!efx->phy_data)
return -ENOMEM;

return 0;
}

/* Other
*/

Expand Down Expand Up @@ -193,6 +203,10 @@ static int ef100_probe_main(struct efx_nic *efx)

efx->max_vis = EF100_MAX_VIS;

rc = ef100_phy_probe(efx);
if (rc)
goto fail;

rc = efx_init_channels(efx);
if (rc)
goto fail;
Expand Down

0 comments on commit aa86a75

Please sign in to comment.