Commit e00ae1a2 authored by Maciej Machnikowski's avatar Maciej Machnikowski Committed by Tony Nguyen
Browse files

ice: Refactor ice_aqc_link_topo_addr 



Separate link topo parameters in struct ice_aqc_link_topo_addr into
new struct ice_aqc_link_topo_params.
This keeps input parameters for the get_link_topo command in a separate
structure and is required by future commands that operate only on link
topo params without the node handle.

Signed-off-by: default avatarMaciej Machnikowski <maciej.machnikowski@intel.com>
Tested-by: default avatarSunitha Mekala <sunithax.d.mekala@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9974cb5c

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+5 −1
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ struct ice_aqc_set_mac_lb { 
	u8 reserved[15];

};



struct ice_aqc_link_topo_addr {

struct ice_aqc_link_topo_params {

	u8 lport_num;

	u8 lport_num_valid;

#define ICE_AQC_LINK_TOPO_PORT_NUM_VALID	BIT(0)
@@ -1305,6 +1305,10 @@ struct ice_aqc_link_topo_addr { 
#define ICE_AQC_LINK_TOPO_NODE_CTX_PROVIDED	4

#define ICE_AQC_LINK_TOPO_NODE_CTX_OVERRIDE	5

	u8 index;

};



struct ice_aqc_link_topo_addr {

	struct ice_aqc_link_topo_params topo_params;

	__le16 handle;

#define ICE_AQC_LINK_TOPO_HANDLE_S	0

#define ICE_AQC_LINK_TOPO_HANDLE_M	(0x3FF << ICE_AQC_LINK_TOPO_HANDLE_S)

drivers/net/ethernet/intel/ice/ice_common.c

+5 −3
Original line number Diff line number Diff line
@@ -240,11 +240,13 @@ ice_aq_get_link_topo_handle(struct ice_port_info *pi, u8 node_type, 


	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_link_topo);



	cmd->addr.node_type_ctx = (ICE_AQC_LINK_TOPO_NODE_CTX_PORT <<

	cmd->addr.topo_params.node_type_ctx =

		(ICE_AQC_LINK_TOPO_NODE_CTX_PORT <<

		 ICE_AQC_LINK_TOPO_NODE_CTX_S);



	/* set node type */

	cmd->addr.node_type_ctx |= (ICE_AQC_LINK_TOPO_NODE_TYPE_M & node_type);

	cmd->addr.topo_params.node_type_ctx |=

		(ICE_AQC_LINK_TOPO_NODE_TYPE_M & node_type);



	return ice_aq_send_cmd(pi->hw, &desc, NULL, 0, cd);

}