net/sfc/base: add accessor to whole link status

Add a function which makes an MCDI GET_LINK request and
packages up the results. Currently, the get-link function
is triggered from several entry points which then pass
on or store selected parts of the data. When the driver
needs to obtain the current link state, it is more
efficient to do this in a single call.

Signed-off-by: Richard Houldsworth <rhouldsworth@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index e43e26e68ceae0e082a40c063b799d5c027f90bf..f971063a11e1e02af252d991c4fe3520f7f36ef6 100644 (file)
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -593,11 +593,7 @@ ef10_nvram_buffer_finish(
 /* PHY */
 
 typedef struct ef10_link_state_s {
-       uint32_t                els_adv_cap_mask;
-       uint32_t                els_lp_cap_mask;
-       unsigned int            els_fcntl;
-       efx_phy_fec_type_t      els_fec;
-       efx_link_mode_t         els_link_mode;
+       efx_phy_link_state_t    epls;
 #if EFSYS_OPT_LOOPBACK
        efx_loopback_type_t     els_loopback;
 #endif
@@ -634,9 +630,9 @@ ef10_phy_oui_get(
        __out           uint32_t *ouip);
 
 extern __checkReturn   efx_rc_t
-ef10_phy_fec_type_get(
+ef10_phy_link_state_get(
        __in            efx_nic_t *enp,
-       __out           efx_phy_fec_type_t *fecp);
+       __out           efx_phy_link_state_t *eplsp);
 
 #if EFSYS_OPT_PHY_STATS
 

diff --git a/drivers/net/sfc/base/ef10_mac.c b/drivers/net/sfc/base/ef10_mac.c
index ab73828f10b5280f864aa4b00dff7cc9c51050e7..9f10f6f79bc1d1a5db24fd8ac726851d670c3747 100644 (file)
--- a/drivers/net/sfc/base/ef10_mac.c
+++ b/drivers/net/sfc/base/ef10_mac.c
@@ -22,10 +22,10 @@ ef10_mac_poll(
        if ((rc = ef10_phy_get_link(enp, &els)) != 0)
                goto fail1;
 
-       epp->ep_adv_cap_mask = els.els_adv_cap_mask;
-       epp->ep_fcntl = els.els_fcntl;
+       epp->ep_adv_cap_mask = els.epls.epls_adv_cap_mask;
+       epp->ep_fcntl = els.epls.epls_fcntl;
 
-       *link_modep = els.els_link_mode;
+       *link_modep = els.epls.epls_link_mode;
 
        return (0);
 

diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c
index 1b3d60682fcaf29c0a1e543437d96e7d2e291eff..50e23b7d4e7cb667b96b6444d2ae38ba98278013 100644 (file)
--- a/drivers/net/sfc/base/ef10_nic.c
+++ b/drivers/net/sfc/base/ef10_nic.c
@@ -1852,8 +1852,8 @@ ef10_nic_board_cfg(
        /* Obtain the default PHY advertised capabilities */
        if ((rc = ef10_phy_get_link(enp, &els)) != 0)
                goto fail7;
-       epp->ep_default_adv_cap_mask = els.els_adv_cap_mask;
-       epp->ep_adv_cap_mask = els.els_adv_cap_mask;
+       epp->ep_default_adv_cap_mask = els.epls.epls_adv_cap_mask;
+       epp->ep_adv_cap_mask = els.epls.epls_adv_cap_mask;
 
        /* Check capabilities of running datapath firmware */
        if ((rc = ef10_get_datapath_caps(enp)) != 0)

diff --git a/drivers/net/sfc/base/ef10_phy.c b/drivers/net/sfc/base/ef10_phy.c
index ec3600e966ff2bee85c51357ebb1c882a6eaac34..84ccdde5d8edec5fed4496ef33144493062c465f 100644 (file)
--- a/drivers/net/sfc/base/ef10_phy.c
+++ b/drivers/net/sfc/base/ef10_phy.c
@@ -286,9 +286,9 @@ ef10_phy_get_link(
        }
 
        mcdi_phy_decode_cap(MCDI_OUT_DWORD(req, GET_LINK_OUT_CAP),
-                           &elsp->els_adv_cap_mask);
+                           &elsp->epls.epls_adv_cap_mask);
        mcdi_phy_decode_cap(MCDI_OUT_DWORD(req, GET_LINK_OUT_LP_CAP),
-                           &elsp->els_lp_cap_mask);
+                           &elsp->epls.epls_lp_cap_mask);
 
        if (req.emr_out_length_used < MC_CMD_GET_LINK_OUT_V2_LEN)
                fec = MC_CMD_FEC_NONE;
@@ -298,8 +298,16 @@ ef10_phy_get_link(
        mcdi_phy_decode_link_mode(enp, MCDI_OUT_DWORD(req, GET_LINK_OUT_FLAGS),
                            MCDI_OUT_DWORD(req, GET_LINK_OUT_LINK_SPEED),
                            MCDI_OUT_DWORD(req, GET_LINK_OUT_FCNTL),
-                           fec, &elsp->els_link_mode,
-                           &elsp->els_fcntl, &elsp->els_fec);
+                           fec, &elsp->epls.epls_link_mode,
+                           &elsp->epls.epls_fcntl, &elsp->epls.epls_fec);
+
+       if (req.emr_out_length_used < MC_CMD_GET_LINK_OUT_V2_LEN) {
+               elsp->epls.epls_ld_cap_mask = 0;
+       } else {
+               mcdi_phy_decode_cap(MCDI_OUT_DWORD(req, GET_LINK_OUT_V2_LD_CAP),
+                                   &elsp->epls.epls_ld_cap_mask);
+       }
+
 
 #if EFSYS_OPT_LOOPBACK
        /*
@@ -543,18 +551,18 @@ ef10_phy_oui_get(
 }
 
        __checkReturn   efx_rc_t
-ef10_phy_fec_type_get(
+ef10_phy_link_state_get(
        __in            efx_nic_t *enp,
-       __out           efx_phy_fec_type_t  *fecp)
+       __out           efx_phy_link_state_t  *eplsp)
 {
        efx_rc_t rc;
        ef10_link_state_t els;
 
-       /* Obtain the active FEC type */
+       /* Obtain the active link state */
        if ((rc = ef10_phy_get_link(enp, &els)) != 0)
                goto fail1;
 
-       *fecp = els.els_fec;
+       *eplsp = els.epls;
 
        return (0);
 

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 246708f9ccbfea388a14515f1dc3d0b79fe72588..8e10e8934034a9fa1e107fc0bdc1a226ada46f70 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -3257,6 +3257,21 @@ efx_phy_fec_type_get(
        __in            efx_nic_t *enp,
        __out           efx_phy_fec_type_t *typep);
 
+typedef struct efx_phy_link_state_s {
+       uint32_t                epls_adv_cap_mask;
+       uint32_t                epls_lp_cap_mask;
+       uint32_t                epls_ld_cap_mask;
+       unsigned int            epls_fcntl;
+       efx_phy_fec_type_t      epls_fec;
+       efx_link_mode_t         epls_link_mode;
+} efx_phy_link_state_t;
+
+extern __checkReturn   efx_rc_t
+efx_phy_link_state_get(
+       __in            efx_nic_t *enp,
+       __out           efx_phy_link_state_t  *eplsp);
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h
index 9f44d2f64ea1b74c4eda04e3ff6a4c2fdb6af5d3..bad23f819806eeb32799e004fd8aaa19e2be9c56 100644 (file)
--- a/drivers/net/sfc/base/efx_impl.h
+++ b/drivers/net/sfc/base/efx_impl.h
@@ -224,7 +224,7 @@ typedef struct efx_phy_ops_s {
        efx_rc_t        (*epo_reconfigure)(efx_nic_t *);
        efx_rc_t        (*epo_verify)(efx_nic_t *);
        efx_rc_t        (*epo_oui_get)(efx_nic_t *, uint32_t *);
-       efx_rc_t        (*epo_fec_type_get)(efx_nic_t *, efx_phy_fec_type_t *);
+       efx_rc_t        (*epo_link_state_get)(efx_nic_t *, efx_phy_link_state_t *);
 #if EFSYS_OPT_PHY_STATS
        efx_rc_t        (*epo_stats_update)(efx_nic_t *, efsys_mem_t *,
                                            uint32_t *);

diff --git a/drivers/net/sfc/base/efx_phy.c b/drivers/net/sfc/base/efx_phy.c
index 63b89e6a4dcb85991872313cca297784bf875f6e..36a7bbd3dde393425ae8184b015fc6874723117c 100644 (file)
--- a/drivers/net/sfc/base/efx_phy.c
+++ b/drivers/net/sfc/base/efx_phy.c
@@ -15,7 +15,7 @@ static const efx_phy_ops_t    __efx_phy_siena_ops = {
        siena_phy_reconfigure,          /* epo_reconfigure */
        siena_phy_verify,               /* epo_verify */
        siena_phy_oui_get,              /* epo_oui_get */
-       NULL,                           /* epo_fec_type_get */
+       NULL,                           /* epo_link_state_get */
 #if EFSYS_OPT_PHY_STATS
        siena_phy_stats_update,         /* epo_stats_update */
 #endif /* EFSYS_OPT_PHY_STATS */
@@ -35,7 +35,7 @@ static const efx_phy_ops_t    __efx_phy_ef10_ops = {
        ef10_phy_reconfigure,           /* epo_reconfigure */
        ef10_phy_verify,                /* epo_verify */
        ef10_phy_oui_get,               /* epo_oui_get */
-       ef10_phy_fec_type_get,          /* epo_fec_type_get */
+       ef10_phy_link_state_get,        /* epo_link_state_get */
 #if EFSYS_OPT_PHY_STATS
        ef10_phy_stats_update,          /* epo_stats_update */
 #endif /* EFSYS_OPT_PHY_STATS */
@@ -321,19 +321,41 @@ fail1:
 efx_phy_fec_type_get(
        __in            efx_nic_t *enp,
        __out           efx_phy_fec_type_t *typep)
+{
+       efx_rc_t rc;
+       efx_phy_link_state_t epls;
+
+       if ((rc = efx_phy_link_state_get(enp, &epls)) != 0)
+               goto fail1;
+
+       *typep = epls.epls_fec;
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+
+       __checkReturn           efx_rc_t
+efx_phy_link_state_get(
+       __in            efx_nic_t *enp,
+       __out           efx_phy_link_state_t *eplsp)
 {
        efx_port_t *epp = &(enp->en_port);
        const efx_phy_ops_t *epop = epp->ep_epop;
        efx_rc_t rc;
 
        EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
 
-       if (epop->epo_fec_type_get == NULL) {
+       if (epop->epo_link_state_get == NULL) {
                rc = ENOTSUP;
                goto fail1;
        }
 
-       if ((rc = epop->epo_fec_type_get(enp, typep)) != 0)
+       if ((rc = epop->epo_link_state_get(enp, eplsp)) != 0)
                goto fail2;
 
        return (0);