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 94FACC433F5 for ; Mon, 27 Sep 2021 10:37:56 +0000 (UTC) Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by mail.kernel.org (Postfix) with ESMTP id 17B4E6101A for ; Mon, 27 Sep 2021 10:37:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 17B4E6101A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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 061AF40686; Mon, 27 Sep 2021 12:37:55 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C727B4003D for ; Mon, 27 Sep 2021 12:37:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632739073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjLC3weBLjEqZUluAUP7oZ4oCWMohsoyFGJ1o/G01WQ=; b=Y6oZppog/5RkKNprTQ2h4MTXTpcpOOlVE2ULmC+KigIr0jyJ3R4h7RFcxOThjA67P9xrxj XhrDfbSbewOrtaSad9UwhRDPtlk4ImCPtiov6gb2M22ddS5M04zMmBg8jxCC1NLiP2NfD6 dtqdz20Dm8P/4St6d88lCxp4ZEKFoOY= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-256-4jH6n7mIM0CgtpqkIXJl_g-1; Mon, 27 Sep 2021 06:37:52 -0400 X-MC-Unique: 4jH6n7mIM0CgtpqkIXJl_g-1 Received: by mail-wr1-f69.google.com with SMTP id f7-20020a5d50c7000000b0015e288741a4so13927006wrt.9 for ; Mon, 27 Sep 2021 03:37:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:cc:references:from:subject:in-reply-to :content-transfer-encoding; bh=MjLC3weBLjEqZUluAUP7oZ4oCWMohsoyFGJ1o/G01WQ=; b=tlM2FJ+wcKxC/3jvp+Blx+gXU6Uu0bhsfGFRz/OKa3UBKYgc3sY1soRijMQGR0kKQB P2IDN5u1tV26rsrp2OsGsw8fcWW7U2y34gmYSkRcjAe389hO+QsUmBZGn9cqJQNExsCw 8X5diATvPib3VLh/H0wyTAUQn86/xOrNxxP6O0fsja500TBEK8dXcn7EL1LPum0SCCo0 d87DzRQ10cUA5wswrvXQ3sUqb0ADvDWEmxwGHBxUB/tAvNxOKreegVOHgs+pIgkD/Y/5 7mzyJtY7sgSftFRSTguad1h+bOT/RkL5KsuFEbc4h8Rb1X6OMbwM0HYS4KjuJAm0SUzv z/sg== X-Gm-Message-State: AOAM531e+gP9NrNAsTNIwd/5nNV/4krk1/ZuQInecXEgbW23pr6xhMwM 6wt2sbdxfBBEk+/G5jiq5yjr5dL234arEZEnwpDCjshsiQjTm2g+wlv1M//IiNgySM8liXvQXjz m9KE= X-Received: by 2002:a05:6000:1192:: with SMTP id g18mr12042625wrx.63.1632739070840; Mon, 27 Sep 2021 03:37:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEENUXX9uK4n1NxIQHlL6UHZ0cbNCXQ6Xnc9+EMd92a7meVGlksuuwmY7zOU+2k9VRCMK9hA== X-Received: by 2002:a05:6000:1192:: with SMTP id g18mr12042601wrx.63.1632739070619; Mon, 27 Sep 2021 03:37:50 -0700 (PDT) Received: from [192.168.0.36] ([78.18.26.217]) by smtp.gmail.com with ESMTPSA id b7sm19915698wrm.9.2021.09.27.03.37.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Sep 2021 03:37:50 -0700 (PDT) Message-ID: <894844b2-3d2d-76a7-33bd-ea5b50256372@redhat.com> Date: Mon, 27 Sep 2021 11:37:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 To: "Zhang, RobinX" , "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" References: <20210618063851.3694702-1-robinx.zhang@intel.com> <20210906020258.1291688-1-robinx.zhang@intel.com> <20210906020258.1291688-19-robinx.zhang@intel.com> From: Kevin Traynor In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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, On 27/09/2021 10:30, Zhang, RobinX wrote: > 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 >> >> >> >>> -----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 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? > > This patch is dependent on share code, so cannot cc stable. > I don't think the original definition should be the fixes commit, unless it was incorrect before these patches. This warning was introduced by the redefining in patch 13/18. It would be better to fix 13/18 to not introduce the warning, rather than introduce a warning and fix it at the end of the series. >> >>> >>> 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 = 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 >