i40e/i40evf: Add nvmupdate support

This implements a state machine intended to support the userland tool for
updating the device eeprom. The state machine implements one-shot reads,
writes, multi-step write sessions, and checksum requests. If we're in the middle
of a multi-step write session, no one should fire off other writes, however, one
shot reads are valid. The userland tool is expected to keep track of its session
status, arrange the placement and ordering of the writes, and deal with the
checksum requirement.

This patch also adds nvmupdate support to ethtool callbacks.
The get_eeprom() and set_eeprom() services in ethtool are used here to
facilitate the userland NVMUpdate tool.  The 'magic' value in the get and
set commands is used to pass additional control information for managing
the read and write steps.

The read operation works both as normally expected in the standard ethtool
method, as well as with the extra NVM controls.  The write operation
works only for the expanded NVM functions - the normal ethtool method is
not allowed because of the NVM semaphore management needed for multipart
writes, as well as the checksum requirement.

Change-ID: I1d84a170153a9f437906744e2e350fd68fe7563d
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 59 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 3abd3cbab75f..f1d241ec1fc3 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -759,10 +759,33 @@ static int i40e_get_eeprom(struct net_device *netdev,
         u8 *eeprom_buff;
         u16 i, sectors;
         bool last;
+        u32 magic;
+
 #define I40E_NVM_SECTOR_SIZE  4096
         if (eeprom->len == 0)
                 return -EINVAL;
 
+        /* check for NVMUpdate access method */
+        magic = hw->vendor_id | (hw->device_id << 16);
+        if (eeprom->magic && eeprom->magic != magic) {
+                int errno;
+
+                /* make sure it is the right magic for NVMUpdate */
+                if ((eeprom->magic >> 16) != hw->device_id)
+                        return -EINVAL;
+
+                ret_val = i40e_nvmupd_command(hw,
+                                              (struct i40e_nvm_access *)eeprom,
+                                              bytes, &errno);
+                if (ret_val)
+                        dev_info(&pf->pdev->dev,
+                                 "NVMUpdate read failed err=%d status=0x%x\n",
+                                 ret_val, hw->aq.asq_last_status);
+
+                return errno;
+        }
+
+        /* normal ethtool get_eeprom support */
         eeprom->magic = hw->vendor_id | (hw->device_id << 16);
 
         eeprom_buff = kzalloc(eeprom->len, GFP_KERNEL);
@@ -789,7 +812,7 @@ static int i40e_get_eeprom(struct net_device *netdev,
                 ret_val = i40e_aq_read_nvm(hw, 0x0,
                                 eeprom->offset + (I40E_NVM_SECTOR_SIZE * i),
                                 len,
-                                eeprom_buff + (I40E_NVM_SECTOR_SIZE * i),
+                                (u8 *)eeprom_buff + (I40E_NVM_SECTOR_SIZE * i),
                                 last, NULL);
                 if (ret_val) {
                         dev_info(&pf->pdev->dev,
@@ -801,7 +824,7 @@ static int i40e_get_eeprom(struct net_device *netdev,
 
 release_nvm:
         i40e_release_nvm(hw);
-        memcpy(bytes, eeprom_buff, eeprom->len);
+        memcpy(bytes, (u8 *)eeprom_buff, eeprom->len);
 free_buff:
         kfree(eeprom_buff);
         return ret_val;
@@ -821,6 +844,39 @@ static int i40e_get_eeprom_len(struct net_device *netdev)
         return val;
 }
 
+static int i40e_set_eeprom(struct net_device *netdev,
+                           struct ethtool_eeprom *eeprom, u8 *bytes)
+{
+        struct i40e_netdev_priv *np = netdev_priv(netdev);
+        struct i40e_hw *hw = &np->vsi->back->hw;
+        struct i40e_pf *pf = np->vsi->back;
+        int ret_val = 0;
+        int errno;
+        u32 magic;
+
+        /* normal ethtool set_eeprom is not supported */
+        magic = hw->vendor_id | (hw->device_id << 16);
+        if (eeprom->magic == magic)
+                return -EOPNOTSUPP;
+
+        /* check for NVMUpdate access method */
+        if (!eeprom->magic || (eeprom->magic >> 16) != hw->device_id)
+                return -EINVAL;
+
+        if (test_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state) ||
+            test_bit(__I40E_RESET_INTR_RECEIVED, &pf->state))
+                return -EBUSY;
+
+        ret_val = i40e_nvmupd_command(hw, (struct i40e_nvm_access *)eeprom,
+                                      bytes, &errno);
+        if (ret_val)
+                dev_info(&pf->pdev->dev,
+                         "NVMUpdate write failed err=%d status=0x%x\n",
+                         ret_val, hw->aq.asq_last_status);
+
+        return errno;
+}
+
 static void i40e_get_drvinfo(struct net_device *netdev,
                              struct ethtool_drvinfo *drvinfo)
 {
@@ -2094,6 +2150,7 @@ static const struct ethtool_ops i40e_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
         .get_wol                = i40e_get_wol,
         .set_wol                = i40e_set_wol,
+        .set_eeprom             = i40e_set_eeprom,
         .get_eeprom_len         = i40e_get_eeprom_len,
         .get_eeprom             = i40e_get_eeprom,
         .get_ringparam          = i40e_get_ringparam,