From: olof@lixom.net (Olof Johansson)
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org
Subject: [PATCH v3] [8/10] pasemi_mac: Add msglevel support and "pasemi_mac_debug" module param
Date: Sat, 28 Apr 2007 15:38:03 -0500 [thread overview]
Message-ID: <20070428203803.GI4331@lixom.net> (raw)
In-Reply-To: <20070428203624.GA4331@lixom.net>
Add msglevel support for pasemi_mac. Move the MODULE_* defines to the
top to go together with the variable (similar to tg3).
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
@@ -53,6 +53,16 @@
#define RX_RING_SIZE 512
#define TX_RING_SIZE 512
+#define DEFAULT_MSG_ENABLE \
+ (NETIF_MSG_DRV | \
+ NETIF_MSG_PROBE | \
+ NETIF_MSG_LINK | \
+ NETIF_MSG_TIMER | \
+ NETIF_MSG_IFDOWN | \
+ NETIF_MSG_IFUP | \
+ NETIF_MSG_RX_ERR | \
+ NETIF_MSG_TX_ERR)
+
#define TX_DESC(mac, num) ((mac)->tx->desc[(num) & (TX_RING_SIZE-1)])
#define TX_DESC_INFO(mac, num) ((mac)->tx->desc_info[(num) & (TX_RING_SIZE-1)])
#define RX_DESC(mac, num) ((mac)->rx->desc[(num) & (RX_RING_SIZE-1)])
@@ -61,6 +71,14 @@
#define BUF_SIZE 1646 /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
+MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
+
+static int pasemi_mac_debug = -1; /* -1 == use DEFAULT_MSG_ENABLE as value */
+module_param(pasemi_mac_debug, int, 0);
+MODULE_PARM_DESC(pasemi_mac_debug, "PA Semi MAC bitmapped debugging message enable value");
+
static struct pasdma_status *dma_status;
static int pasemi_get_mac_addr(struct pasemi_mac *mac)
@@ -873,6 +891,7 @@ static struct net_device_stats *pasemi_m
return &mac->stats;
}
+
static void pasemi_mac_set_rx_mode(struct net_device *dev)
{
struct pasemi_mac *mac = netdev_priv(dev);
@@ -1007,6 +1026,12 @@ pasemi_mac_probe(struct pci_dev *pdev, c
mac->rx_status = &dma_status->rx_sta[mac->dma_rxch];
mac->tx_status = &dma_status->tx_sta[mac->dma_txch];
+ /* Enable most messages by default */
+ if (pasemi_mac_debug > 0)
+ mac->msg_enable = DEFAULT_MSG_ENABLE;
+ else
+ mac->msg_enable = pasemi_mac_debug;
+
err = register_netdev(dev);
if (err) {
@@ -1081,9 +1106,5 @@ int pasemi_mac_init_module(void)
return pci_register_driver(&pasemi_mac_driver);
}
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
-MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
-
module_init(pasemi_mac_init_module);
module_exit(pasemi_mac_cleanup_module);
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
@@ -75,6 +75,8 @@ struct pasemi_mac {
struct pasemi_mac_rxring *rx;
unsigned long tx_irq;
unsigned long rx_irq;
+
+ unsigned int msg_enable;
};
/* Software status descriptor (desc_info) */
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 ` [PATCH v3] [6/10] pasemi_mac: Minor cleanup / define fixes Olof Johansson
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 ` Olof Johansson [this message]
2007-05-08 5:03 ` [PATCH v3] [8/10] pasemi_mac: Add msglevel support and "pasemi_mac_debug" module param 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=20070428203803.GI4331@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 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).