From patchwork Fri Sep 17 15:39:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 12502641 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67870C433EF for ; Fri, 17 Sep 2021 15:40:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4EC7161164 for ; Fri, 17 Sep 2021 15:40:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236637AbhIQPlY (ORCPT ); Fri, 17 Sep 2021 11:41:24 -0400 Received: from mail-bn7nam10on2091.outbound.protection.outlook.com ([40.107.92.91]:34017 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S241725AbhIQPlD (ORCPT ); Fri, 17 Sep 2021 11:41:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X0pE/md8rIsVbC9R3k0x6CSamyM2SVf0WQ6ZVAku76E6uJ6pyUO7ToQ01RYnWy8XXxvBQo4/2lAWjeRn4ephNB4Gme7tshEyuFLCfL4HvKsF/cdILrZY9IXjTOuWSUT/LCw/EO3htwqOny6yKt9fby1D1UQxvWEjRiSYRuYgMziJyu/wMz+6+qN0Bt8nYuFczd+yneUcwpqhTu4PXfxq7jgPiCznpMjFrZDk3PmDJBxlfPkVIf3cNSL+Cayo+jODory5pDNj4Jc94sBqfGebK2jXF94xnKwaRIiMbIiTK9lUNzxu6tlhrbar+b+nweGctLS87X7tJ7kFNpLytYmITg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=80NNPZL5JRoBFFfFiENsMWq6GgE+IzrrUZ7Zz0sQ+SU=; b=d4xgu44l6+eb0U9kcJLBjWL4KnBtXFumyBqOm//1hQd5FY4FP3b9+/JtuhpgTlmvkj2fcmWGh5liwazxaWTq1M4edxJPYjz0Agnd6hMdPZYh4dQSVwRp9sMaHM1UzKNADnw6W8B+g7MalCMYNjrdBUFpZmil5vji/1loi+mjlN9q0HdLJom2zMZXKNhpvff6Qwj6Nlm3rzDieFaKEzhK44AKBA27OeXRJdhthk7HZjq4YvDk8tR6zuQj5BNGzdl5L6PelThlt9zXcz4WQTKFVyJJh9VAloUOxKFasZ7iaJciMg0Jw2X68qtgzHiEEGTz3SpOcvYBevLwuAn5pZAT+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=in-advantage.com; dmarc=pass action=none header.from=in-advantage.com; dkim=pass header.d=in-advantage.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inadvantage.onmicrosoft.com; s=selector2-inadvantage-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=80NNPZL5JRoBFFfFiENsMWq6GgE+IzrrUZ7Zz0sQ+SU=; b=dFrx+XHraZHAp6tajtQCpNsqrcjk8WGyRfAdiHN02YTOIA7E4P5BKlnsd238sVQHTXbP/SfDSRU7NkaUU1PxS9YvkNfkPFOwrRXOA0FaOT6ptzAkPZs89k64UGGo1w2BRPzidpagTqvqE3UzMu0eJ829zx+NTYUNfdsKKvtXxWU= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=in-advantage.com; Received: from MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) by MWHPR1001MB2221.namprd10.prod.outlook.com (2603:10b6:301:2c::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Fri, 17 Sep 2021 15:39:19 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::bc3f:264a:a18d:cf93]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::bc3f:264a:a18d:cf93%7]) with mapi id 15.20.4523.017; Fri, 17 Sep 2021 15:39:19 +0000 From: Colin Foster To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vladimir Oltean , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com, "David S. Miller" , Jakub Kicinski Subject: [PATCH v3 net 1/2] net: mscc: ocelot: remove buggy and useless write to ANA_PFC_PFC_CFG Date: Fri, 17 Sep 2021 08:39:04 -0700 Message-Id: <20210917153905.1173010-2-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210917153905.1173010-1-colin.foster@in-advantage.com> References: <20210917153905.1173010-1-colin.foster@in-advantage.com> X-ClientProxiedBy: BYAPR02CA0055.namprd02.prod.outlook.com (2603:10b6:a03:54::32) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 Received: from localhost.localdomain (67.185.175.147) by BYAPR02CA0055.namprd02.prod.outlook.com (2603:10b6:a03:54::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 15:39:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d099f3b-4e59-4c1d-473f-08d979f15059 X-MS-TrafficTypeDiagnostic: MWHPR1001MB2221: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6rGmXjK/Ek1LAjCVnUYg8r52wT/LFJ9b4Pv0/wrAlqYAjgSmpGoMopnEUbWznzUZDfYTa+h+DyD73SvUdqXG5uTPmUySVTJQVPKPFSE14pNQfNof3p9fMtI4gGkTnwn5gaqRytHsibC0kM17419oRJBfBHEjVteRe+/CRqJRNzfzG6A9PxzQ9j4UZsCb6gTaFY3KcB57DoNGqNMz2Z42Uc9DhrufKip/8uniV/XlTj7dVsw0TylElpLv/Q+mT380lN1fEU89+KziRhluP9jWjhCNWEN2c1QP0Kbq5oTwsbWqn397xlMLSkF9dwvUOeuUkM1gRy6hSdOLpwFamn4GXf5ncUTe2uz/jmescVPtc1iW30LNeoby9K4Tj+85SGVg44GIjowqiXcxvJsPyG9dMfSjW0V48m8qeOZx6lrE+kgUpzq2fsa4oCRx8yjIibS9Nvdtvepn5DbSiIBo19oz8bYvfMojAkICDlrmCrkxhizdi/IofQELHpUFDhMBPTJSb9hsmW3TLI/JiGs6Vbg/ObcxvvpJEj29HSf8z99F95P0b89ImQ9gswcFUm+lxDDLi4DbJpW+ikKk3yv5mXzZJc3nqV2BpYolkRV6kof5z+VQNGucOEOS4VEmViygqzQ4vT3hGmKXeqSJ1NDFBkpDNsYBbcOFhAuRRzAncIkNfyENmFBSoACQVyeg/6aIllhxEWkgx8KQmlhPHKdX6IBGuQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2351.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(136003)(346002)(366004)(376002)(39830400003)(52116002)(6506007)(5660300002)(956004)(2616005)(1076003)(4326008)(186003)(478600001)(66556008)(66476007)(26005)(44832011)(38350700002)(38100700002)(6666004)(316002)(54906003)(8936002)(2906002)(6512007)(8676002)(86362001)(6486002)(83380400001)(66946007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Xj3rKRhlxLpFH9Ycyf336LqCmktZskkZTY2Xxs/wIJjY232nSg0qrPGDjC7el8wEsJg1+sL17AxPJjFaL43IQEj9R9zA9prxRBRm4YKRcXtHYXDPZBHm94iMjw5aMhBl1IrjsZ9Kzif+xU38b0xS5ITA2A0Y0p4aLdqMVrtZv66VL5OUcZnQTw4RuqzgLwPzaoxprHZtGljHrhZkj3X9+0fywAZ+IkC/1R1BHRxMwkH+S8DBNB70AHxoWvHVxAz5YlpmiKkYkfAdAb8r4OmrZP90dNm7UIU96cE9TkLTWf23c9IjN67R+LLgaJPxiwQUAyH98YPfLWA3zaIlVTqlQDf03dzuHePhPXEeAFFvZInPWhhopPyhkoyDJZ37+zchLbM3FK3H5JYH4HeUfA3lzImYohmw2Iu709RQPOU8JJZWSxG9/El6pyiK8inGuYoAejdCqRcpMnk8WW0CuZ3Zv/ilSY0r9qLAY/sr9DKi1weh5sjoB650nWxUJ2l9XSMLeQYkV/XnB2F6kd0hfQLRPnDSLnSZMeqpsqnVhbsdMjbz5NjaZTxKpotjF6TeeZE3XRm7/lu7o9rj2e7KxAMpGSos4IZvQP13NWpsQ0r/ilO+n5zEj28amWICa5ConKP9XwGTneptaoVKZBJ+GbEEMA91fIkr9AQJk1BjkcYd6Q4fyl0LpW7Ulr4ppMTuqTwvkExrjDAo5TY2Y/1u125FpnYiUzhhnh8ORGl/uJ90jGjdP7Xv1+S8Mp1LQ3NDsXxa6+rp/jBnbym6OsgDcoUPL7W6SZHV89U0DzwTH5uQThb2aLgHEISKTrcx97CI7tOVwUArmA0T0zr1zbR1fwjLXyWWf17OBaKg3j3gp700KsWgZ4QvevFbQ/c5QVoSoDm+DGufWuqNLGzlYb3hZVUHaUr29XAlHPwkhpPfH8NU/A10TMjjKp8W+2tXPpJRFfYEPPP7ORH/87Hkde1oUTFcZqlrDljm1lMCW1WN/1qt+83XHAsa7zxnVL496zhYKLFimJwgpEJQDc1+b6uDPxH2gHapOynK9SzG2ACGRTbnDAgANcsXMEl2YFwbVG6gjSNNb2Ep413zhyQUdhQYyvxcq/ipVSNehgxPPhJjPP3li1975c717rO0KerWdmhS5AOPiDcHj537qmle2JaQM9aPUCN0t4R0Zp6zMRJ9nWHtwHIHBXJFU6yVXXW2YDVAMbaXvlxt+PxqCO+M9DsqHjlMUBleg1P4MqUA9Ey4P+0quve7wUirtg3M7hFcMR03qFy9m2MH7tc6l0/t7eDn0XiWGz6DryWypDFMSDHqo4BOxugfF01YGUmx3nOFn5Sqjkub X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d099f3b-4e59-4c1d-473f-08d979f15059 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:19.5321 (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: ykWj88JUDavyJpML0V7wNheyBRURlEvlOsLGgBTnAeov4HiTGaAb3sctkFfoLxHwDXYeHkcbiUNJb5Eixoy75mbmVR2bo60OcRCLwFOIeYw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2221 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org A useless write to ANA_PFC_PFC_CFG was left in while refactoring ocelot to phylink. Since priority flow control is disabled, writing the speed has no effect. Further, it was using ethtool.h SPEED_ instead of OCELOT_SPEED_ macros, which are incorrectly offset for GENMASK. Lastly, for priority flow control to properly function, some scenarios would rely on the rate adaptation from the PCS while the MAC speed would be fixed. So it isn't used, and even if it was, neither "speed" nor "mac_speed" are necessarily the correct values to be used. Fixes: e6e12df625f2 ("net: mscc: ocelot: convert to phylink") Signed-off-by: Colin Foster Reviewed-by: Vladimir Oltean --- drivers/net/ethernet/mscc/ocelot.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index c581b955efb3..08be0440af28 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -569,10 +569,6 @@ void ocelot_phylink_mac_link_up(struct ocelot *ocelot, int port, ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed), DEV_CLOCK_CFG); - /* No PFC */ - ocelot_write_gix(ocelot, ANA_PFC_PFC_CFG_FC_LINK_SPEED(speed), - ANA_PFC_PFC_CFG, port); - /* Core: Enable port for frame transfer */ ocelot_fields_write(ocelot, port, QSYS_SWITCH_PORT_MODE_PORT_ENA, 1); From patchwork Fri Sep 17 15:39:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 12502637 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18E62C433FE for ; Fri, 17 Sep 2021 15:39:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 019B661164 for ; Fri, 17 Sep 2021 15:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243762AbhIQPlS (ORCPT ); Fri, 17 Sep 2021 11:41:18 -0400 Received: from mail-bn7nam10on2091.outbound.protection.outlook.com ([40.107.92.91]:34017 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S243677AbhIQPko (ORCPT ); Fri, 17 Sep 2021 11:40:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EvlzjQ0DYR6LiGTUhyqKG/NtYXAG0iHcuk9xZzKjb9XWp99ufPEK1wik54/nDhVHqWJefBgEX2iaQBFJAEC758FOhHfOKPDtBTomaloILIz9VM671YCRnkPP7cisp1WWwqwPVgbTRLUVeaIr0sahv61L25yQTVjiaZacuZS8qoMyif+S6g2o/RcGxHfLCSTp6wDs+ror+w/VOuBWbTh2kRKB2ALPdj+LUj/MAhoqCljzjzvoMt4EOZXbDfgDPhlLg18rsKSaR8TWOqsCtoR+8UVGa6l819oncU73rFPn951UsO7s66Dn7cA5gBc7uXuIUnlwXn13ljidGkQ/tGIQbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=qlBz1AsTK41IMxmwRHpPApShtW2URrjcS72AhQsfgdo=; b=bSU4WIjevhuSAIgaU1+7b3zYqBMARtqtVvjc59G34JP4bTmyo43ELzZZFx/2AilDnsRSvwYZz9s8aJGGVnWOSAHafvZA16ECHwlvpNcMDbRG1Gx73pvH2T0Hf4MHzroiKqAv+gjYadgw/I8z/XO7ULoPODfu3BnAemsOZ8LdhMtEr7EHNFHvIpFsIwa3nxJ38Zue2t1M6REs+vyDA7gL3FemIxBWPDmq0OMIMO61Sz+qdi2TNK5BVt6ZZ/FY9zz0GXWKa2ItO2TeeqCUZI6xGrV5AEElGPsg0oO8x1gDLzWH6q/MdgvB6gvWKl4PskBvZn6K4Rf3MAcrix3vkm51mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=in-advantage.com; dmarc=pass action=none header.from=in-advantage.com; dkim=pass header.d=in-advantage.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inadvantage.onmicrosoft.com; s=selector2-inadvantage-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qlBz1AsTK41IMxmwRHpPApShtW2URrjcS72AhQsfgdo=; b=nQUB8jdTMz3CrNWSnFdJfKHpAiXeqCcfFaosgZgtgCufU+mCSFN/tInEu9X2hASkEdHluev7LGGX6eULSvfzJPedXXTU3NisF34ag0QUrjx1rQChKE9mB8nMPbEhG6DGEx1X6o2gk74rx3FM+FQSflTCCNT/PwZ3FYxk0afAxG4= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=in-advantage.com; Received: from MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) by MWHPR1001MB2221.namprd10.prod.outlook.com (2603:10b6:301:2c::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Fri, 17 Sep 2021 15:39:20 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::bc3f:264a:a18d:cf93]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::bc3f:264a:a18d:cf93%7]) with mapi id 15.20.4523.017; Fri, 17 Sep 2021 15:39:20 +0000 From: Colin Foster To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vladimir Oltean , Claudiu Manoil , Alexandre Belloni , UNGLinuxDriver@microchip.com, "David S. Miller" , Jakub Kicinski 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> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210917153905.1173010-1-colin.foster@in-advantage.com> References: <20210917153905.1173010-1-colin.foster@in-advantage.com> X-ClientProxiedBy: BYAPR02CA0055.namprd02.prod.outlook.com (2603:10b6:a03:54::32) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 Received: from localhost.localdomain (67.185.175.147) by BYAPR02CA0055.namprd02.prod.outlook.com (2603:10b6:a03:54::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 15:39:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efd92cdd-d7b8-45fd-b060-08d979f15104 X-MS-TrafficTypeDiagnostic: MWHPR1001MB2221: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j8yHudZIGT03HVNr/BXnH6k0ZtzG0499r/8L9RkiqT1n9m7d5FIPElnfnOkXXl9SM/ZVcgfpHwbGnsHP9FDQfenceUmcw0vYn6ky4F91SfHENEwXrVJofTVQDWP0vFU9JA/5fCCVq5PLyiOCOI2uHd9vsN26MlJfaa8nssCIfYXJkeImhIeQlrUMRrtWAPvfCKX/3zFXkG43mdPdgDNxLSU9PikxeYKkM+dWPoq5r6rkL3xIo/n+7Yp+c8zIAvLa+ygGtwM+2tNciSoX/CtAopT0WV0TKLTv0NWM5m3VTJ+JVyXFuhGEbt6d85C1E4C/vGE1KnLhuCH6d4WJA3ht2joIE/P4hmA5Cc9TY5Y4/6hbGExEIvxw/Sk6q9NzY72wEL+/rp2Bmmc6uYUMtZCjHh2VwZR31YdtjvmfGEqHrckhS+KtTTCvyD1f0uNUE0G49B2pcnwkGk61U1Dn6/ry52u1gt1sXqTRfObfNbfR9TZ4JRRC8Z69xTtulEFQIFcrvBQdUfYRwkCp4kKqg13qp2jBfPpfXCRc6Gpv9d34EqGMf09p6Q3cKJeFMXeaEHNi/Y2ffotzFA2fLTZo5sgRuUwypejofPrhGEzHr4VyWITitPcIb/ZAcc3zhUtk3GgxomjzKdaqBWo1apTQWGPROaBJPPRQtG2p5jDLCy4yfLKFWHSE3WwAfKwPUpF6WcgBRokdh8S/UPjdYIJesr2GFw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2351.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(136003)(346002)(366004)(376002)(39830400003)(52116002)(6506007)(5660300002)(956004)(2616005)(1076003)(4326008)(186003)(478600001)(66556008)(66476007)(26005)(44832011)(38350700002)(38100700002)(6666004)(316002)(54906003)(8936002)(2906002)(6512007)(8676002)(86362001)(6486002)(83380400001)(66946007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yAwztSUBYNWpcWFhgP5nDbB3xEWZSlmAiP8S8TYBaM75goCbogefNAh+dboHqlj50po6JR3VWgREpLOsZJUE//D1a09I0+OiO/TeoN//8XYPEnD2FKNGdKqU+ikvsBbsvVnNzCtIIpFwg5CTdMfI6xiTmvceioBKPCXBRvrKLB8Wt4yA6l19VpIDkfx7OPo9VZyIqxnnXb77LcXNh7JrmmgeGedqFi/wwKE8//V83o+1nt7V5ifQeyvd/d49ZGtjvIfKb3bpKfKxHpiFIK+ebP6Os+zIkHsS/DZcKRoQx9GXgLCr6dCNhnj9dhpaHvniLywrIcWCZvALoYUFbW2JI6fg1SeNJQW1uVlPi+ioplK3ymhP886lQW8WNmndBciFXOEs2jrjeE/HAkfamBBNcArHT9v4DtvUx2R8V1ITeGqhEnw0S18iJGQUAT6jMY7pHiWVxbiVWNuNQjsLq3Hk+T6S5/YapDiuuOQH2SgFPh4NTdccn2XOWcFu/glzws33XWCaeYyUn5DgTaI2Js5NfR90d97Bul5vv4MLV/YrsHpNJmuttN45FPX2B1MYBwG/rmISRp6aYhsiC//0tiTEyKmpS0/hnZGmnoLVHFRRORrxDyOhwwu90DJ2YXCPyV2KtUuIJ8Q92iYn3AVByid/V0VMVw9909Kul/dmC+J6b+lyb+2pMZd70q8F6C9wmFu5xn4NZ1NT37qOsKg1bwgO/BhAZEAWXG8WCZkxr71uYNhPYbT0hlYM8+TkybQ2fFsxWXBf65bk5Algj8r+VakMTB04hfnEbJd8v2G2+DiCjYrNcT/cXqr60NFD2iokO3pAS1hfKY+LpTAIVowCiuli7MVEW6epPxQMI4Zt4/I1/JfjKUwKmP3SYcTdQvw4r8P2XijhAAfz1OLG+tA+jJqhDm1Xk8A2KeGZ3nXENKPtwBgDvKEjjtJZ1n/f8wbUqRhGwBuyCz/Kcz2AX7JT2Z3iiMqpEkK8GcR/8DAPjL49WdQhHbzhBUt2lBd+DXYp10Hs25Lpuc4n47kC+KVfSY43uW4CiMI36x3zFu0MnSHDbB9fO9RSAtrrsil0vn8zVVVCnFh25981nJMj99QdB5WFbFn20z6wZ1MYCuUuRBS7gRvuspdjwhWkwB9c1hAcjLteKpiv9mfNFJt2HJZV6X+jreuhUTVwfCXRc4ziNtahASPokAwzz/UYOAV76vdRGNs7CdnPJH1aSeGokg8P5XDzxjaVtWjfRmwR6T7n8rHhvMEcN7DjUBTF5YqyJ8J9wGHdx1/FdPUF4l4Yr3St13/zOL4cFXWpOvjccnyU5RD/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: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@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 Reviewed-by: Vladimir Oltean --- 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);