devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Madalin Bucur <madalin.bucur@oss.nxp.com>
To: davem@davemloft.net, netdev@vger.kernel.org,
	linux@armlinux.org.uk, andrew@lunn.ch
Cc: f.fainelli@gmail.com, hkallweit1@gmail.com, shawnguo@kernel.org,
	leoyang.li@nxp.com, devicetree@vger.kernel.org,
	robh+dt@kernel.org, mark.rutland@arm.com,
	Madalin Bucur <madalin.bucur@oss.nxp.com>
Subject: [PATCH net-next v2 5/7] net: phy: aquantia: add support for PHY_INTERFACE_MODE_XFI
Date: Mon, 23 Dec 2019 12:14:11 +0200	[thread overview]
Message-ID: <1577096053-20507-6-git-send-email-madalin.bucur@oss.nxp.com> (raw)
In-Reply-To: <1577096053-20507-1-git-send-email-madalin.bucur@oss.nxp.com>

The PHY_INTERFACE_MODE_10GKR was introduced as a catch-all
value for 10GBase-KR, XFI, SFI, to differentiate against XGMII.
The AQR PHYs support XFI as a PHY connection type, adding it
to the list of supported types. I'm not sure whether 10GBase-KR
is actually supported or not on the AQR devices so I'm not
touching that.

Signed-off-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
---
 drivers/net/phy/aquantia_main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c
index 975789d9349d..688a637f1aba 100644
--- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c
@@ -358,9 +358,11 @@ static int aqr107_read_status(struct phy_device *phydev)
 
 	switch (FIELD_GET(MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK, val)) {
 	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR:
-	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_XFI:
 		phydev->interface = PHY_INTERFACE_MODE_10GKR;
 		break;
+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_XFI:
+		phydev->interface = PHY_INTERFACE_MODE_XFI;
+		break;
 	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_USXGMII:
 		phydev->interface = PHY_INTERFACE_MODE_USXGMII;
 		break;
@@ -493,6 +495,7 @@ static int aqr107_config_init(struct phy_device *phydev)
 	    phydev->interface != PHY_INTERFACE_MODE_2500BASEX &&
 	    phydev->interface != PHY_INTERFACE_MODE_XGMII &&
 	    phydev->interface != PHY_INTERFACE_MODE_USXGMII &&
+	    phydev->interface != PHY_INTERFACE_MODE_XFI &&
 	    phydev->interface != PHY_INTERFACE_MODE_10GKR)
 		return -ENODEV;
 
-- 
2.1.0


  parent reply	other threads:[~2019-12-23 10:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-23 10:14 [PATCH net-next v2 0/7] Add PHY connection types for XFI and SFI Madalin Bucur
2019-12-23 10:14 ` [PATCH net-next v2 1/7] net: phy: add interface modes for XFI, SFI Madalin Bucur
2019-12-23 10:57   ` Russell King - ARM Linux admin
2019-12-23 11:10     ` Andrew Lunn
2019-12-23 10:14 ` [PATCH net-next v2 2/7] net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G Madalin Bucur
2019-12-23 10:14 ` [PATCH net-next v2 3/7] net: fsl/fman: add support for PHY_INTERFACE_MODE_XFI Madalin Bucur
2019-12-23 10:14 ` [PATCH net-next v2 4/7] net: fsl/fman: add support for PHY_INTERFACE_MODE_SFI Madalin Bucur
2019-12-23 10:14 ` Madalin Bucur [this message]
2019-12-23 10:14 ` [PATCH net-next v2 6/7] dt-bindings: net: add xfi, sfi to phy-connection-type Madalin Bucur
2019-12-23 10:14 ` [PATCH net-next v2 7/7] arm64: dts: ls104xardb: set correct PHY interface mode Madalin Bucur

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=1577096053-20507-6-git-send-email-madalin.bucur@oss.nxp.com \
    --to=madalin.bucur@oss.nxp.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=leoyang.li@nxp.com \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=netdev@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=shawnguo@kernel.org \
    /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).