From: olof@lixom.net (Olof Johansson)
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org
Subject: [PATCH v3] [6/10] pasemi_mac: Minor cleanup / define fixes
Date: Sat, 28 Apr 2007 15:37:39 -0500 [thread overview]
Message-ID: <20070428203739.GG4331@lixom.net> (raw)
In-Reply-To: <20070428203624.GA4331@lixom.net>
* Remove some unused defines
* Fix a couple of wrong chip register defines, and add a few more fields
that might be used in the near future.
Signed-off-by: Olof Johansson <olof@lixom.net>
Index: netdev-2.6/drivers/net/pasemi_mac.c
===================================================================
--- netdev-2.6.orig/drivers/net/pasemi_mac.c
+++ netdev-2.6/drivers/net/pasemi_mac.c
@@ -61,12 +61,6 @@
#define BUF_SIZE 1646 /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
-/* XXXOJN these should come out of the device tree some day */
-#define PAS_DMA_CAP_BASE 0xe00d0040
-#define PAS_DMA_CAP_SIZE 0x100
-#define PAS_DMA_COM_BASE 0xe00d0100
-#define PAS_DMA_COM_SIZE 0x100
-
static struct pasdma_status *dma_status;
static int pasemi_get_mac_addr(struct pasemi_mac *mac)
Index: netdev-2.6/drivers/net/pasemi_mac.h
===================================================================
--- netdev-2.6.orig/drivers/net/pasemi_mac.h
+++ netdev-2.6/drivers/net/pasemi_mac.h
@@ -195,11 +195,15 @@ enum {
#define PAS_DMA_RXINT_RCMDSTA(i) (0x200+(i)*_PAS_DMA_RXINT_STRIDE)
#define PAS_DMA_RXINT_RCMDSTA_EN 0x00000001
#define PAS_DMA_RXINT_RCMDSTA_ST 0x00000002
-#define PAS_DMA_RXINT_RCMDSTA_OO 0x00000100
-#define PAS_DMA_RXINT_RCMDSTA_BP 0x00000200
-#define PAS_DMA_RXINT_RCMDSTA_DR 0x00000400
+#define PAS_DMA_RXINT_RCMDSTA_MBT 0x00000008
+#define PAS_DMA_RXINT_RCMDSTA_MDR 0x00000010
+#define PAS_DMA_RXINT_RCMDSTA_MOO 0x00000020
+#define PAS_DMA_RXINT_RCMDSTA_MBP 0x00000040
#define PAS_DMA_RXINT_RCMDSTA_BT 0x00000800
-#define PAS_DMA_RXINT_RCMDSTA_TB 0x00001000
+#define PAS_DMA_RXINT_RCMDSTA_DR 0x00001000
+#define PAS_DMA_RXINT_RCMDSTA_OO 0x00002000
+#define PAS_DMA_RXINT_RCMDSTA_BP 0x00004000
+#define PAS_DMA_RXINT_RCMDSTA_TB 0x00008000
#define PAS_DMA_RXINT_RCMDSTA_ACT 0x00010000
#define PAS_DMA_RXINT_RCMDSTA_DROPS_M 0xfffe0000
#define PAS_DMA_RXINT_RCMDSTA_DROPS_S 17
next prev parent reply other threads:[~2007-04-28 20:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-28 20:36 [PATCH v3] [0/10] pasemi_mac: fixes and enhancements Olof Johansson
2007-04-28 20:36 ` [PATCH v3] [1/10] pasemi_mac: A couple of minor bugfixes Olof Johansson
2007-05-08 5:02 ` Jeff Garzik
2007-04-28 20:36 ` [PATCH v3] [2/10] pasemi_mac: Move the IRQ mapping from the PCI layer to the driver Olof Johansson
2007-04-28 20:57 ` [PATCH v3] [2/10] [REAL 2/10] " Olof Johansson
2007-05-08 5:02 ` Jeff Garzik
2007-05-08 5:32 ` Olof Johansson
2007-04-28 20:37 ` [PATCH v3] [3/10] pasemi_mac: Abstract and fix up interrupt restart routines Olof Johansson
2007-04-28 20:37 ` [PATCH v3] [4/10] pasemi_mac: Timer and interrupt fixes Olof Johansson
2007-04-28 20:37 ` [PATCH v3] [5/10] pasemi_mac: Add SKB reuse / copy-break Olof Johansson
2007-04-28 20:37 ` Olof Johansson [this message]
2007-04-28 20:37 ` [PATCH v3] [2/10] pasemi_mac: Move the IRQ mapping from the PCI layer to the driver[PATCH v3] [7/10] pasemi_mac: Logic cleanup / rx performance improvements Olof Johansson
2007-04-28 20:38 ` [PATCH v3] [8/10] pasemi_mac: Add msglevel support and "pasemi_mac_debug" module param Olof Johansson
2007-05-08 5:03 ` Jeff Garzik
2007-05-08 5:33 ` Olof Johansson
2007-04-28 20:38 ` [PATCH v3] [9/10] pasemi_mac: PHY support Olof Johansson
2007-05-08 5:03 ` Jeff Garzik
2007-04-28 20:38 ` [PATCH v3] [10/10] pasemi_mac: Use local-mac-address instead of mac-address if available Olof Johansson
2007-04-28 20:58 ` [PATCH v3] [7/10] pasemi_mac: Logic cleanup / rx performance improvements Olof Johansson
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=20070428203739.GG4331@lixom.net \
--to=olof@lixom.net \
--cc=jgarzik@pobox.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.