net/ice: fix speed capability
[dpdk.git] / drivers / net / ice / ice_ethdev.c
index 0a81e04..1482ced 100644 (file)
@@ -4,12 +4,19 @@
 
 #include <rte_ethdev_pci.h>
 
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include "base/ice_sched.h"
+#include "base/ice_flow.h"
 #include "ice_ethdev.h"
 #include "ice_rxtx.h"
 
 #define ICE_MAX_QP_NUM "max_queue_pair_num"
 #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100
+#define ICE_DFLT_PKG_FILE "/lib/firmware/intel/ice/ddp/ice.pkg"
 
 int ice_logtype_init;
 int ice_logtype_driver;
@@ -38,6 +45,10 @@ static int ice_rss_hash_update(struct rte_eth_dev *dev,
                               struct rte_eth_rss_conf *rss_conf);
 static int ice_rss_hash_conf_get(struct rte_eth_dev *dev,
                                 struct rte_eth_rss_conf *rss_conf);
+static void ice_promisc_enable(struct rte_eth_dev *dev);
+static void ice_promisc_disable(struct rte_eth_dev *dev);
+static void ice_allmulti_enable(struct rte_eth_dev *dev);
+static void ice_allmulti_disable(struct rte_eth_dev *dev);
 static int ice_vlan_filter_set(struct rte_eth_dev *dev,
                               uint16_t vlan_id,
                               int on);
@@ -103,6 +114,10 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
        .reta_query                   = ice_rss_reta_query,
        .rss_hash_update              = ice_rss_hash_update,
        .rss_hash_conf_get            = ice_rss_hash_conf_get,
+       .promiscuous_enable           = ice_promisc_enable,
+       .promiscuous_disable          = ice_promisc_disable,
+       .allmulticast_enable          = ice_allmulti_enable,
+       .allmulticast_disable         = ice_allmulti_disable,
        .rx_queue_intr_enable         = ice_rx_queue_intr_enable,
        .rx_queue_intr_disable        = ice_rx_queue_intr_disable,
        .fw_version_get               = ice_fw_version_get,
@@ -1251,6 +1266,69 @@ ice_pf_setup(struct ice_pf *pf)
        return 0;
 }
 
+static int ice_load_pkg(struct rte_eth_dev *dev)
+{
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       const char *pkg_file = ICE_DFLT_PKG_FILE;
+       int err;
+       uint8_t *buf;
+       int buf_len;
+       FILE *file;
+       struct stat fstat;
+
+       file = fopen(pkg_file, "rb");
+       if (!file)  {
+               PMD_INIT_LOG(ERR, "failed to open file: %s\n", pkg_file);
+               return -1;
+       }
+
+       err = stat(pkg_file, &fstat);
+       if (err) {
+               PMD_INIT_LOG(ERR, "failed to get file stats\n");
+               fclose(file);
+               return err;
+       }
+
+       buf_len = fstat.st_size;
+       buf = rte_malloc(NULL, buf_len, 0);
+
+       if (!buf) {
+               PMD_INIT_LOG(ERR, "failed to allocate buf of size %d for package\n",
+                               buf_len);
+               fclose(file);
+               return -1;
+       }
+
+       err = fread(buf, buf_len, 1, file);
+       if (err != 1) {
+               PMD_INIT_LOG(ERR, "failed to read package data\n");
+               fclose(file);
+               err = -1;
+               goto fail_exit;
+       }
+
+       fclose(file);
+
+       err = ice_copy_and_init_pkg(hw, buf, buf_len);
+       if (err) {
+               PMD_INIT_LOG(ERR, "ice_copy_and_init_hw failed: %d\n", err);
+               goto fail_exit;
+       }
+       err = ice_init_hw_tbls(hw);
+       if (err) {
+               PMD_INIT_LOG(ERR, "ice_init_hw_tbls failed: %d\n", err);
+               goto fail_init_tbls;
+       }
+
+       return 0;
+
+fail_init_tbls:
+       rte_free(hw->pkg_copy);
+fail_exit:
+       rte_free(buf);
+       return err;
+}
+
 static int
 ice_dev_init(struct rte_eth_dev *dev)
 {
@@ -1258,6 +1336,8 @@ ice_dev_init(struct rte_eth_dev *dev)
        struct rte_intr_handle *intr_handle;
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_adapter *ad =
+               ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
        struct ice_vsi *vsi;
        int ret;
 
@@ -1290,6 +1370,13 @@ ice_dev_init(struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
+       ret = ice_load_pkg(dev);
+       if (ret) {
+               PMD_INIT_LOG(WARNING, "Failed to load the DDP package,"
+                               "Entering Safe Mode");
+               ad->is_safe_mode = 1;
+       }
+
        PMD_INIT_LOG(INFO, "FW %d.%d.%05d API %d.%d",
                     hw->fw_maj_ver, hw->fw_min_ver, hw->fw_build,
                     hw->api_maj_ver, hw->api_min_ver);
@@ -1450,15 +1537,14 @@ ice_dev_close(struct rte_eth_dev *dev)
 
        ice_res_pool_destroy(&pf->msix_pool);
        ice_release_vsi(pf->main_vsi);
-
+       ice_sched_cleanup_all(hw);
+       rte_free(hw->port_info);
        ice_shutdown_all_ctrlq(hw);
 }
 
 static int
 ice_dev_uninit(struct rte_eth_dev *dev)
 {
-       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
@@ -1478,11 +1564,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)
        rte_intr_callback_unregister(intr_handle,
                                     ice_interrupt_handler, dev);
 
-       ice_release_vsi(pf->main_vsi);
-       ice_sched_cleanup_all(hw);
-       rte_free(hw->port_info);
-       ice_shutdown_all_ctrlq(hw);
-
        return 0;
 }
 
