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:     Alexandru Marginean <alexandru.marginean@nxp.com>,
        Paolo Abeni <pabeni@redhat.com>,
        "David S . Miller" <davem@davemloft.net>,
        linux-kernel@vger.kernel.org, Vladimir Oltean <olteanv@gmail.com>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Sean Anderson <sean.anderson@seco.com>,
        Bhadram Varka <vbhadram@nvidia.com>,
        Madalin Bucur <madalin.bucur@nxp.com>
Subject: [PATCH v2 01/11] net: dpaa: Fix <1G ethernet on LS1046ARDB
Date:   Tue, 19 Jul 2022 19:49:51 -0400
Message-Id: <20220719235002.1944800-2-sean.anderson@seco.com>
In-Reply-To: <20220719235002.1944800-1-sean.anderson@seco.com>
References: <20220719235002.1944800-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?/aYL3dfiOyqtETHmRW+ytMUc1jhvhLWZVnvOrOXoAJR6uf92/rCpD7SeOvOp?=
 =?us-ascii?Q?o2yEVB4RwsT1aTysPC6SIL8w0ONpnGAZ3xYrpbq21GVeriQia+sh9knl6wnE?=
 =?us-ascii?Q?cqAUQICZKzp3sOm2t5l/kRELXBB0Uty1vHf4VTH3QXTy/WO9+ABFicHnwJv8?=
 =?us-ascii?Q?Xj6aEIymeSAUWA9PesgKJaM7AYpqaEsYf2ma97MDpoYQZpDDnvErZAIfi8Xx?=
 =?us-ascii?Q?x2WzEUIo2ytrdbUHk4IhmR4MwGipTUrS6fgVoOhIdaBlUhHfOL7ApLMRgAk3?=
 =?us-ascii?Q?nrY59Mre5Az+vW8UZMcBZwTSkEZWClEHWUwuZQDFMJ+5H+DA+JxKaxVdizE5?=
 =?us-ascii?Q?erHYzG874Pv/g3U0sSNQsMxRbfFmbWW5cba2NHScLXnJVEKVeq5PJiYusoC5?=
 =?us-ascii?Q?qIX0HBHDCGmMLo5Hh6Cq5NjvPRcL3osgSeXhibB11WRqyWSD7NY2ldOFn7nH?=
 =?us-ascii?Q?wDR0eVPclFLT//MpGKCxpmycFnrJEv7GUMwgPiz/liZtofUKWg9S6XFM+dII?=
 =?us-ascii?Q?rTd6uwoBrcJ72qHqQSOVOLMEdoMpiVqBOXln5/v4Q1b4OgJFa4461hZY5ho7?=
 =?us-ascii?Q?XxyhiJVd7kxcJAu/mf4bXMjC00WKbUMCuinmQzWDuVhAAjfjC7fKvlIvu80u?=
 =?us-ascii?Q?j6s8oU6HLNNkQm1KpKggDTB0Ehidj5NUlez+8BANhqhTF9fdW0ZJ5v701AJN?=
 =?us-ascii?Q?b3C28weAG0atlxR8oXy/6WDI1r8bBXofZ+O8jMRf4ohO4bHWCACs3N9xKcFE?=
 =?us-ascii?Q?UN2V18YOAzB0udRP/GcDXuV3w2RyDu9HQAd/uQi3jiO5RIscfEF6M2I9wpaW?=
 =?us-ascii?Q?fgFnQNY+yosXzDa4nWEYuoTZHlHJTZGAuhio/nL4IdPA+OTTeGP3URWCLyJ0?=
 =?us-ascii?Q?nJEfyqC0mrwTKBrzloghxkXCqd/QNYpLJA3hCmXbXECypEpVjlnB/n4IY95F?=
 =?us-ascii?Q?qLp1FKH4b74aHadAvwnYoeofMENvzTh8yoMbYewXwCHur+T9N5mrWhj05W58?=
 =?us-ascii?Q?9uFRHJOEgFiLIOdYpKbPDhyLsRVJVu8dbYNnn9ZX+FRE3NDpHjCmPvByp9qX?=
 =?us-ascii?Q?tE+YZ4ogqXRbR2aAm1hLZwBYwaKnSHcsg/t4N/+ruRrK8Jgk4ttbDBDpEbin?=
 =?us-ascii?Q?qm9AtlT74JyX1bLZnvbilSGjuBSNSuNtalbWPRE0l0OYssjqDqDH7DRMuxjy?=
 =?us-ascii?Q?0DUX3AIwFCsmVnXlgUD7Q5zhVPzTB6KOtHOu/l7XX0yyTEQd2CY0PVHKOdiW?=
 =?us-ascii?Q?zFycASs/fxaMcl+kvfvLcd6jGyQKVcP0iypnJUcUaiIM1kCmVmta3BsPq1yr?=
 =?us-ascii?Q?OY0IdrfxZuMPEiV6Zauqn7/k9785ZUF9K2xiiILhz7rkF1y5ggWiTZJ6+Frg?=
 =?us-ascii?Q?rb79mUas2aTlIGQyU7gJPojVtpFDuyl+zKNH/zkf3sOGwPqKDcixdUoqwoHl?=
 =?us-ascii?Q?vLh2IzlDkQzF7NC5+ppwhrfTZdAYLd+7imIPgC6TZ737Yi7TAyZGkgflm+Gg?=
 =?us-ascii?Q?CpDwxA9a5RHmuFxLFmbpUvqIJiy8Se24fvjrGn4nF80tdnLXWKxYfF/tXxiv?=
 =?us-ascii?Q?9dMiOeqKI0pWBhIyIIe4n9meGYdng6tCmZTte6lPskrsytrEDrzN0bwalvc6?=
 =?us-ascii?Q?tQ=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a50748dc-96af-46f1-ea19-08da69e1739c
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2022 23:50:25.5661
 (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: PlD7akeWgDRnEkUR71wSbzf45JPyqVAzyz/KsYeC5rb/8IsNKIYOT7QnYHfdroIQeB/UJTw7Vci4r6+jUIoQfg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB4811
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 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

As discussed in commit 73a21fa817f0 ("dpaa_eth: support all modes with
rate adapting PHYs"), we must add a workaround for Aquantia phys with
in-tree support in order to keep 1G support working. Update this
workaround for the AQR113C phy found on revision C LS1046ARDB boards.

Fixes: 12cf1b89a668 ("net: phy: Add support for AQR113C EPHY")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
In a previous version of this commit, I referred to an AQR115, however
on further inspection this appears to be an AQR113C. Confusingly, the
higher-numbered phys support lower data rates.

(no changes since v1)

 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 45634579adb6..a770bab4d1ed 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -2886,6 +2886,7 @@ static void dpaa_adjust_link(struct net_device *net_dev)
 
 /* The Aquantia PHYs are capable of performing rate adaptation */
 #define PHY_VEND_AQUANTIA	0x03a1b400
+#define PHY_VEND_AQUANTIA2	0x31c31c00
 
 static int dpaa_phy_init(struct net_device *net_dev)
 {
@@ -2893,6 +2894,7 @@ static int dpaa_phy_init(struct net_device *net_dev)
 	struct mac_device *mac_dev;
 	struct phy_device *phy_dev;
 	struct dpaa_priv *priv;
+	u32 phy_vendor;
 
 	priv = netdev_priv(net_dev);
 	mac_dev = priv->mac_dev;
@@ -2905,9 +2907,11 @@ static int dpaa_phy_init(struct net_device *net_dev)
 		return -ENODEV;
 	}
 
+	phy_vendor = phy_dev->drv->phy_id & GENMASK(31, 10);
 	/* Unless the PHY is capable of rate adaptation */
 	if (mac_dev->phy_if != PHY_INTERFACE_MODE_XGMII ||
-	    ((phy_dev->drv->phy_id & GENMASK(31, 10)) != PHY_VEND_AQUANTIA)) {
+	    (phy_vendor != PHY_VEND_AQUANTIA &&
+	     phy_vendor != PHY_VEND_AQUANTIA2)) {
 		/* remove any features not supported by the controller */
 		ethtool_convert_legacy_u32_to_link_mode(mask,
 							mac_dev->if_support);
-- 
2.35.1.1320.gc452695387.dirty