From: Murphy Yang <murphyx.yang@intel.com>
To: stable@dpdk.org
Cc: Murphy Yang <murphyx.yang@intel.com>,
Shougang Wang <shougangx.wang@intel.com>
Subject: [dpdk-stable] [PATCH 19.11] net/ice: fix incorrect EEPROM data
Date: Wed, 10 Mar 2021 09:13:27 +0000 [thread overview]
Message-ID: <20210310091327.86253-1-murphyx.yang@intel.com> (raw)
[ upstream commit 01186263c2c79b9a22d3f3b1eeec844c6552fdc7 ]
Kernel driver reads EEPROM data from flash but DPDK reads from
shadow ram. This patch fixes the issue by changing method to get
EEPROM data from flash.
Fixes: 68a1ab82ad74 ("net/ice: speed up to retrieve EEPROM")
Cc: stable@dpdk.org
Signed-off-by: Shougang Wang <shougangx.wang@intel.com>
---
drivers/net/ice/ice_ethdev.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index c2e659303c..efb2d67d54 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -3984,8 +3984,7 @@ ice_get_eeprom_length(struct rte_eth_dev *dev)
{
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- /* Convert word count to byte count */
- return hw->nvm.sr_words << 1;
+ return hw->nvm.flash_size;
}
static int
@@ -3993,26 +3992,24 @@ ice_get_eeprom(struct rte_eth_dev *dev,
struct rte_dev_eeprom_info *eeprom)
{
struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- uint16_t *data = eeprom->data;
- uint16_t first_word, last_word, nwords;
enum ice_status status = ICE_SUCCESS;
+ uint8_t *data = eeprom->data;
- first_word = eeprom->offset >> 1;
- last_word = (eeprom->offset + eeprom->length - 1) >> 1;
- nwords = last_word - first_word + 1;
+ eeprom->magic = hw->vendor_id | (hw->device_id << 16);
- if (first_word >= hw->nvm.sr_words ||
- last_word >= hw->nvm.sr_words) {
- PMD_DRV_LOG(ERR, "Requested EEPROM bytes out of range.");
- return -EINVAL;
+ status = ice_acquire_nvm(hw, ICE_RES_READ);
+ if (status) {
+ PMD_DRV_LOG(ERR, "acquire nvm failed.");
+ return -EIO;
}
- eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+ status = ice_read_flat_nvm(hw, eeprom->offset, &eeprom->length,
+ data, false);
+
+ ice_release_nvm(hw);
- status = ice_read_sr_buf(hw, first_word, &nwords, data);
if (status) {
PMD_DRV_LOG(ERR, "EEPROM read failed.");
- eeprom->length = sizeof(uint16_t) * nwords;
return -EIO;
}
--
2.17.1
next reply other threads:[~2021-03-10 9:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 9:13 Murphy Yang [this message]
2021-03-10 10:29 ` Christian Ehrhardt
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=20210310091327.86253-1-murphyx.yang@intel.com \
--to=murphyx.yang@intel.com \
--cc=shougangx.wang@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).