@@ -1510,12 +1591,18 @@ static int ice_init_rss(struct ice_pf *pf)
        struct ice_aqc_get_set_rss_keys key;
        uint16_t i, nb_q;
        int ret = 0;
+       bool is_safe_mode = pf->adapter->is_safe_mode;
 
        rss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf;
        nb_q = dev->data->nb_rx_queues;
        vsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE;
        vsi->rss_lut_size = hw->func_caps.common_cap.rss_table_size;
 
+       if (is_safe_mode) {
+               PMD_DRV_LOG(WARNING, "RSS is not supported in safe mode\n");
+               return 0;
+       }
+
        if (!vsi->rss_key)
                vsi->rss_key = rte_zmalloc(NULL,
                                           vsi->rss_key_size, 0);
@@ -1548,6 +1635,44 @@ static int ice_init_rss(struct ice_pf *pf)
        if (ret)
                return -EINVAL;
 
+       /* configure RSS for tcp6 with input set IPv6 src/dst, TCP src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV6,
+                             ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV6);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s TCP_IPV6 rss flow fail %d", __func__, ret);
+
+       /* configure RSS for udp6 with input set IPv6 src/dst, UDP src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV6,
+                             ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV6);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s UDP_IPV6 rss flow fail %d", __func__, ret);
+
+       /* configure RSS for sctp6 with input set IPv6 src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV6,
+                             ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV6);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s SCTP_IPV6 rss flow fail %d",
+                               __func__, ret);
+
+       /* configure RSS for tcp4 with input set IP src/dst, TCP src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_TCP_IPV4,
+                             ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV4);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s TCP_IPV4 rss flow fail %d", __func__, ret);
+
+       /* configure RSS for udp4 with input set IP src/dst, UDP src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_HASH_UDP_IPV4,
+                             ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV4);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s UDP_IPV4 rss flow fail %d", __func__, ret);
+
+       /* configure RSS for sctp4 with input set IP src/dst */
+       ret = ice_add_rss_cfg(hw, vsi->idx, ICE_FLOW_HASH_IPV4,
+                             ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV4);
+       if (ret)
+               PMD_DRV_LOG(ERR, "%s SCTP_IPV4 rss flow fail %d",
+                               __func__, ret);
+
        return 0;
 }
 
@@ -1709,9 +1834,10 @@ ice_dev_start(struct rte_eth_dev *dev)
        struct rte_eth_dev_data *data = dev->data;
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
        uint16_t nb_rxq = 0;
        uint16_t nb_txq, i;
-       int ret;
+       int mask, ret;
 
        /* program Tx queues' context in hardware */
        for (nb_txq = 0; nb_txq < data->nb_tx_queues; nb_txq++) {
@@ -1738,11 +1864,28 @@ ice_dev_start(struct rte_eth_dev *dev)
        }
 
        ice_set_rx_function(dev);
+       ice_set_tx_function(dev);
+
+       mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK |
+                       ETH_VLAN_EXTEND_MASK;
+       ret = ice_vlan_offload_set(dev, mask);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "Unable to set VLAN offload");
+               goto rx_err;
+       }
 
        /* enable Rx interrput and mapping Rx queue to interrupt vector */
        if (ice_rxq_intr_setup(dev))
                return -EIO;
 
