Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b72dc7b1 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e/i40evf: add get AQ result command to nvmupdate utility 



Add a facility to recover the result of a previously run AQ command.

Change-ID: I21afec2c20c1a5e6ba60c7fbfcbedfff78c10e45
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e4c83c20

drivers/net/ethernet/intel/i40e/i40e_nvm.c

+79 −0
Original line number Original line Diff line number Diff line
@@ -618,6 +618,9 @@ static i40e_status i40e_nvmupd_nvm_read(struct i40e_hw *hw, 
static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw,

static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw,

				       struct i40e_nvm_access *cmd,

				       struct i40e_nvm_access *cmd,

				       u8 *bytes, int *perrno);

				       u8 *bytes, int *perrno);

static i40e_status i40e_nvmupd_get_aq_result(struct i40e_hw *hw,

					     struct i40e_nvm_access *cmd,

					     u8 *bytes, int *perrno);

static inline u8 i40e_nvmupd_get_module(u32 val)

static inline u8 i40e_nvmupd_get_module(u32 val)

{

{

	return (u8)(val & I40E_NVM_MOD_PNT_MASK);

	return (u8)(val & I40E_NVM_MOD_PNT_MASK);
@@ -643,6 +646,7 @@ static char *i40e_nvm_update_state_str[] = { 
	"I40E_NVMUPD_CSUM_LCB",

	"I40E_NVMUPD_CSUM_LCB",

	"I40E_NVMUPD_STATUS",

	"I40E_NVMUPD_STATUS",

	"I40E_NVMUPD_EXEC_AQ",

	"I40E_NVMUPD_EXEC_AQ",

	"I40E_NVMUPD_GET_AQ_RESULT",

};

};





/**

/**
@@ -832,6 +836,10 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw, 
		status = i40e_nvmupd_exec_aq(hw, cmd, bytes, perrno);

		status = i40e_nvmupd_exec_aq(hw, cmd, bytes, perrno);

		break;

		break;





	case I40E_NVMUPD_GET_AQ_RESULT:

		status = i40e_nvmupd_get_aq_result(hw, cmd, bytes, perrno);

		break;



	default:

	default:

		i40e_debug(hw, I40E_DEBUG_NVM,

		i40e_debug(hw, I40E_DEBUG_NVM,

			   "NVMUPD: bad cmd %s in init state\n",

			   "NVMUPD: bad cmd %s in init state\n",
@@ -1047,6 +1055,8 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw, 
		case I40E_NVM_EXEC:

		case I40E_NVM_EXEC:

			if (module == 0xf)

			if (module == 0xf)

				upd_cmd = I40E_NVMUPD_STATUS;

				upd_cmd = I40E_NVMUPD_STATUS;

			else if (module == 0)

				upd_cmd = I40E_NVMUPD_GET_AQ_RESULT;

			break;

			break;

		}

		}

		break;

		break;
@@ -1159,6 +1169,75 @@ static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw, 
	return status;

	return status;

}

}





/**

 * i40e_nvmupd_get_aq_result - Get the results from the previous exec_aq

 * @hw: pointer to hardware structure

 * @cmd: pointer to nvm update command buffer

 * @bytes: pointer to the data buffer

 * @perrno: pointer to return error code

 *

 * cmd structure contains identifiers and data buffer

 **/

static i40e_status i40e_nvmupd_get_aq_result(struct i40e_hw *hw,

					     struct i40e_nvm_access *cmd,

					     u8 *bytes, int *perrno)

{

	u32 aq_total_len;

	u32 aq_desc_len;

	int remainder;

	u8 *buff;



	i40e_debug(hw, I40E_DEBUG_NVM, "NVMUPD: %s\n", __func__);



	aq_desc_len = sizeof(struct i40e_aq_desc);

	aq_total_len = aq_desc_len + le16_to_cpu(hw->nvm_wb_desc.datalen);



	/* check offset range */

	if (cmd->offset > aq_total_len) {

		i40e_debug(hw, I40E_DEBUG_NVM, "%s: offset too big %d > %d\n",

			   __func__, cmd->offset, aq_total_len);

		*perrno = -EINVAL;

		return I40E_ERR_PARAM;

	}



	/* check copylength range */

	if (cmd->data_size > (aq_total_len - cmd->offset)) {

		int new_len = aq_total_len - cmd->offset;



		i40e_debug(hw, I40E_DEBUG_NVM, "%s: copy length %d too big, trimming to %d\n",

			   __func__, cmd->data_size, new_len);

		cmd->data_size = new_len;

	}



	remainder = cmd->data_size;

	if (cmd->offset < aq_desc_len) {

		u32 len = aq_desc_len - cmd->offset;



		len = min(len, cmd->data_size);

		i40e_debug(hw, I40E_DEBUG_NVM, "%s: aq_desc bytes %d to %d\n",

			   __func__, cmd->offset, cmd->offset + len);



		buff = ((u8 *)&hw->nvm_wb_desc) + cmd->offset;

		memcpy(bytes, buff, len);



		bytes += len;

		remainder -= len;

		buff = hw->nvm_buff.va;

	} else {

		buff = hw->nvm_buff.va + (cmd->offset - aq_desc_len);

	}



	if (remainder > 0) {

		int start_byte = buff - (u8 *)hw->nvm_buff.va;



		i40e_debug(hw, I40E_DEBUG_NVM, "%s: databuf bytes %d to %d\n",

			   __func__, start_byte, start_byte + remainder);

		memcpy(bytes, buff, remainder);

	}



	return 0;

}



/**

/**

 * i40e_nvmupd_nvm_read - Read NVM

 * i40e_nvmupd_nvm_read - Read NVM

 * @hw: pointer to hardware structure

 * @hw: pointer to hardware structure

drivers/net/ethernet/intel/i40e/i40e_type.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -307,6 +307,7 @@ enum i40e_nvmupd_cmd { 
	I40E_NVMUPD_CSUM_LCB,

	I40E_NVMUPD_CSUM_LCB,

	I40E_NVMUPD_STATUS,

	I40E_NVMUPD_STATUS,

	I40E_NVMUPD_EXEC_AQ,

	I40E_NVMUPD_EXEC_AQ,

	I40E_NVMUPD_GET_AQ_RESULT,

};

};





enum i40e_nvmupd_state {

enum i40e_nvmupd_state {

drivers/net/ethernet/intel/i40evf/i40e_type.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -306,6 +306,7 @@ enum i40e_nvmupd_cmd { 
	I40E_NVMUPD_CSUM_LCB,

	I40E_NVMUPD_CSUM_LCB,

	I40E_NVMUPD_STATUS,

	I40E_NVMUPD_STATUS,

	I40E_NVMUPD_EXEC_AQ,

	I40E_NVMUPD_EXEC_AQ,

	I40E_NVMUPD_GET_AQ_RESULT,

};

};





enum i40e_nvmupd_state {

enum i40e_nvmupd_state {