Commit 5b36bef4 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ixgbe: use libie adminq descriptors 



Use libie_aq_desc instead of ixgbe_aci_desc. Do needed changes to allow
clean build.

Move additional caps used in ixgbe to libie.

Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent fdb7f139

drivers/net/ethernet/intel/ixgbe/devlink/region.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int ixgbe_devlink_nvm_snapshot(struct devlink *devlink, 
		 * total period of reading whole NVM is longer than the maximum

		 * period the lock can be taken defined by the IXGBE_NVM_TIMEOUT.

		 */

		err = ixgbe_acquire_nvm(hw, IXGBE_RES_READ);

		err = ixgbe_acquire_nvm(hw, LIBIE_AQC_RES_ACCESS_READ);

		if (err) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Failed to acquire NVM semaphore");
@@ -184,7 +184,7 @@ static int ixgbe_devlink_nvm_read(struct devlink *devlink, 
		return -ERANGE;

	}



	err = ixgbe_acquire_nvm(hw, IXGBE_RES_READ);

	err = ixgbe_acquire_nvm(hw, LIBIE_AQC_RES_ACCESS_READ);

	if (err) {

		NL_SET_ERR_MSG_MOD(extack, "Failed to acquire NVM semaphore");

		return -EBUSY;

drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c

+137 −135

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h

+6 −6
Original line number Diff line number Diff line
@@ -6,15 +6,15 @@ 


#include "ixgbe_type.h"



int ixgbe_aci_send_cmd(struct ixgbe_hw *hw, struct ixgbe_aci_desc *desc,

int ixgbe_aci_send_cmd(struct ixgbe_hw *hw, struct libie_aq_desc *desc,

		       void *buf, u16 buf_size);

bool ixgbe_aci_check_event_pending(struct ixgbe_hw *hw);

int ixgbe_aci_get_event(struct ixgbe_hw *hw, struct ixgbe_aci_event *e,

			bool *pending);

void ixgbe_fill_dflt_direct_cmd_desc(struct ixgbe_aci_desc *desc, u16 opcode);

int ixgbe_acquire_res(struct ixgbe_hw *hw, enum ixgbe_aci_res_ids res,

		      enum ixgbe_aci_res_access_type access, u32 timeout);

void ixgbe_release_res(struct ixgbe_hw *hw, enum ixgbe_aci_res_ids res);

void ixgbe_fill_dflt_direct_cmd_desc(struct libie_aq_desc *desc, u16 opcode);

int ixgbe_acquire_res(struct ixgbe_hw *hw, enum libie_aq_res_id res,

		      enum libie_aq_res_access_type access, u32 timeout);

void ixgbe_release_res(struct ixgbe_hw *hw, enum libie_aq_res_id res);

int ixgbe_aci_list_caps(struct ixgbe_hw *hw, void *buf, u16 buf_size,

			u32 *cap_count, enum ixgbe_aci_opc opc);

int ixgbe_discover_dev_caps(struct ixgbe_hw *hw,
@@ -62,7 +62,7 @@ int ixgbe_aci_get_netlist_node(struct ixgbe_hw *hw, 
			       struct ixgbe_aci_cmd_get_link_topo *cmd,

			       u8 *node_part_number, u16 *node_handle);

int ixgbe_acquire_nvm(struct ixgbe_hw *hw,

		      enum ixgbe_aci_res_access_type access);

		      enum libie_aq_res_access_type access);

void ixgbe_release_nvm(struct ixgbe_hw *hw);

int ixgbe_aci_read_nvm(struct ixgbe_hw *hw, u16 module_typeid, u32 offset,

		       u16 length, void *data, bool last_command,

drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h

+4 −222

File changed.

Preview size limit exceeded, changes collapsed.