From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-f193.google.com (mail-ob0-f193.google.com [209.85.214.193]) by dpdk.org (Postfix) with ESMTP id 965195952 for ; Tue, 21 Jun 2016 13:21:00 +0200 (CEST) Received: by mail-ob0-f193.google.com with SMTP id s7so2155000obo.1 for ; Tue, 21 Jun 2016 04:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=O3v+UMeCy3cZUJNVowJ3nTSyD8oSX5HLbyvT0QJhPdA=; b=KLd+R3dQ7uZdU1rRjeNQiGXopx36O9iLCXlHSnKhyWDI8IK3o9qoMJNnIVrpCdZXFs qi9sh56DmZFlvBWkw52XlnfGqIzSTslxEFKCUDqyDM6R6B0U6waDCvxut9S+PGmxztzO r/RS6Rlf8aHEZhv6tTex/1773pJIvH+r03E+JsQ6LESECOsY3aISGrSipBMgw5rn9Bcu zXIB3BtvR4QTb1mBYFevKpeEeWBoAVJ9RNrg9ooaSiSZsKO3VM1boHFF3lwf6ioBcRMX sp3/e9+dYi/ItHTXNa0wKb0ck0ZuKvYReAT1vZkPJJqd8ruoJB83472ntE3qUheBE6DT zlUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=O3v+UMeCy3cZUJNVowJ3nTSyD8oSX5HLbyvT0QJhPdA=; b=h4D11u+MDsBwuyv2sXg4CRkUGRn2sKAQLbLM4f1DPPyOVGpXN02/pq8udz6UXYoYO+ 8yjQHggI7YmbEIB3GrnoE+u4dG1Ww6nexO9VXojNuonVydSaWoe2CL4EDnSCGNy6mk56 t43WYxz4zxBUtWTS4pHOGpER7FJ5Cb/BOXyhsmODjRckoc2MgC3FXeyz9XcdFFLkoBv1 sXnI66fX1xTxnNC+yjoYi2BXkh+6P/fT2yU708elDHITNhx5+KEXeOpIIzCwKSJM0Pl1 noQfG6pb8RQQ9m43wew1rFk2a7tnm/C4dpoltWWHa7iRVmrvIC/Da8rT3bBhGRNM3qvg ORkA== X-Gm-Message-State: ALyK8tIYFmzX/BAAvM+MpXUgH8CW212V56TABo9Q9nVjqglIo4tX72R1j1KiAHYJmGXoX8TziWIWN32+QReo8w== X-Received: by 10.157.19.58 with SMTP id f55mr13631568ote.171.1466508060086; Tue, 21 Jun 2016 04:21:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.202.59.67 with HTTP; Tue, 21 Jun 2016 04:20:59 -0700 (PDT) In-Reply-To: <57691284.4090900@intel.com> References: <87eg7ros2m.fsf@fatcat.parallelwireless> <57691284.4090900@intel.com> From: Anupam Kapoor Date: Tue, 21 Jun 2016 16:50:59 +0530 Message-ID: To: Ferruh Yigit Cc: dev@dpdk.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH] kni : fix build errors for gcc --version >= 6.1 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: , X-List-Received-Date: Tue, 21 Jun 2016 11:21:01 -0000 On Tue, Jun 21, 2016 at 3:40 PM, Ferruh Yigit wrote: > Hi Anupam, > > Thank you for the patch. > > > On 6/21/2016 9:37 AM, Anupam Kapoor wrote: > > This commit fixes build errors triggered due misleading indentation. > > > > Fixes: 366113dbfb696 (e1000: suppress misleading indentation warning) > This looks like wrong commit id that fixed, can you please double check > Also you may need two fixes lines, since fixing two different driver file= s > =E2=80=8Byes, you are right, i erroneously looked at the commit-id =E2=80= =8B =E2=80=8Bwhich included the '-Wno-misleading-indentation' and used that.=E2= =80=8B > > > > > > Signed-off-by: Anupam Kapoor > > --- > > lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 12 > ++++++++---- > > lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 6 +++--- > > 2 files changed, 11 insertions(+), 7 deletions(-) > > > > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c > b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c > > index df224702ed7d..26352da15101 100644 > > --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c > > +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c > > @@ -3299,13 +3299,15 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw= , > u32 address, u32 *data) > > return -E1000_ERR_PHY; > > *data =3D E1000_READ_REG(hw, E1000_MPHY_DATA); > > > > - /* Disable access to mPHY if it was originally disabled */ > > - if (locked) > > + /* Disable access to mPHY if it was originally enabled */ > I think original comment is correct. > As far as I can see, if access disabled in the beginning of the > function, it is enabled and here disabled back. Original state saved to > locked variable. > =E2=80=8Byes, the locked variable keeps that state... =E2=80=8B > > + if (locked) { > > ready =3D e1000_is_mphy_ready(hw); > > if (!ready) > > return -E1000_ERR_PHY; > > + > > E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, > > E1000_MPHY_DIS_ACCESS); > > + } > > > > ... > > > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c > b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c > > index 017dfe16c73f..dc2a4fb61c25 100644 > > --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c > > +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c > > @@ -870,9 +870,9 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, > > if (speed & IXGBE_LINK_SPEED_10GB_FULL) > > if (orig_autoc & IXGBE_AUTOC_KX4_SUPP) > > autoc |=3D IXGBE_AUTOC_KX4_SUPP; > > - if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && > > - (hw->phy.smart_speed_active =3D=3D false)) > > - autoc |=3D IXGBE_AUTOC_KR_SUPP; > > + if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && > > + (hw->phy.smart_speed_active =3D=3D false)) > > + autoc |=3D IXGBE_AUTOC_KR_SUPP; > Can you please check following commit: > > https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/comm= it/?id=3D55461ddbc =E2=80=8Bcool thanks for the information. =E2=80=8B > > > if (speed & IXGBE_LINK_SPEED_1GB_FULL) > > autoc |=3D IXGBE_AUTOC_KX_SUPP; > > } else if ((pma_pmd_1g =3D=3D IXGBE_AUTOC_1G_SFI) && > > -- > > 2.9.0 > > > > > Would you mind sending a new version of patch according above comments? =E2=80=8Byes sure. in a few minutes...=E2=80=8B > > Thanks, > ferruh > --=20 =E2=80=8Bthanks anupam=E2=80=8B