net/ngbe: support EEPROM dump
authorJiawen Wu <jiawenwu@trustnetic.com>
Thu, 21 Oct 2021 09:50:18 +0000 (17:50 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 29 Oct 2021 22:53:19 +0000 (00:53 +0200)
Support to get and set device EEPROM data.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
doc/guides/nics/features/ngbe.ini
drivers/net/ngbe/base/ngbe_dummy.h
drivers/net/ngbe/base/ngbe_eeprom.c
drivers/net/ngbe/base/ngbe_eeprom.h
drivers/net/ngbe/base/ngbe_hw.c
drivers/net/ngbe/base/ngbe_mng.c
drivers/net/ngbe/base/ngbe_mng.h
drivers/net/ngbe/base/ngbe_type.h
drivers/net/ngbe/ngbe_ethdev.c

index c12d43b..4331c04 100644 (file)
@@ -34,6 +34,7 @@ Basic stats          = Y
 Extended stats       = Y
 Stats per queue      = Y
 FW version           = Y
+EEPROM dump          = Y
 LED                  = Y
 Multiprocess aware   = Y
 Linux                = Y
index 9930a3a..61b0d82 100644 (file)
@@ -33,11 +33,21 @@ static inline s32 ngbe_rom_init_params_dummy(struct ngbe_hw *TUP0)
 {
        return NGBE_ERR_OPS_DUMMY;
 }
+static inline s32 ngbe_rom_readw_buffer_dummy(struct ngbe_hw *TUP0, u32 TUP1,
+                                       u32 TUP2, void *TUP3)
+{
+       return NGBE_ERR_OPS_DUMMY;
+}
 static inline s32 ngbe_rom_read32_dummy(struct ngbe_hw *TUP0, u32 TUP1,
                                        u32 *TUP2)
 {
        return NGBE_ERR_OPS_DUMMY;
 }
+static inline s32 ngbe_rom_writew_buffer_dummy(struct ngbe_hw *TUP0, u32 TUP1,
+                                       u32 TUP2, void *TUP3)
+{
+       return NGBE_ERR_OPS_DUMMY;
+}
 static inline s32 ngbe_rom_validate_checksum_dummy(struct ngbe_hw *TUP0,
                                        u16 *TUP1)
 {
@@ -270,7 +280,9 @@ static inline void ngbe_init_ops_dummy(struct ngbe_hw *hw)
 {
        hw->bus.set_lan_id = ngbe_bus_set_lan_id_dummy;
        hw->rom.init_params = ngbe_rom_init_params_dummy;
+       hw->rom.readw_buffer = ngbe_rom_readw_buffer_dummy;
        hw->rom.read32 = ngbe_rom_read32_dummy;
+       hw->rom.writew_buffer = ngbe_rom_writew_buffer_dummy;
        hw->rom.validate_checksum = ngbe_rom_validate_checksum_dummy;
        hw->mac.init_hw = ngbe_mac_init_hw_dummy;
        hw->mac.reset_hw = ngbe_mac_reset_hw_dummy;
index 9ae2f0b..f9a876e 100644 (file)
@@ -161,6 +161,45 @@ void ngbe_release_eeprom_semaphore(struct ngbe_hw *hw)
        ngbe_flush(hw);
 }
 
+/**
+ *  ngbe_ee_read_buffer- Read EEPROM word(s) using hostif
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to read
+ *  @words: number of words
+ *  @data: word(s) read from the EEPROM
+ *
+ *  Reads a 16 bit word(s) from the EEPROM using the hostif.
+ **/
+s32 ngbe_ee_readw_buffer(struct ngbe_hw *hw,
+                                    u32 offset, u32 words, void *data)
+{
+       const u32 mask = NGBE_MNGSEM_SWMBX | NGBE_MNGSEM_SWFLASH;
+       u32 addr = (offset << 1);
+       u32 len = (words << 1);
+       u8 *buf = (u8 *)data;
+       int err;
+
+       err = hw->mac.acquire_swfw_sync(hw, mask);
+       if (err)
+               return err;
+
+       while (len) {
+               u32 seg = (len <= NGBE_PMMBX_DATA_SIZE
+                               ? len : NGBE_PMMBX_DATA_SIZE);
+
+               err = ngbe_hic_sr_read(hw, addr, buf, seg);
+               if (err)
+                       break;
+
+               len -= seg;
+               addr += seg;
+               buf += seg;
+       }
+
+       hw->mac.release_swfw_sync(hw, mask);
+       return err;
+}
+
 /**
  *  ngbe_ee_read32 - Read EEPROM word using a host interface cmd
  *  @hw: pointer to hardware structure
@@ -185,6 +224,44 @@ s32 ngbe_ee_read32(struct ngbe_hw *hw, u32 addr, u32 *data)
        return err;
 }
 
+/**
+ *  ngbe_ee_write_buffer - Write EEPROM word(s) using hostif
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to write
+ *  @words: number of words
+ *  @data: word(s) write to the EEPROM
+ *
+ *  Write a 16 bit word(s) to the EEPROM using the hostif.
+ **/
+s32 ngbe_ee_writew_buffer(struct ngbe_hw *hw,
+                                     u32 offset, u32 words, void *data)
+{
+       const u32 mask = NGBE_MNGSEM_SWMBX | NGBE_MNGSEM_SWFLASH;
+       u32 addr = (offset << 1);
+       u32 len = (words << 1);
+       u8 *buf = (u8 *)data;
+       int err;
+
+       err = hw->mac.acquire_swfw_sync(hw, mask);
+       if (err)
+               return err;
+
+       while (len) {
+               u32 seg = (len <= NGBE_PMMBX_DATA_SIZE
+                               ? len : NGBE_PMMBX_DATA_SIZE);
+
+               err = ngbe_hic_sr_write(hw, addr, buf, seg);
+               if (err)
+                       break;
+
+               len -= seg;
+               buf += seg;
+       }
+
+       hw->mac.release_swfw_sync(hw, mask);
+       return err;
+}
+
 /**
  *  ngbe_validate_eeprom_checksum_em - Validate EEPROM checksum
  *  @hw: pointer to hardware structure
index 5f27425..26ac686 100644 (file)
@@ -17,6 +17,11 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw);
 void ngbe_release_eeprom_semaphore(struct ngbe_hw *hw);
 s32 ngbe_save_eeprom_version(struct ngbe_hw *hw);
 
+s32 ngbe_ee_readw_buffer(struct ngbe_hw *hw, u32 offset, u32 words,
+                               void *data);
 s32 ngbe_ee_read32(struct ngbe_hw *hw, u32 addr, u32 *data);
 
+s32 ngbe_ee_writew_buffer(struct ngbe_hw *hw, u32 offset, u32 words,
+                               void *data);
+
 #endif /* _NGBE_EEPROM_H_ */
index cd547ee..0716357 100644 (file)
@@ -1920,7 +1920,9 @@ s32 ngbe_init_ops_pf(struct ngbe_hw *hw)
 
        /* EEPROM */
        rom->init_params = ngbe_init_eeprom_params;
+       rom->readw_buffer = ngbe_ee_readw_buffer;
        rom->read32 = ngbe_ee_read32;
+       rom->writew_buffer = ngbe_ee_writew_buffer;
        rom->validate_checksum = ngbe_validate_eeprom_checksum_em;
 
        mac->mcft_size          = NGBE_EM_MC_TBL_SIZE;
index 9416ea4..a3dd809 100644 (file)
@@ -202,6 +202,47 @@ s32 ngbe_hic_sr_read(struct ngbe_hw *hw, u32 addr, u8 *buf, int len)
        return 0;
 }
 
+/**
+ *  ngbe_hic_sr_write - Write EEPROM word using hostif
+ *  @hw: pointer to hardware structure
+ *  @offset: offset of  word in the EEPROM to write
+ *  @data: word write to the EEPROM
+ *
+ *  Write a 16 bit word to the EEPROM using the hostif.
+ **/
+s32 ngbe_hic_sr_write(struct ngbe_hw *hw, u32 addr, u8 *buf, int len)
+{
+       struct ngbe_hic_write_shadow_ram command;
+       u32 value;
+       int err = 0, i = 0, j = 0;
+
+       if (len > NGBE_PMMBX_DATA_SIZE)
+               return NGBE_ERR_HOST_INTERFACE_COMMAND;
+
+       memset(&command, 0, sizeof(command));
+       command.hdr.req.cmd = FW_WRITE_SHADOW_RAM_CMD;
+       command.hdr.req.buf_lenh = 0;
+       command.hdr.req.buf_lenl = FW_WRITE_SHADOW_RAM_LEN;
+       command.hdr.req.checksum = FW_DEFAULT_CHECKSUM;
+       command.address = cpu_to_be32(addr);
+       command.length = cpu_to_be16(len);
+
+       while (i < (len >> 2)) {
+               value = ((u32 *)buf)[i];
+               wr32a(hw, NGBE_MNGMBX, FW_NVM_DATA_OFFSET + i, value);
+               i++;
+       }
+
+       for (i <<= 2; i < len; i++)
+               ((u8 *)&value)[j++] = ((u8 *)buf)[i];
+
+       wr32a(hw, NGBE_MNGMBX, FW_NVM_DATA_OFFSET + (i >> 2), value);
+
+       UNREFERENCED_PARAMETER(&command);
+
+       return err;
+}
+
 s32 ngbe_hic_check_cap(struct ngbe_hw *hw)
 {
        struct ngbe_hic_read_shadow_ram command;
index 6f368b0..e3d0309 100644 (file)
@@ -18,6 +18,8 @@
 #define FW_CEM_RESP_STATUS_SUCCESS      0x1
 #define FW_READ_SHADOW_RAM_CMD          0x31
 #define FW_READ_SHADOW_RAM_LEN          0x6
+#define FW_WRITE_SHADOW_RAM_CMD         0x33
+#define FW_WRITE_SHADOW_RAM_LEN         0xA /* 8 plus 1 WORD to write */
 #define FW_DEFAULT_CHECKSUM             0xFF /* checksum always 0xFF */
 #define FW_NVM_DATA_OFFSET              3
 #define FW_EEPROM_CHECK_STATUS         0xE9
@@ -65,6 +67,17 @@ struct ngbe_hic_read_shadow_ram {
        u16 pad3;
 };
 
+struct ngbe_hic_write_shadow_ram {
+       union ngbe_hic_hdr2 hdr;
+       u32 address;
+       u16 length;
+       u16 pad2;
+       u16 data;
+       u16 pad3;
+};
+
 s32 ngbe_hic_sr_read(struct ngbe_hw *hw, u32 addr, u8 *buf, int len);
+s32 ngbe_hic_sr_write(struct ngbe_hw *hw, u32 addr, u8 *buf, int len);
+
 s32 ngbe_hic_check_cap(struct ngbe_hw *hw);
 #endif /* _NGBE_MNG_H_ */
index 886dffc..32d3ab5 100644 (file)
@@ -231,7 +231,11 @@ typedef u8* (*ngbe_mc_addr_itr) (struct ngbe_hw *hw, u8 **mc_addr_ptr,
 
 struct ngbe_rom_info {
        s32 (*init_params)(struct ngbe_hw *hw);
+       s32 (*readw_buffer)(struct ngbe_hw *hw, u32 offset, u32 words,
+                           void *data);
        s32 (*read32)(struct ngbe_hw *hw, u32 addr, u32 *data);
+       s32 (*writew_buffer)(struct ngbe_hw *hw, u32 offset, u32 words,
+                            void *data);
        s32 (*validate_checksum)(struct ngbe_hw *hw, u16 *checksum_val);
 
        enum ngbe_eeprom_type type;
index b36da08..0be100f 100644 (file)
@@ -2669,6 +2669,55 @@ ngbe_dev_set_mc_addr_list(struct rte_eth_dev *dev,
                                         ngbe_dev_addr_list_itr, TRUE);
 }
 
+static int
+ngbe_get_eeprom_length(struct rte_eth_dev *dev)
+{
+       struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+       /* Return unit is byte count */
+       return hw->rom.word_size * 2;
+}
+
+static int
+ngbe_get_eeprom(struct rte_eth_dev *dev,
+               struct rte_dev_eeprom_info *in_eeprom)
+{
+       struct ngbe_hw *hw = ngbe_dev_hw(dev);
+       struct ngbe_rom_info *eeprom = &hw->rom;
+       uint16_t *data = in_eeprom->data;
+       int first, length;
+
+       first = in_eeprom->offset >> 1;
+       length = in_eeprom->length >> 1;
+       if (first > hw->rom.word_size ||
+           ((first + length) > hw->rom.word_size))
+               return -EINVAL;
+
+       in_eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+       return eeprom->readw_buffer(hw, first, length, data);
+}
+
+static int
+ngbe_set_eeprom(struct rte_eth_dev *dev,
+               struct rte_dev_eeprom_info *in_eeprom)
+{
+       struct ngbe_hw *hw = ngbe_dev_hw(dev);
+       struct ngbe_rom_info *eeprom = &hw->rom;
+       uint16_t *data = in_eeprom->data;
+       int first, length;
+
+       first = in_eeprom->offset >> 1;
+       length = in_eeprom->length >> 1;
+       if (first > hw->rom.word_size ||
+           ((first + length) > hw->rom.word_size))
+               return -EINVAL;
+
+       in_eeprom->magic = hw->vendor_id | (hw->device_id << 16);
+
+       return eeprom->writew_buffer(hw,  first, length, data);
+}
+
 static const struct eth_dev_ops ngbe_eth_dev_ops = {
        .dev_configure              = ngbe_dev_configure,
        .dev_infos_get              = ngbe_dev_info_get,
@@ -2719,6 +2768,9 @@ static const struct eth_dev_ops ngbe_eth_dev_ops = {
        .set_mc_addr_list           = ngbe_dev_set_mc_addr_list,
        .rx_burst_mode_get          = ngbe_rx_burst_mode_get,
        .tx_burst_mode_get          = ngbe_tx_burst_mode_get,
+       .get_eeprom_length          = ngbe_get_eeprom_length,
+       .get_eeprom                 = ngbe_get_eeprom,
+       .set_eeprom                 = ngbe_set_eeprom,
 };
 
 RTE_PMD_REGISTER_PCI(net_ngbe, rte_ngbe_pmd);