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

Commit a1ef48e1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-09-17

This series contains updates to i40e and i40evf.

Shannon provides updates to i40e and i40evf to resolve an issue with the
nvmupdate utility.  First renames a variable name to reduce confusion and
to differentiate it from the actual user variable.  Then added the ability
to save the admin queue write back descriptor if a caller supplies a
buffer for it to be saved into.  Added a new GetStatus command so that
the NVM update tool can query the current status instead of doing fake
write requests to probe for readiness.  Added wait states to the NVM
update state machine to signify when waiting for an update operation to
finish, whether we are in the middle of a set of write operations, or we
are now idle but waiting.  Then added a facility to run admin queue
commands through the NVM update utility in order to allow the update
tools to interact with the firmware and do special commands needed for
updates and configuration changes.  Also added a facility to recover the
result of a previously run admin queue command.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents eaf9a992 f91638af

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

+20 −0
Original line number Diff line number Diff line
@@ -657,6 +657,9 @@ i40e_status i40e_shutdown_adminq(struct i40e_hw *hw) 


	/* destroy the locks */



	if (hw->nvm_buff.va)

		i40e_free_virt_mem(hw, &hw->nvm_buff);



	return ret_code;

}
@@ -889,6 +892,10 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
		   "AQTX: desc and buffer writeback:\n");

	i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff, buff_size);



	/* save writeback aq if requested */

	if (details->wb_desc)

		*details->wb_desc = *desc_on_ring;



	/* update the error if time out occurred */

	if ((!cmd_completed) &&

	    (!details->async && !details->postpone)) {
@@ -1014,6 +1021,19 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw, 
			i40e_release_nvm(hw);

			hw->aq.nvm_release_on_done = false;

		}



		switch (hw->nvmupd_state) {

		case I40E_NVMUPD_STATE_INIT_WAIT:

			hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;

			break;



		case I40E_NVMUPD_STATE_WRITE_WAIT:

			hw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;

			break;



		default:

			break;

		}

	}



	return ret_code;

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

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct i40e_asq_cmd_details { 
	u16 flags_dis;

	bool async;

	bool postpone;

	struct i40e_aq_desc *wb_desc;

};



#define I40E_ADMINQ_DETAILS(R, i)   \

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static const char i40e_driver_string[] = 


#define DRV_VERSION_MAJOR 1

#define DRV_VERSION_MINOR 3

#define DRV_VERSION_BUILD 9

#define DRV_VERSION_BUILD 21

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN

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

+305 −81

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −1
Original line number Diff line number Diff line
@@ -305,12 +305,17 @@ enum i40e_nvmupd_cmd { 
	I40E_NVMUPD_CSUM_CON,

	I40E_NVMUPD_CSUM_SA,

	I40E_NVMUPD_CSUM_LCB,

	I40E_NVMUPD_STATUS,

	I40E_NVMUPD_EXEC_AQ,

	I40E_NVMUPD_GET_AQ_RESULT,

};



enum i40e_nvmupd_state {

	I40E_NVMUPD_STATE_INIT,

	I40E_NVMUPD_STATE_READING,

	I40E_NVMUPD_STATE_WRITING

	I40E_NVMUPD_STATE_WRITING,

	I40E_NVMUPD_STATE_INIT_WAIT,

	I40E_NVMUPD_STATE_WRITE_WAIT,

};



/* nvm_access definition and its masks/shifts need to be accessible to
@@ -329,6 +334,7 @@ enum i40e_nvmupd_state { 
#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_ADAPT_SHIFT	16

#define I40E_NVM_ADAPT_MASK	(0xffff << I40E_NVM_ADAPT_SHIFT)
@@ -492,6 +498,8 @@ struct i40e_hw { 


	/* state of nvm update process */

	enum i40e_nvmupd_state nvmupd_state;

	struct i40e_aq_desc nvm_wb_desc;

	struct i40e_virt_mem nvm_buff;



	/* HMC info */

	struct i40e_hmc_info hmc; /* HMC info struct */