Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 159321
b: refs/heads/master
c: c1c00ab
h: refs/heads/master
i:
  159319: 30cb932
v: v3
  • Loading branch information
Dhananjay Phadke authored and David S. Miller committed Aug 5, 2009
1 parent 4523f0d commit c48ae79
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 06db58c0cd92e157a4ccf2b6836c9f4b931c7cda
refs/heads/master: c1c00ab8626298ac784ea344bf10e94b5bd9bcb5
21 changes: 21 additions & 0 deletions trunk/drivers/net/netxen/netxen_nic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ struct rcv_desc {
#define NETXEN_NIC_RXPKT_DESC 0x04
#define NETXEN_OLD_RXPKT_DESC 0x3f
#define NETXEN_NIC_RESPONSE_DESC 0x05
#define NETXEN_NIC_LRO_DESC 0x12

/* for status field in status_desc */
#define STATUS_NEED_CKSUM (1)
Expand Down Expand Up @@ -398,6 +399,24 @@ struct rcv_desc {
#define netxen_get_sts_opcode(sts_data) \
(((sts_data) >> 58) & 0x03F)

#define netxen_get_lro_sts_refhandle(sts_data) \
((sts_data) & 0x0FFFF)
#define netxen_get_lro_sts_length(sts_data) \
(((sts_data) >> 16) & 0x0FFFF)
#define netxen_get_lro_sts_l2_hdr_offset(sts_data) \
(((sts_data) >> 32) & 0x0FF)
#define netxen_get_lro_sts_l4_hdr_offset(sts_data) \
(((sts_data) >> 40) & 0x0FF)
#define netxen_get_lro_sts_timestamp(sts_data) \
(((sts_data) >> 48) & 0x1)
#define netxen_get_lro_sts_type(sts_data) \
(((sts_data) >> 49) & 0x7)
#define netxen_get_lro_sts_push_flag(sts_data) \
(((sts_data) >> 52) & 0x1)
#define netxen_get_lro_sts_seq_number(sts_data) \
((sts_data) & 0x0FFFFFFFF)


struct status_desc {
__le64 status_desc_data[2];
} __attribute__ ((aligned(16)));
Expand Down Expand Up @@ -712,6 +731,7 @@ struct netxen_recv_context {
#define NX_CAP0_LSO NX_CAP_BIT(0, 6)
#define NX_CAP0_JUMBO_CONTIGUOUS NX_CAP_BIT(0, 7)
#define NX_CAP0_LRO_CONTIGUOUS NX_CAP_BIT(0, 8)
#define NX_CAP0_HW_LRO NX_CAP_BIT(0, 10)

/*
* Context state
Expand Down Expand Up @@ -969,6 +989,7 @@ typedef struct {
#define NX_FW_CAPABILITY_PEXQ (1 << 7)
#define NX_FW_CAPABILITY_BDG (1 << 8)
#define NX_FW_CAPABILITY_FVLANTX (1 << 9)
#define NX_FW_CAPABILITY_HW_LRO (1 << 10)

/* module types */
#define LINKEVENT_MODULE_NOT_PRESENT 1
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/net/netxen/netxen_nic_ctx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)

cap = (NX_CAP0_LEGACY_CONTEXT | NX_CAP0_LEGACY_MN);
cap |= (NX_CAP0_JUMBO_CONTIGUOUS | NX_CAP0_LRO_CONTIGUOUS);
if (adapter->capabilities & NX_FW_CAPABILITY_HW_LRO)
cap |= NX_CAP0_HW_LRO;

prq->capabilities[0] = cpu_to_le32(cap);
prq->host_int_crb_mode =
Expand Down
124 changes: 102 additions & 22 deletions trunk/drivers/net/netxen/netxen_nic_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1242,20 +1242,31 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter,

static struct netxen_rx_buffer *
netxen_process_rcv(struct netxen_adapter *adapter,
int ring, int index, int length, int cksum, int pkt_offset,
struct nx_host_sds_ring *sds_ring)
struct nx_host_sds_ring *sds_ring,
int ring, u64 sts_data0)
{
struct net_device *netdev = adapter->netdev;
struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
struct netxen_rx_buffer *buffer;
struct sk_buff *skb;
struct nx_host_rds_ring *rds_ring = &recv_ctx->rds_rings[ring];
struct nx_host_rds_ring *rds_ring;
int index, length, cksum, pkt_offset;

if (unlikely(index > rds_ring->num_desc))
if (unlikely(ring >= adapter->max_rds_rings))
return NULL;

rds_ring = &recv_ctx->rds_rings[ring];

index = netxen_get_sts_refhandle(sts_data0);
if (unlikely(index >= rds_ring->num_desc))
return NULL;

buffer = &rds_ring->rx_buf_arr[index];

length = netxen_get_sts_totallength(sts_data0);
cksum = netxen_get_sts_status(sts_data0);
pkt_offset = netxen_get_sts_pkt_offset(sts_data0);

skb = netxen_process_rxbuf(adapter, rds_ring, index, cksum);
if (!skb)
return buffer;
Expand All @@ -1279,6 +1290,78 @@ netxen_process_rcv(struct netxen_adapter *adapter,
return buffer;
}

#define TCP_HDR_SIZE 20
#define TCP_TS_OPTION_SIZE 12
#define TCP_TS_HDR_SIZE (TCP_HDR_SIZE + TCP_TS_OPTION_SIZE)

static struct netxen_rx_buffer *
netxen_process_lro(struct netxen_adapter *adapter,
struct nx_host_sds_ring *sds_ring,
int ring, u64 sts_data0, u64 sts_data1)
{
struct net_device *netdev = adapter->netdev;
struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
struct netxen_rx_buffer *buffer;
struct sk_buff *skb;
struct nx_host_rds_ring *rds_ring;
struct iphdr *iph;
struct tcphdr *th;
bool push, timestamp;
int l2_hdr_offset, l4_hdr_offset;
int index;
u16 lro_length, length, data_offset;
u32 seq_number;

if (unlikely(ring > adapter->max_rds_rings))
return NULL;

rds_ring = &recv_ctx->rds_rings[ring];

index = netxen_get_lro_sts_refhandle(sts_data0);
if (unlikely(index > rds_ring->num_desc))
return NULL;

buffer = &rds_ring->rx_buf_arr[index];

timestamp = netxen_get_lro_sts_timestamp(sts_data0);
lro_length = netxen_get_lro_sts_length(sts_data0);
l2_hdr_offset = netxen_get_lro_sts_l2_hdr_offset(sts_data0);
l4_hdr_offset = netxen_get_lro_sts_l4_hdr_offset(sts_data0);
push = netxen_get_lro_sts_push_flag(sts_data0);
seq_number = netxen_get_lro_sts_seq_number(sts_data1);

skb = netxen_process_rxbuf(adapter, rds_ring, index, STATUS_CKSUM_OK);
if (!skb)
return buffer;

if (timestamp)
data_offset = l4_hdr_offset + TCP_TS_HDR_SIZE;
else
data_offset = l4_hdr_offset + TCP_HDR_SIZE;

skb_put(skb, lro_length + data_offset);

skb->truesize = (skb->len + sizeof(struct sk_buff) +
((unsigned long)skb->data - (unsigned long)skb->head));

skb_pull(skb, l2_hdr_offset);
skb->protocol = eth_type_trans(skb, netdev);

iph = (struct iphdr *)skb->data;
th = (struct tcphdr *)(skb->data + (iph->ihl << 2));

length = (iph->ihl << 2) + (th->doff << 2) + lro_length;
iph->tot_len = htons(length);
iph->check = 0;
iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
th->psh = push;
th->seq = htonl(seq_number);

netif_receive_skb(skb);

return buffer;
}

#define netxen_merge_rx_buffers(list, head) \
do { list_splice_tail_init(list, head); } while (0);

Expand All @@ -1295,28 +1378,33 @@ netxen_process_rcv_ring(struct nx_host_sds_ring *sds_ring, int max)
u32 consumer = sds_ring->consumer;

int count = 0;
u64 sts_data;
int opcode, ring, index, length, cksum, pkt_offset, desc_cnt;
u64 sts_data0, sts_data1;
int opcode, ring = 0, desc_cnt;

while (count < max) {
desc = &sds_ring->desc_head[consumer];
sts_data = le64_to_cpu(desc->status_desc_data[0]);
sts_data0 = le64_to_cpu(desc->status_desc_data[0]);

if (!(sts_data & STATUS_OWNER_HOST))
if (!(sts_data0 & STATUS_OWNER_HOST))
break;

desc_cnt = netxen_get_sts_desc_cnt(sts_data);
ring = netxen_get_sts_type(sts_data);
desc_cnt = netxen_get_sts_desc_cnt(sts_data0);

if (ring > RCV_RING_JUMBO)
goto skip;

opcode = netxen_get_sts_opcode(sts_data);
opcode = netxen_get_sts_opcode(sts_data0);

switch (opcode) {
case NETXEN_NIC_RXPKT_DESC:
case NETXEN_OLD_RXPKT_DESC:
case NETXEN_NIC_SYN_OFFLOAD:
ring = netxen_get_sts_type(sts_data0);
rxbuf = netxen_process_rcv(adapter, sds_ring,
ring, sts_data0);
break;
case NETXEN_NIC_LRO_DESC:
ring = netxen_get_lro_sts_type(sts_data0);
sts_data1 = le64_to_cpu(desc->status_desc_data[1]);
rxbuf = netxen_process_lro(adapter, sds_ring,
ring, sts_data0, sts_data1);
break;
case NETXEN_NIC_RESPONSE_DESC:
netxen_handle_fw_message(desc_cnt, consumer, sds_ring);
Expand All @@ -1326,14 +1414,6 @@ netxen_process_rcv_ring(struct nx_host_sds_ring *sds_ring, int max)

WARN_ON(desc_cnt > 1);

index = netxen_get_sts_refhandle(sts_data);
length = netxen_get_sts_totallength(sts_data);
cksum = netxen_get_sts_status(sts_data);
pkt_offset = netxen_get_sts_pkt_offset(sts_data);

rxbuf = netxen_process_rcv(adapter, ring, index,
length, cksum, pkt_offset, sds_ring);

if (rxbuf)
list_add_tail(&rxbuf->list, &sds_ring->free_list[ring]);

Expand Down

0 comments on commit c48ae79

Please sign in to comment.