From patchwork Mon Nov 14 06:53:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aminuddin Jamaluddin X-Patchwork-Id: 19552 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2009345wru; Sun, 13 Nov 2022 23:18:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf6PGVDwZdeMqw377hIfOC0gLTmDQUbIgC264u0e3Hz4j1AuiKl5tQB44h38ARy1Ha47GL3d X-Received: by 2002:a17:90b:d95:b0:20d:23ee:c041 with SMTP id bg21-20020a17090b0d9500b0020d23eec041mr12389795pjb.140.1668410302606; Sun, 13 Nov 2022 23:18:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668410302; cv=none; d=google.com; s=arc-20160816; b=aFv9o7LEHoE6DV5Akir/szSK03PTBi5W0PWGyr0YiwKSxtx7ZCkkRjkRZgnOnw0sPj ylrVFRgTiWRF/0IVPbVLHZl7C/cOvotFMb+CYNezqmC/i4nVDspJzrfSwtHWxR7iV66X lBH+xYjpOSaXi2AK7NMZ6ALYmt4irgmrp4CGIOGO9+k/xWWn5N3b0zbZlZpxapFnYAIF nBvrugiIWq2QDyHnm9x/albT96xOfnj3TEnfFSNxAa7vUr99A3WGzTBXauSu7IsiXiEP pxlVUSIOruN7BFzW1i94JnAbV83ZlB7VEeRtebQIOz8yoLXoibjynYjW225W+8cmBMMw YDtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=gBixsBApC3V0Q03DYW/ZLbozpIZwpQmOErvTHezM0X4=; b=E1nLCjrxFVciB4+rFq03K9P0qhuFJY9+C4+IKDr3maSXCNOjjtM6L8U9FVtUTZl16W m8D6Svwa4+cLIq+Nelw+9TT0/2G2MjBUVoEgJ+OEWTiP5Ryk2H/wTUyQBeSksyUSnzJ4 L57H+2yvzVjGFkXPoNBsUQ3YdAfE8qgoZBRzg00KRJi2Ayy77IsOWG8DLXRvrhdYUmw1 yeUbiOPEdkw3IExWcuFCpUgaRuHnTwI06a4W0V/P+bfcb5QDSMcvMDXFgnH9AzV0CF1i KsU0PhVnRe5YDWLl7gT7Lo1Gwlx/Na8Wjt3sF2wZkNjcj4TgZ2bPujBOjtzzwm28tS3A QSJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nwP3aopw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ot14-20020a17090b3b4e00b00213bbb6751asi10875979pjb.112.2022.11.13.23.18.04; Sun, 13 Nov 2022 23:18:22 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nwP3aopw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235889AbiKNGxL (ORCPT + 99 others); Mon, 14 Nov 2022 01:53:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235840AbiKNGxK (ORCPT ); Mon, 14 Nov 2022 01:53:10 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCAF3BE22; Sun, 13 Nov 2022 22:53:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668408789; x=1699944789; h=from:to:cc:subject:date:message-id; bh=OMAW/EH2o+W96Ahwt8yKZ5v2TWWf93Wuusd98lfZN38=; b=nwP3aopwkMfQU2Pr0h78Ia8BeEa8iSMYPM0F24eCCI7VbXtvDaq+0K6m R2BDsn3scQ+3gepI8QIykWQgmZ4rKZgUtsLCSD/Ot0ELK81z+6h9/u/Op vR1+Gt1IOp6PXBMRGUMwR+wfSY1ojZFf9AQPTSjjLiqz8AOmFmzAQm6Tn Kd8CANExA8EXuOsNP0y+jyolDU6Hg1eHepAgIBM29ZUMK4T9909pQ8K+U Te2MpEBxdRRtnr1GLLdWaCbPKV7J9G/AzDyTp5AX1TksC5Gy73UR8ZO6g 8t25TSUXipKAFSNPA1AwfvJCTMkbxzYdFkJnV1ed/sL6agp0vFJjNmoH/ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="313701420" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="313701420" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2022 22:53:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10530"; a="589257469" X-IronPort-AV: E=Sophos;i="5.96,161,1665471600"; d="scan'208";a="589257469" Received: from aminuddin-ilbpg12.png.intel.com ([10.88.229.89]) by orsmga003.jf.intel.com with ESMTP; 13 Nov 2022 22:53:05 -0800 From: Aminuddin Jamaluddin To: Andrew Lunn , Heiner Kallweit , Russell King , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Mohammad Athari Bin Ismail Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, tee.min.tan@intel.com, muhammad.husaini.zulkifli@intel.com, aminuddin.jamaluddin@intel.com, hong.aun.looi@intel.com Subject: [PATCH net v3] net: phy: marvell: add sleep time after enabling the loopback bit Date: Mon, 14 Nov 2022 14:53:02 +0800 Message-Id: <20221114065302.10625-1-aminuddin.jamaluddin@intel.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749455001782979680?= X-GMAIL-MSGID: =?utf-8?q?1749455001782979680?= Sleep time is added to ensure the phy to be ready after loopback bit was set. This to prevent the phy loopback test from failing. Fixes: 020a45aff119 ("net: phy: marvell: add Marvell specific PHY loopback") Cc: # 5.15.x Signed-off-by: Muhammad Husaini Zulkifli Signed-off-by: Aminuddin Jamaluddin --- V2 -> V3: Fix review comments from Jakub V1: https://patchwork.kernel.org/project/netdevbpf/patch/20220825082238.11056-1-aminuddin.jamaluddin@intel.com/ --- --- drivers/net/phy/marvell.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index a3e810705ce2..860610ba4d00 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -2015,14 +2015,16 @@ static int m88e1510_loopback(struct phy_device *phydev, bool enable) if (err < 0) return err; - /* FIXME: Based on trial and error test, it seem 1G need to have - * delay between soft reset and loopback enablement. - */ - if (phydev->speed == SPEED_1000) - msleep(1000); + err = phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, + BMCR_LOOPBACK); - return phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, - BMCR_LOOPBACK); + if (!err) { + /* It takes some time for PHY device to switch + * into/out-of loopback mode. + */ + msleep(1000); + } + return err; } else { err = phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, 0); if (err < 0)