Commit d3c74871 authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ipr: Runtime debugging options 



Make some compile time debugging options runtime module options.

Signed-off-by: default avatarBrian King <brking@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 12baa420

drivers/scsi/ipr.c

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ static int ipr_testmode = 0; 
static unsigned int ipr_fastfail = 0;

static unsigned int ipr_transop_timeout = IPR_OPERATIONAL_TIMEOUT;

static unsigned int ipr_enable_cache = 1;

static unsigned int ipr_debug = 0;

static DEFINE_SPINLOCK(ipr_driver_lock);



/* This table describes the differences between DMA controller chips */
@@ -153,6 +154,8 @@ module_param_named(transop_timeout, ipr_transop_timeout, int, 0); 
MODULE_PARM_DESC(transop_timeout, "Time in seconds to wait for adapter to come operational (default: 300)");

module_param_named(enable_cache, ipr_enable_cache, int, 0);

MODULE_PARM_DESC(enable_cache, "Enable adapter's non-volatile write cache (default: 1)");

module_param_named(debug, ipr_debug, int, 0);

MODULE_PARM_DESC(debug, "Enable device driver debugging logging. Set to 1 to enable. (default: 0)");

MODULE_LICENSE("GPL");

MODULE_VERSION(IPR_DRIVER_VERSION);

drivers/scsi/ipr.h

+3 −27
Original line number Diff line number Diff line
@@ -39,21 +39,6 @@ 
#define IPR_DRIVER_VERSION "2.0.14"

#define IPR_DRIVER_DATE "(May 2, 2005)"



/*

 * IPR_DBG_TRACE: Setting this to 1 will turn on some general function tracing

 *			resulting in a bunch of extra debugging printks to the console

 *

 * IPR_DEBUG:	Setting this to 1 will turn on some error path tracing.

 *			Enables the ipr_trace macro.

 */

#ifdef IPR_DEBUG_ALL

#define IPR_DEBUG				1

#define IPR_DBG_TRACE			1

#else

#define IPR_DEBUG				0

#define IPR_DBG_TRACE			0

#endif



/*

 * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding

 *	ops per device for devices not running tagged command queuing.
@@ -1090,11 +1075,7 @@ struct ipr_ucode_image_header { 
/*

 * Macros

 */

#if IPR_DEBUG

#define IPR_DBG_CMD(CMD) do { CMD; } while (0)

#else

#define IPR_DBG_CMD(CMD)

#endif

#define IPR_DBG_CMD(CMD) if (ipr_debug) { CMD; }



#ifdef CONFIG_SCSI_IPR_TRACE

#define ipr_create_trace_file(kobj, attr) sysfs_create_bin_file(kobj, attr)
@@ -1156,13 +1137,8 @@ struct ipr_ucode_image_header { 
#define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\

	__FILE__, __FUNCTION__, __LINE__)



#if IPR_DBG_TRACE

#define ENTER printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__)

#define LEAVE printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__)

#else

#define ENTER

#define LEAVE

#endif

#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__))

#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__))



#define ipr_err_separator \

ipr_err("----------------------------------------------------------\n")