Commit 62f4dafc authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Align to updated AQ command formats 



The current specification has updates to the command formats for
manage MAC opcodes (opcodes 0x0107 and 0x0108) and get PHY caps
(opcode 0x0600). Update the code to reflect this.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 91d7a590

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

+8 −7
Original line number Diff line number Diff line
@@ -120,11 +120,9 @@ struct ice_aqc_manage_mac_read { 
#define ICE_AQC_MAN_MAC_WOL_ADDR_VALID		BIT(7)

#define ICE_AQC_MAN_MAC_READ_S			4

#define ICE_AQC_MAN_MAC_READ_M			(0xF << ICE_AQC_MAN_MAC_READ_S)

	u8 lport_num;

	u8 lport_num_valid;

#define ICE_AQC_MAN_MAC_PORT_NUM_IS_VALID	BIT(0)

	u8 rsvd[2];

	u8 num_addr; /* Used in response */

	u8 reserved[3];

	u8 rsvd1[3];

	__le32 addr_high;

	__le32 addr_low;

};
@@ -140,7 +138,7 @@ struct ice_aqc_manage_mac_read_resp { 


/* Manage MAC address, write command - direct (0x0108) */

struct ice_aqc_manage_mac_write {

	u8 port_num;

	u8 rsvd;

	u8 flags;

#define ICE_AQC_MAN_MAC_WR_MC_MAG_EN		BIT(0)

#define ICE_AQC_MAN_MAC_WR_WOL_LAA_PFR_KEEP	BIT(1)
@@ -934,6 +932,7 @@ struct ice_aqc_get_phy_caps_data { 
#define ICE_AQC_PHY_EEE_EN_40GBASE_KR4			BIT(6)

	__le16 eeer_value;

	u8 phy_id_oui[4]; /* PHY/Module ID connected on the port */

	u8 phy_fw_ver[8];

	u8 link_fec_options;

#define ICE_AQC_PHY_FEC_10G_KR_40G_KR4_EN		BIT(0)

#define ICE_AQC_PHY_FEC_10G_KR_40G_KR4_REQ		BIT(1)
@@ -943,6 +942,7 @@ struct ice_aqc_get_phy_caps_data { 
#define ICE_AQC_PHY_FEC_25G_RS_CLAUSE91_EN		BIT(6)

#define ICE_AQC_PHY_FEC_25G_KR_CLAUSE74_EN		BIT(7)

#define ICE_AQC_PHY_FEC_MASK				ICE_M(0xdf, 0)

	u8 rsvd1;	/* Byte 35 reserved */

	u8 extended_compliance_code;

#define ICE_MODULE_TYPE_TOTAL_BYTE			3

	u8 module_type[ICE_MODULE_TYPE_TOTAL_BYTE];
@@ -957,13 +957,14 @@ struct ice_aqc_get_phy_caps_data { 
#define ICE_AQC_MOD_TYPE_BYTE2_SFP_PLUS			0xA0

#define ICE_AQC_MOD_TYPE_BYTE2_QSFP_PLUS		0x86

	u8 qualified_module_count;

	u8 rsvd2[7];	/* Bytes 47:41 reserved */

#define ICE_AQC_QUAL_MOD_COUNT_MAX			16

	struct {

		u8 v_oui[3];

		u8 rsvd1;

		u8 rsvd3;

		u8 v_part[16];

		__le32 v_rev;

		__le64 rsvd8;

		__le64 rsvd4;

	} qual_modules[ICE_AQC_QUAL_MOD_COUNT_MAX];

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE