From: "Xing, Beilei" <beilei.xing@intel.com>
To: "Zhang, RobinX" <robinx.zhang@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "Zhang, Qi Z" <qi.z.zhang@intel.com>,
"Zhang, Helin" <helin.zhang@intel.com>,
"Wu, Jingjing" <jingjing.wu@intel.com>,
"remy.horton@intel.com" <remy.horton@intel.com>,
"jijiang.liu@intel.com" <jijiang.liu@intel.com>,
"jing.d.chen@intel.com" <jing.d.chen@intel.com>,
"Zhu, Heqing" <heqing.zhu@intel.com>,
"Liang, Cunming" <cunming.liang@intel.com>,
"Lu, Wenzhuo" <wenzhuo.lu@intel.com>,
"Zhang, Roy Fan" <roy.fan.zhang@intel.com>,
"Chilikin, Andrey" <andrey.chilikin@intel.com>,
"echaudro@redhat.com" <echaudro@redhat.com>,
"Guo, Junfeng" <junfeng.guo@intel.com>,
"Yang, SteveX" <stevex.yang@intel.com>
Subject: Re: [dpdk-dev] [PATCH v4 18/18] net/i40e: fix redefinition warning
Date: Mon, 27 Sep 2021 09:17:53 +0000 [thread overview]
Message-ID: <MWHPR11MB1872DD4B993E55D88E9CDF21F7A79@MWHPR11MB1872.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20210906020258.1291688-19-robinx.zhang@intel.com>
> -----Original Message-----
> From: Zhang, RobinX <robinx.zhang@intel.com>
> Sent: Monday, September 6, 2021 10:03 AM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> Zhang, Helin <helin.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>;
> remy.horton@intel.com; jijiang.liu@intel.com; jing.d.chen@intel.com; Zhu,
> Heqing <heqing.zhu@intel.com>; Liang, Cunming
> <cunming.liang@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>; Zhang,
> Roy Fan <roy.fan.zhang@intel.com>; Chilikin, Andrey
> <andrey.chilikin@intel.com>; echaudro@redhat.com; Guo, Junfeng
> <junfeng.guo@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
> RobinX <robinx.zhang@intel.com>
> Subject: [PATCH v4 18/18] net/i40e: fix redefinition warning
>
> After update i40e share code, there will be a redefinition compile warning.
> 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?
>
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> ---
> 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 = I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA);
> + reg_val = I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA(0));
> link_speed = reg_val & I40E_REG_SPEED_MASK;
> reg_val &= I40E_REG_LINK_UP;
> link->link_status = (reg_val == I40E_REG_LINK_UP) ? 1 : 0;
> --
> 2.25.1
next prev parent reply other threads:[~2021-09-27 9:18 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 6:38 [dpdk-dev] [PATCH 00/14] i40e base code update Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 01/14] net/i40e/base: add new versions of send ASQ command functions Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 02/14] net/i40e/base: update FVL FW API version to 1.14 Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 03/14] net/i40e/base: add support for Min Rollback Revision for 4 more FPK modules Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 04/14] net/i40e/base: set TSA table values when parsing CEE configuration Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 05/14] net/i40e/base: define new Shadow RAM pointers Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 06/14] net/i40e/base: fix PHY type identifiers for 2.5G and 5G adapters Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 07/14] net/i40e/base: fix PF reset failed Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 08/14] net/i40e/base: fix update link data for X722 Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 09/14] net/i40e/base: fix AOC media type reported by ethtool Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 10/14] net/i40e/base: add flags and fields for double vlan processing Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 11/14] net/i40e/base: 10GBASE-ER Optical modules recognition Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 12/14] net/i40e/base: fix headers to match functions Robin Zhang
2021-06-18 6:38 ` [dpdk-dev] [PATCH 13/14] net/i40e/base: fix potentially uninitialized variables in NVM code Robin Zhang
2021-06-21 6:52 ` Xing, Beilei
2021-06-18 6:38 ` [dpdk-dev] [PATCH 14/14] net/i40e/base: update version in readme Robin Zhang
2021-06-21 6:36 ` [dpdk-dev] [PATCH v2 00/14] i40e base code update Robin Zhang
2021-06-21 6:36 ` [dpdk-dev] [PATCH v2 01/14] net/i40e/base: add new versions of send ASQ command functions Robin Zhang
2021-06-21 6:36 ` [dpdk-dev] [PATCH v2 02/14] net/i40e/base: update FW API version to 1.14 Robin Zhang
2021-06-21 6:36 ` [dpdk-dev] [PATCH v2 03/14] net/i40e/base: add support for Min Rollback Revision for 4 more X722 modules Robin Zhang
2021-06-21 6:36 ` [dpdk-dev] [PATCH v2 04/14] net/i40e/base: set TSA table values when parsing CEE configuration Robin Zhang
2021-06-21 6:36 ` [dpdk-dev] [PATCH v2 05/14] net/i40e/base: define new Shadow RAM pointers Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 06/14] net/i40e/base: fix PHY type identifiers for 2.5G and 5G adapters Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 07/14] net/i40e/base: fix PF reset failed Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 08/14] net/i40e/base: fix update link data for X722 Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 09/14] net/i40e/base: fix AOC media type reported by ethtool Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 10/14] net/i40e/base: add flags and fields for double vlan processing Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 11/14] net/i40e/base: 10GBASE-ER Optical modules recognition Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 12/14] net/i40e/base: fix headers to match functions Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 13/14] net/i40e/base: fix potentially uninitialized variables in NVM code Robin Zhang
2021-06-21 6:37 ` [dpdk-dev] [PATCH v2 14/14] net/i40e/base: update version in readme Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 00/15] i40e base code update Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 01/15] net/i40e/base: add new versions of send ASQ command functions Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 02/15] net/i40e/base: update X710 FW API version to 1.14 Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 03/15] net/i40e/base: add support for Min Rollback Revision for 4 more X722 modules Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 04/15] net/i40e/base: set TSA table values when parsing CEE configuration Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 05/15] net/i40e/base: define new Shadow RAM pointers Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 06/15] net/i40e/base: fix PHY type identifiers for 2.5G and 5G adapters Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 07/15] net/i40e/base: fix PF reset failed Robin Zhang
2021-06-21 7:51 ` [dpdk-dev] [PATCH v3 08/15] net/i40e/base: fix update link data for X722 Robin Zhang
2021-06-21 7:52 ` [dpdk-dev] [PATCH v3 09/15] net/i40e/base: fix AOC media type reported by ethtool Robin Zhang
2021-06-21 7:52 ` [dpdk-dev] [PATCH v3 10/15] net/i40e/base: add flags and fields for double vlan processing Robin Zhang
2021-06-21 7:52 ` [dpdk-dev] [PATCH v3 11/15] net/i40e/base: 10GBASE-ER Optical modules recognition Robin Zhang
2021-06-21 7:52 ` [dpdk-dev] [PATCH v3 12/15] net/i40e/base: fix headers to match functions Robin Zhang
2021-06-21 7:52 ` [dpdk-dev] [PATCH v3 13/15] net/i40e/base: fix potentially uninitialized variables in NVM code Robin Zhang
2021-06-21 7:52 ` [dpdk-dev] [PATCH v3 14/15] net/i40e/base: fix checksum is used before return value is checked Robin Zhang
2021-06-21 7:52 ` [dpdk-dev] [PATCH v3 15/15] net/i40e/base: update version in readme Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 00/18] i40e base code update Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 01/18] net/i40e/base: add new versions of send ASQ command functions Robin Zhang
2021-09-29 16:21 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 02/18] net/i40e/base: add support for Min Rollback Revision for 4 more X722 modules Robin Zhang
2021-09-29 16:21 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 03/18] net/i40e/base: set TSA table values when parsing CEE configuration Robin Zhang
2021-09-29 16:21 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 04/18] net/i40e/base: define new Shadow RAM pointers Robin Zhang
2021-09-29 16:21 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 05/18] net/i40e/base: fix PHY type identifiers for 2.5G and 5G adapters Robin Zhang
2021-09-29 16:21 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 06/18] net/i40e/base: fix PF reset failed Robin Zhang
2021-09-29 16:21 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 07/18] net/i40e/base: fix update link data for X722 Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 08/18] net/i40e/base: fix AOC media type reported by ethtool Robin Zhang
2021-09-29 16:21 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 09/18] net/i40e/base: add flags and fields for double vlan processing Robin Zhang
2021-09-29 16:22 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 10/18] net/i40e/base: fix headers to match functions Robin Zhang
2021-09-29 15:59 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 11/18] net/i40e/base: fix potentially uninitialized variables in NVM code Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 12/18] net/i40e/base: fix checksum is used before return value is checked Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 13/18] net/i40e/base: add defs for MAC frequency calculation if no link Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 14/18] net/i40e/base: separate kernel allocated rx_bi rings from AF_XDP rings Robin Zhang
2021-09-29 16:22 ` Ferruh Yigit
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 15/18] net/i40e/base: Update FVL FW API version to 1.15 Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 16/18] net/i40e/base: add defines related to DDP Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 17/18] net/i40e/base: update version in readme Robin Zhang
2021-09-06 2:02 ` [dpdk-dev] [PATCH v4 18/18] net/i40e: fix redefinition warning Robin Zhang
2021-09-27 9:17 ` Xing, Beilei [this message]
2021-09-27 9:30 ` Zhang, RobinX
2021-09-27 10:37 ` Kevin Traynor
2021-09-27 11:00 ` Zhang, Qi Z
2021-09-27 9:41 ` [dpdk-dev] [PATCH v4 00/18] i40e base code update Xing, Beilei
2021-09-27 12:09 ` Zhang, Qi Z
2021-09-29 16:21 ` Ferruh Yigit
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 00/17] " Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 01/17] net/i40e/base: add v2 version of send ASQ command functions Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 02/17] net/i40e/base: add Min SRev for 4 more X722 modules Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 03/17] net/i40e/base: set TSA table values when parsing CEE config Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 04/17] net/i40e/base: define new shadow RAM pointers Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 05/17] net/i40e/base: fix PHY identifiers for 2.5G and 5G adapters Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 06/17] net/i40e/base: fix PF reset Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 07/17] net/i40e/base: fix update link data for X722 Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 08/17] net/i40e/base: fix AOC media type Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 09/17] net/i40e/base: add flags and fields for double VLAN Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 10/17] net/i40e/base: fix headers to match functions Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 11/17] net/i40e/base: fix potentially uninitialized variables Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 12/17] net/i40e/base: fix checksum is used incorrectly Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 13/17] net/i40e/base: add calculation of MAC frequency if no link Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 14/17] net/i40e/base: separate kernel allocated Rx bi rings Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 15/17] net/i40e/base: update FVL FW API version to 1.15 Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 16/17] net/i40e/base: add defines related to DDP Robin Zhang
2021-10-09 1:26 ` [dpdk-dev] [PATCH v5 17/17] net/i40e/base: update version in readme Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 00/17] i40e base code update Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 01/17] net/i40e/base: add v2 version of send ASQ command functions Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 02/17] net/i40e/base: add Min SRev for 4 more X722 modules Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 03/17] net/i40e/base: set TSA table values when parsing CEE config Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 04/17] net/i40e/base: define new shadow RAM pointers Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 05/17] net/i40e/base: fix PHY identifiers for 2.5G and 5G adapters Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 06/17] net/i40e/base: fix PF reset Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 07/17] net/i40e/base: fix update link data for X722 Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 08/17] net/i40e/base: fix AOC media type Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 09/17] net/i40e/base: add flags and fields for double VLAN Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 10/17] net/i40e/base: fix headers to match functions Robin Zhang
2021-10-09 5:36 ` Zhang, Qi Z
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 11/17] net/i40e/base: fix potentially uninitialized variables Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 12/17] net/i40e/base: fix checksum is used incorrectly Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 13/17] net/i40e/base: add calculation of MAC frequency if no link Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 14/17] net/i40e/base: separate kernel allocated Rx bi rings Robin Zhang
2021-10-09 5:39 ` Zhang, Qi Z
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 15/17] net/i40e/base: update FVL FW API version to 1.15 Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 16/17] net/i40e/base: add defines related to DDP Robin Zhang
2021-10-09 1:39 ` [dpdk-dev] [PATCH v6 17/17] net/i40e/base: update version in readme Robin Zhang
2021-10-09 5:41 ` [dpdk-dev] [PATCH v6 00/17] i40e base code update Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MWHPR11MB1872DD4B993E55D88E9CDF21F7A79@MWHPR11MB1872.namprd11.prod.outlook.com \
--to=beilei.xing@intel.com \
--cc=andrey.chilikin@intel.com \
--cc=cunming.liang@intel.com \
--cc=dev@dpdk.org \
--cc=echaudro@redhat.com \
--cc=helin.zhang@intel.com \
--cc=heqing.zhu@intel.com \
--cc=jijiang.liu@intel.com \
--cc=jing.d.chen@intel.com \
--cc=jingjing.wu@intel.com \
--cc=junfeng.guo@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=remy.horton@intel.com \
--cc=robinx.zhang@intel.com \
--cc=roy.fan.zhang@intel.com \
--cc=stevex.yang@intel.com \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).