i40e/i40evf: Enable NVMUpdate to retrieve AdminQ and add preservation flags for NVM update
Subsystems (2)
PATCH 1/9 i40e/i40evf: Enable NVMUpdate to retrieve AdminQ and add preservation flags for NVM update
From: Pawel Jablonski <[email protected]>
This patch adds new I40E_NVMUPD_GET_AQ_EVENT state to allow retrieval of AdminQ events as a result of AdminQ commands sent to firmware.
Add preservation flags support on X722 devices for NVM update AdminQ function wrapper. Add new parameter and handling to nvm update admin queue function intended to allow nvmupdate tool to configure the preservation flags in the AdminQ command.
This is required to implement FlatNVM on X722 devices.
Signed-off-by Pawel Jablonski <[email protected]>
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 8 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 13 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 141 ++++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 6 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 26 ++-- .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 8 +- drivers/net/ethernet/intel/i40evf/i40e_type.h | 26 ++-- 9 files changed, 173 insertions(+), 59 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +1 -1
@@ -1027,7 +1027,7 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw, hw->aq.arq.next_to_clean = ntc; hw->aq.arq.next_to_use = ntu; -i40e_nvmupd_check_wait_event (hw,le16_to_cpu (e->desc.opcode)); +i40e_nvmupd_check_wait_event (hw,le16_to_cpu (e->desc.opcode), &e->desc); clean_arq_element_out:/* Set pending if needed, unlock and return */ if (pending)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +6 -2
@@ -2231,8 +2231,12 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_phy_register_access);*/ struct i40e_aqc_nvm_update {u8 command_flags; -#define I40E_AQ_NVM_LAST_CMD 0x01 -#define I40E_AQ_NVM_FLASH_ONLY 0x80 +#define I40E_AQ_NVM_LAST_CMD 0x01 +#define I40E_AQ_NVM_FLASH_ONLY 0x80 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_SHIFT 1 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_MASK 0x03 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_SELECTED 0x03 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_ALL 0x01u8 module_pointer;__le16 length;__le32 offset;
drivers/net/ethernet/intel/i40e/i40e_common.c +12 -1
@@ -3465,13 +3465,14 @@ i40e_status i40e_aq_discover_capabilities(struct i40e_hw *hw,* @length: length of the section to be written (in bytes from the offset) * @data: command buffer (size [bytes] = length) * @last_command: tells if this is the last command in a series +* @preservation_flags: Preservation mode flags * @cmd_details: pointer to command details structure or NULL * * Update the NVM using the admin queue commands **/ i40e_status i40e_aq_update_nvm (struct i40e_hw *hw,u8 module_pointer,u32 offset,u16 length,void *data, -bool last_command, +bool last_command,u8 preservation_flags,struct i40e_asq_cmd_details *cmd_details) {struct i40e_aq_desc desc;
@@ -3490,6 +3491,16 @@ i40e_status i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer,/* If this is the last command in a series, set the proper flag. */ if (last_command) cmd->command_flags |=I40E_AQ_NVM_LAST_CMD ; +if (hw->mac.type ==I40E_MAC_X722 ) { +if (preservation_flags ==I40E_NVM_PRESERVATION_FLAGS_SELECTED ) + cmd->command_flags |= + (I40E_AQ_NVM_PRESERVATION_FLAGS_SELECTED << +I40E_AQ_NVM_PRESERVATION_FLAGS_SHIFT ); +else if (preservation_flags ==I40E_NVM_PRESERVATION_FLAGS_ALL ) + cmd->command_flags |= + (I40E_AQ_NVM_PRESERVATION_FLAGS_ALL << +I40E_AQ_NVM_PRESERVATION_FLAGS_SHIFT ); + } cmd->module_pointer = module_pointer; cmd->offset =cpu_to_le32 (offset); cmd->length =cpu_to_le16 (length);
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -11028,7 +11028,7 @@ i40e_status i40e_commit_partition_bw_setting(struct i40e_pf *pf) ret =i40e_aq_update_nvm (&pf->hw,I40E_SR_NVM_CONTROL_WORD ,0x10 ,sizeof (nvm_word), - &nvm_word, true,NULL ); + &nvm_word, true,0 ,NULL );/* Save off last admin queue command status before releasing * the NVM */
drivers/net/ethernet/intel/i40e/i40e_nvm.c +109 -32
250 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_prototype.h +4 -2
@@ -214,7 +214,7 @@ i40e_status i40e_aq_discover_capabilities(struct i40e_hw *hw, struct i40e_asq_cmd_details *cmd_details);i40e_status i40e_aq_update_nvm (struct i40e_hw *hw,u8 module_pointer,u32 offset,u16 length,void *data, -bool last_command, +bool last_command,u8 preservation_flags,struct i40e_asq_cmd_details *cmd_details); i40e_status i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type, u8 mib_type, void *buff, u16 buff_size,
@@ -333,7 +333,9 @@ i40e_status i40e_validate_nvm_checksum(struct i40e_hw *hw,i40e_status i40e_nvmupd_command (struct i40e_hw *hw,struct i40e_nvm_access *cmd,u8 *bytes,int *); -void i40e_nvmupd_check_wait_event (struct i40e_hw *hw,u16 opcode); +void i40e_nvmupd_check_wait_event (struct i40e_hw *hw,u16 opcode, +struct i40e_aq_desc *desc); +void i40e_nvmupd_clear_wait_state (struct i40e_hw *hw);void i40e_set_pci_config_data (struct i40e_hw *hw,u16 link_status);extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
drivers/net/ethernet/intel/i40e/i40e_type.h +17 -9
@@ -402,6 +402,7 @@ enum i40e_nvmupd_cmd {I40E_NVMUPD_STATUS ,I40E_NVMUPD_EXEC_AQ ,I40E_NVMUPD_GET_AQ_RESULT , + I40E_NVMUPD_GET_AQ_EVENT, }; enum i40e_nvmupd_state {
@@ -421,15 +422,21 @@ enum i40e_nvmupd_state {#define I40E_NVM_MOD_PNT_MASK 0xFF -#define I40E_NVM_TRANS_SHIFT 8 -#define I40E_NVM_TRANS_MASK (0xf << I40E_NVM_TRANS_SHIFT) -#define I40E_NVM_CON 0x0 -#define I40E_NVM_SNT 0x1 -#define I40E_NVM_LCB 0x2 -#define I40E_NVM_SA (I40E_NVM_SNT | I40E_NVM_LCB) -#define I40E_NVM_ERA 0x4 -#define I40E_NVM_CSUM 0x8 -#define I40E_NVM_EXEC 0xf +#define I40E_NVM_TRANS_SHIFT 8 +#define I40E_NVM_TRANS_MASK (0xf << I40E_NVM_TRANS_SHIFT) +#define I40E_NVM_PRESERVATION_FLAGS_SHIFT 12 +#define I40E_NVM_PRESERVATION_FLAGS_MASK \ + (0x3 << I40E_NVM_PRESERVATION_FLAGS_SHIFT) +#define I40E_NVM_PRESERVATION_FLAGS_SELECTED 0x01 +#define I40E_NVM_PRESERVATION_FLAGS_ALL 0x02 +#define I40E_NVM_CON 0x0 +#define I40E_NVM_SNT 0x1 +#define I40E_NVM_LCB 0x2 +#define I40E_NVM_SA (I40E_NVM_SNT | I40E_NVM_LCB) +#define I40E_NVM_ERA 0x4 +#define I40E_NVM_CSUM 0x8 +#define I40E_NVM_AQE 0xe +#define I40E_NVM_EXEC 0xf#define I40E_NVM_ADAPT_SHIFT 16#define I40E_NVM_ADAPT_MASK (0xffff << I40E_NVM_ADAPT_SHIFT)
@@ -611,6 +618,7 @@ struct i40e_hw {/* state of nvm update process */ enum i40e_nvmupd_state nvmupd_state;struct i40e_aq_desc nvm_wb_desc; +struct i40e_aq_desc nvm_aq_event_desc;struct i40e_virt_mem nvm_buff;bool nvm_release_on_done;u16 nvm_wait_opcode;
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +6 -2
@@ -2196,8 +2196,12 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_phy_register_access);*/ struct i40e_aqc_nvm_update {u8 command_flags; -#define I40E_AQ_NVM_LAST_CMD 0x01 -#define I40E_AQ_NVM_FLASH_ONLY 0x80 +#define I40E_AQ_NVM_LAST_CMD 0x01 +#define I40E_AQ_NVM_FLASH_ONLY 0x80 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_SHIFT 1 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_MASK 0x03 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_SELECTED 0x03 +#define I40E_AQ_NVM_PRESERVATION_FLAGS_ALL 0x01u8 module_pointer;__le16 length;__le32 offset;
drivers/net/ethernet/intel/i40evf/i40e_type.h +17 -9
@@ -361,6 +361,7 @@ enum i40e_nvmupd_cmd {I40E_NVMUPD_STATUS ,I40E_NVMUPD_EXEC_AQ ,I40E_NVMUPD_GET_AQ_RESULT , + I40E_NVMUPD_GET_AQ_EVENT, }; enum i40e_nvmupd_state {
@@ -380,15 +381,21 @@ enum i40e_nvmupd_state {#define I40E_NVM_MOD_PNT_MASK 0xFF -#define I40E_NVM_TRANS_SHIFT 8 -#define I40E_NVM_TRANS_MASK (0xf << I40E_NVM_TRANS_SHIFT) -#define I40E_NVM_CON 0x0 -#define I40E_NVM_SNT 0x1 -#define I40E_NVM_LCB 0x2 -#define I40E_NVM_SA (I40E_NVM_SNT | I40E_NVM_LCB) -#define I40E_NVM_ERA 0x4 -#define I40E_NVM_CSUM 0x8 -#define I40E_NVM_EXEC 0xf +#define I40E_NVM_TRANS_SHIFT 8 +#define I40E_NVM_TRANS_MASK (0xf << I40E_NVM_TRANS_SHIFT) +#define I40E_NVM_PRESERVATION_FLAGS_SHIFT 12 +#define I40E_NVM_PRESERVATION_FLAGS_MASK \ + (0x3 << I40E_NVM_PRESERVATION_FLAGS_SHIFT) +#define I40E_NVM_PRESERVATION_FLAGS_SELECTED 0x01 +#define I40E_NVM_PRESERVATION_FLAGS_ALL 0x02 +#define I40E_NVM_CON 0x0 +#define I40E_NVM_SNT 0x1 +#define I40E_NVM_LCB 0x2 +#define I40E_NVM_SA (I40E_NVM_SNT | I40E_NVM_LCB) +#define I40E_NVM_ERA 0x4 +#define I40E_NVM_CSUM 0x8 +#define I40E_NVM_AQE 0xe +#define I40E_NVM_EXEC 0xf#define I40E_NVM_ADAPT_SHIFT 16#define I40E_NVM_ADAPT_MASK (0xffff << I40E_NVM_ADAPT_SHIFT)
@@ -561,6 +568,7 @@ struct i40e_hw {/* state of nvm update process */ enum i40e_nvmupd_state nvmupd_state;struct i40e_aq_desc nvm_wb_desc; +struct i40e_aq_desc nvm_aq_event_desc;struct i40e_virt_mem nvm_buff;bool nvm_release_on_done;u16 nvm_wait_opcode;
Signature · 1 line
2.9.5