From: linas@austin.ibm.com (Linas Vepstas)
To: akpm@osdl.org
Cc: jeff@garzik.org, Arnd Bergmann <arnd@arndb.de>,
netdev@vger.kernel.org, James K Lewis <jklewis@us.ibm.com>,
linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org
Subject: [PATCH 7/21]: Spidernet fix register field definitions
Date: Tue, 10 Oct 2006 16:02:54 -0500 [thread overview]
Message-ID: <20061010210254.GD4381@austin.ibm.com> (raw)
In-Reply-To: <20061010204946.GW4381@austin.ibm.com>
This patch fixes the names of a few fields in the DMA control
register. There is no functional change.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
----
drivers/net/spider_net.c | 2 +-
drivers/net/spider_net.h | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
Index: linux-2.6.18-mm2/drivers/net/spider_net.c
===================================================================
--- linux-2.6.18-mm2.orig/drivers/net/spider_net.c 2006-10-10 12:49:56.000000000 -0500
+++ linux-2.6.18-mm2/drivers/net/spider_net.c 2006-10-10 12:51:26.000000000 -0500
@@ -1614,7 +1614,7 @@ spider_net_enable_card(struct spider_net
SPIDER_NET_INT2_MASK_VALUE);
spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
- SPIDER_NET_GDTDCEIDIS);
+ SPIDER_NET_GDTBSTA | SPIDER_NET_GDTDCEIDIS);
}
/**
Index: linux-2.6.18-mm2/drivers/net/spider_net.h
===================================================================
--- linux-2.6.18-mm2.orig/drivers/net/spider_net.h 2006-10-10 12:20:55.000000000 -0500
+++ linux-2.6.18-mm2/drivers/net/spider_net.h 2006-10-10 12:51:26.000000000 -0500
@@ -191,7 +191,9 @@ extern char spider_net_driver_name[];
#define SPIDER_NET_MACMODE_VALUE 0x00000001
#define SPIDER_NET_BURSTLMT_VALUE 0x00000200 /* about 16 us */
-/* 1(0) enable r/tx dma
+/* DMAC control register GDMACCNTR
+ *
+ * 1(0) enable r/tx dma
* 0000000 fixed to 0
*
* 000000 fixed to 0
@@ -200,6 +202,7 @@ extern char spider_net_driver_name[];
*
* 000000 fixed to 0
* 00 burst alignment: 128 bytes
+ * 11 burst alignment: 1024 bytes
*
* 00000 fixed to 0
* 0 descr writeback size 32 bytes
@@ -210,10 +213,13 @@ extern char spider_net_driver_name[];
#define SPIDER_NET_DMA_RX_VALUE 0x80000000
#define SPIDER_NET_DMA_RX_FEND_VALUE 0x00030003
/* to set TX_DMA_EN */
-#define SPIDER_NET_TX_DMA_EN 0x80000000
-#define SPIDER_NET_GDTDCEIDIS 0x00000302
-#define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \
- SPIDER_NET_GDTDCEIDIS
+#define SPIDER_NET_TX_DMA_EN 0x80000000
+#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
+
#define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003
/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */
next prev parent reply other threads:[~2006-10-10 21:03 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-10 20:49 [PATCH 0/21]: powerpc/cell spidernet bugfixes, etc Linas Vepstas
2006-10-10 20:56 ` [PATCH 1/21]: powerpc/cell spidernet ethtool -i version number info Linas Vepstas
2006-10-10 20:57 ` [PATCH 2/21]: powerpc/cell spidernet burst alignment patch Linas Vepstas
2006-10-10 20:59 ` [PATCH 3/21]: Spidernet module parm permissions Linas Vepstas
2006-10-10 21:00 ` [PATCH 4/21]: powerpc/cell spidernet force-end fix Linas Vepstas
2006-10-10 21:00 ` [PATCH 0/21]: powerpc/cell spidernet bugfixes, etc Andrew Morton
2006-10-10 21:01 ` [PATCH 5/21]: powerpc/cell spidernet zlen min packet length Linas Vepstas
2006-10-10 21:01 ` [PATCH 6/21]: powerpc/cell spidernet add missing netdev watchdog Linas Vepstas
2006-10-10 21:02 ` Linas Vepstas [this message]
2006-10-10 21:04 ` [PATCH 8/21]: Spidernet stop queue when queue is full Linas Vepstas
2006-10-10 21:05 ` [PATCH 9/21]: powerpc/cell spidernet bogus rx interrupt bit Linas Vepstas
2006-10-10 21:06 ` [PATCH 10/21]: powerpc/cell spidernet fix error interrupt print Linas Vepstas
2006-10-10 21:08 ` [PATCH 11/21]: powerpc/cell spidernet stop error printing patch Linas Vepstas
2006-10-10 21:09 ` [PATCH 12/21]: powerpc/cell spidernet incorrect offset Linas Vepstas
2006-10-10 21:11 ` [PATCH 13/21]: powerpc/cell spidernet low watermark patch Linas Vepstas
2006-10-10 21:13 ` [PATCH 14/21]: powerpc/cell spidernet NAPI polling info Linas Vepstas
2006-10-10 21:14 ` [PATCH 15/21]: powerpc/cell spidernet refine locking Linas Vepstas
2006-10-10 21:15 ` [PATCH 16/21]: powerpc/cell spidernet Linas Vepstas
2006-10-10 21:18 ` [PATCH 17/21]: powerpc/cell spidernet reduce DMA kicking Linas Vepstas
2006-10-10 21:19 ` [PATCH 18/21]: powerpc/cell spidernet variable name change Linas Vepstas
2006-10-10 21:21 ` [PATCH 19/21]: powerpc/cell spidernet DMA direction fix Linas Vepstas
2006-10-10 21:22 ` [PATCH 20/21]: powerpc/cell spidernet release all descrs Linas Vepstas
2006-10-10 21:23 ` [PATCH 21/21]: powerpc/cell spidernet DMA coalescing Linas Vepstas
2006-10-10 23:20 ` jschopp
2006-10-11 1:46 ` Geoff Levand
2006-10-11 9:25 ` Arnd Bergmann
2006-10-11 15:20 ` Linas Vepstas
2006-10-11 15:47 ` Geoff Levand
2006-10-11 22:13 ` Benjamin Herrenschmidt
2006-10-11 7:15 ` Benjamin Herrenschmidt
2006-10-14 2:12 ` Joel Schopp
2006-10-11 16:02 ` [PATCH 0/21]: powerpc/cell spidernet bugfixes, etc Arnd Bergmann
2006-10-11 16:42 ` James K Lewis
2006-10-11 21:06 ` James K Lewis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061010210254.GD4381@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=akpm@osdl.org \
--cc=arnd@arndb.de \
--cc=jeff@garzik.org \
--cc=jklewis@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).