Re: [PATCH 03/11] scsi: remove ordered_tags scsi_device field

2014-11-11 Thread Hannes Reinecke 
On 11/10/2014 04:56 PM, Christoph Hellwig wrote:
 Remove the ordered_tags field, we haven't been issuing ordered tags based
 on it since the big barrier rework in 2010.
 
 Signed-off-by: Christoph Hellwig h...@lst.de
 Reviewed-by: Bart Van Assche bvanass...@acm.org
 Reviewed-by: Martin K. Petersen martin.peter...@oracle.com
Reviewed-by: Hannes Reinecke h...@suse.de

Cheers,

Hannes
-- 
Dr. Hannes Reinecke   zSeries  Storage
h...@suse.de  +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 03/11] scsi: remove ordered_tags scsi_device field

2014-11-10 Thread Christoph Hellwig 
Remove the ordered_tags field, we haven't been issuing ordered tags based
on it since the big barrier rework in 2010.

Signed-off-by: Christoph Hellwig h...@lst.de
Reviewed-by: Bart Van Assche bvanass...@acm.org
Reviewed-by: Martin K. Petersen martin.peter...@oracle.com
---
 drivers/message/fusion/mptscsih.c|  5 ++---
 drivers/scsi/bfa/bfad_im.c   | 11 +++
 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 16 
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 15 +++
 drivers/scsi/qla2xxx/qla_os.c|  5 +
 drivers/scsi/scsi.c  | 13 ++---
 drivers/scsi/scsi_sysfs.c| 13 +++--
 drivers/scsi/vmw_pvscsi.c|  4 ++--
 drivers/target/loopback/tcm_loop.c   | 14 +-
 include/scsi/scsi_device.h   |  1 -
 include/scsi/scsi_tcq.h  |  9 -
 11 files changed, 25 insertions(+), 81 deletions(-)

diff --git a/drivers/message/fusion/mptscsih.c 
b/drivers/message/fusion/mptscsih.c
index e7dcb25..00bd13d 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2400,9 +2400,8 @@ mptscsih_slave_configure(struct scsi_device *sdev)
mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH,
SCSI_QDEPTH_DEFAULT);
dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-   tagged %d, simple %d, ordered %d\n,
-   ioc-name,sdev-tagged_supported, sdev-simple_tags,
-   sdev-ordered_tags));
+   tagged %d, simple %d\n,
+   ioc-name,sdev-tagged_supported, sdev-simple_tags));
 
blk_queue_dma_alignment (sdev-request_queue, 512 - 1);
 
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index f067332..99280e8 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -868,14 +868,9 @@ bfad_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct 
scsi_device *sdev)
if (bfa_lun_queue_depth  tmp_sdev-queue_depth) {
if (tmp_sdev-id != sdev-id)
continue;
-   if (tmp_sdev-ordered_tags)
-   scsi_adjust_queue_depth(tmp_sdev,
-   MSG_ORDERED_TAG,
-   tmp_sdev-queue_depth + 1);
-   else
-   scsi_adjust_queue_depth(tmp_sdev,
-   MSG_SIMPLE_TAG,
-   tmp_sdev-queue_depth + 1);
+   scsi_adjust_queue_depth(tmp_sdev,
+   MSG_SIMPLE_TAG,
+   tmp_sdev-queue_depth + 1);
 
itnim-last_ramp_up_time = jiffies;
}
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c 
b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index ec36b91..69dc166 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -1246,9 +1246,9 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int 
qdepth, int reason)
 
if (sdev-inquiry_len  7)
sdev_printk(KERN_INFO, sdev, qdepth(%d), tagged(%d), 
-   simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n,
+   simple(%d), scsi_level(%d), cmd_que(%d)\n,
sdev-queue_depth, sdev-tagged_supported, sdev-simple_tags,
-   sdev-ordered_tags, sdev-scsi_level,
+   sdev-scsi_level,
(sdev-inquiry[7]  2)  1);
 
return sdev-queue_depth;
@@ -3944,16 +3944,8 @@ _scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd 
*scmd)
mpi_control = MPI2_SCSIIO_CONTROL_NODATATRANSFER;
 
/* set tags */
-   if (!(sas_device_priv_data-flags  MPT_DEVICE_FLAGS_INIT)) {
-   if (scmd-device-tagged_supported) {
-   if (scmd-device-ordered_tags)
-   mpi_control |= MPI2_SCSIIO_CONTROL_ORDEREDQ;
-   else
-   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-   } else
-   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-   } else
-   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
+   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
+
/* Make sure Device is not raid volume.
 * We do not expose raid functionality to upper layer for warpdrive.
 */
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 52464ac..d3abf25 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -1114,9 +1114,9 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int 
qdepth, int reason)
 
