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

Commit 0ba9a3b6 authored by Kumar Sanghvi's avatar Kumar Sanghvi Committed by David S. Miller
Browse files

cxgb4: save additional filter tuple field shifts in tp_params 



Save additional filter tuple field shifts in tp_params based on
configured filter tuple fields.

Also, save the combined filter tuple mask based on configured
filter tuple fields.

Signed-off-by: default avatarKumar Sanghvi <kumaras@chelsio.com>
Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f2c897c

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+10 −2
Original line number Diff line number Diff line
@@ -287,10 +287,18 @@ struct tp_params { 
	 * places we store their offsets here, or a -1 if the field isn't

	 * present.

	 */

	int vlan_shift;

	int vnic_shift;

	int fcoe_shift;

	int port_shift;

	int vnic_shift;

	int vlan_shift;

	int tos_shift;

	int protocol_shift;

	int ethertype_shift;

	int macmatch_shift;

	int matchtype_shift;

	int frag_shift;



	u64 hash_filter_mask;

};



struct vpd_params {

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+16 −2
Original line number Diff line number Diff line
@@ -8816,11 +8816,21 @@ int t4_init_tp_params(struct adapter *adap, bool sleep_ok) 
	 * shift positions of several elements of the Compressed Filter Tuple

	 * for this adapter which we need frequently ...

	 */

	adap->params.tp.vlan_shift = t4_filter_field_shift(adap, VLAN_F);

	adap->params.tp.vnic_shift = t4_filter_field_shift(adap, VNIC_ID_F);

	adap->params.tp.fcoe_shift = t4_filter_field_shift(adap, FCOE_F);

	adap->params.tp.port_shift = t4_filter_field_shift(adap, PORT_F);

	adap->params.tp.vnic_shift = t4_filter_field_shift(adap, VNIC_ID_F);

	adap->params.tp.vlan_shift = t4_filter_field_shift(adap, VLAN_F);

	adap->params.tp.tos_shift = t4_filter_field_shift(adap, TOS_F);

	adap->params.tp.protocol_shift = t4_filter_field_shift(adap,

							       PROTOCOL_F);

	adap->params.tp.ethertype_shift = t4_filter_field_shift(adap,

								ETHERTYPE_F);

	adap->params.tp.macmatch_shift = t4_filter_field_shift(adap,

							       MACMATCH_F);

	adap->params.tp.matchtype_shift = t4_filter_field_shift(adap,

								MPSHITTYPE_F);

	adap->params.tp.frag_shift = t4_filter_field_shift(adap,

							   FRAGMENTATION_F);



	/* If TP_INGRESS_CONFIG.VNID == 0, then TP_VLAN_PRI_MAP.VNIC_ID

	 * represents the presence of an Outer VLAN instead of a VNIC ID.
@@ -8828,6 +8838,10 @@ int t4_init_tp_params(struct adapter *adap, bool sleep_ok) 
	if ((adap->params.tp.ingress_config & VNIC_F) == 0)

		adap->params.tp.vnic_shift = -1;



	v = t4_read_reg(adap, LE_3_DB_HASH_MASK_GEN_IPV4_T6_A);

	adap->params.tp.hash_filter_mask = v;

	v = t4_read_reg(adap, LE_4_DB_HASH_MASK_GEN_IPV4_T6_A);

	adap->params.tp.hash_filter_mask |= ((u64)v << 32);

	return 0;

}

drivers/net/ethernet/chelsio/cxgb4/t4_regs.h

+3 −0
Original line number Diff line number Diff line
@@ -2933,6 +2933,9 @@ 
#define SSRAMINTPERR_V(x) ((x) << SSRAMINTPERR_S)

#define SSRAMINTPERR_F    SSRAMINTPERR_V(1U)



#define LE_3_DB_HASH_MASK_GEN_IPV4_T6_A	0x19eac

#define LE_4_DB_HASH_MASK_GEN_IPV4_T6_A	0x19eb0



#define NCSI_INT_CAUSE_A 0x1a0d8



#define CIM_DM_PRTY_ERR_S    8