summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas
diff options
context:
space:
mode:
authorKashyap, Desai <kashyap.desai@lsi.com>2010-06-17 13:31:17 +0530
committerJames Bottomley <James.Bottomley@suse.de>2010-07-27 12:02:07 -0500
commitdd5fd3323abcb799d4d81f3c4b3e2a5fcbfce7bf (patch)
treec77f908a8f6987ce70b9c4464396038fc13464bd /drivers/scsi/mpt2sas
parentd274213a1ae59e8abde8d43e1e3a478fe9f28794 (diff)
downloadop-kernel-dev-dd5fd3323abcb799d4d81f3c4b3e2a5fcbfce7bf.zip
op-kernel-dev-dd5fd3323abcb799d4d81f3c4b3e2a5fcbfce7bf.tar.gz
[SCSI] mpt2sas: staged device discovery. disable_discovery module parameter is added.
Added command line option called disable_discovery. When enabled on the command line, the driver will not send a port_enable when loaded for the first time. If port_enable is not called, then there is no discovery of devices, as well as the sas topology. Then later if one desires to invoke discovery, then they will need to issue a diagnostic reset. A diagnostic reset can be issued various ways. One of the way is throught sysfs. Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index f0c0df4..68cb000 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -95,6 +95,10 @@ int mpt2sas_fwfault_debug;
MODULE_PARM_DESC(mpt2sas_fwfault_debug, " enable detection of firmware fault "
"and halt firmware - (default=0)");
+static int disable_discovery = -1;
+module_param(disable_discovery, int, 0);
+MODULE_PARM_DESC(disable_discovery, " disable discovery ");
+
/**
* _scsih_set_fwfault_debug - global setting of ioc->fwfault_debug.
*
@@ -3520,6 +3524,9 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
if (sleep_flag == CAN_SLEEP)
_base_static_config_pages(ioc);
+ if (ioc->wait_for_port_enable_to_complete && disable_discovery > 0)
+ return r;
+
r = _base_send_port_enable(ioc, sleep_flag);
if (r)
return r;
OpenPOWER on IntegriCloud