From: Qi Zhang <qi.z.zhang@intel.com>
To: beilei.xing@intel.com
Cc: dev@dpdk.org, jingjing.wu@intel.com,
Qi Zhang <qi.z.zhang@intel.com>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH v2 11/24] net/i40e/base: fix NVM lock
Date: Tue, 9 Jan 2018 15:17:11 -0500 [thread overview]
Message-ID: <1515529044-10168-12-git-send-email-qi.z.zhang@intel.com> (raw)
In-Reply-To: <1515529044-10168-1-git-send-email-qi.z.zhang@intel.com>
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")
Cc: stable@dpdk.org
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/i40e/base/i40e_adminq.c | 6 ++++++
drivers/net/i40e/base/i40e_common.c | 3 ++-
drivers/net/i40e/base/i40e_nvm.c | 7 +++++--
drivers/net/i40e/base/i40e_type.h | 1 +
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c
index 8cc8c5eca..109d4cf6c 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -694,6 +694,12 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;
}
+ /* 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 f085e3a99..8158c7c10 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1037,7 +1037,8 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw)
hw->pf_id = (u8)(func_rid & 0x7);
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;
status = i40e_init_nvm(hw);
return status;
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index 946778ba3..fec35a887 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -219,14 +219,17 @@ enum i40e_status_code i40e_read_nvm_word(struct i40e_hw *hw, u16 offset,
{
enum i40e_status_code ret_code = I40E_SUCCESS;
- 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) {
if (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) {
ret_code = i40e_read_nvm_word_aq(hw, offset, data);
} else {
ret_code = i40e_read_nvm_word_srctl(hw, offset, data);
}
- i40e_release_nvm(hw);
+ if (hw->flags & I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK)
+ i40e_release_nvm(hw);
}
return ret_code;
}
diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/i40e/base/i40e_type.h
index 438e70678..23ccd1eb4 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -722,6 +722,7 @@ struct i40e_hw {
#define I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE BIT_ULL(0)
#define I40E_HW_FLAG_802_1AD_CAPABLE BIT_ULL(1)
#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE BIT_ULL(2)
+#define I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK BIT_ULL(3)
u64 flags;
/* Used in set switch config AQ command */
--
2.14.1
next prev parent reply other threads:[~2018-01-10 3:26 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 20:17 [dpdk-dev] [PATCH v2 00/24] net/i40e: update base code Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 01/24] net/i40e/base: add new PHY type Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 02/24] net/i40e/base: add capability macros Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 03/24] net/i40e/base: add (Q)SFP module memory access definitions Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 04/24] net/i40e/base: release spinlock before function returns Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 05/24] net/i40e/base: retry AQC to overcome IRCRead hangs Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 06/24] net/i40e/base: add byte swaps in PHY register access Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 07/24] net/i40e/base: add macro for 25G device Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 08/24] net/i40e/base: code refactoring for LED blink Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 09/24] net/i40e/base: add link speed convert function Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 10/24] net/i40e/base: add AQ command for DCB parameters Qi Zhang
2018-01-09 20:17 ` Qi Zhang [this message]
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 12/24] net/i40e/base: code clean Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 13/24] net/i40e/base: add NVM update preservation flags Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 14/24] net/i40e/base: enable AQ event get in NVM update Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 15/24] net/i40e/base: fix link LED blink Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 16/24] net/i40e/base: add defines for flat NVM Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 17/24] net/i40e: enhanced loopback AQ command Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 18/24] net/i40e/base: add rearrange process " Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 19/24] net/i40e/base: add AQ critical error type Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 20/24] net/i40e/base: fix compile issue for GCC 6.3 Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 21/24] net/i40e/base: fix reading LLDP configuration Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 22/24] net/i40e/base: fix unaligned data issue Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 23/24] net/i40e: rename a field Qi Zhang
2018-01-09 20:17 ` [dpdk-dev] [PATCH v2 24/24] net/i40e/base: update README file Qi Zhang
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=1515529044-10168-12-git-send-email-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=stable@dpdk.org \
/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).