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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 A3992C4CED1 for ; Thu, 3 Oct 2019 16:07:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71209215EA for ; Thu, 3 Oct 2019 16:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118872; bh=PzDVJIaJusdMjmT/cggQNTFeh15nn52NkL+YCM8KRfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zFE6qUtAFIwY8V+Hi6C9BERBYg6e4Ld7EguHxwmX3kOBUwtv3M7TkRq5qngX73S8l NdDrN/jS4mFBijOAxaz61JFkalggYvSOGhT7GGllHXEkmF/7Be8UWnfFCvEdKGD/WN Luwpobw8tVnVCjN9UuSuqR499QHCvA9P7+KJpYnc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733011AbfJCQHv (ORCPT ); Thu, 3 Oct 2019 12:07:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:55678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732998AbfJCQHq (ORCPT ); Thu, 3 Oct 2019 12:07:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 79C49215EA; Thu, 3 Oct 2019 16:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118866; bh=PzDVJIaJusdMjmT/cggQNTFeh15nn52NkL+YCM8KRfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nvgkRNZckQ/8FJe9eVAeQKqCzrBWY/ydGT/OcaKR24MyduA/+j4csIzDDLjC4VbLX CN5K9eDSC/86205LAQQuhIK7niKH+IcfuxR4Z57EHnyrFZSqUeYLoaE/EA6qUAYoTg sORjiQmCkn7a75YDiVn6PMdaSNk/yq799kO1XENI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Mamonov , Andrew Lunn , Jakub Kicinski Subject: [PATCH 4.14 037/185] net/phy: fix DP83865 10 Mbps HDX loopback disable function Date: Thu, 3 Oct 2019 17:51:55 +0200 Message-Id: <20191003154446.048932258@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154437.541662648@linuxfoundation.org> References: <20191003154437.541662648@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peter Mamonov [ Upstream commit e47488b2df7f9cb405789c7f5d4c27909fc597ae ] According to the DP83865 datasheet "the 10 Mbps HDX loopback can be disabled in the expanded memory register 0x1C0.1". The driver erroneously used bit 0 instead of bit 1. Fixes: 4621bf129856 ("phy: Add file missed in previous commit.") Signed-off-by: Peter Mamonov Reviewed-by: Andrew Lunn Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/phy/national.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/net/phy/national.c +++ b/drivers/net/phy/national.c @@ -110,14 +110,17 @@ static void ns_giga_speed_fallback(struc static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable) { + u16 lb_dis = BIT(1); + if (disable) - ns_exp_write(phydev, 0x1c0, ns_exp_read(phydev, 0x1c0) | 1); + ns_exp_write(phydev, 0x1c0, + ns_exp_read(phydev, 0x1c0) | lb_dis); else ns_exp_write(phydev, 0x1c0, - ns_exp_read(phydev, 0x1c0) & 0xfffe); + ns_exp_read(phydev, 0x1c0) & ~lb_dis); pr_debug("10BASE-T HDX loopback %s\n", - (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on"); + (ns_exp_read(phydev, 0x1c0) & lb_dis) ? "off" : "on"); } static int ns_config_init(struct phy_device *phydev)