Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     netdev@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>
Cc:     "David S . Miller" <davem@davemloft.net>,
        Paolo Abeni <pabeni@redhat.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        linux-kernel@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Alexandru Marginean <alexandru.marginean@nxp.com>,
        Sean Anderson <sean.anderson@seco.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Ioana Ciornei <ioana.ciornei@nxp.com>
Subject: [PATCH net-next v4 09/10] net: phy: aquantia: Add some additional phy interfaces
Date:   Thu, 18 Aug 2022 12:46:15 -0400
Message-Id: <20220818164616.2064242-10-sean.anderson@seco.com>
In-Reply-To: <20220818164616.2064242-1-sean.anderson@seco.com>
References: <20220818164616.2064242-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Nbetuu1fRr5Ipxz8dN9L5XFdeF25T79Y1HFKVGqbfG8GCgW4auln/z5Cub44?=
 =?us-ascii?Q?OupRCthj0gJc7QnKJbnDtevnm2Ef/tAZq0hFJLLD6RE3wLII36hUJpmairIR?=
 =?us-ascii?Q?foG9JzvgXoJ4mgKof3HxAs2dZfzPoaW1FiIW9X+2L2xIlJTgWaxldcGbFYlg?=
 =?us-ascii?Q?T/WQ3STRPmO8/aN6TO55PobemIw7B6b9L2Na5dkPTWZrwjJTooWSjYK23QL2?=
 =?us-ascii?Q?+YogN10Ndu3X9jc1hOOBj2ioVzglz0+aWKrctnA67Ol/ept+TFXL3fjxY+DH?=
 =?us-ascii?Q?cVJmyk/MPnyMjXKh0DPIQ3NE8hHS2WX7GsnoXVmsN5EZyA2Ycrtp3ypX/Qwy?=
 =?us-ascii?Q?idiEViGMI9g6d6L0w6XTBFIfmsP1QSeiYH4K1sxA3A6cTlqy9uqUMU0UF4Zi?=
 =?us-ascii?Q?FlpD4Vr2Wq3LWKPpUuxwrGwTzEkuZVvjphZGkEQFLuYDqS4FxmiUJ3WeV2eg?=
 =?us-ascii?Q?XIVFxWXvHHH6bnqcPres2SAj3G0E9ndD0edix/R7oukHsRP6jMADz9DH45M1?=
 =?us-ascii?Q?YoGzT3JGcczJTjUPGMkBfBd3Qz/WGoNnoTRaf5axjU661UKoIboPrqlvQDYK?=
 =?us-ascii?Q?iLspHnORon5XuTUJgIbpDI7FO0Ulj+ML8eUKgauT6xm3ifNBZiQNpbcgtsX9?=
 =?us-ascii?Q?TrM/usS3O5xQ3QqpmuTG3nctFTypBHPWjk1ErLubjb9WNgUyzSNJjehym4vd?=
 =?us-ascii?Q?z2Nx+VWZP7lL4gPSEZy8wow5qSI9MavCW4FrAizk4n1/j0Xb+nLj14EXtYfQ?=
 =?us-ascii?Q?H3dI8kXHMa8SoBeewPeqE8fMd006uMK3qOTZPZfugGIoU7DxsR57xCzhVUEf?=
 =?us-ascii?Q?PtxSvpwbHWPmJXzM36FghHJAWT5FiadzFdgG4JAgKALlwE2o6fol6mbJ5SVG?=
 =?us-ascii?Q?Dcwj0MMVpTgcKeozfJy5DSCl2NYwWVp66h1W5LQvJCHFHQL6DfmoixEsDzBa?=
 =?us-ascii?Q?QmCq0N12tpxYAfDeNBQcFOLPNe8AlOqpU9D097df2rJ4TOhGHv4ytySKFvIO?=
 =?us-ascii?Q?R7hLA6aaZ5wvuwp4EWRC5pwxJs9v0qFxVk1TR0iDcdKqV/gCpviyxhO9VI0E?=
 =?us-ascii?Q?KRs6yqkXA2KK4rO5lNuMyThhiNJqR2jJiUeE4dLD14/f1M6uhIoY6JUQnEIr?=
 =?us-ascii?Q?IJD59SA1K6iUZrtvtVzPoEKvV12WNQQ+mPNU/O73ZI9kbwcSeNMY7+voGzsX?=
 =?us-ascii?Q?wnnaW2TaQTPrrvSy37gBBYTbJpry+RYR2mujy/E7jWyACNcinyWHzuWhoMPk?=
 =?us-ascii?Q?HX9PKwaDb/+NRuUulZDDQmvat+cSnlkP9thIAtTJLbtN68d7SzOaHSseA4fU?=
 =?us-ascii?Q?Fp3pBgEZSrmT0DqCB+0XKtG4HEeGmRY/wOOdjyuNnWmUnMS6J1q1mhrCK6+3?=
 =?us-ascii?Q?QcaNjKYLue2zRSrLiJRqnX2RvsGvaVgsmbmo40QkZOpF5W9TCUCLNN51nylT?=
 =?us-ascii?Q?qRo0EOBIqBS+C5dRp9c/dgbKz16xqwKLrRhGc0jIAv8TR5FY4ksf8PiuHgnC?=
 =?us-ascii?Q?AFVfaBcJ6HQCoQt4JUh9iBuH5BkhYeGa/05hyGyn9TlQzE8JpOYRuwrqnioM?=
 =?us-ascii?Q?o/OsswlDYPhOjF7zJOY8rwKIGzDJNBIyWxK3FMZ7+3D75tr86M76Oy0kFAro?=
 =?us-ascii?Q?oA=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 15876b1f-f863-44e4-608e-08da81393a86
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2022 16:46:42.5569
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: b9fwp5ZahWXV2qPkSB7SZuwYvYrTNEpsAe6K5MwsQZblzsoL+vxGhFxDlsf4uN+JdDANSQAJYSx4Vvdy7YClCw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR03MB7649
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

