The patch titled
spidernet: poor network performance
has been removed from the -mm tree. Its filename was
spidernet-poor-network-performance.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: spidernet: poor network performance
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Correct a problem seen on later kernels running the NetPIPE application.
Specifically, NetPIPE would begin running very slowly at the 1533 packet
size. It was determined that Spidernet slowed with an idle DMA engine.
Signed-off-by: James K Lewis <jklewis@xxxxxxxxxx>
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/spider_net.c | 2 +-
drivers/net/spider_net.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/net/spider_net.c~spidernet-poor-network-performance drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~spidernet-poor-network-performance
+++ a/drivers/net/spider_net.c
@@ -1635,7 +1635,7 @@ spider_net_enable_card(struct spider_net
SPIDER_NET_INT2_MASK_VALUE);
spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
- SPIDER_NET_GDTBSTA | SPIDER_NET_GDTDCEIDIS);
+ SPIDER_NET_GDTBSTA);
}
/**
diff -puN drivers/net/spider_net.h~spidernet-poor-network-performance drivers/net/spider_net.h
--- a/drivers/net/spider_net.h~spidernet-poor-network-performance
+++ a/drivers/net/spider_net.h
@@ -24,7 +24,7 @@
#ifndef _SPIDER_NET_H
#define _SPIDER_NET_H
-#define VERSION "1.5 A"
+#define VERSION "1.6 A"
#include "sungem_phy.h"
@@ -217,8 +217,7 @@ extern char spider_net_driver_name[];
#define SPIDER_NET_GDTBSTA 0x00000300
#define SPIDER_NET_GDTDCEIDIS 0x00000002
#define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \
- SPIDER_NET_GDTBSTA | \
- SPIDER_NET_GDTDCEIDIS
+ SPIDER_NET_GDTBSTA
#define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003
@@ -328,7 +327,8 @@ enum spider_net_int2_status {
SPIDER_NET_GRISPDNGINT
};
-#define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GDTFDCINT) )
+#define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GDTFDCINT) | \
+ (1 << SPIDER_NET_GDTDCEINT) )
/* We rely on flagged descriptor interrupts */
#define SPIDER_NET_RXINT ( (1 << SPIDER_NET_GDAFDCINT) )
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
origin.patch
git-powerpc.patch
hvcs-char-driver-janitoring-move-block-of-code.patch
hvcs-char-driver-janitoring-rm-compiler-warnings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
