Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     colin.foster@in-advantage.com,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Russell King <linux@armlinux.org.uk>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 net] net: ethernet: mscc: ocelot: bug fix when writing MAC speed
Date:   Tue, 14 Sep 2021 23:21:02 -0700
Message-Id: <20210915062103.149287-1-colin.foster@in-advantage.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?WC/Z9PIB1s9wHkUZRlk6P5RcUP1S4xrexosyQphOYKL+/YE7xmSNr/dGJqbm?=
 =?us-ascii?Q?fCW62wt4Opo0xrQ/diBVunyjYV91B1c1pFokbJfpi07a1PKqDEGxHB3M9NFN?=
 =?us-ascii?Q?Vf5P08zJ+/3AqOC74/3OaD5BbTxpx7kti3ev5hMgO3Sl5bnxiVzbGEbkdEwq?=
 =?us-ascii?Q?Y+dbLKOZEg7/YfcXICpenajbXcTu15Xxo/Ayaq8albrnVXR7fJsOZLp+QCHU?=
 =?us-ascii?Q?anFwUBibg9zYkD8Puu9UUqVOONk9FsvcrLzWRvBnHwUVl8biycjn4mTHCt+O?=
 =?us-ascii?Q?eaJHZExJOfzdtTKbafe0xs6vE44Bld0HH7U601bIVkXg3tNRUFf9cZ+kNKC6?=
 =?us-ascii?Q?Xv8ZJW5dwPrSF3p6TUfrn9zVP9qxLVrMS7/yREQzSflXvHDxFnRcm3JNW+XY?=
 =?us-ascii?Q?wGQCEfefelOYeO3L6cCNouMapH+G9FDP39PPpAxhhmXdJMwcjjOUL5popdMA?=
 =?us-ascii?Q?BwAESrhiFr13aQXIP6mSsoLVVFpUoRtRxCbZw8lWdF/+8wlz4tRuk9cwysDc?=
 =?us-ascii?Q?7gPxWWCpjAfTEwW1HXyvNSLh2G7GnZlljb5Cc9OFnB0Wce6v+4d7mNW/NuDP?=
 =?us-ascii?Q?zIPROv5KX/zKSIvSnbUDHn4mIokY6esDKzm8GhORi4unPHQM77OUdNmL2jPm?=
 =?us-ascii?Q?5o6+v6k6DyslmGgAsSKXYRRB+qADpfeB9EdAQ0drSwb5ztoe1gbKyiurgcAg?=
 =?us-ascii?Q?kw/krlKe+OJPtPfFtjKmRLcW+7DSh96ghEUQ/AsGkJNf7PRO9bOGRJE3Alqp?=
 =?us-ascii?Q?RQN0BrqnuxKfcGkf5+7CMN6FDRZkj0NoGI60Cnnopw8AH2P1EWMybDD9OWN0?=
 =?us-ascii?Q?gIgYOAt4P+S8N7fM2mCUZJCEGGi1/VBdAeopbFshG7ErxTfjAB1fo8h4rqNO?=
 =?us-ascii?Q?nWEQEqyBo+D/XnTmdDsFW6WPb7zN+VKxVyJ8Pg4MZkuvLexFXo/SSEs45J4V?=
 =?us-ascii?Q?plSMdkeah1nqhKUqkZYeTCXc1W5gSFMT/uV9CT1GU51XjvH4zu+gYL0H6C6u?=
 =?us-ascii?Q?k6mSIJUhDtVABVo2hpJlJ5hbUuOXOaOU6WzkH/QAAwgbVUYASutSyr4lD7Cy?=
 =?us-ascii?Q?kREey95x+r6UlQw+oBxgrV6gcbHTaBDJPhW+rkJBVcRAxka6AdSAF6QZFcuO?=
 =?us-ascii?Q?Uvee8ac+covXzbrYxYaDyWh2spNWpgLpZVqyUZI1Wi3sGAljStgfgW53WcVP?=
 =?us-ascii?Q?6R3FpiEwpsWYi4j1oSIqkitMgFvkaqT7JktFTZk1vFb5cGVHTQ7KCbIoFz8U?=
 =?us-ascii?Q?D8hJZxCkxIMf7OtZso5xCvSNOhTdXAWpCTeqzhg5tOTTwEdFrkSJwBRktWbS?=
 =?us-ascii?Q?MtnxraegIind4Kxn66dNVelu?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 342db8f8-4aba-4ff0-9c38-08d9781104f1
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 06:21:14.5304
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: dErehnNJ9IAliQY4kmv0NeNC9iGN2n9RDVVtcCsozDiRHstnrm9xEkO7paqSDb95Gwb5TW1d4mxzStPgDn6QeyA6xUwxyZdPKvL2uoyQVuM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1853
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Converting the ocelot driver to use phylink, commit e6e12df625f2, uses mac_speed
in ocelot_phylink_mac_link_up instead of the local variable speed. Stale
references to the old variable were missed, and so were always performing
invalid second writes to the DEV_CLOCK_CFG and ANA_PFC_CFG registers.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/net/ethernet/mscc/ocelot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index c581b955efb3..91a31523be8f 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -566,11 +566,11 @@ void ocelot_phylink_mac_link_up(struct ocelot *ocelot, int port,
 	/* Take MAC, Port, Phy (intern) and PCS (SGMII/Serdes) clock out of
 	 * reset
 	 */
-	ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed),
+	ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(mac_speed),
 			   DEV_CLOCK_CFG);
 
 	/* No PFC */
-	ocelot_write_gix(ocelot, ANA_PFC_PFC_CFG_FC_LINK_SPEED(speed),
+	ocelot_write_gix(ocelot, ANA_PFC_PFC_CFG_FC_LINK_SPEED(mac_speed),
 			 ANA_PFC_PFC_CFG, port);
 
 	/* Core: Enable port for frame transfer */
-- 
2.25.1