Commit add44414762c ("net/ixgbe/base: add E610 NVM-related operations") has
added code to read minimum security revision from NVM. This code was not
meant to be included in DPDK, and was only meant for other drivers derived
from shared base code, but was present due to the way shared driver code
snapshot was generated. Remove this code from DPDK driver.
Fixes: add44414762c ("net/ixgbe/base: add E610 NVM-related operations")
Signed-off-by: Anatoly Burakov <anatoly.bura...@intel.com>
---
drivers/net/ixgbe/base/ixgbe_e610.c | 54 -----------------------------
drivers/net/ixgbe/base/ixgbe_e610.h | 1 -
2 files changed, 55 deletions(-)
diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c
b/drivers/net/ixgbe/base/ixgbe_e610.c
index ac71980630..3e2be07731 100644
--- a/drivers/net/ixgbe/base/ixgbe_e610.c
+++ b/drivers/net/ixgbe/base/ixgbe_e610.c
@@ -2488,60 +2488,6 @@ static s32 ixgbe_read_nvm_sr_copy(struct ixgbe_hw *hw,
return ixgbe_read_nvm_module(hw, bank, hdr_len + offset, data);
}
-/**
- * ixgbe_get_nvm_minsrevs - Get the minsrevs values from flash
- * @hw: pointer to the HW struct
- * @minsrevs: structure to store NVM and OROM minsrev values
- *
- * Read the Minimum Security Revision TLV and extract
- * the revision values from the flash image
- * into a readable structure for processing.
- *
- * Return: the exit code of the operation.
- */
-s32 ixgbe_get_nvm_minsrevs(struct ixgbe_hw *hw,
- struct ixgbe_minsrev_info *minsrevs)
-{
- struct ixgbe_aci_cmd_nvm_minsrev data;
- s32 status;
- u16 valid;
-
- status = ixgbe_acquire_nvm(hw, IXGBE_RES_READ);
- if (status)
- return status;
-
- status = ixgbe_aci_read_nvm(hw, IXGBE_ACI_NVM_MINSREV_MOD_ID,
- 0, sizeof(data), &data,
- true, false);
-
- ixgbe_release_nvm(hw);
-
- if (status)
- return status;
-
- valid = IXGBE_LE16_TO_CPU(data.validity);
-
- /* Extract NVM minimum security revision */
- if (valid & IXGBE_ACI_NVM_MINSREV_NVM_VALID) {
- u16 minsrev_l = IXGBE_LE16_TO_CPU(data.nvm_minsrev_l);
- u16 minsrev_h = IXGBE_LE16_TO_CPU(data.nvm_minsrev_h);
-
- minsrevs->nvm = minsrev_h << 16 | minsrev_l;
- minsrevs->nvm_valid = true;
- }
-
- /* Extract the OROM minimum security revision */
- if (valid & IXGBE_ACI_NVM_MINSREV_OROM_VALID) {
- u16 minsrev_l = IXGBE_LE16_TO_CPU(data.orom_minsrev_l);
- u16 minsrev_h = IXGBE_LE16_TO_CPU(data.orom_minsrev_h);
-
- minsrevs->orom = minsrev_h << 16 | minsrev_l;
- minsrevs->orom_valid = true;
- }
-
- return IXGBE_SUCCESS;
-}
-
/**
* ixgbe_get_nvm_srev - Read the security revision from the NVM CSS header
* @hw: pointer to the HW struct
diff --git a/drivers/net/ixgbe/base/ixgbe_e610.h
b/drivers/net/ixgbe/base/ixgbe_e610.h
index 33c683d1c1..4babee821e 100644
--- a/drivers/net/ixgbe/base/ixgbe_e610.h
+++ b/drivers/net/ixgbe/base/ixgbe_e610.h
@@ -85,7 +85,6 @@ s32 ixgbe_aci_read_nvm(struct ixgbe_hw *hw, u16
module_typeid, u32 offset,
s32 ixgbe_nvm_validate_checksum(struct ixgbe_hw *hw);
s32 ixgbe_nvm_recalculate_checksum(struct ixgbe_hw *hw);
-s32 ixgbe_get_nvm_minsrevs(struct ixgbe_hw *hw, struct ixgbe_minsrev_info
*minsrevs);
s32 ixgbe_get_inactive_nvm_ver(struct ixgbe_hw *hw, struct ixgbe_nvm_info
*nvm);
s32 ixgbe_get_active_nvm_ver(struct ixgbe_hw *hw, struct ixgbe_nvm_info *nvm);
s32 ixgbe_init_nvm(struct ixgbe_hw *hw);
--
2.43.5