if (sdev-inquiry_len  7)
sdev_printk(KERN_INFO, sdev,

Re: [PATCH 03/11] scsi: remove ordered_tags scsi_device field

2014-11-06 Thread Bart Van Assche 

On 11/04/14 08:54, Christoph Hellwig wrote:

Remove the ordered_tags field, we haven't been issuing ordered tags based
on it since the big barrier rework in 2010.


Reviewed-by: Bart Van Assche bvanass...@acm.org
--
To unsubscribe from this list: send the line unsubscribe linux-scsi in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 03/11] scsi: remove ordered_tags scsi_device field

2014-11-03 Thread Christoph Hellwig 
Remove the ordered_tags field, we haven't been issuing ordered tags based
on it since the big barrier rework in 2010.

Signed-off-by: Christoph Hellwig h...@lst.de
---
 drivers/message/fusion/mptscsih.c|  5 ++---
 drivers/scsi/bfa/bfad_im.c   | 11 +++
 drivers/scsi/mpt2sas/mpt2sas_scsih.c | 16 
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 15 +++
 drivers/scsi/qla2xxx/qla_os.c|  5 +
 drivers/scsi/scsi.c  | 13 ++---
 drivers/scsi/scsi_sysfs.c| 13 +++--
 drivers/scsi/vmw_pvscsi.c|  4 ++--
 drivers/target/loopback/tcm_loop.c   | 14 +-
 include/scsi/scsi_device.h   |  1 -
 include/scsi/scsi_tcq.h  |  9 -
 11 files changed, 25 insertions(+), 81 deletions(-)

diff --git a/drivers/message/fusion/mptscsih.c 
b/drivers/message/fusion/mptscsih.c
index e7dcb25..00bd13d 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2400,9 +2400,8 @@ mptscsih_slave_configure(struct scsi_device *sdev)
mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH,
SCSI_QDEPTH_DEFAULT);
dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-   tagged %d, simple %d, ordered %d\n,
-   ioc-name,sdev-tagged_supported, sdev-simple_tags,
-   sdev-ordered_tags));
+   tagged %d, simple %d\n,
+   ioc-name,sdev-tagged_supported, sdev-simple_tags));
 
blk_queue_dma_alignment (sdev-request_queue, 512 - 1);
 
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index f067332..99280e8 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -868,14 +868,9 @@ bfad_ramp_up_qdepth(struct bfad_itnim_s *itnim, struct 
scsi_device *sdev)
if (bfa_lun_queue_depth  tmp_sdev-queue_depth) {
if (tmp_sdev-id != sdev-id)
continue;
-   if (tmp_sdev-ordered_tags)
-   scsi_adjust_queue_depth(tmp_sdev,
-   MSG_ORDERED_TAG,
-   tmp_sdev-queue_depth + 1);
-   else
-   scsi_adjust_queue_depth(tmp_sdev,
-   MSG_SIMPLE_TAG,
-   tmp_sdev-queue_depth + 1);
+   scsi_adjust_queue_depth(tmp_sdev,
+   MSG_SIMPLE_TAG,
+   tmp_sdev-queue_depth + 1);
 
itnim-last_ramp_up_time = jiffies;
}
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c 
b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index ec36b91..69dc166 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -1246,9 +1246,9 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int 
qdepth, int reason)
 
if (sdev-inquiry_len  7)
sdev_printk(KERN_INFO, sdev, qdepth(%d), tagged(%d), 
-   simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n,
+   simple(%d), scsi_level(%d), cmd_que(%d)\n,
sdev-queue_depth, sdev-tagged_supported, sdev-simple_tags,
-   sdev-ordered_tags, sdev-scsi_level,
+   sdev-scsi_level,
(sdev-inquiry[7]  2)  1);
 
return sdev-queue_depth;
@@ -3944,16 +3944,8 @@ _scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd 
*scmd)
mpi_control = MPI2_SCSIIO_CONTROL_NODATATRANSFER;
 
/* set tags */
-   if (!(sas_device_priv_data-flags  MPT_DEVICE_FLAGS_INIT)) {
-   if (scmd-device-tagged_supported) {
-   if (scmd-device-ordered_tags)
-   mpi_control |= MPI2_SCSIIO_CONTROL_ORDEREDQ;
-   else
-   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-   } else
-   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-   } else
-   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
+   mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
+
/* Make sure Device is not raid volume.
 * We do not expose raid functionality to upper layer for warpdrive.
 */
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 52464ac..d3abf25 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -1114,9 +1114,9 @@ _scsih_change_queue_depth(struct scsi_device *sdev, int 
qdepth, int reason)
 
if (sdev-inquiry_len  7)
sdev_printk(KERN_INFO, sdev, qdepth(%d), tagged(%d),  \
-   simple(%d), ordered(%d), scsi_level(%d), cmd_que(%d)\n,
+