aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorbrking@us.ibm.com <brking@us.ibm.com>2005-11-01 18:02:01 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2005-11-06 14:08:49 -0500
commit32d29776f8fe8293f7c5273624ec8fbd2b936bfa (patch)
tree6e75a226578be11ae8db7ff1be56c902828abbf1 /drivers/scsi
parent3d1d0da67520aa5dbcea617d52546ae046e946a4 (diff)
[SCSI] ipr: Module parm to disable RAID 0 auto create
Some ipr adapters will automatically create single device RAID 0 arrays for all unconfigured RAID capable devices found at adapter initialization time. This patch adds a module parameter to disable this behavior. Signed-off-by: Brian King <brking@us.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/ipr.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 97f33ddc7bdd..a5df245c8c2c 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -93,6 +93,7 @@ static unsigned int ipr_fastfail = 0;
93static unsigned int ipr_transop_timeout = IPR_OPERATIONAL_TIMEOUT; 93static unsigned int ipr_transop_timeout = IPR_OPERATIONAL_TIMEOUT;
94static unsigned int ipr_enable_cache = 1; 94static unsigned int ipr_enable_cache = 1;
95static unsigned int ipr_debug = 0; 95static unsigned int ipr_debug = 0;
96static int ipr_auto_create = 1;
96static DEFINE_SPINLOCK(ipr_driver_lock); 97static DEFINE_SPINLOCK(ipr_driver_lock);
97 98
98/* This table describes the differences between DMA controller chips */ 99/* This table describes the differences between DMA controller chips */
@@ -156,6 +157,8 @@ module_param_named(enable_cache, ipr_enable_cache, int, 0);
156MODULE_PARM_DESC(enable_cache, "Enable adapter's non-volatile write cache (default: 1)"); 157MODULE_PARM_DESC(enable_cache, "Enable adapter's non-volatile write cache (default: 1)");
157module_param_named(debug, ipr_debug, int, 0); 158module_param_named(debug, ipr_debug, int, 0);
158MODULE_PARM_DESC(debug, "Enable device driver debugging logging. Set to 1 to enable. (default: 0)"); 159MODULE_PARM_DESC(debug, "Enable device driver debugging logging. Set to 1 to enable. (default: 0)");
160module_param_named(auto_create, ipr_auto_create, int, 0);
161MODULE_PARM_DESC(auto_create, "Auto-create single device RAID 0 arrays when initialized (default: 1)");
159MODULE_LICENSE("GPL"); 162MODULE_LICENSE("GPL");
160MODULE_VERSION(IPR_DRIVER_VERSION); 163MODULE_VERSION(IPR_DRIVER_VERSION);
161 164
@@ -5919,6 +5922,8 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg,
5919 ioa_cfg->pdev = pdev; 5922 ioa_cfg->pdev = pdev;
5920 ioa_cfg->log_level = ipr_log_level; 5923 ioa_cfg->log_level = ipr_log_level;
5921 ioa_cfg->doorbell = IPR_DOORBELL; 5924 ioa_cfg->doorbell = IPR_DOORBELL;
5925 if (!ipr_auto_create)
5926 ioa_cfg->doorbell |= IPR_RUNTIME_RESET;
5922 sprintf(ioa_cfg->eye_catcher, IPR_EYECATCHER); 5927 sprintf(ioa_cfg->eye_catcher, IPR_EYECATCHER);
5923 sprintf(ioa_cfg->trace_start, IPR_TRACE_START_LABEL); 5928 sprintf(ioa_cfg->trace_start, IPR_TRACE_START_LABEL);
5924 sprintf(ioa_cfg->ipr_free_label, IPR_FREEQ_LABEL); 5929 sprintf(ioa_cfg->ipr_free_label, IPR_FREEQ_LABEL);