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:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     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>
Subject: [PATCH v3 net 2/2] net: mscc: ocelot: remove buggy duplicate write to DEV_CLOCK_CFG
Date:   Fri, 17 Sep 2021 08:39:05 -0700
Message-Id: <20210917153905.1173010-3-colin.foster@in-advantage.com>
In-Reply-To: <20210917153905.1173010-1-colin.foster@in-advantage.com>
References: <20210917153905.1173010-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?yAwztSUBYNWpcWFhgP5nDbB3xEWZSlmAiP8S8TYBaM75goCbogefNAh+dboH?=
 =?us-ascii?Q?qlj50po6JR3VWgREpLOsZJUE//D1a09I0+OiO/TeoN//8XYPEnD2FKNGdKqU?=
 =?us-ascii?Q?+ikvsBbsvVnNzCtIIpFwg5CTdMfI6xiTmvceioBKPCXBRvrKLB8Wt4yA6l19?=
 =?us-ascii?Q?VpIDkfx7OPo9VZyIqxnnXb77LcXNh7JrmmgeGedqFi/wwKE8//V83o+1nt7V?=
 =?us-ascii?Q?5ifQeyvd/d49ZGtjvIfKb3bpKfKxHpiFIK+ebP6Os+zIkHsS/DZcKRoQx9GX?=
 =?us-ascii?Q?gLCr6dCNhnj9dhpaHvniLywrIcWCZvALoYUFbW2JI6fg1SeNJQW1uVlPi+io?=
 =?us-ascii?Q?plK3ymhP886lQW8WNmndBciFXOEs2jrjeE/HAkfamBBNcArHT9v4DtvUx2R8?=
 =?us-ascii?Q?V1ITeGqhEnw0S18iJGQUAT6jMY7pHiWVxbiVWNuNQjsLq3Hk+T6S5/YapDiu?=
 =?us-ascii?Q?uOQH2SgFPh4NTdccn2XOWcFu/glzws33XWCaeYyUn5DgTaI2Js5NfR90d97B?=
 =?us-ascii?Q?ul5vv4MLV/YrsHpNJmuttN45FPX2B1MYBwG/rmISRp6aYhsiC//0tiTEyKmp?=
 =?us-ascii?Q?S0/hnZGmnoLVHFRRORrxDyOhwwu90DJ2YXCPyV2KtUuIJ8Q92iYn3AVByid/?=
 =?us-ascii?Q?V0VMVw9909Kul/dmC+J6b+lyb+2pMZd70q8F6C9wmFu5xn4NZ1NT37qOsKg1?=
 =?us-ascii?Q?bwgO/BhAZEAWXG8WCZkxr71uYNhPYbT0hlYM8+TkybQ2fFsxWXBf65bk5Alg?=
 =?us-ascii?Q?j8r+VakMTB04hfnEbJd8v2G2+DiCjYrNcT/cXqr60NFD2iokO3pAS1hfKY+L?=
 =?us-ascii?Q?pTAIVowCiuli7MVEW6epPxQMI4Zt4/I1/JfjKUwKmP3SYcTdQvw4r8P2Xijh?=
 =?us-ascii?Q?AAfz1OLG+tA+jJqhDm1Xk8A2KeGZ3nXENKPtwBgDvKEjjtJZ1n/f8wbUqRhG?=
 =?us-ascii?Q?wBuyCz/Kcz2AX7JT2Z3iiMqpEkK8GcR/8DAPjL49WdQhHbzhBUt2lBd+DXYp?=
 =?us-ascii?Q?10Hs25Lpuc4n47kC+KVfSY43uW4CiMI36x3zFu0MnSHDbB9fO9RSAtrrsil0?=
 =?us-ascii?Q?vn8zVVVCnFh25981nJMj99QdB5WFbFn20z6wZ1MYCuUuRBS7gRvuspdjwhWk?=
 =?us-ascii?Q?wB9c1hAcjLteKpiv9mfNFJt2HJZV6X+jreuhUTVwfCXRc4ziNtahASPokAwz?=
 =?us-ascii?Q?z/UYOAV76vdRGNs7CdnPJH1aSeGokg8P5XDzxjaVtWjfRmwR6T7n8rHhvMEc?=
 =?us-ascii?Q?N7DjUBTF5YqyJ8J9wGHdx1/FdPUF4l4Yr3St13/zOL4cFXWpOvjccnyU5RD/?=
 =?us-ascii?Q?LdvbWidBmDiag2kK6NzDgpKc?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: efd92cdd-d7b8-45fd-b060-08d979f15104
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 15:39:20.5695
 (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: Dc9kQtsZf6HHiaajxBdsEB1eTPh/Cd8x90EnmRqkPZoYPPaP4Hr+1h1S2hWrOPAO3rYPB/8IGpIsO5PUystwXwRQYu7tNbAincadMbTFcPU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2221
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When updating ocelot to use phylink, a second write to DEV_CLOCK_CFG was
mistakenly left in. It used the variable "speed" which, previously, would
would have been assigned a value of OCELOT_SPEED_1000. In phylink the
variable is be SPEED_1000, which is invalid for the
DEV_CLOCK_LINK_SPEED macro. Removing it as unnecessary and buggy.

Fixes: e6e12df625f2 ("net: mscc: ocelot: convert to phylink")
Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/mscc/ocelot.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 08be0440af28..729ba826ba17 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -563,12 +563,6 @@ void ocelot_phylink_mac_link_up(struct ocelot *ocelot, int port,
 	ocelot_port_writel(ocelot_port, DEV_MAC_ENA_CFG_RX_ENA |
 			   DEV_MAC_ENA_CFG_TX_ENA, DEV_MAC_ENA_CFG);
 
-	/* Take MAC, Port, Phy (intern) and PCS (SGMII/Serdes) clock out of
-	 * reset
-	 */
-	ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed),
-			   DEV_CLOCK_CFG);
-
 	/* Core: Enable port for frame transfer */
 	ocelot_fields_write(ocelot, port,
 			    QSYS_SWITCH_PORT_MODE_PORT_ENA, 1);
-- 
2.25.1