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, 13 insertions, 8 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
index 0e551f281d59..1e21fbb1359c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
@@ -38,8 +38,8 @@ static void i40e_resume_aq(struct i40e_hw *hw);
  **/
 static inline bool i40e_is_nvm_update_op(struct i40e_aq_desc *desc)
 {
-        return (desc->opcode == i40e_aqc_opc_nvm_erase) ||
-               (desc->opcode == i40e_aqc_opc_nvm_update);
+        return (desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_erase)) ||
+                (desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_update));
 }
 
 /**
@@ -889,9 +889,6 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,
                 hw->aq.asq_last_status = (enum i40e_admin_queue_err)retval;
         }
 
-        if (i40e_is_nvm_update_op(desc))
-                hw->aq.nvm_busy = true;
-
         if (le16_to_cpu(desc->datalen) == buff_size) {
                 i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
                            "AQTX: desc and buffer writeback:\n");
@@ -907,6 +904,9 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,
                 status = I40E_ERR_ADMIN_QUEUE_TIMEOUT;
         }
 
+        if (!status && i40e_is_nvm_update_op(desc))
+                hw->aq.nvm_busy = true;
+
 asq_send_command_error:
         mutex_unlock(&hw->aq.asq_mutex);
 asq_send_command_exit:
@@ -988,9 +988,6 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw,
                                e->msg_size);
         }
 
-        if (i40e_is_nvm_update_op(&e->desc))
-                hw->aq.nvm_busy = false;
-
         i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQRX: desc and buffer:\n");
         i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, e->msg_buf);
 
@@ -1023,6 +1020,14 @@ clean_arq_element_out:
                 *pending = (ntc > ntu ? hw->aq.arq.count : 0) + (ntu - ntc);
         mutex_unlock(&hw->aq.arq_mutex);
 
+        if (i40e_is_nvm_update_op(&e->desc)) {
+                hw->aq.nvm_busy = false;
+                if (hw->aq.nvm_release_on_done) {
+                        i40e_release_nvm(hw);
+                        hw->aq.nvm_release_on_done = false;
+                }
+        }
+
         return ret_code;
 }