From: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
To: linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org
Cc: Sathya.Prakash@broadcom.com, sreekanth.reddy@broadcom.com,
Hannes Reinecke <hare@suse.de>,
Suganath Prabu S <suganath-prabu.subramani@broadcom.com>,
Chaitra P B <chaitra.basappa@broadcom.com>
Subject: [PATCH 10/11] mpt3sas: simplify _wait_for_commands_to_complete()
Date: Thu, 21 Dec 2017 23:31:46 -0800 [thread overview]
Message-ID: <1513927907-19735-11-git-send-email-suganath-prabu.subramani@broadcom.com> (raw)
In-Reply-To: <1513927907-19735-1-git-send-email-suganath-prabu.subramani@broadcom.com>
From: Hannes Reinecke <hare@suse.de>
Use 'host_busy' instead of counting outstanding commands by hand.
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
---
drivers/scsi/mpt3sas/mpt3sas_base.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index a49040e..eb4cc20 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -2898,9 +2898,9 @@ _base_recovery_check(struct MPT3SAS_ADAPTER *ioc)
* See _wait_for_commands_to_complete() call with regards to this code.
*/
if (ioc->shost_recovery && ioc->pending_io_count) {
- if (ioc->pending_io_count == 1)
+ ioc->pending_io_count = atomic_read(&ioc->shost->host_busy);
+ if (ioc->pending_io_count == 0)
wake_up(&ioc->reset_wq);
- ioc->pending_io_count--;
}
}
@@ -6310,15 +6310,13 @@ _base_reset_handler(struct MPT3SAS_ADAPTER *ioc, int reset_phase)
* _wait_for_commands_to_complete - reset controller
* @ioc: Pointer to MPT_ADAPTER structure
*
- * This function waiting(3s) for all pending commands to complete
+ * This function is waiting 10s for all pending commands to complete
* prior to putting controller in reset.
*/
static void
_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc)
{
u32 ioc_state;
- unsigned long flags;
- u16 i;
ioc->pending_io_count = 0;
@@ -6327,11 +6325,7 @@ _wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc)
return;
/* pending command count */
- spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
- for (i = 0; i < ioc->scsiio_depth; i++)
- if (ioc->scsi_lookup[i].cb_idx != 0xFF)
- ioc->pending_io_count++;
- spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
+ ioc->pending_io_count = atomic_read(&ioc->shost->host_busy);
if (!ioc->pending_io_count)
return;
--
2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: suganath-prabu.subramani@broadcom.com (Suganath Prabu S)
Subject: [PATCH 10/11] mpt3sas: simplify _wait_for_commands_to_complete()
Date: Thu, 21 Dec 2017 23:31:46 -0800 [thread overview]
Message-ID: <1513927907-19735-11-git-send-email-suganath-prabu.subramani@broadcom.com> (raw)
In-Reply-To: <1513927907-19735-1-git-send-email-suganath-prabu.subramani@broadcom.com>
From: Hannes Reinecke <hare@suse.de>
Use 'host_busy' instead of counting outstanding commands by hand.
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani at broadcom.com>
Signed-off-by: Chaitra P B <chaitra.basappa at broadcom.com>
---
drivers/scsi/mpt3sas/mpt3sas_base.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index a49040e..eb4cc20 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -2898,9 +2898,9 @@ _base_recovery_check(struct MPT3SAS_ADAPTER *ioc)
* See _wait_for_commands_to_complete() call with regards to this code.
*/
if (ioc->shost_recovery && ioc->pending_io_count) {
- if (ioc->pending_io_count == 1)
+ ioc->pending_io_count = atomic_read(&ioc->shost->host_busy);
+ if (ioc->pending_io_count == 0)
wake_up(&ioc->reset_wq);
- ioc->pending_io_count--;
}
}
@@ -6310,15 +6310,13 @@ _base_reset_handler(struct MPT3SAS_ADAPTER *ioc, int reset_phase)
* _wait_for_commands_to_complete - reset controller
* @ioc: Pointer to MPT_ADAPTER structure
*
- * This function waiting(3s) for all pending commands to complete
+ * This function is waiting 10s for all pending commands to complete
* prior to putting controller in reset.
*/
static void
_wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc)
{
u32 ioc_state;
- unsigned long flags;
- u16 i;
ioc->pending_io_count = 0;
@@ -6327,11 +6325,7 @@ _wait_for_commands_to_complete(struct MPT3SAS_ADAPTER *ioc)
return;
/* pending command count */
- spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
- for (i = 0; i < ioc->scsiio_depth; i++)
- if (ioc->scsi_lookup[i].cb_idx != 0xFF)
- ioc->pending_io_count++;
- spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
+ ioc->pending_io_count = atomic_read(&ioc->shost->host_busy);
if (!ioc->pending_io_count)
return;
--
2.5.5
next prev parent reply other threads:[~2017-12-22 7:32 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 7:31 [PATCH 00/11] mpt3sas: Enable scsi MQ & lockless command submission Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 01/11] mpt3sas: set default value for cb_idx Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 02/11] mpt3sas: use list_splice_init() Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 03/11] mpt3sas: separate out _base_recovery_check() Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 04/11] mpt3sas: open-code _scsih_scsi_lookup_get() Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 05/11] mpt3sas: Introduce mpt3sas_get_st_from_smid() Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 06/11] mpt3sas: check command status before attempting abort Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 07/11] mpt3sas: always use first reserved smid for ioctl passthrough Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 08/11] mpt3sas: simplify task management functions Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` [PATCH 09/11] mpt3sas: simplify mpt3sas_scsi_issue_tm() Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S [this message]
2017-12-22 7:31 ` [PATCH 10/11] mpt3sas: simplify _wait_for_commands_to_complete() Suganath Prabu S
2017-12-22 7:31 ` [PATCH 11/11] mpt3sas: lockless command submission Suganath Prabu S
2017-12-22 7:31 ` Suganath Prabu S
2017-12-22 7:54 ` [PATCH 00/11] mpt3sas: Enable scsi MQ & " Hannes Reinecke
2017-12-22 7:54 ` Hannes Reinecke
2018-01-04 4:07 ` Martin K. Petersen
2018-01-04 4:07 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1513927907-19735-11-git-send-email-suganath-prabu.subramani@broadcom.com \
--to=suganath-prabu.subramani@broadcom.com \
--cc=Sathya.Prakash@broadcom.com \
--cc=chaitra.basappa@broadcom.com \
--cc=hare@suse.de \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=sreekanth.reddy@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.