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

Commit 207969b9 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Add definitions for x550em_a 10G MAC 



Add definitions for a x550em_a 10G MAC device with a native SFP
interface.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a711ad89

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

+18 −4
Original line number Diff line number Diff line
@@ -81,16 +81,18 @@ 
#define IXGBE_DEV_ID_X550EM_X_SFP	0x15AC

#define IXGBE_DEV_ID_X550EM_X_10G_T	0x15AD

#define IXGBE_DEV_ID_X550EM_X_1G_T	0x15AE

#define IXGBE_DEV_ID_X550EM_A_SFP_N	0x15C4



/* VF Device IDs */

#define IXGBE_DEV_ID_X550_VF_HV	0x1564

#define IXGBE_DEV_ID_X550_VF		0x1565

#define IXGBE_DEV_ID_X550EM_X_VF	0x15A8

#define IXGBE_DEV_ID_X550EM_X_VF_HV	0x15A9



/* VF Device IDs */

#define IXGBE_DEV_ID_82599_VF           0x10ED

#define IXGBE_DEV_ID_X540_VF            0x1515

#define IXGBE_DEV_ID_X550_VF		0x1565

#define IXGBE_DEV_ID_X550EM_X_VF	0x15A8

#define IXGBE_DEV_ID_X550EM_A_VF	0x15C5



#define IXGBE_CAT(r, m)	IXGBE_##r##_##m
@@ -129,7 +131,7 @@ 
#define IXGBE_FLA_X540		IXGBE_FLA_8259X

#define IXGBE_FLA_X550		IXGBE_FLA_8259X

#define IXGBE_FLA_X550EM_x	IXGBE_FLA_8259X

#define IXGBE_FLA_X550EM_a	0x15F6C

#define IXGBE_FLA_X550EM_a	0x15F68

#define IXGBE_FLA(_hw)		IXGBE_BY_MAC((_hw), FLA)

#define IXGBE_EEMNGCTL  0x10110

#define IXGBE_EEMNGDATA 0x10114
@@ -369,6 +371,8 @@ struct ixgbe_thermal_sensor_data { 
#define IXGBE_MRCTL(_i)      (0x0F600 + ((_i) * 4))

#define IXGBE_VMRVLAN(_i)    (0x0F610 + ((_i) * 4))

#define IXGBE_VMRVM(_i)      (0x0F630 + ((_i) * 4))

#define IXGBE_WQBR_RX(_i)    (0x2FB0 + ((_i) * 4)) /* 4 total */

#define IXGBE_WQBR_TX(_i)    (0x8130 + ((_i) * 4)) /* 4 total */

#define IXGBE_L34T_IMIR(_i)  (0x0E800 + ((_i) * 4)) /*128 of these (0-127)*/

#define IXGBE_RXFECCERR0         0x051B8

#define IXGBE_LLITHRESH 0x0EC90
@@ -440,6 +444,8 @@ struct ixgbe_thermal_sensor_data { 
#define IXGBE_DMATXCTL_TE       0x1 /* Transmit Enable */

#define IXGBE_DMATXCTL_NS       0x2 /* No Snoop LSO hdr buffer */

#define IXGBE_DMATXCTL_GDV      0x8 /* Global Double VLAN */

#define IXGBE_DMATXCTL_MDP_EN   0x20 /* Bit 5 */

#define IXGBE_DMATXCTL_MBINTEN  0x40 /* Bit 6 */

#define IXGBE_DMATXCTL_VT_SHIFT 16  /* VLAN EtherType */



#define IXGBE_PFDTXGSWC_VT_LBEN 0x1 /* Local L2 VT switch enable */
@@ -548,7 +554,6 @@ struct ixgbe_thermal_sensor_data { 
#define IXGBE_TDPT2TCCR(_i)     (0x0CD20 + ((_i) * 4)) /* 8 of these (0-7) */

#define IXGBE_TDPT2TCSR(_i)     (0x0CD40 + ((_i) * 4)) /* 8 of these (0-7) */





/* Security Control Registers */

#define IXGBE_SECTXCTRL         0x08800

#define IXGBE_SECTXSTAT         0x08804
@@ -1197,6 +1202,8 @@ struct ixgbe_thermal_sensor_data { 
#define IXGBE_RDRXCTL_RSCLLIDIS     0x00800000 /* Disable RSC compl on LLI */

#define IXGBE_RDRXCTL_RSCACKC       0x02000000 /* must set 1 when RSC enabled */

#define IXGBE_RDRXCTL_FCOE_WRFIX    0x04000000 /* must set 1 when RSC enabled */

#define IXGBE_RDRXCTL_MBINTEN       0x10000000

#define IXGBE_RDRXCTL_MDP_EN        0x20000000



/* RQTC Bit Masks and Shifts */

#define IXGBE_RQTC_SHIFT_TC(_i)     ((_i) * 4)
@@ -1951,7 +1958,9 @@ enum { 
#define IXGBE_GSSR_PHY1_SM		0x0004

#define IXGBE_GSSR_MAC_CSR_SM		0x0008

#define IXGBE_GSSR_FLASH_SM		0x0010

#define IXGBE_GSSR_NVM_UPDATE_SM	0x0200

#define IXGBE_GSSR_SW_MNG_SM		0x0400

#define IXGBE_GSSR_TOKEN_SM	0x40000000 /* SW bit for shared access */

#define IXGBE_GSSR_SHARED_I2C_SM	0x1806 /* Wait for both phys & I2Cs */

#define IXGBE_GSSR_I2C_MASK		0x1800

#define IXGBE_GSSR_NVM_PHY_MASK		0xF
@@ -2524,6 +2533,10 @@ enum ixgbe_fdir_pballoc_type { 
#define IXGBE_FDIRCTRL_REPORT_STATUS_ALWAYS     0x00000080

#define IXGBE_FDIRCTRL_DROP_Q_SHIFT             8

#define IXGBE_FDIRCTRL_FLEX_SHIFT               16

#define IXGBE_FDIRCTRL_DROP_NO_MATCH		0x00008000

#define IXGBE_FDIRCTRL_FILTERMODE_SHIFT		21

#define IXGBE_FDIRCTRL_FILTERMODE_MACVLAN	0x0001 /* bit 23:21, 001b */

#define IXGBE_FDIRCTRL_FILTERMODE_CLOUD		0x0002 /* bit 23:21, 010b */

#define IXGBE_FDIRCTRL_SEARCHLIM                0x00800000

#define IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT         24

#define IXGBE_FDIRCTRL_FULL_THRESH_MASK         0xF0000000
@@ -2982,6 +2995,7 @@ enum ixgbe_mac_type { 
	ixgbe_mac_X540,

	ixgbe_mac_X550,

	ixgbe_mac_X550EM_x,

	ixgbe_mac_x550em_a,

	ixgbe_num_macs

};