From: "Randy.Dunlap" <rdunlap@xenotime.net>
To: ide <linux-ide@vger.kernel.org>
Cc: linux-kernel@vger.kernel.org, akpm@osdl.org, jgarzik@pobox.com
Subject: [PATCH 2/4] libata debugging support
Date: Fri, 13 Jan 2006 22:44:14 -0800 [thread overview]
Message-ID: <20060113224414.20509944.rdunlap@xenotime.net> (raw)
In-Reply-To: <20060113224252.38d8890f.rdunlap@xenotime.net>
From: Borislav Petkov <petkov@uni-muenster.de>
libata new debugging macro definitions
Signed-off-by: Borislav Petkov <petkov@uni-muenster.de>
Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
---
include/linux/libata.h | 52 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
--- linux-2615-g9.orig/include/linux/libata.h
+++ linux-2615-g9/include/linux/libata.h
@@ -36,7 +36,8 @@
#include <acpi/acpi.h>
/*
- * compile-time options
+ * compile-time options: to be removed as soon as all the drivers are
+ * converted to the new debugging mechanism
*/
#undef ATA_DEBUG /* debugging output */
#undef ATA_VERBOSE_DEBUG /* yet more debugging output */
@@ -72,6 +73,38 @@
}
#endif
+/* NEW: debug levels */
+#define HAVE_LIBATA_MSG 1
+
+enum {
+ ATA_MSG_DRV = 0x0001,
+ ATA_MSG_INFO = 0x0002,
+ ATA_MSG_PROBE = 0x0004,
+ ATA_MSG_WARN = 0x0008,
+ ATA_MSG_MALLOC = 0x0010,
+ ATA_MSG_CTL = 0x0020,
+ ATA_MSG_INTR = 0x0040,
+ ATA_MSG_ERR = 0x0080,
+};
+
+#define ata_msg_drv(p) ((p)->msg_enable & ATA_MSG_DRV)
+#define ata_msg_info(p) ((p)->msg_enable & ATA_MSG_INFO)
+#define ata_msg_probe(p) ((p)->msg_enable & ATA_MSG_PROBE)
+#define ata_msg_warn(p) ((p)->msg_enable & ATA_MSG_WARN)
+#define ata_msg_malloc(p) ((p)->msg_enable & ATA_MSG_MALLOC)
+#define ata_msg_ctl(p) ((p)->msg_enable & ATA_MSG_CTL)
+#define ata_msg_intr(p) ((p)->msg_enable & ATA_MSG_INTR)
+#define ata_msg_err(p) ((p)->msg_enable & ATA_MSG_ERR)
+
+static inline u32 ata_msg_init(int dval, int default_msg_enable_bits)
+{
+ if (dval < 0 || dval >= (sizeof(u32) * 8))
+ return default_msg_enable_bits; /* should be 0x1 - only driver info msgs */
+ if (!dval)
+ return 0;
+ return (1 << dval) - 1;
+}
+
/* defines only for the constants which don't work well as enums */
#define ATA_TAG_POISON 0xfafbfcfdU
@@ -362,6 +395,8 @@ struct ata_port {
unsigned int hsm_task_state;
unsigned long pio_task_timeout;
+ u32 msg_enable;
+
void *private_data;
};
@@ -646,9 +681,9 @@ static inline u8 ata_wait_idle(struct at
if (status & (ATA_BUSY | ATA_DRQ)) {
unsigned long l = ap->ioaddr.status_addr;
- printk(KERN_WARNING
- "ATA: abnormal status 0x%X on port 0x%lX\n",
- status, l);
+ if (ata_msg_warn(ap))
+ printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%lX\n",
+ status, l);
}
return status;
@@ -740,7 +775,8 @@ static inline u8 ata_irq_ack(struct ata_
status = ata_busy_wait(ap, bits, 1000);
if (status & bits)
- DPRINTK("abnormal status 0x%X\n", status);
+ if (ata_msg_err(ap))
+ printk(KERN_ERR "abnormal status 0x%X\n", status);
/* get controller status; clear intr, err bits */
if (ap->flags & ATA_FLAG_MMIO) {
@@ -758,8 +794,10 @@ static inline u8 ata_irq_ack(struct ata_
post_stat = inb(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
}
- VPRINTK("irq ack: host_stat 0x%X, new host_stat 0x%X, drv_stat 0x%X\n",
- host_stat, post_stat, status);
+ if (ata_msg_intr(ap))
+ printk(KERN_INFO "%s: irq ack: host_stat 0x%X, new host_stat 0x%X, drv_stat 0x%X\n",
+ __FUNCTION__,
+ host_stat, post_stat, status);
return status;
}
---
next prev parent reply other threads:[~2006-01-14 6:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-14 6:42 [PATCH 1/4] SATA ACPI build (applies to 2.6.16-git9) Randy.Dunlap
2006-01-14 6:44 ` Randy.Dunlap [this message]
2006-01-14 6:45 ` [PATCH 3/4] SATA ACPI objects support Randy.Dunlap
2006-01-14 6:45 ` [PATCH 4/4] additional libata parameters Randy.Dunlap
2006-01-18 0:35 ` [PATCH 2/4] libata debugging support Jeff Garzik
2006-01-14 7:28 ` [PATCH 1/4] SATA ACPI build (applies to 2.6.16-git9) Sam Ravnborg
2006-01-14 7:30 ` Randy.Dunlap
2006-01-16 11:56 ` Erik Mouw
2006-01-16 14:07 ` Erik Mouw
2006-01-16 21:04 ` Adrian Bunk
2006-01-17 9:01 ` Erik Mouw
2006-01-17 11:27 ` Adrian Bunk
2006-01-16 22:46 ` Jens Axboe
2006-01-16 22:48 ` Randy.Dunlap
2006-01-16 23:00 ` Alan Cox
2006-01-16 23:10 ` Jens Axboe
2006-01-18 12:24 ` Pavel Machek
2006-01-17 9:09 ` Erik Mouw
2006-01-16 15:40 ` Randy.Dunlap
2006-01-16 12:31 ` Jens Axboe
2006-01-16 15:37 ` Randy.Dunlap
2006-01-16 15:44 ` Jens Axboe
2006-01-16 15:51 ` Alan Cox
2006-01-16 15:52 ` Jens Axboe
2006-01-16 15:58 ` Randy.Dunlap
2006-01-16 16:02 ` Jens Axboe
2006-01-16 16:08 ` Randy.Dunlap
2006-01-16 22:43 ` Jens Axboe
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=20060113224414.20509944.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@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).