From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 049DE1B1B3 for ; Fri, 26 Jan 2018 14:16:06 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id g1so1204323wmg.2 for ; Fri, 26 Jan 2018 05:16:06 -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=bPU90n7et9Hwiw7tN1/MBTRtBM9xpVl9O0M1pHgc6lo=; b=cVSBMtpTZZ/rYpbp0YUacbzlRGQNk7uxjtdxs4w8eoeK+BIdxgsUSaePkZtSCuvBWO 87OHoKvORkG/snAv2MLgcOqwYN1LyFJNIlELsoyd72ecgloxo0PzagaApbvPo1/edndM dbS13jdMpOeFWnMcueNOP05ZiufW7WPY3z5dkPE5slk5JHinAxr0/E+ZKCSfJRYisrXv Vq2GXl0iq4v3Kw1IpG3+6o1eSyBH6QfyRFZl6CM8wRIo2Pb+0jfUtevSH/ZBegeNuYqX o2p3O+q1NL0s5nuDYgSdVH5ShStfrQXw57NCmc9VVEJIWj5Pk+/yeVenBFGcLS4VqkyT +u1g== 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=bPU90n7et9Hwiw7tN1/MBTRtBM9xpVl9O0M1pHgc6lo=; b=SZQE5IkgmwTf37Q53SxCipxmfHj3LFeXGJmwOrJGX8lmpapzUyFu5pQDbY7Jp9kK5v lKsXNr9bHdyEmDcEcktWi95XyW9TLSFGAr+BKPVABXDOfwXMGoEr6rANqQy/wS5JyYzi IgAKKVo+ReCU5/MBmO0vqTTIt5QAAsCAddp07mS2TUvV3pmwkqIIRxe0CJgdhSphnYoO yQ6TwilVd5W9Dxjh5xAr+Q8xQ8b+jmG4WfGGVzUI+iJTrz8vft5hFWdNlaH4Atp99u6T ZENN5IyRdxhlbHPIR2ij5nZVwguRG2Wacq9exCqw1bTwc1srxlAtG4PiW/0aSnYahbUB 2meg== X-Gm-Message-State: AKwxytd2HG1K8VM1322mrrxCJyyufkk/36YQYNEGlINAa9l/rD3yMerr cxyUYk0SKlcyNMhDxW/kF+rMu7MbxGo= X-Google-Smtp-Source: AH8x227/YUC2W5nB413jF0TpisWvDf1k3PgowhiKQS99L2a7uXvtpUr2x9gOHHwLiVJ3mPoXlUZLpQ== X-Received: by 10.28.184.82 with SMTP id i79mr10730255wmf.6.1516972565711; Fri, 26 Jan 2018 05:16:05 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:9531:588b:44ae:bec4]) by smtp.gmail.com with ESMTPSA id j77sm5253478wmf.37.2018.01.26.05.16.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2018 05:16:05 -0800 (PST) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Beilei Xing , dpdk stable Date: Fri, 26 Jan 2018 13:13:05 +0000 Message-Id: <20180126131332.15346-35-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 NVM lock' 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:06 -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 4617d3b2e596c63c3636a70b55b0e9897b52025d Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 9 Jan 2018 15:30:09 -0500 Subject: [PATCH] net/i40e/base: fix NVM lock [ upstream commit 4b3b515901b927985e04d4d96a2a804f18e04a16 ] NVM lock is only required at below situation: 1. its X722 device or 2. API version >= 1.5 or may have issue at firmware downgrade. Fixes: c5846a125b26 ("net/i40e/base: fix NVM access interfering") Signed-off-by: Qi Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_adminq.c | 6 ++++++ drivers/net/i40e/base/i40e_common.c | 3 ++- drivers/net/i40e/base/i40e_nvm.c | 3 ++- drivers/net/i40e/base/i40e_type.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c index 0d3a83fa4..15cbd8955 100644 --- a/drivers/net/i40e/base/i40e_adminq.c +++ b/drivers/net/i40e/base/i40e_adminq.c @@ -682,6 +682,12 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) &oem_lo); hw->nvm.oem_ver = ((u32)oem_hi << 16) | oem_lo; + /* Newer versions of firmware require lock when reading the NVM */ + if ((hw->aq.api_maj_ver > 1) || + ((hw->aq.api_maj_ver == 1) && + (hw->aq.api_min_ver >= 5))) + hw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK; + if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) { ret_code = I40E_ERR_FIRMWARE_API_VERSION; goto init_adminq_free_arq; diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 9a6b3ed61..76f262116 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1046,7 +1046,8 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw) #ifdef X722_SUPPORT if (hw->mac.type == I40E_MAC_X722) - hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE; + hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE | + I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK; #endif status = i40e_init_nvm(hw); diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c index 4fa1220b2..4976b1ffc 100644 --- a/drivers/net/i40e/base/i40e_nvm.c +++ b/drivers/net/i40e/base/i40e_nvm.c @@ -221,7 +221,8 @@ enum i40e_status_code i40e_read_nvm_word(struct i40e_hw *hw, u16 offset, #ifdef X722_SUPPORT if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) { - ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); + if (hw->flags & I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK) + ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ); if (!ret_code) { ret_code = i40e_read_nvm_word_aq(hw, offset, data); i40e_release_nvm(hw); diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/i40e/base/i40e_type.h index b5f72c32d..d514abe34 100644 --- a/drivers/net/i40e/base/i40e_type.h +++ b/drivers/net/i40e/base/i40e_type.h @@ -685,6 +685,7 @@ struct i40e_hw { #endif #define I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE BIT_ULL(0) +#define I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK BIT_ULL(3) u64 flags; /* debug mask */ -- 2.14.2