Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 16.11.5
[deb_dpdk.git]
/
drivers
/
net
/
i40e
/
base
/
i40e_nvm.c
diff --git
a/drivers/net/i40e/base/i40e_nvm.c
b/drivers/net/i40e/base/i40e_nvm.c
index
4fa1220
..
4976b1f
100644
(file)
--- 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) {
#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);
if (!ret_code) {
ret_code = i40e_read_nvm_word_aq(hw, offset, data);
i40e_release_nvm(hw);