From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 21 Mar 2013 09:15:49 +0000 (+0800)
Subject: bnx: Improve 57766 performance by forcing 2K DMA size
X-Git-Tag: v3.4.0rc~70
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/60e67e3ff6e88ef17fa7a32cb7ead501121df881

bnx: Improve 57766 performance by forcing 2K DMA size

Obtained-from: tg3
---

diff --git a/sys/dev/netif/bge/if_bgereg.h b/sys/dev/netif/bge/if_bgereg.h
index cdb2cdeb8a..0c799a7c5d 100644
--- a/sys/dev/netif/bge/if_bgereg.h
+++ b/sys/dev/netif/bge/if_bgereg.h
@@ -1482,6 +1482,7 @@
 #define BGE_RDMAMODE_MBUF_SBD_CRPT_ATTN	0x00002000
 #define BGE_RDMAMODE_FIFO_SIZE_128	0x00020000
 #define BGE_RDMAMODE_FIFO_LONG_BURST	0x00030000
+#define BGE_RDMAMODE_JMB_2K_MMRR	0x00800000
 #define BGE_RDMAMODE_MULT_DMA_RD_DIS	0x01000000
 #define BGE_RDMAMODE_TSO4_ENABLE	0x08000000
 #define BGE_RDMAMODE_H2BNC_VLAN_DET	0x20000000
diff --git a/sys/dev/netif/bnx/if_bnx.c b/sys/dev/netif/bnx/if_bnx.c
index 4938791efa..6f5ff90a36 100644
--- a/sys/dev/netif/bnx/if_bnx.c
+++ b/sys/dev/netif/bnx/if_bnx.c
@@ -1670,6 +1670,8 @@ bnx_blockinit(struct bnx_softc *sc)
 		 */
 		val &= ~BGE_RDMAMODE_MULT_DMA_RD_DIS;
 	}
+	if (sc->bnx_asicrev == BGE_ASICREV_BCM57766)
+		val |= BGE_RDMAMODE_JMB_2K_MMRR;
 	if (sc->bnx_flags & BNX_FLAG_TSO)
 		val |= BGE_RDMAMODE_TSO4_ENABLE;
 	val |= BGE_RDMAMODE_FIFO_LONG_BURST;
@@ -3585,7 +3587,7 @@ static int
 bnx_dma_alloc(struct bnx_softc *sc)
 {
 	struct ifnet *ifp = &sc->arpcom.ac_if;
-	bus_size_t txmaxsz;
+	bus_size_t txmaxsz, txmaxsegsz;
 	int i, error;
 
 	/*
@@ -3656,10 +3658,14 @@ bnx_dma_alloc(struct bnx_softc *sc)
 		txmaxsz = IP_MAXPACKET + sizeof(struct ether_vlan_header);
 	else
 		txmaxsz = BNX_JUMBO_FRAMELEN;
+	if (sc->bnx_asicrev == BGE_ASICREV_BCM57766)
+		txmaxsegsz = MCLBYTES;
+	else
+		txmaxsegsz = PAGE_SIZE;
 	error = bus_dma_tag_create(sc->bnx_cdata.bnx_parent_tag, 1, 0,
 				   BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
 				   NULL, NULL,
-				   txmaxsz, BNX_NSEG_NEW, PAGE_SIZE,
+				   txmaxsz, BNX_NSEG_NEW, txmaxsegsz,
 				   BUS_DMA_ALLOCNOW | BUS_DMA_WAITOK |
 				   BUS_DMA_ONEBPAGE,
 				   &sc->bnx_cdata.bnx_tx_mtag);