openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bnxt_en: Refactor bnxt_gro_skb(). 

Newer chips require different logic to handle GRO packets.  So refactor
the code so that we can call different functions depending on the chip.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2016-06-13 02:25:34 -04:00 committed by David S. Miller
parent 659c805cc0
commit 309369c9b3
2 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View File

@ -945,29 +945,15 @@ static void bnxt_abort_tpa(struct bnxt *bp, struct bnxt_napi *bnapi,
#define BNXT_IPV4_HDR_SIZE (sizeof(struct iphdr) + sizeof(struct tcphdr)) #define BNXT_IPV4_HDR_SIZE (sizeof(struct iphdr) + sizeof(struct tcphdr))
#define BNXT_IPV6_HDR_SIZE (sizeof(struct ipv6hdr) + sizeof(struct tcphdr)) #define BNXT_IPV6_HDR_SIZE (sizeof(struct ipv6hdr) + sizeof(struct tcphdr))
static inline struct sk_buff *bnxt_gro_skb(struct bnxt_tpa_info *tpa_info, static struct sk_buff *bnxt_gro_func_5730x(struct bnxt_tpa_info *tpa_info,
struct rx_tpa_end_cmp *tpa_end, int payload_off, int tcp_ts,
struct rx_tpa_end_cmp_ext *tpa_end1,
struct sk_buff *skb) struct sk_buff *skb)
{ {
#ifdef CONFIG_INET #ifdef CONFIG_INET
struct tcphdr *th; struct tcphdr *th;
int payload_off, tcp_opt_len = 0; int len, nw_off, tcp_opt_len;
int len, nw_off;
u16 segs;
segs = TPA_END_TPA_SEGS(tpa_end); if (tcp_ts)
if (segs == 1)
return skb;
NAPI_GRO_CB(skb)->count = segs;
skb_shinfo(skb)->gso_size =
le32_to_cpu(tpa_end1->rx_tpa_end_cmp_seg_len);
skb_shinfo(skb)->gso_type = tpa_info->gso_type;
payload_off = (le32_to_cpu(tpa_end->rx_tpa_end_cmp_misc_v1) &
RX_TPA_END_CMP_PAYLOAD_OFFSET) >>
RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT;
if (TPA_END_GRO_TS(tpa_end))
tcp_opt_len = 12; tcp_opt_len = 12;
if (tpa_info->gso_type == SKB_GSO_TCPV4) { if (tpa_info->gso_type == SKB_GSO_TCPV4) {
@ -1024,6 +1010,32 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt_tpa_info *tpa_info,
return skb; return skb;
} }
static inline struct sk_buff *bnxt_gro_skb(struct bnxt *bp,
struct bnxt_tpa_info *tpa_info,
struct rx_tpa_end_cmp *tpa_end,
struct rx_tpa_end_cmp_ext *tpa_end1,
struct sk_buff *skb)
{
#ifdef CONFIG_INET
int payload_off;
u16 segs;
segs = TPA_END_TPA_SEGS(tpa_end);
if (segs == 1)
return skb;
NAPI_GRO_CB(skb)->count = segs;
skb_shinfo(skb)->gso_size =
le32_to_cpu(tpa_end1->rx_tpa_end_cmp_seg_len);
skb_shinfo(skb)->gso_type = tpa_info->gso_type;
payload_off = (le32_to_cpu(tpa_end->rx_tpa_end_cmp_misc_v1) &
RX_TPA_END_CMP_PAYLOAD_OFFSET) >>
RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT;
skb = bp->gro_func(tpa_info, payload_off, TPA_END_GRO_TS(tpa_end), skb);
#endif
return skb;
}
static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp, static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,
struct bnxt_napi *bnapi, struct bnxt_napi *bnapi,
u32 *raw_cons, u32 *raw_cons,
@ -1134,7 +1146,7 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,
} }
if (TPA_END_GRO(tpa_end)) if (TPA_END_GRO(tpa_end))
skb = bnxt_gro_skb(tpa_info, tpa_end, tpa_end1, skb); skb = bnxt_gro_skb(bp, tpa_info, tpa_end, tpa_end1, skb);
return skb; return skb;
} }
@ -6420,6 +6432,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (rc) if (rc)
goto init_err; goto init_err;
bp->gro_func = bnxt_gro_func_5730x;
rc = bnxt_hwrm_func_drv_rgtr(bp); rc = bnxt_hwrm_func_drv_rgtr(bp);
if (rc) if (rc)
goto init_err; goto init_err;

3
drivers/net/ethernet/broadcom/bnxt/bnxt.h
View File

@ -953,6 +953,9 @@ struct bnxt {
struct bnxt_rx_ring_info *rx_ring; struct bnxt_rx_ring_info *rx_ring;
struct bnxt_tx_ring_info *tx_ring; struct bnxt_tx_ring_info *tx_ring;
struct sk_buff * (*gro_func)(struct bnxt_tpa_info *, int, int,
struct sk_buff *);
u32 rx_buf_size; u32 rx_buf_size;
u32 rx_buf_use_size; /* useable size */ u32 rx_buf_use_size; /* useable size */
u32 rx_ring_size; u32 rx_ring_size;