ethtool/mdio: Report MDIO mode support and link partner advertising

Add mdio_support and lp_advertising fields to ethtool_cmd.  Set these
in mdio45_ethtool_gset{,_npage}().

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/mdio.c b/drivers/net/mdio.c
index 2fb0d16b61f72c4e9bec7f2e61f3ddb39aba58de..ee383c256931333b9b3ab917e83e31a7fd716dac 100644 (file)
--- a/drivers/net/mdio.c
+++ b/drivers/net/mdio.c
@@ -173,6 +173,8 @@ void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio,
 
        ecmd->transceiver = XCVR_INTERNAL;
        ecmd->phy_address = mdio->prtad;
+       ecmd->mdio_support =
+               mdio->mode_support & (MDIO_SUPPORTS_C45 | MDIO_SUPPORTS_C22);
 
        reg = mdio->mdio_read(mdio->dev, mdio->prtad, MDIO_MMD_PMAPMD,
                              MDIO_CTRL2);
@@ -235,16 +237,19 @@ void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio,
 
        if (ecmd->autoneg) {
                u32 modes = 0;
+               int an_stat = mdio->mdio_read(mdio->dev, mdio->prtad,
+                                             MDIO_MMD_AN, MDIO_STAT1);
 
                /* If AN is complete and successful, report best common
                 * mode, otherwise report best advertised mode. */
-               if (mdio->mdio_read(mdio->dev, mdio->prtad, MDIO_MMD_AN,
-                                   MDIO_STAT1) &
-                   MDIO_AN_STAT1_COMPLETE)
-                       modes = (ecmd->advertising &
-                                (mdio45_get_an(mdio, MDIO_AN_LPA) |
-                                 npage_lpa));
-               if (modes == 0)
+               if (an_stat & MDIO_AN_STAT1_COMPLETE) {
+                       ecmd->lp_advertising =
+                               mdio45_get_an(mdio, MDIO_AN_LPA) | npage_lpa;
+                       if (an_stat & MDIO_AN_STAT1_LPABLE)
+                               ecmd->lp_advertising |= ADVERTISED_Autoneg;
+                       modes = ecmd->advertising & ecmd->lp_advertising;
+               }
+               if ((modes & ~ADVERTISED_Autoneg) == 0)
                        modes = ecmd->advertising;
 
                if (modes & ADVERTISED_10000baseT_Full) {

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 5ccb6bd660c7840a1dcfd3974254277bca1cfae4..14e6bc86011241b7c779a50c82bac0bd6879a402 100644 (file)
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -26,11 +26,13 @@ struct ethtool_cmd {
        __u8    phy_address;
        __u8    transceiver;    /* Which transceiver to use */
        __u8    autoneg;        /* Enable or disable autonegotiation */
+       __u8    mdio_support;
        __u32   maxtxpkt;       /* Tx pkts before generating tx int */
        __u32   maxrxpkt;       /* Rx pkts before generating rx int */
        __u16   speed_hi;
        __u16   reserved2;
-       __u32   reserved[3];
+       __u32   lp_advertising; /* Features the link partner advertises */
+       __u32   reserved[2];
 };
 
 static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,

diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index 5645c0f863dc02b806393c6b0cff03bda87a0c7f..1bff2f2d0e19e151645a06a2e0f0ae6a512de852 100644 (file)
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -234,6 +234,9 @@ static inline __u16 mdio_phy_id_devad(int phy_id)
        return phy_id & MDIO_PHY_ID_DEVAD;
 }
 
+#define MDIO_SUPPORTS_C22              1
+#define MDIO_SUPPORTS_C45              2
+
 #ifdef __KERNEL__ 
 
 /**
@@ -264,8 +267,6 @@ struct mdio_if_info {
 
 #define MDIO_PRTAD_NONE                        (-1)
 #define MDIO_DEVAD_NONE                        (-1)
-#define MDIO_SUPPORTS_C22              1
-#define MDIO_SUPPORTS_C45              2
 #define MDIO_EMULATE_C22               4
 
 struct ethtool_cmd;