netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bnx2x: add support for receive hashing
@ 2010-04-23  5:54 Tom Herbert
  2010-04-23  7:11 ` David Miller
                   ` (2 more replies)
  0 siblings, 3 replies; 50+ messages in thread
From: Tom Herbert @ 2010-04-23  5:54 UTC (permalink / raw)
  To: davem, netdev

Add support to bnx2x to extract Toeplitz hash out of the receive descriptor
for use in skb->rxhash.

Signed-off-by: Tom Herbert <therbert@google.com>
---
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 0819530..8bd2368 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -1330,7 +1330,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 		AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \
 		AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
 
-#define MULTI_FLAGS(bp) \
+#define RSS_FLAGS(bp) \
 		(TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_CAPABILITY | \
 		 TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_TCP_CAPABILITY | \
 		 TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV6_CAPABILITY | \
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 0c6dba2..613f727 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -1582,7 +1582,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 		struct sw_rx_bd *rx_buf = NULL;
 		struct sk_buff *skb;
 		union eth_rx_cqe *cqe;
-		u8 cqe_fp_flags;
+		u8 cqe_fp_flags, cqe_fp_status_flags;
 		u16 len, pad;
 
 		comp_ring_cons = RCQ_BD(sw_comp_cons);
@@ -1598,6 +1598,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
 
 		cqe = &fp->rx_comp_ring[comp_ring_cons];
 		cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
+		cqe_fp_status_flags = cqe->fast_path_cqe.status_flags;
 
 		DP(NETIF_MSG_RX_STATUS, "CQE type %x  err %x  status %x"
 		   "  queue %x  vlan %x  len %u\n", CQE_TYPE(cqe_fp_flags),
@@ -1727,6 +1728,12 @@ reuse_rx:
 
 			skb->protocol = eth_type_trans(skb, bp->dev);
 
+			if ((bp->dev->features & ETH_FLAG_RXHASH) &&
+			    (cqe_fp_status_flags &
+			     ETH_FAST_PATH_RX_CQE_RSS_HASH_FLG))
+				skb->rxhash = le32_to_cpu(
+				    cqe->fast_path_cqe.rss_hash_result);
+
 			skb->ip_summed = CHECKSUM_NONE;
 			if (bp->rx_csum) {
 				if (likely(BNX2X_RX_CSUM_OK(cqe)))
@@ -5750,10 +5757,10 @@ static void bnx2x_init_internal_func(struct bnx2x *bp)
 	u32 offset;
 	u16 max_agg_size;
 
-	if (is_multi(bp)) {
-		tstorm_config.config_flags = MULTI_FLAGS(bp);
+	tstorm_config.config_flags = RSS_FLAGS(bp);
+
+	if (is_multi(bp))
 		tstorm_config.rss_result_mask = MULTI_MASK;
-	}
 
 	/* Enable TPA if needed */
 	if (bp->flags & TPA_ENABLE_FLAG)
@@ -6629,10 +6636,8 @@ static int bnx2x_init_common(struct bnx2x *bp)
 	bnx2x_init_block(bp, PBF_BLOCK, COMMON_STAGE);
 
 	REG_WR(bp, SRC_REG_SOFT_RST, 1);
-	for (i = SRC_REG_KEYRSS0_0; i <= SRC_REG_KEYRSS1_9; i += 4) {
-		REG_WR(bp, i, 0xc0cac01a);
-		/* TODO: replace with something meaningful */
-	}
+	for (i = SRC_REG_KEYRSS0_0; i <= SRC_REG_KEYRSS1_9; i += 4)
+		REG_WR(bp, i, random32());
 	bnx2x_init_block(bp, SRCH_BLOCK, COMMON_STAGE);
 #ifdef BCM_CNIC
 	REG_WR(bp, SRC_REG_KEYSEARCH_0, 0x63285672);
@@ -11001,6 +11006,11 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
 		changed = 1;
 	}
 
+	if (data & ETH_FLAG_RXHASH)
+		dev->features |= NETIF_F_RXHASH;
+	else
+		dev->features &= ~NETIF_F_RXHASH;
+
 	if (changed && netif_running(dev)) {
 		bnx2x_nic_unload(bp, UNLOAD_NORMAL);
 		rc = bnx2x_nic_load(bp, LOAD_NORMAL);

^ permalink raw reply related	[flat|nested] 50+ messages in thread

end of thread, other threads:[~2010-07-11 22:34 UTC | newest]

Thread overview: 50+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23  5:54 [PATCH] bnx2x: add support for receive hashing Tom Herbert
2010-04-23  7:11 ` David Miller
2010-04-26 17:20 ` Eric Dumazet
2010-04-26 17:38   ` Tom Herbert
2010-04-26 17:47     ` Ben Hutchings
2010-04-26 17:56       ` David Miller
2010-04-26 18:04     ` David Miller
2010-04-26 18:19       ` Tom Herbert
2010-04-26 18:22         ` David Miller
2010-04-26 20:19           ` Rick Jones
2010-04-26 20:40             ` David Miller
2010-04-26 20:48               ` Rick Jones
2010-04-26 20:53                 ` David Miller
2010-04-26 21:12                   ` Rick Jones
2010-04-27 18:31                     ` Eilon Greenstein
2010-04-27 19:30                       ` Eric Dumazet
2010-04-26 20:58               ` Stephen Hemminger
2010-04-26 21:11               ` jamal
2010-04-26 21:14                 ` jamal
2010-04-26 23:27             ` Brian Bloniarz
2010-04-27 13:37       ` Brian Bloniarz
2010-04-27 14:30         ` Eric Dumazet
2010-04-27 15:44           ` Brian Bloniarz
2010-04-27 16:51         ` David Miller
2010-04-27 17:02           ` Brian Bloniarz
2010-04-27 17:06             ` David Miller
2010-04-27 17:13           ` Eric Dumazet
2010-04-27 17:20             ` David Miller
2010-04-27 17:37               ` Eric Dumazet
2010-04-27 20:21                 ` [PATCH net-next-2.6] net: sk_add_backlog() take rmem_alloc into account Eric Dumazet
2010-04-27 21:43                   ` David Miller
2010-04-27 22:11                     ` David Miller
2010-04-27 22:19                       ` Eric Dumazet
2010-04-28 15:41                   ` Brian Bloniarz
2010-04-28 15:52                     ` Eric Dumazet
2010-04-27 17:31             ` [PATCH] bnx2x: add support for receive hashing Tom Herbert
2010-04-27 17:36               ` Eric Dumazet
2010-07-04 16:36 ` Vladislav Zolotarov
2010-07-04 16:46   ` Vladislav Zolotarov
2010-07-06  7:16   ` Vladislav Zolotarov
2010-07-07 19:17     ` Tom Herbert
2010-07-08  8:40       ` Vladislav Zolotarov
2010-07-11  2:12       ` David Miller
2010-07-11 10:02         ` Vladislav Zolotarov
2010-07-11 13:16           ` Vladislav Zolotarov
2010-07-11 16:45             ` Eric Dumazet
2010-07-11 17:22               ` Vladislav Zolotarov
2010-07-11 17:41                 ` Eric Dumazet
2010-07-11 18:18                   ` Vladislav Zolotarov
2010-07-11 22:34           ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).