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 2/3 net-next] net: phy: aquantia: set interface mode in aqr_read_status
Date: Mon, 4 Feb 2019 22:07:36 +0100 [thread overview]
Message-ID: <0876da7c-e0cf-c702-75ce-6aa37eb028b2@gmail.com> (raw)
In-Reply-To: <8e41695d-a23e-adad-ae3d-66a46d1ab077@gmail.com>
Extend aqr_read_status to set the interface mode properly.
Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/phy/aquantia.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 51ae3feea..281873c59 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/phy.h>
+#include <linux/bitfield.h>
#define PHY_ID_AQ1202 0x03a1b445
#define PHY_ID_AQ2104 0x03a1b460
@@ -34,6 +35,21 @@
#define MDIO_AN_TX_VEND_INT_MASK2 0xd401
#define MDIO_AN_TX_VEND_INT_MASK2_LINK BIT(0)
+/* PHY XS System Interface Connection Status */
+#define MDIO_XS_SYSIF_STATUS 0xe812
+#define MDIO_XS_SYSIF_MODE_MASK GENMASK(7, 3)
+#define MDIO_XS_SYSIF_MODE_BACKPLANE_KR 0
+#define MDIO_XS_SYSIF_MODE_BACKPLANE_KX 1
+#define MDIO_XS_SYSIF_MODE_XFI 2
+#define MDIO_XS_SYSIF_MODE_USXGMII 3
+#define MDIO_XS_SYSIF_MODE_XAUI 4
+#define MDIO_XS_SYSIF_MODE_XAUI_PAUSE 5
+#define MDIO_XS_SYSIF_MODE_SGMII 6
+#define MDIO_XS_SYSIF_MODE_RXAUI 7
+#define MDIO_XS_SYSIF_MODE_MAC 8
+#define MDIO_XS_SYSIF_MODE_OFF 9
+#define MDIO_XS_SYSIF_MODE_OCSGMII 10
+
/* Vendor specific 1, MDIO_MMD_VEND1 */
#define VEND1_GLOBAL_INT_STD_STATUS 0xfc00
#define VEND1_GLOBAL_INT_VEND_STATUS 0xfc01
@@ -158,6 +174,27 @@ static int aqr_read_status(struct phy_device *phydev)
phydev->duplex = !!(reg & MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX);
+ reg = phy_read_mmd(phydev, MDIO_MMD_PHYXS, MDIO_XS_SYSIF_STATUS);
+
+ switch (FIELD_GET(MDIO_XS_SYSIF_MODE_MASK, reg)) {
+ case MDIO_XS_SYSIF_MODE_BACKPLANE_KR:
+ phydev->interface = PHY_INTERFACE_MODE_10GKR;
+ break;
+ case MDIO_XS_SYSIF_MODE_SGMII:
+ phydev->interface = PHY_INTERFACE_MODE_SGMII;
+ break;
+ case MDIO_XS_SYSIF_MODE_XAUI:
+ case MDIO_XS_SYSIF_MODE_XAUI_PAUSE:
+ phydev->interface = PHY_INTERFACE_MODE_XAUI;
+ break;
+ case MDIO_XS_SYSIF_MODE_RXAUI:
+ phydev->interface = PHY_INTERFACE_MODE_RXAUI;
+ break;
+ default:
+ phydev->interface = PHY_INTERFACE_MODE_NA;
+ break;
+ }
+
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 ` [PATCH 1/3 net-next] net: phy: aquantia: improve setting speed and duplex in aqr_read_status Heiner Kallweit
2019-02-04 21:28 ` 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 ` Heiner Kallweit [this message]
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=0876da7c-e0cf-c702-75ce-6aa37eb028b2@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).