These are documented in the AQR115 register reference. I haven't tested
them, but perhaps they'll be useful to someone.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---

(no changes since v3)

Changes in v3:
- Move unused defines to next commit (where they will be used)

 drivers/net/phy/aquantia_main.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c
index 8b7a46db30e0..b3a5db487e52 100644
--- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c
@@ -27,9 +27,12 @@
 #define MDIO_PHYXS_VEND_IF_STATUS		0xe812
 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK	GENMASK(7, 3)
 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR	0
+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_KX	1
 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_XFI	2
 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_USXGMII	3
+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_XAUI	4
 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_SGMII	6
+#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_RXAUI	7
 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_OCSGMII	10
 
 #define MDIO_AN_VEND_PROV			0xc400
@@ -392,15 +395,24 @@ static int aqr107_read_status(struct phy_device *phydev)
 	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR:
 		phydev->interface = PHY_INTERFACE_MODE_10GKR;
 		break;
+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_KX:
+		phydev->interface = PHY_INTERFACE_MODE_1000BASEKX;
+		break;
 	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_XFI:
 		phydev->interface = PHY_INTERFACE_MODE_10GBASER;
 		break;
 	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_USXGMII:
 		phydev->interface = PHY_INTERFACE_MODE_USXGMII;
 		break;
+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_XAUI:
+		phydev->interface = PHY_INTERFACE_MODE_XAUI;
+		break;
 	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_SGMII:
 		phydev->interface = PHY_INTERFACE_MODE_SGMII;
 		break;
+	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_RXAUI:
+		phydev->interface = PHY_INTERFACE_MODE_RXAUI;
+		break;
 	case MDIO_PHYXS_VEND_IF_STATUS_TYPE_OCSGMII:
 		phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
 		break;
@@ -513,11 +525,14 @@ static int aqr107_config_init(struct phy_device *phydev)
 
 	/* Check that the PHY interface type is compatible */
 	if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
+	    phydev->interface != PHY_INTERFACE_MODE_1000BASEKX &&
 	    phydev->interface != PHY_INTERFACE_MODE_2500BASEX &&
 	    phydev->interface != PHY_INTERFACE_MODE_XGMII &&
 	    phydev->interface != PHY_INTERFACE_MODE_USXGMII &&
 	    phydev->interface != PHY_INTERFACE_MODE_10GKR &&
-	    phydev->interface != PHY_INTERFACE_MODE_10GBASER)
+	    phydev->interface != PHY_INTERFACE_MODE_10GBASER &&
+	    phydev->interface != PHY_INTERFACE_MODE_XAUI &&
+	    phydev->interface != PHY_INTERFACE_MODE_RXAUI)
 		return -ENODEV;
 
 	WARN(phydev->interface == PHY_INTERFACE_MODE_XGMII,
-- 
2.35.1.1320.gc452695387.dirty