d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxgbe(4): Deal with compressed error vectors.

Browse Source 
MFC after:	3 days
Sponsored by:	Chelsio Communications
This commit is contained in:
np 2016-12-15 02:05:29 +00:00
parent 565e916002
commit 6058ed8022
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/cxgbe/common/common.h
View File

@ -227,7 +227,7 @@ struct tp_params {
uint32_t vlan_pri_map; uint32_t vlan_pri_map;
uint32_t ingress_config; uint32_t ingress_config;
uint32_t rx_pkt_encap; __be16 err_vec_mask;
int8_t fcoe_shift; int8_t fcoe_shift;
int8_t port_shift; int8_t port_shift;

11
sys/dev/cxgbe/common/t4_hw.c
View File

@ -8020,12 +8020,17 @@ int t4_init_tp_params(struct adapter *adap)
read_filter_mode_and_ingress_config(adap); read_filter_mode_and_ingress_config(adap);
/* /*
* For T6, cache the adapter's compressed error vector * Cache a mask of the bits that represent the error vector portion of
* and passing outer header info for encapsulated packets. * rx_pkt.err_vec. T6+ can use a compressed error vector to make room
* for information about outer encapsulation (GENEVE/VXLAN/NVGRE).
*/ */
tpp->err_vec_mask = htobe16(0xffff);
if (chip_id(adap) > CHELSIO_T5) { if (chip_id(adap) > CHELSIO_T5) {
v = t4_read_reg(adap, A_TP_OUT_CONFIG); v = t4_read_reg(adap, A_TP_OUT_CONFIG);
tpp->rx_pkt_encap = (v & F_CRXPKTENC) ? 1 : 0; if (v & F_CRXPKTENC) {
tpp->err_vec_mask =
htobe16(V_T6_COMPR_RXERR_VEC(M_T6_COMPR_RXERR_VEC));
}
} }
return 0; return 0;

2
sys/dev/cxgbe/common/t4_msg.h
View File

@ -2014,7 +2014,7 @@ struct cpl_rx_pkt {
#define S_T6_COMPR_RXERR_VEC 0 #define S_T6_COMPR_RXERR_VEC 0
#define M_T6_COMPR_RXERR_VEC 0x3F #define M_T6_COMPR_RXERR_VEC 0x3F
#define V_T6_COMPR_RXERR_VEC(x) ((x) << S_T6_COMPR_RXERR_LEN) #define V_T6_COMPR_RXERR_VEC(x) ((x) << S_T6_COMPR_RXERR_VEC)
#define G_T6_COMPR_RXERR_VEC(x) \ #define G_T6_COMPR_RXERR_VEC(x) \
(((x) >> S_T6_COMPR_RXERR_VEC) & M_T6_COMPR_RXERR_VEC) (((x) >> S_T6_COMPR_RXERR_VEC) & M_T6_COMPR_RXERR_VEC)

2
sys/dev/cxgbe/t4_sge.c
View File

@ -1808,7 +1808,7 @@ t4_eth_rx(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m0)
M_HASHTYPE_SET(m0, sw_hashtype[rss->hash_type][rss->ipv6]); M_HASHTYPE_SET(m0, sw_hashtype[rss->hash_type][rss->ipv6]);
m0->m_pkthdr.flowid = be32toh(rss->hash_val); m0->m_pkthdr.flowid = be32toh(rss->hash_val);
if (cpl->csum_calc && !cpl->err_vec) { if (cpl->csum_calc && !(cpl->err_vec & sc->params.tp.err_vec_mask)) {
if (ifp->if_capenable & IFCAP_RXCSUM && if (ifp->if_capenable & IFCAP_RXCSUM &&
cpl->l2info & htobe32(F_RXF_IP)) { cpl->l2info & htobe32(F_RXF_IP)) {
m0->m_pkthdr.csum_flags = (CSUM_IP_CHECKED | m0->m_pkthdr.csum_flags = (CSUM_IP_CHECKED |