From: Heiner Kallweit <hkallweit1@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
David Miller <davem@davemloft.net>
Cc: Nikita Yushchenko <nikita.yoush@cogentembedded.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH 1/3 net-next] net: phy: aquantia: improve setting speed and duplex in aqr_read_status
Date: Mon, 4 Feb 2019 22:03:21 +0100 [thread overview]
Message-ID: <d1f1160c-ebea-0e7b-4d73-a27ebbd5c199@gmail.com> (raw)
In-Reply-To: <8e41695d-a23e-adad-ae3d-66a46d1ab077@gmail.com>
Add support for speeds 10Mbps, 5Gbps, and 10Gbps. In addition don't
hardcode duplex but read it from the chip.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/phy/aquantia.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 482004efa..51ae3feea 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -133,6 +133,12 @@ static int aqr_read_status(struct phy_device *phydev)
reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_STATUS1);
switch (reg & MDIO_AN_TX_VEND_STATUS1_RATE_MASK) {
+ case MDIO_AN_TX_VEND_STATUS1_10GBASET:
+ phydev->speed = SPEED_10000;
+ break;
+ case MDIO_AN_TX_VEND_STATUS1_5000BASET:
+ phydev->speed = SPEED_5000;
+ break;
case MDIO_AN_TX_VEND_STATUS1_2500BASET:
phydev->speed = SPEED_2500;
break;
@@ -142,11 +148,15 @@ static int aqr_read_status(struct phy_device *phydev)
case MDIO_AN_TX_VEND_STATUS1_100BASETX:
phydev->speed = SPEED_100;
break;
+ case MDIO_AN_TX_VEND_STATUS1_10BASET:
+ phydev->speed = SPEED_10;
+ break;
default:
- phydev->speed = SPEED_10000;
+ phydev->speed = SPEED_UNKNOWN;
break;
}
- phydev->duplex = DUPLEX_FULL;
+
+ phydev->duplex = !!(reg & MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX);
return 0;
}
--
2.20.1
next prev parent reply other threads:[~2019-02-04 21:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 21:02 [PATCH 0/3 net-next] net: phy: aquantia: extend aqr_read_status Heiner Kallweit
2019-02-04 21:03 ` Heiner Kallweit [this message]
2019-02-04 21:28 ` [PATCH 1/3 net-next] net: phy: aquantia: improve setting speed and duplex in aqr_read_status Andrew Lunn
2019-02-04 21:45 ` Heiner Kallweit
2019-02-04 22:23 ` Andrew Lunn
2019-02-04 23:06 ` Heiner Kallweit
2019-02-04 21:07 ` [PATCH 2/3 net-next] net: phy: aquantia: set interface mode " Heiner Kallweit
2019-02-04 21:09 ` [PATCH 3/3 net-next] net: phy: aquantia: use FIELD_GET for getting speed " Heiner Kallweit
2019-02-04 21:31 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1f1160c-ebea-0e7b-4d73-a27ebbd5c199@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nikita.yoush@cogentembedded.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.