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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 862CCC4332F for ; Mon, 27 Sep 2021 09:31:07 +0000 (UTC) Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by mail.kernel.org (Postfix) with ESMTP id 1DE05603E8 for ; Mon, 27 Sep 2021 09:31:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1DE05603E8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dpdk.org Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7647F40686; Mon, 27 Sep 2021 11:31:06 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id C3FF84003D for ; Mon, 27 Sep 2021 11:31:04 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10119"; a="221241505" X-IronPort-AV: E=Sophos;i="5.85,326,1624345200"; d="scan'208";a="221241505" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2021 02:31:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,326,1624345200"; d="scan'208";a="553126159" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by FMSMGA003.fm.intel.com with ESMTP; 27 Sep 2021 02:31:03 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 27 Sep 2021 02:31:02 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Mon, 27 Sep 2021 02:31:02 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.175) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Mon, 27 Sep 2021 02:31:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=na4MHz3f7zSspLI+8+iOk3l9uHhAf6Ekhf9GUIixA62KUxW3A07JB7sAN8OBL1tCluYNzt4EVEsPy926muCMMs1Q1SvGzmbezEKg1NAhKIa4HRBJhRKK3GiAMPY4HEgJg97w73wefHBUzFPlT78OSbaOaJ9YRYJGXySn7b1om0jWlL3S8fb5LPV4WVv4EFBlD2NZOiDObsDl6HAKXR5F8b5ytCUu4jDONgNSoBQUDw62mEWtu6FYtARoVK8V1gy1PjoCNyReEXkKEIS6+kfz/cBFuDozam7Gh4TJ7OcMmKDz42HeHpNtb46JRnnHcpsDcdkhLBw89Gub4lzcTiEEMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Vgnee1MJ/AKruKbqxW//GZC1CuzcDvey3+5nfC+yqwE=; b=XPsIN163wnDKmUM7iV3PeM5XG6esdm0GMnjuJgWAetRHkEwLaVgss2utDwl4YFe9zFyd80MEqgn7yiYriDUq0XN2XJ/t+ios8L+J3KUlFxi9OL/NKJPGJBZiBTeBSbRKm53vOXZ1dBkDkReVEGlL6+AcdIp/TR3rsqJPc+sM6qGwriN20vzQ8LmEiHWRDfFokWewypaQTIZDG/zv9X6PQtnQUjjeihXDGWJLb2IocKFrL9syoAyw3qGk2uqAtFMHP+iFv/Orvi9byRl9R2myF/K6vpkJIbIBMbZvq/bqj0nGs9XHWhBWizwDqXp1jXYkN1zaqhfvcbabqrd5pPvtog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vgnee1MJ/AKruKbqxW//GZC1CuzcDvey3+5nfC+yqwE=; b=O7QMJHPInKDOFNQ/FD6Fun6rL5IJWSTYnYssDBWwBo3ZKXsh0UU6HEEknAQK0GoKvKk7nuSbv1frAqRcSPKUNP8U+gigJGgYvjeHu83dZdpMiR8I+HRX1xdKp3xZmDeYtX7ngwqIEiRZvOxhsUsr9YYofPqvqdna4G6rF/f50hI= Received: from BN9PR11MB5529.namprd11.prod.outlook.com (2603:10b6:408:102::16) by BN6PR11MB1938.namprd11.prod.outlook.com (2603:10b6:404:105::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Mon, 27 Sep 2021 09:30:58 +0000 Received: from BN9PR11MB5529.namprd11.prod.outlook.com ([fe80::7d94:8664:9dde:9f91]) by BN9PR11MB5529.namprd11.prod.outlook.com ([fe80::7d94:8664:9dde:9f91%6]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 09:30:58 +0000 From: "Zhang, RobinX" To: "Xing, Beilei" , "dev@dpdk.org" CC: "Zhang, Qi Z" , "Zhang, Helin" , "Wu, Jingjing" , "remy.horton@intel.com" , "jijiang.liu@intel.com" , "jing.d.chen@intel.com" , "Zhu, Heqing" , "Liang, Cunming" , "Lu, Wenzhuo" , "Zhang, Roy Fan" , "Chilikin, Andrey" , "echaudro@redhat.com" , "Guo, Junfeng" , "Yang, SteveX" Thread-Topic: [PATCH v4 18/18] net/i40e: fix redefinition warning Thread-Index: AQHXosVcEiTxxPGcV0+9kHagfi8nS6u3u46AgAADTvA= Date: Mon, 27 Sep 2021 09:30:58 +0000 Message-ID: References: <20210618063851.3694702-1-robinx.zhang@intel.com> <20210906020258.1291688-1-robinx.zhang@intel.com> <20210906020258.1291688-19-robinx.zhang@intel.com> In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a15840e2-9a0a-4280-9172-08d981998395 x-ms-traffictypediagnostic: BN6PR11MB1938: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:38; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: eT19DJQt56ZyYEEEHawGkit6gT9oDsujOzmK0sCxwNZxUAWPvhYbo9bpIBTp8RLqv1F/btZWyCW2Y/an6+IrCLhCJUPGqkbD+CAeHbsnc+gYefXVpf/x4ipmYed534pbPhe1TwywP9cssks11lZNKakx7Ykxbxnag50wDFWIylMp4z2rudHhVxy0VaWBht4lYCcq391vK2tku2T+C41KswjZgtJUrNlOCHXBX0m8FzIxtSuKCz/1s+oHwN4m4L4anmAmHHUIRb8smxVT/7hYkBrjv+L4m17UEZ/X0e8g9P0c9DUO5WvjMiNLVoB9mTApuYqG8GpTny6HTBBe42Nq6Igp+M1Eg3Td7YkFGZHiFqTmFKftG9HSU1nj795LJCMLoKlnwEvfQKJMLV2c4a9Edmf/UVltwD9HF0axDX6S9HQtwXVfU41OhkMI/ZOaerdE+TdcH6zF4bAVgxuz3FWfOC0soMPezn1c09sOJ3U/Wd/VkN0XzcXXSPnFMs4ruOOK0G19PEHqI64P6vgVerXTibzSdyaReTHH3iQMTq9EgLQ3PLTepxlV+SOCf0iCIurq0f1Iv/dhYdlTQP0r1fO2jQYPT1R/joZbft//Au+6DHvr0AvAnXyuHUabr8+qQAGheaEpwkaS8Dnk1FGUq+Wt8C306ZpcNSID8Yl49e7Y8GMhobVMI9qseEsmRAGFkpmcIKqPM67HiIga80Llb8ih7A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5529.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(2906002)(8936002)(122000001)(54906003)(107886003)(8676002)(110136005)(508600001)(9686003)(316002)(38100700002)(55016002)(71200400001)(64756008)(186003)(52536014)(26005)(5660300002)(86362001)(66556008)(66446008)(7696005)(66946007)(38070700005)(4326008)(6506007)(53546011)(83380400001)(33656002)(66476007)(76116006); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?49gxyDprEXuDmDCkWqBHxedYBkUyu/FDeRJFuhNAyl9ibpfhNP0jurf19mf1?= =?us-ascii?Q?6VjRex5wqrGDQfC0b5s2Heu8wHd8TPunDoBkMaFmRJVnheTJ9C8wvI78hW8+?= =?us-ascii?Q?/x50Tr5jHHkm3K+oNhlEaSmVSt4hBjnbGnnzVdk2eLXSGvUW9T4+Ba5y9WTk?= =?us-ascii?Q?+nJ3d0wFvToPdHVrLB34ysaKMAoc1gQl4TB3AAer9GXM1f7jXYytGyMXn6Vv?= =?us-ascii?Q?bUtrkHbqwK7zIgJlAKQgLjxczcn0K3p2q5q6zxk3QwuQv6EVHy4jLvaz27t0?= =?us-ascii?Q?EIug17pyw4TKdjLk5eDJgs1uQyRYzxKYKM9PiVy210skTVKQJeAGqIHJDjjO?= =?us-ascii?Q?V3FQnmk/jwjO1lU7KnzQpXFuqHSBxDQkqsGz2HqLq9HSprYzPJLjbVLTVbva?= =?us-ascii?Q?Wzia0wR5PID4kZr02ARxvFZItIh6LqhXiCdsXg02VxnxPcpPHpiIOjNSWzaR?= =?us-ascii?Q?DCbLKA70sakFDj1PS9RhbczvoVGs/rSj7KrdFp76tVJr6WcwmzbFqZXxIpSp?= =?us-ascii?Q?ei8lH4vW+yE6EH+AMpZO84UaISHdCyaoPh+SXdq/YVMx/c2vuZ6bV5Nalcw+?= =?us-ascii?Q?PPhG38hNEnhbk9NVBVVajHvEi3STk4JcOMppAFR5UDVC19ZPqPigz/y38pJH?= =?us-ascii?Q?yOTFfFyte4Fcdf4xmQpDR8MdHOcbBvoUrsoLuE64/z8Ss3gtqsAbulYj1HYz?= =?us-ascii?Q?7to6UmZKuWji9ktuctQCo4f543ewC9x8ouXLGwY3Aw26uMRTrj2O5QYhhxRQ?= =?us-ascii?Q?OWgaFOwYbZwTcUIa+wEG+GI+TKixQHBy8+GAEPEK0MI4rWo7rVhXIlAhNgZI?= =?us-ascii?Q?WtXvCy/yJjrmZPL9tBYJbAfyexuuqpAE9cHhLY4/Tepl2EJPlqdU+B/aBpo8?= =?us-ascii?Q?gI6rlrC0F3XJ9wsX+gaVAQbaTthZ+whGRlkw0nPRtiPhXJN3g29VcyaCvj9X?= =?us-ascii?Q?7TivytysUGXnuu7MkKpBqleJ+g+MYJs5s8rzIpuGUjTLgQe6cBLzhAVovsRV?= =?us-ascii?Q?VKuxDivTDXcmOHtiqJFGTTFTLGu4fDsa5lFZfuQyiLHy4YtxBOEh8SB/X8vv?= =?us-ascii?Q?E9eUV0MuqNgSHgnewC44Bb9FK59XsI16tcPqozT+5iWVG88VR58Uuml4Qdf3?= =?us-ascii?Q?t1FuDnPjrSHyG3W6mFB68lj51tboKuu76yfFjfJjsslKcZA/OanrekqOt5i1?= =?us-ascii?Q?0VRRbQnLr3wzPQlfkXBmc6fIQPDLvQyxDk+WbJXhBdzRwInjh2/CQR+8p1PC?= =?us-ascii?Q?leFo46k+zEgUZcL6/XEAX5+0aiVqJo3dM0svn5HzUN1i8qYKDnevhz8xbL5x?= =?us-ascii?Q?rhE=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5529.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a15840e2-9a0a-4280-9172-08d981998395 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Sep 2021 09:30:58.6037 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: kREixAiUl+70fsQlggAxmAm0z3L15ZQxbRZ8P+sLTML38sf+hCar+1NWq4LqesD8ZzH+HKyN4rHuIZADB6f9rg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1938 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v4 18/18] net/i40e: fix redefinition warning X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi, Beilei > -----Original Message----- > From: Xing, Beilei > Sent: Monday, September 27, 2021 5:18 PM > To: Zhang, RobinX ; dev@dpdk.org > Cc: Zhang, Qi Z ; Zhang, Helin > ; Wu, Jingjing ; > remy.horton@intel.com; jijiang.liu@intel.com; jing.d.chen@intel.com; Zhu, > Heqing ; Liang, Cunming > ; Lu, Wenzhuo ; Zhang, > Roy Fan ; Chilikin, Andrey > ; echaudro@redhat.com; Guo, Junfeng > ; Yang, SteveX > Subject: RE: [PATCH v4 18/18] net/i40e: fix redefinition warning >=20 >=20 >=20 > > -----Original Message----- > > From: Zhang, RobinX > > Sent: Monday, September 6, 2021 10:03 AM > > To: dev@dpdk.org > > Cc: Xing, Beilei ; Zhang, Qi Z > > ; Zhang, Helin ; Wu, > > Jingjing ; remy.horton@intel.com; > > jijiang.liu@intel.com; jing.d.chen@intel.com; Zhu, Heqing > > ; Liang, Cunming ; Lu, > > Wenzhuo ; Zhang, Roy Fan > > ; Chilikin, Andrey > > ; echaudro@redhat.com; Guo, Junfeng > > ; Yang, SteveX ; Zhang, > > RobinX > > Subject: [PATCH v4 18/18] net/i40e: fix redefinition warning > > > > After update i40e share code, there will be a redefinition compile warn= ing. > > This patch fix the situation by remove duplicate definition in > > i40e_ethdev.c > > > > Fixes: eef2daf2e199 ("net/i40e: fix link update no wait") > Need to cc stable? This patch is dependent on share code, so cannot cc stable. >=20 > > > > Signed-off-by: Robin Zhang > > --- > > drivers/net/i40e/i40e_ethdev.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c > > b/drivers/net/i40e/i40e_ethdev.c index 7b230e2ed1..4fc44dc5e2 100644 > > --- a/drivers/net/i40e/i40e_ethdev.c > > +++ b/drivers/net/i40e/i40e_ethdev.c > > @@ -2886,7 +2886,6 @@ static __rte_always_inline void > > update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) { > > /* Link status registers and values*/ > > -#define I40E_PRTMAC_LINKSTA 0x001E2420 > > #define I40E_REG_LINK_UP 0x40000080 > > #define I40E_PRTMAC_MACC 0x001E24E0 > > #define I40E_REG_MACC_25GB 0x00020000 > > @@ -2899,7 +2898,7 @@ update_link_reg(struct i40e_hw *hw, struct > > rte_eth_link *link) > > uint32_t link_speed; > > uint32_t reg_val; > > > > - reg_val =3D I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA); > > + reg_val =3D I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA(0)); > > link_speed =3D reg_val & I40E_REG_SPEED_MASK; > > reg_val &=3D I40E_REG_LINK_UP; > > link->link_status =3D (reg_val =3D=3D I40E_REG_LINK_UP) ? 1 : 0; > > -- > > 2.25.1