From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED 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 8E849C43381 for ; Fri, 22 Mar 2019 19:00:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EEFB218FE for ; Fri, 22 Mar 2019 19:00:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dkzdR98R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727058AbfCVTAb (ORCPT ); Fri, 22 Mar 2019 15:00:31 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41021 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725998AbfCVTAa (ORCPT ); Fri, 22 Mar 2019 15:00:30 -0400 Received: by mail-wr1-f66.google.com with SMTP id p1so3465541wrs.8 for ; Fri, 22 Mar 2019 12:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=MccKzTD8VSpycyCp+Bxz63ociGvr6qeyqDf46ZY4+0Y=; b=dkzdR98RKgeSrEPaoCmls8XbwxWasqP1999V6SQSLlfcLIxEOdJDy67yEnvis/1xr0 iSAwEry5pQsC6yDQ/v2b13tgj26xGE3/hHIY9WSXhFR297j8Mnvg7CiIvMs/jgS5M0mS ygVrn0D9394lINfVOxQSH2x4+fzJFYJdhORESWQ8txvAgLWeBoeKpGoRzyoytCFFKyCO 0Fl9x6m4SZUhJZOtoRK7jiDUkJsfPVIoqicXy31qXNiRfj8hh4PWHw+c5sWBo0N0xYq9 EPLpMApHkbSRUM7WHNiY/8fAnsXxL43ZODO1ETfBpRF3KU0AK7vg7wT4fMrAfllIa59x W2qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=MccKzTD8VSpycyCp+Bxz63ociGvr6qeyqDf46ZY4+0Y=; b=qiAFYhT/K52SntZMCrzDvgKZalHiMmiY743POnDQb3ylTWb2o7AimNIFsvV5hl/B9C zmAtuOZkfu+af/j+YvXaco+KzESSHaEiz3ziVRjmwSG0jMsWrUgpjcHKQGgFaz8eYCL7 yPz8xi9KvFOp77M9Uukm/Fs48vYudCO7fsf+aA1Vg0FcG5tO58kM7tfaQAd0Ns7C6Bgx TaTLYiBh7paSbqgmVqG2d6MDWgxRR3LNitL9JZuMIO9g9kNGpN4CNW0xk0HHCTJIXU6b oR7rXtMo7h8+yN/IMnk7wLw2jWWsrWYW2//79rFWpY4gjsu5N33B35qxahiUp6TBsOeC 9NFw== X-Gm-Message-State: APjAAAWCoP9t+NMK2yR/fQmxfq0rmh4QRHfuQpvx/tD5nhX0CQdOi1j7 B1yUWz9jvjXIcHHOdnKl/JvIAPps X-Google-Smtp-Source: APXvYqxWdgarOSu6WaRmFm73jLcQFTWZxTq9ziVjR2R62Fx2oRe/DOkxIoALFPO41JAy0yseWlmIhQ== X-Received: by 2002:a5d:4a8d:: with SMTP id o13mr7119348wrq.209.1553281228771; Fri, 22 Mar 2019 12:00:28 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc4:dc00:cced:ae1:ce60:4817? (p200300EA8BC4DC00CCED0AE1CE604817.dip0.t-ipconnect.de. [2003:ea:8bc4:dc00:cced:ae1:ce60:4817]) by smtp.googlemail.com with ESMTPSA id f11sm5682012wrm.30.2019.03.22.12.00.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 12:00:28 -0700 (PDT) To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" , Phil Reid , liweihang From: Heiner Kallweit Subject: [PATCH net] net: phy: don't clear BMCR in genphy_soft_reset Message-ID: <58079905-c107-6b41-ce04-3d88ef00d70b@gmail.com> Date: Fri, 22 Mar 2019 20:00:20 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org So far we effectively clear the BMCR register. Some PHY's can deal with this (e.g. because they reset BMCR to a default as part of a soft-reset) whilst on others this causes issues because e.g. the autoneg bit is cleared. Marvell is an example, see also thread [0]. So let's be a little bit more gentle and leave all bits we're not interested in as-is. This change is needed for PHY drivers to properly deal with the original patch. [0] https://marc.info/?t=155264050700001&r=1&w=2 Fixes: 6e2d85ec0559 ("net: phy: Stop with excessive soft reset") Tested-by: Phil Reid Tested-by: liweihang Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 49fdd1ee7..77068c545 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1831,7 +1831,7 @@ int genphy_soft_reset(struct phy_device *phydev) { int ret; - ret = phy_write(phydev, MII_BMCR, BMCR_RESET); + ret = phy_set_bits(phydev, MII_BMCR, BMCR_RESET); if (ret < 0) return ret; -- 2.21.0