From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 882721B291 for ; Fri, 26 Jan 2018 14:16:10 +0100 (CET) Received: by mail-wm0-f67.google.com with SMTP id r71so1206967wmd.1 for ; Fri, 26 Jan 2018 05:16:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LtjEEYDYm9f/qqedNTT8tFgZNUrxfKSxm+6GU2DnBes=; b=fQYgw+3PxqZjIQyiTQD9gQ8EkBtSuOZJYj2PpIngL2sH56PzBBhw+a0f5eryfFbMjU Qn4iRr2q+/34GOzmDuycqe/T2mMkSioTHrCwQmdSIHpU1P56vvzKLbTMBbhXhlVNcFgc MTXQlQcN/RXiqNPkYxPiLZJCdZWv5QYhz6OZ3piqwKFAjTESNJEBn8BLh4Dw6UzxhQhO wzp1tm0mOr2txr33ga588CVriGh1lGIC/Bu96/Psq/qF7R82+SoclHYjJELUDArJGpMv 6fq9zbw6430zQod8Az3uVye7iq3uMugpUwraTUxnm6w+hCaeuHf/yEVSph1SyVyLptXw WTLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LtjEEYDYm9f/qqedNTT8tFgZNUrxfKSxm+6GU2DnBes=; b=Cyj84NSKLW7kO1gNZcZ18XhgKF3v6rSyNL2LJ8CD9PMb/hlVHnjTv6tWvnjPqjS7nf /OILh0qULH138P0A1AOYN8lbkPIIwdYbTqhDOvbOrjwYD/yMNdmEj1OLT1zTjurbMy/b sNVlGAXtuUOsoJtwuguInd9seAAerY82kxHTYQcYBnNu9h51zhI17YTwPY6TA/u3wYMW qxULkMuipkKyuVepV/2Rg/SdK/acPtYYOd+3ZK4zmAqcpo/Q07+fxDnoqpanDzgQbBiW R+q1JGqg3zKS9LC/EmQaMl9Mgs0fIqxC2nw1mMl/CjfFbTOOJfkueslCirKjXBaZgHF9 LKTw== X-Gm-Message-State: AKwxytfCiJi0EU2mY9wIvjQq0jhKLVwAeP/tTHGYKPv0o82XUE7ZGNqY 7RD5hjA1CjxFW16KGvmLUp4= X-Google-Smtp-Source: AH8x225VJnRmTtjHxdHzVCd1KeOuWr9AjJxCxQAlhLUZQvwvzAScpnZ7db91a04pfBKnekmUyDiDgA== X-Received: by 10.28.213.77 with SMTP id m74mr11380959wmg.137.1516972570275; Fri, 26 Jan 2018 05:16:10 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:9531:588b:44ae:bec4]) by smtp.gmail.com with ESMTPSA id w83sm3755862wma.47.2018.01.26.05.16.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2018 05:16:09 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Beilei Xing , dpdk stable Date: Fri, 26 Jan 2018 13:13:07 +0000 Message-Id: <20180126131332.15346-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180126131332.15346-1-luca.boccassi@gmail.com> References: <20180126131332.15346-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/i40e/base: fix compile issue for GCC 6.3' has been queued to LTS release 16.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jan 2018 13:16:10 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/28/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 10387dda97788be517bc30f1accf33642cb6b948 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 9 Jan 2018 15:30:18 -0500 Subject: [PATCH] net/i40e/base: fix compile issue for GCC 6.3 [ upstream commit bc29754abacd0b2f61195736374d275552d3a518 ] When using GCC 6.3.0 and EXTRA_CFLAGS=-Og, the compiler is not smart enough to see that when you have an integrated VF that just one of the if statemets has to be true so that ntu is always set. Fix the way that the code is for integrated VFs so that the compiler won't complain. Fixes: 9783eb15eb98 ("i40e/base: wrap the register definitions for PF and VF") Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_adminq.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c index 15cbd8955..e231582c5 100644 --- a/drivers/net/i40e/base/i40e_adminq.c +++ b/drivers/net/i40e/base/i40e_adminq.c @@ -1057,22 +1057,19 @@ enum i40e_status_code i40e_clean_arq_element(struct i40e_hw *hw, } /* set next_to_use to head */ -#ifdef PF_DRIVER #ifdef INTEGRATED_VF if (!i40e_is_vf(hw)) - ntu = (rd32(hw, hw->aq.arq.head) & I40E_PF_ARQH_ARQH_MASK); + ntu = rd32(hw, hw->aq.arq.head) & I40E_PF_ARQH_ARQH_MASK; + else + ntu = rd32(hw, hw->aq.arq.head) & I40E_VF_ARQH1_ARQH_MASK; #else - ntu = (rd32(hw, hw->aq.arq.head) & I40E_PF_ARQH_ARQH_MASK); -#endif /* INTEGRATED_VF */ +#ifdef PF_DRIVER + ntu = rd32(hw, hw->aq.arq.head) & I40E_PF_ARQH_ARQH_MASK; #endif /* PF_DRIVER */ #ifdef VF_DRIVER -#ifdef INTEGRATED_VF - if (i40e_is_vf(hw)) - ntu = (rd32(hw, hw->aq.arq.head) & I40E_VF_ARQH1_ARQH_MASK); -#else - ntu = (rd32(hw, hw->aq.arq.head) & I40E_VF_ARQH1_ARQH_MASK); -#endif /* INTEGRATED_VF */ + ntu = rd32(hw, hw->aq.arq.head) & I40E_VF_ARQH1_ARQH_MASK; #endif /* VF_DRIVER */ +#endif /* INTEGRATED_VF */ if (ntu == ntc) { /* nothing to do - shouldn't need to update ring's values */ ret_code = I40E_ERR_ADMIN_QUEUE_NO_WORK; -- 2.14.2