From patchwork Fri Feb 26 13:13:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 10868 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 951C737B6; Fri, 26 Feb 2016 14:13:19 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A44FB2C62 for ; Fri, 26 Feb 2016 14:13:17 +0100 (CET) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 23AD764392; Fri, 26 Feb 2016 13:13:17 +0000 (UTC) Received: from aconole-fed23 (vpn-54-84.rdu2.redhat.com [10.10.54.84]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1QDDETs011645 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 26 Feb 2016 08:13:15 -0500 From: Aaron Conole To: "Lu\, Wenzhuo" References: <1456426121-21423-1-git-send-email-aconole@redhat.com> <1456426121-21423-4-git-send-email-aconole@redhat.com> <6A0DE07E22DDAD4C9103DF62FEBC090903435921@shsmsx102.ccr.corp.intel.com> Date: Fri, 26 Feb 2016 08:13:13 -0500 In-Reply-To: <6A0DE07E22DDAD4C9103DF62FEBC090903435921@shsmsx102.ccr.corp.intel.com> (Wenzhuo Lu's message of "Fri, 26 Feb 2016 01:02:35 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 26 Feb 2016 13:13:17 +0000 (UTC) Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCH 3/8] drivers/net/e1000: Fix missing brackets X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Wenzhou, "Lu, Wenzhuo" writes: > Hi Aaron, > > >> -----Original Message----- >> From: Aaron Conole [mailto:aconole@redhat.com] >> Sent: Friday, February 26, 2016 2:49 AM >> To: dev@dpdk.org >> Cc: Lu, Wenzhuo; Zhang, Helin; Ananyev, Konstantin; Richardson, Bruce >> Subject: [PATCH 3/8] drivers/net/e1000: Fix missing brackets >> >> The register read/write mphy functions have misleading whitespace around the >> locked check. This cleanup merely preserves the existing functionality while >> improving the ready check. >> >> Signed-off-by: Aaron Conole >> --- >> drivers/net/e1000/base/e1000_phy.c | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/net/e1000/base/e1000_phy.c >> b/drivers/net/e1000/base/e1000_phy.c >> index d43b7ce..8642d38 100644 >> --- a/drivers/net/e1000/base/e1000_phy.c >> +++ b/drivers/net/e1000/base/e1000_phy.c >> @@ -4153,13 +4153,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw >> *hw, u32 address, u32 *data) >> *data = E1000_READ_REG(hw, E1000_MPHY_DATA); >> >> /* Disable access to mPHY if it was originally disabled */ >> - if (locked) >> + if (locked) { >> ready = e1000_is_mphy_ready(hw); >> if (!ready) >> return -E1000_ERR_PHY; >> - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, >> - E1000_MPHY_DIS_ACCESS); >> + } >> >> + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, >> E1000_MPHY_DIS_ACCESS); >> return E1000_SUCCESS; >> } >> >> @@ -4218,13 +4218,13 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw >> *hw, u32 address, u32 data, >> E1000_WRITE_REG(hw, E1000_MPHY_DATA, data); >> >> /* Disable access to mPHY if it was originally disabled */ >> - if (locked) >> + if (locked) { >> ready = e1000_is_mphy_ready(hw); >> if (!ready) >> return -E1000_ERR_PHY; >> - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, >> - E1000_MPHY_DIS_ACCESS); >> + } >> >> + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, >> E1000_MPHY_DIS_ACCESS); >> return E1000_SUCCESS; >> } >> >> -- >> 2.5.0 > Normally we will not maintain the base code. It's just taken from kernel driver. > Agree with you that the whitespace is misleading. But as it's no real > impact. I'd like to say not a big deal, better not change it. :) Thanks for this hint. It turns out my patch is wrong. It should actually be this (and I've confirmed by looking at the drivers): I will cook up a v2 of this patch if it makes sense. It is a real bug, so should be fixed. -Aaron diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c index d43b7ce..ad3fd58 100644 --- a/drivers/net/e1000/base/e1000_phy.c +++ b/drivers/net/e1000/base/e1000_phy.c @@ -4153,12 +4153,12 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) *data = E1000_READ_REG(hw, E1000_MPHY_DATA); /* Disable access to mPHY if it was originally disabled */ - if (locked) + if (locked) { ready = e1000_is_mphy_ready(hw); if (!ready) return -E1000_ERR_PHY; - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, - E1000_MPHY_DIS_ACCESS); + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + } return E1000_SUCCESS; } @@ -4218,12 +4218,12 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, E1000_WRITE_REG(hw, E1000_MPHY_DATA, data); /* Disable access to mPHY if it was originally disabled */ - if (locked) + if (locked) { ready = e1000_is_mphy_ready(hw); if (!ready) return -E1000_ERR_PHY; - E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, - E1000_MPHY_DIS_ACCESS); + E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + } return E1000_SUCCESS; }