From 68a1ab82ad74403de83eadbecd8c2ffdd5f63ee8 Mon Sep 17 00:00:00 2001 From: Leyi Rong Date: Mon, 18 Mar 2019 13:50:39 +0800 Subject: [PATCH] net/ice: speed up to retrieve EEPROM Replace ice_read_sr_word with ice_read_sr_buf in ice_get_eeprom. Fixes: d0dd1c8e1997 ("net/ice: support EEPROM information getting") Cc: stable@dpdk.org Signed-off-by: Leyi Rong Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index a23c63ae59..cdb5502d1c 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2814,26 +2814,26 @@ ice_get_eeprom(struct rte_eth_dev *dev, { struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); uint16_t *data = eeprom->data; - uint16_t offset, length, i; - enum ice_status ret_code = ICE_SUCCESS; + uint16_t first_word, last_word, nwords; + enum ice_status status = ICE_SUCCESS; - offset = eeprom->offset >> 1; - length = eeprom->length >> 1; + first_word = eeprom->offset >> 1; + last_word = (eeprom->offset + eeprom->length - 1) >> 1; + nwords = last_word - first_word + 1; - if (offset > hw->nvm.sr_words || - offset + length > hw->nvm.sr_words) { + 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; } eeprom->magic = hw->vendor_id | (hw->device_id << 16); - for (i = 0; i < length; i++) { - ret_code = ice_read_sr_word(hw, offset + i, &data[i]); - if (ret_code != ICE_SUCCESS) { - PMD_DRV_LOG(ERR, "EEPROM read failed."); - return -EIO; - } + 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; } return 0; -- 2.20.1