+       /* Enable receiving broadcast packets and transmitting packets */
+       ret = ice_set_vsi_promisc(hw, vsi->idx,
+                                 ICE_PROMISC_BCAST_RX | ICE_PROMISC_BCAST_TX |
+                                 ICE_PROMISC_UCAST_TX | ICE_PROMISC_MCAST_TX,
+                                 0);
+       if (ret != ICE_SUCCESS)
+               PMD_DRV_LOG(INFO, "fail to set vsi broadcast");
+
        ret = ice_aq_set_event_mask(hw, hw->port_info->lport,
                                    ((u16)(ICE_AQ_LINK_EVENT_LINK_FAULT |
                                     ICE_AQ_LINK_EVENT_PHY_TEMP_ALARM |
@@ -1802,6 +1945,9 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct ice_vsi *vsi = pf->main_vsi;
        struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
+       bool is_safe_mode = pf->adapter->is_safe_mode;
+       u64 phy_type_low;
+       u64 phy_type_high;
 
        dev_info->min_rx_bufsize = ICE_BUF_SIZE_MIN;
        dev_info->max_rx_pktlen = ICE_FRAME_SIZE_MAX;
@@ -1812,33 +1958,40 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
        dev_info->rx_offload_capa =
                DEV_RX_OFFLOAD_VLAN_STRIP |
-               DEV_RX_OFFLOAD_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_UDP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_CKSUM |
-               DEV_RX_OFFLOAD_QINQ_STRIP |
-               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
-               DEV_RX_OFFLOAD_VLAN_EXTEND |
                DEV_RX_OFFLOAD_JUMBO_FRAME |
                DEV_RX_OFFLOAD_KEEP_CRC |
                DEV_RX_OFFLOAD_SCATTER |
                DEV_RX_OFFLOAD_VLAN_FILTER;
        dev_info->tx_offload_capa =
                DEV_TX_OFFLOAD_VLAN_INSERT |
-               DEV_TX_OFFLOAD_QINQ_INSERT |
-               DEV_TX_OFFLOAD_IPV4_CKSUM |
-               DEV_TX_OFFLOAD_UDP_CKSUM |
-               DEV_TX_OFFLOAD_TCP_CKSUM |
-               DEV_TX_OFFLOAD_SCTP_CKSUM |
-               DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
                DEV_TX_OFFLOAD_TCP_TSO |
                DEV_TX_OFFLOAD_MULTI_SEGS |
                DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+       dev_info->flow_type_rss_offloads = 0;
+
+       if (!is_safe_mode) {
+               dev_info->rx_offload_capa |=
+                       DEV_RX_OFFLOAD_IPV4_CKSUM |
+                       DEV_RX_OFFLOAD_UDP_CKSUM |
+                       DEV_RX_OFFLOAD_TCP_CKSUM |
+                       DEV_RX_OFFLOAD_QINQ_STRIP |
+                       DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+                       DEV_RX_OFFLOAD_VLAN_EXTEND;
+               dev_info->tx_offload_capa |=
+                       DEV_TX_OFFLOAD_QINQ_INSERT |
+                       DEV_TX_OFFLOAD_IPV4_CKSUM |
+                       DEV_TX_OFFLOAD_UDP_CKSUM |
+                       DEV_TX_OFFLOAD_TCP_CKSUM |
+                       DEV_TX_OFFLOAD_SCTP_CKSUM |
+                       DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM;
+               dev_info->flow_type_rss_offloads |= ICE_RSS_OFFLOAD_ALL;
+       }
+
        dev_info->rx_queue_offload_capa = 0;
        dev_info->tx_queue_offload_capa = 0;
 
        dev_info->reta_size = hw->func_caps.common_cap.rss_table_size;
        dev_info->hash_key_size = (VSIQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);
-       dev_info->flow_type_rss_offloads = ICE_RSS_OFFLOAD_ALL;
 
        dev_info->default_rxconf = (struct rte_eth_rxconf) {
                .rx_thresh = {
@@ -1881,8 +2034,17 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                               ETH_LINK_SPEED_5G |
                               ETH_LINK_SPEED_10G |
                               ETH_LINK_SPEED_20G |
-                              ETH_LINK_SPEED_25G |
-                              ETH_LINK_SPEED_40G;
+                              ETH_LINK_SPEED_25G;
+
+       phy_type_low = hw->port_info->phy.phy_type_low;
+       phy_type_high = hw->port_info->phy.phy_type_high;
+
+       if (ICE_PHY_TYPE_SUPPORT_50G(phy_type_low))
+               dev_info->speed_capa |= ETH_LINK_SPEED_50G;
+
+       if (ICE_PHY_TYPE_SUPPORT_100G_LOW(phy_type_low) ||
+                       ICE_PHY_TYPE_SUPPORT_100G_HIGH(phy_type_high))
+               dev_info->speed_capa |= ETH_LINK_SPEED_100G;
 
        dev_info->nb_rx_queues = dev->data->nb_rx_queues;
        dev_info->nb_tx_queues = dev->data->nb_tx_queues;
@@ -1993,6 +2155,12 @@ ice_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
        case ICE_AQ_LINK_SPEED_40GB:
                link.link_speed = ETH_SPEED_NUM_40G;
                break;
+       case ICE_AQ_LINK_SPEED_50GB:
+               link.link_speed = ETH_SPEED_NUM_50G;
+               break;
+       case ICE_AQ_LINK_SPEED_100GB:
+               link.link_speed = ETH_SPEED_NUM_100G;
+               break;
        case ICE_AQ_LINK_SPEED_UNKNOWN:
        default:
                PMD_DRV_LOG(ERR, "Unknown link speed");
@@ -2183,14 +2351,20 @@ ice_vsi_config_vlan_filter(struct ice_vsi *vsi, bool on)
        if (ret) {
                PMD_DRV_LOG(INFO, "Update VSI failed to %s vlan rx pruning",
                            on ? "enable" : "disable");
-               ret = -EINVAL;
+               return -EINVAL;
        } else {
                vsi->info.valid_sections |=
                        rte_cpu_to_le_16(ICE_AQ_VSI_PROP_SW_VALID |
                                         ICE_AQ_VSI_PROP_SECURITY_VALID);
        }
 
-       return ret;
+       /* consist with other drivers, allow untagged packet when vlan filter on */
+       if (on)
+               ret = ice_add_vlan_filter(vsi, 0);
+       else
+               ret = ice_remove_vlan_filter(vsi, 0);
+
+       return 0;
 }
 
 static int
@@ -2550,6 +2724,75 @@ ice_rss_hash_conf_get(struct rte_eth_dev *dev,
        return 0;
 }
 
+static void
+ice_promisc_enable(struct rte_eth_dev *dev)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       uint8_t pmask;
+       uint16_t status;
+
+       pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX |
+               ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
+
+       status = ice_set_vsi_promisc(hw, vsi->idx, pmask, 0);
+       if (status != ICE_SUCCESS)
+               PMD_DRV_LOG(ERR, "Failed to enable promisc, err=%d", status);
+}
+
+static void
+ice_promisc_disable(struct rte_eth_dev *dev)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       uint16_t status;
+       uint8_t pmask;
+
+       pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX |
+               ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
+
+       status = ice_clear_vsi_promisc(hw, vsi->idx, pmask, 0);
+       if (status != ICE_SUCCESS)
+               PMD_DRV_LOG(ERR, "Failed to clear promisc, err=%d", status);
+}
+
+static void
+ice_allmulti_enable(struct rte_eth_dev *dev)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       uint8_t pmask;
+       uint16_t status;
+
+       pmask = ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
+
+       status = ice_set_vsi_promisc(hw, vsi->idx, pmask, 0);
+       if (status != ICE_SUCCESS)
+               PMD_DRV_LOG(ERR, "Failed to enable allmulti, err=%d", status);
+}
+
+static void
+ice_allmulti_disable(struct rte_eth_dev *dev)
+{
+       struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct ice_vsi *vsi = pf->main_vsi;
+       uint16_t status;
+       uint8_t pmask;
+
+       if (dev->data->promiscuous == 1)
+               return; /* must remain in all_multicast mode */
+
+       pmask = ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX;
+
+       status = ice_clear_vsi_promisc(hw, vsi->idx, pmask, 0);
+       if (status != ICE_SUCCESS)
+               PMD_DRV_LOG(ERR, "Failed to clear allmulti, err=%d", status);
+}
+
 static int ice_rx_queue_intr_enable(struct rte_eth_dev *dev,
                                    uint16_t queue_id)
 {
@@ -2590,11 +2833,22 @@ static int
 ice_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
 {
        struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       u32 full_ver;
+       u8 ver, patch;
+       u16 build;
        int ret;
 
-       ret = snprintf(fw_version, fw_size, "%d.%d.%05d %d.%d",
-                      hw->fw_maj_ver, hw->fw_min_ver, hw->fw_build,
-                      hw->api_maj_ver, hw->api_min_ver);
+       full_ver = hw->nvm.oem_ver;
+       ver = (u8)(full_ver >> 24);
+       build = (u16)((full_ver >> 8) & 0xffff);
+       patch = (u8)(full_ver & 0xff);
+
+       ret = snprintf(fw_version, fw_size,
+                       "%d.%d%d 0x%08x %d.%d.%d",
+                       ((hw->nvm.ver >> 12) & 0xf),
+                       ((hw->nvm.ver >> 4) & 0xff),
+                       (hw->nvm.ver & 0xf), hw->nvm.eetrack,
+                       ver, build, patch);
 
        /* add the size of '\0' */
        ret += 1;
@@ -2701,26 +2955,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;