* [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support
@ 2014-03-14 15:36 ` Reddy, Sreekanth
0 siblings, 0 replies; 7+ messages in thread
From: Reddy, Sreekanth @ 2014-03-14 15:36 UTC (permalink / raw)
To: jejb, JBottomley
Cc: linux-scsi, Sathya.Prakash, Nagalakshmi.Nandigama,
sreekanth.reddy, linux-kernel, sreekanthreddy0547
A new mpt2sas driver module parameter 'disable_eedp' is added to Disable
EEDP support. By default DIF support is enabled in the driver and
this module parameter would allow users to turn it off.
Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
---
drivers/scsi/mpt2sas/mpt2sas_base.c | 9 ++++--
drivers/scsi/mpt2sas/mpt2sas_base.h | 1 +
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 47 +++++++++++++++++++++++-----------
3 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index ed810fb..7355b28 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -440,13 +440,16 @@ _base_sas_ioc_info(struct MPT2SAS_ADAPTER *ioc, MPI2DefaultReply_t *mpi_reply,
****************************************************************************/
case MPI2_IOCSTATUS_EEDP_GUARD_ERROR:
- desc = "eedp guard error";
+ if (!ioc->disable_eedp_support)
+ desc = "eedp guard error";
break;
case MPI2_IOCSTATUS_EEDP_REF_TAG_ERROR:
- desc = "eedp ref tag error";
+ if (!ioc->disable_eedp_support)
+ desc = "eedp ref tag error";
break;
case MPI2_IOCSTATUS_EEDP_APP_TAG_ERROR:
- desc = "eedp app tag error";
+ if (!ioc->disable_eedp_support)
+ desc = "eedp app tag error";
break;
/****************************************************************************
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 1f2ac3a..61b02ee 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -842,6 +842,7 @@ struct MPT2SAS_ADAPTER {
u32 ioc_reset_count;
MPT2SAS_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;
u32 non_operational_loop;
+ u8 disable_eedp_support;
/* internal commands, callback index */
u8 scsi_io_cb_idx;
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 7f0af4f..d502728 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -127,6 +127,11 @@ static int disable_discovery = -1;
module_param(disable_discovery, int, 0);
MODULE_PARM_DESC(disable_discovery, " disable discovery ");
+/* Enable or disable EEDP support */
+static int disable_eedp;
+module_param(disable_eedp, uint, 0);
+MODULE_PARM_DESC(disable_eedp, " disable EEDP support: (default=0)");
+
/* permit overriding the host protection capabilities mask (EEDP/T10 PI) */
static int prot_mask = 0;
module_param(prot_mask, int, 0);
@@ -4031,7 +4036,8 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
}
mpi_request = mpt2sas_base_get_msg_frame(ioc, smid);
memset(mpi_request, 0, sizeof(Mpi2SCSIIORequest_t));
- _scsih_setup_eedp(scmd, mpi_request);
+ if (!ioc->disable_eedp_support)
+ _scsih_setup_eedp(scmd, mpi_request);
if (scmd->cmd_len == 32)
mpi_control |= 4 << MPI2_SCSIIO_CONTROL_ADDCDBLEN_SHIFT;
mpi_request->Function = MPI2_FUNCTION_SCSI_IO_REQUEST;
@@ -4196,14 +4202,20 @@ _scsih_scsi_ioc_info(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
desc_ioc_state = "scsi ext terminated";
break;
case MPI2_IOCSTATUS_EEDP_GUARD_ERROR:
- desc_ioc_state = "eedp guard error";
- break;
+ if (!ioc->disable_eedp_support) {
+ desc_ioc_state = "eedp guard error";
+ break;
+ }
case MPI2_IOCSTATUS_EEDP_REF_TAG_ERROR:
- desc_ioc_state = "eedp ref tag error";
- break;
+ if (!ioc->disable_eedp_support) {
+ desc_ioc_state = "eedp ref tag error";
+ break;
+ }
case MPI2_IOCSTATUS_EEDP_APP_TAG_ERROR:
- desc_ioc_state = "eedp app tag error";
- break;
+ if (!ioc->disable_eedp_support) {
+ desc_ioc_state = "eedp app tag error";
+ break;
+ }
default:
desc_ioc_state = "unknown";
break;
@@ -4625,8 +4637,10 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
case MPI2_IOCSTATUS_EEDP_GUARD_ERROR:
case MPI2_IOCSTATUS_EEDP_REF_TAG_ERROR:
case MPI2_IOCSTATUS_EEDP_APP_TAG_ERROR:
- _scsih_eedp_error_handling(scmd, ioc_status);
- break;
+ if (!ioc->disable_eedp_support) {
+ _scsih_eedp_error_handling(scmd, ioc_status);
+ break;
+ }
case MPI2_IOCSTATUS_SCSI_PROTOCOL_ERROR:
case MPI2_IOCSTATUS_INVALID_FUNCTION:
case MPI2_IOCSTATUS_INVALID_SGL:
@@ -8213,15 +8227,18 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto out_add_shost_fail;
}
- /* register EEDP capabilities with SCSI layer */
- if (prot_mask)
- scsi_host_set_prot(shost, prot_mask);
- else
- scsi_host_set_prot(shost, SHOST_DIF_TYPE1_PROTECTION
+ ioc->disable_eedp_support = disable_eedp;
+ if (!ioc->disable_eedp_support) {
+ /* register EEDP capabilities with SCSI layer */
+ if (prot_mask)
+ scsi_host_set_prot(shost, prot_mask);
+ else
+ scsi_host_set_prot(shost, SHOST_DIF_TYPE1_PROTECTION
| SHOST_DIF_TYPE2_PROTECTION
| SHOST_DIF_TYPE3_PROTECTION);
- scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
+ scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
+ }
/* event thread */
snprintf(ioc->firmware_event_name, sizeof(ioc->firmware_event_name),
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support
@ 2014-03-14 15:36 ` Reddy, Sreekanth
0 siblings, 0 replies; 7+ messages in thread
From: Reddy, Sreekanth @ 2014-03-14 15:36 UTC (permalink / raw)
To: jejb, JBottomley
Cc: linux-scsi, Sathya.Prakash, Nagalakshmi.Nandigama,
sreekanth.reddy, linux-kernel, sreekanthreddy0547
A new mpt2sas driver module parameter 'disable_eedp' is added to Disable
EEDP support. By default DIF support is enabled in the driver and
this module parameter would allow users to turn it off.
Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
---
drivers/scsi/mpt2sas/mpt2sas_base.c | 9 ++++--
drivers/scsi/mpt2sas/mpt2sas_base.h | 1 +
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 47 +++++++++++++++++++++++-----------
3 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index ed810fb..7355b28 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -440,13 +440,16 @@ _base_sas_ioc_info(struct MPT2SAS_ADAPTER *ioc, MPI2DefaultReply_t *mpi_reply,
****************************************************************************/
case MPI2_IOCSTATUS_EEDP_GUARD_ERROR:
- desc = "eedp guard error";
+ if (!ioc->disable_eedp_support)
+ desc = "eedp guard error";
break;
case MPI2_IOCSTATUS_EEDP_REF_TAG_ERROR:
- desc = "eedp ref tag error";
+ if (!ioc->disable_eedp_support)
+ desc = "eedp ref tag error";
break;
case MPI2_IOCSTATUS_EEDP_APP_TAG_ERROR:
- desc = "eedp app tag error";
+ if (!ioc->disable_eedp_support)
+ desc = "eedp app tag error";
break;
/****************************************************************************
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 1f2ac3a..61b02ee 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -842,6 +842,7 @@ struct MPT2SAS_ADAPTER {
u32 ioc_reset_count;
MPT2SAS_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;
u32 non_operational_loop;
+ u8 disable_eedp_support;
/* internal commands, callback index */
u8 scsi_io_cb_idx;
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 7f0af4f..d502728 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -127,6 +127,11 @@ static int disable_discovery = -1;
module_param(disable_discovery, int, 0);
MODULE_PARM_DESC(disable_discovery, " disable discovery ");
+/* Enable or disable EEDP support */
+static int disable_eedp;
+module_param(disable_eedp, uint, 0);
+MODULE_PARM_DESC(disable_eedp, " disable EEDP support: (default=0)");
+
/* permit overriding the host protection capabilities mask (EEDP/T10 PI) */
static int prot_mask = 0;
module_param(prot_mask, int, 0);
@@ -4031,7 +4036,8 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
}
mpi_request = mpt2sas_base_get_msg_frame(ioc, smid);
memset(mpi_request, 0, sizeof(Mpi2SCSIIORequest_t));
- _scsih_setup_eedp(scmd, mpi_request);
+ if (!ioc->disable_eedp_support)
+ _scsih_setup_eedp(scmd, mpi_request);
if (scmd->cmd_len == 32)
mpi_control |= 4 << MPI2_SCSIIO_CONTROL_ADDCDBLEN_SHIFT;
mpi_request->Function = MPI2_FUNCTION_SCSI_IO_REQUEST;
@@ -4196,14 +4202,20 @@ _scsih_scsi_ioc_info(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
desc_ioc_state = "scsi ext terminated";
break;
case MPI2_IOCSTATUS_EEDP_GUARD_ERROR:
- desc_ioc_state = "eedp guard error";
- break;
+ if (!ioc->disable_eedp_support) {
+ desc_ioc_state = "eedp guard error";
+ break;
+ }
case MPI2_IOCSTATUS_EEDP_REF_TAG_ERROR:
- desc_ioc_state = "eedp ref tag error";
- break;
+ if (!ioc->disable_eedp_support) {
+ desc_ioc_state = "eedp ref tag error";
+ break;
+ }
case MPI2_IOCSTATUS_EEDP_APP_TAG_ERROR:
- desc_ioc_state = "eedp app tag error";
- break;
+ if (!ioc->disable_eedp_support) {
+ desc_ioc_state = "eedp app tag error";
+ break;
+ }
default:
desc_ioc_state = "unknown";
break;
@@ -4625,8 +4637,10 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
case MPI2_IOCSTATUS_EEDP_GUARD_ERROR:
case MPI2_IOCSTATUS_EEDP_REF_TAG_ERROR:
case MPI2_IOCSTATUS_EEDP_APP_TAG_ERROR:
- _scsih_eedp_error_handling(scmd, ioc_status);
- break;
+ if (!ioc->disable_eedp_support) {
+ _scsih_eedp_error_handling(scmd, ioc_status);
+ break;
+ }
case MPI2_IOCSTATUS_SCSI_PROTOCOL_ERROR:
case MPI2_IOCSTATUS_INVALID_FUNCTION:
case MPI2_IOCSTATUS_INVALID_SGL:
@@ -8213,15 +8227,18 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto out_add_shost_fail;
}
- /* register EEDP capabilities with SCSI layer */
- if (prot_mask)
- scsi_host_set_prot(shost, prot_mask);
- else
- scsi_host_set_prot(shost, SHOST_DIF_TYPE1_PROTECTION
+ ioc->disable_eedp_support = disable_eedp;
+ if (!ioc->disable_eedp_support) {
+ /* register EEDP capabilities with SCSI layer */
+ if (prot_mask)
+ scsi_host_set_prot(shost, prot_mask);
+ else
+ scsi_host_set_prot(shost, SHOST_DIF_TYPE1_PROTECTION
| SHOST_DIF_TYPE2_PROTECTION
| SHOST_DIF_TYPE3_PROTECTION);
- scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
+ scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
+ }
/* event thread */
snprintf(ioc->firmware_event_name, sizeof(ioc->firmware_event_name),
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support
2014-03-14 15:36 ` Reddy, Sreekanth
@ 2014-03-14 20:37 ` Martin K. Petersen
-1 siblings, 0 replies; 7+ messages in thread
From: Martin K. Petersen @ 2014-03-14 20:37 UTC (permalink / raw)
To: Reddy, Sreekanth
Cc: jejb, JBottomley, linux-scsi, Sathya.Prakash,
Nagalakshmi.Nandigama, linux-kernel, sreekanthreddy0547
>>>>> "Sreekanth" == Reddy, Sreekanth <Sreekanth.Reddy@lsi.com> writes:
Sreekanth> A new mpt2sas driver module parameter 'disable_eedp' is added
Sreekanth> to Disable EEDP support. By default DIF support is enabled in
Sreekanth> the driver and this module parameter would allow users to
Sreekanth> turn it off.
Why don't you just set the prot_mask module parameter to 0?
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support
@ 2014-03-14 20:37 ` Martin K. Petersen
0 siblings, 0 replies; 7+ messages in thread
From: Martin K. Petersen @ 2014-03-14 20:37 UTC (permalink / raw)
To: Reddy, Sreekanth
Cc: jejb, JBottomley, linux-scsi, Sathya.Prakash,
Nagalakshmi.Nandigama, linux-kernel, sreekanthreddy0547
>>>>> "Sreekanth" == Reddy, Sreekanth <Sreekanth.Reddy@lsi.com> writes:
Sreekanth> A new mpt2sas driver module parameter 'disable_eedp' is added
Sreekanth> to Disable EEDP support. By default DIF support is enabled in
Sreekanth> the driver and this module parameter would allow users to
Sreekanth> turn it off.
Why don't you just set the prot_mask module parameter to 0?
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support
2014-03-14 20:37 ` Martin K. Petersen
(?)
@ 2014-03-19 22:21 ` James Bottomley
2014-03-20 13:25 ` Reddy, Sreekanth
-1 siblings, 1 reply; 7+ messages in thread
From: James Bottomley @ 2014-03-19 22:21 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Reddy, Sreekanth, jejb, linux-scsi, Sathya.Prakash,
Nagalakshmi.Nandigama, linux-kernel, sreekanthreddy0547
On Fri, 2014-03-14 at 16:37 -0400, Martin K. Petersen wrote:
> >>>>> "Sreekanth" == Reddy, Sreekanth <Sreekanth.Reddy@lsi.com> writes:
>
> Sreekanth> A new mpt2sas driver module parameter 'disable_eedp' is added
> Sreekanth> to Disable EEDP support. By default DIF support is enabled in
> Sreekanth> the driver and this module parameter would allow users to
> Sreekanth> turn it off.
>
> Why don't you just set the prot_mask module parameter to 0?
Is there an answer to this? It's holding up your patch submission.
James
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support
2014-03-19 22:21 ` James Bottomley
@ 2014-03-20 13:25 ` Reddy, Sreekanth
0 siblings, 0 replies; 7+ messages in thread
From: Reddy, Sreekanth @ 2014-03-20 13:25 UTC (permalink / raw)
To: James Bottomley, Martin K. Petersen
Cc: jejb, linux-scsi, Prakash, Sathya, Nandigama, Nagalakshmi,
linux-kernel, sreekanthreddy0547
>>
>> Sreekanth> A new mpt2sas driver module parameter 'disable_eedp' is
>> Sreekanth> added to Disable EEDP support. By default DIF support is
>> Sreekanth> enabled in the driver and this module parameter would allow
>> Sreekanth> users to turn it off.
>>
>> Why don't you just set the prot_mask module parameter to 0?
>
>Is there an answer to this? It's holding up your patch submission.
>
>James
>
Hi Martin,
The prot_mask module parameter is defined for the purpose of setting the DIF and DIX capabilities.
The disable_eedp module parameter is added with the intent to disable the complete EEDP related code and operations. This include even reading manufacting pages to get EEDPTagMode etc.
Agree that this could also be achieved using prot_mask. We are giving new parameter to be clear that we are disabling the complete EEDP.
Thanks,
Sreekanth
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support
2014-03-14 15:36 ` Reddy, Sreekanth
(?)
(?)
@ 2014-03-20 17:28 ` Bernd Schubert
-1 siblings, 0 replies; 7+ messages in thread
From: Bernd Schubert @ 2014-03-20 17:28 UTC (permalink / raw)
To: Reddy, Sreekanth, jejb, JBottomley
Cc: linux-scsi, Sathya.Prakash, Nagalakshmi.Nandigama, linux-kernel,
sreekanthreddy0547
> u8 scsi_io_cb_idx;
> diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
> index 7f0af4f..d502728 100644
> --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
> +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
> @@ -127,6 +127,11 @@ static int disable_discovery = -1;
> module_param(disable_discovery, int, 0);
> MODULE_PARM_DESC(disable_discovery, " disable discovery ");
>
> +/* Enable or disable EEDP support */
> +static int disable_eedp;
> +module_param(disable_eedp, uint, 0);
> +MODULE_PARM_DESC(disable_eedp, " disable EEDP support: (default=0)");
Wouldn't it make sense to exlain what EEDP means? Something like
MODULE_PARM_DESC(disable_eedp,
" disable end-to-end data protection support (DIF): "
"default=0)");
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-03-20 17:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-14 15:36 [PATCH 02/11][SCSI]mpt2sas: Added new driver module Parameter disable_eedp to Disable EEDP Support Reddy, Sreekanth
2014-03-14 15:36 ` Reddy, Sreekanth
2014-03-14 20:37 ` Martin K. Petersen
2014-03-14 20:37 ` Martin K. Petersen
2014-03-19 22:21 ` James Bottomley
2014-03-20 13:25 ` Reddy, Sreekanth
2014-03-20 17:28 ` Bernd Schubert
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.