* [PATCH] scsi: fnic: set scsi_set_resid only for underflow
@ 2020-11-21 1:51 Karan Tilak Kumar
2020-11-24 1:27 ` Arulprabhu Ponnusamy (arulponn)
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Karan Tilak Kumar @ 2020-11-21 1:51 UTC (permalink / raw)
To: satishkh
Cc: sebaddel, arulponn, jejb, martin.petersen, linux-scsi,
linux-kernel, Karan Tilak Kumar
Fix to set scsi_set_resid() only if
FCPIO_ICMND_CMPL_RESID_UNDER is set.
Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
Signed-off-by: Satish Kharat <satishkh@cisco.com>
---
drivers/scsi/fnic/fnic.h | 2 +-
drivers/scsi/fnic/fnic_scsi.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 7c5c911b2673..e4d399f41a0a 100644
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -39,7 +39,7 @@
#define DRV_NAME "fnic"
#define DRV_DESCRIPTION "Cisco FCoE HBA Driver"
-#define DRV_VERSION "1.6.0.51"
+#define DRV_VERSION "1.6.0.52"
#define PFX DRV_NAME ": "
#define DFX DRV_NAME "%d: "
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 16e66f5b833a..532c3c7ae372 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -921,10 +921,11 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
case FCPIO_SUCCESS:
sc->result = (DID_OK << 16) | icmnd_cmpl->scsi_status;
xfer_len = scsi_bufflen(sc);
- scsi_set_resid(sc, icmnd_cmpl->residual);
- if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER)
+ if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER) {
xfer_len -= icmnd_cmpl->residual;
+ scsi_set_resid(sc, icmnd_cmpl->residual);
+ }
if (icmnd_cmpl->scsi_status == SAM_STAT_CHECK_CONDITION)
atomic64_inc(&fnic_stats->misc_stats.check_condition);
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: fnic: set scsi_set_resid only for underflow
2020-11-21 1:51 [PATCH] scsi: fnic: set scsi_set_resid only for underflow Karan Tilak Kumar
@ 2020-11-24 1:27 ` Arulprabhu Ponnusamy (arulponn)
2020-11-24 3:48 ` Martin K. Petersen
2020-12-01 5:04 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Arulprabhu Ponnusamy (arulponn) @ 2020-11-24 1:27 UTC (permalink / raw)
To: Karan Tilak Kumar (kartilak), Satish Kharat (satishkh)
Cc: Sesidhar Baddela (sebaddel),
jejb, martin.petersen, linux-scsi, linux-kernel
Looks good.
Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com>
On 11/20/20, 5:51 PM, "Karan Tilak Kumar" <kartilak@cisco.com> wrote:
Fix to set scsi_set_resid() only if
FCPIO_ICMND_CMPL_RESID_UNDER is set.
Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
Signed-off-by: Satish Kharat <satishkh@cisco.com>
---
drivers/scsi/fnic/fnic.h | 2 +-
drivers/scsi/fnic/fnic_scsi.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 7c5c911b2673..e4d399f41a0a 100644
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -39,7 +39,7 @@
#define DRV_NAME "fnic"
#define DRV_DESCRIPTION "Cisco FCoE HBA Driver"
-#define DRV_VERSION "1.6.0.51"
+#define DRV_VERSION "1.6.0.52"
#define PFX DRV_NAME ": "
#define DFX DRV_NAME "%d: "
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 16e66f5b833a..532c3c7ae372 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -921,10 +921,11 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic,
case FCPIO_SUCCESS:
sc->result = (DID_OK << 16) | icmnd_cmpl->scsi_status;
xfer_len = scsi_bufflen(sc);
- scsi_set_resid(sc, icmnd_cmpl->residual);
- if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER)
+ if (icmnd_cmpl->flags & FCPIO_ICMND_CMPL_RESID_UNDER) {
xfer_len -= icmnd_cmpl->residual;
+ scsi_set_resid(sc, icmnd_cmpl->residual);
+ }
if (icmnd_cmpl->scsi_status == SAM_STAT_CHECK_CONDITION)
atomic64_inc(&fnic_stats->misc_stats.check_condition);
--
2.29.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: fnic: set scsi_set_resid only for underflow
2020-11-21 1:51 [PATCH] scsi: fnic: set scsi_set_resid only for underflow Karan Tilak Kumar
2020-11-24 1:27 ` Arulprabhu Ponnusamy (arulponn)
@ 2020-11-24 3:48 ` Martin K. Petersen
2020-12-01 5:04 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2020-11-24 3:48 UTC (permalink / raw)
To: Karan Tilak Kumar
Cc: satishkh, sebaddel, arulponn, jejb, martin.petersen, linux-scsi,
linux-kernel
Karan,
> Fix to set scsi_set_resid() only if FCPIO_ICMND_CMPL_RESID_UNDER is
> set.
Applied to 5.11/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: fnic: set scsi_set_resid only for underflow
2020-11-21 1:51 [PATCH] scsi: fnic: set scsi_set_resid only for underflow Karan Tilak Kumar
2020-11-24 1:27 ` Arulprabhu Ponnusamy (arulponn)
2020-11-24 3:48 ` Martin K. Petersen
@ 2020-12-01 5:04 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2020-12-01 5:04 UTC (permalink / raw)
To: satishkh, Karan Tilak Kumar
Cc: Martin K . Petersen, jejb, arulponn, linux-kernel, sebaddel, linux-scsi
On Fri, 20 Nov 2020 17:51:34 -0800, Karan Tilak Kumar wrote:
> Fix to set scsi_set_resid() only if
> FCPIO_ICMND_CMPL_RESID_UNDER is set.
Applied to 5.11/scsi-queue, thanks!
[1/1] scsi: fnic: Set scsi_set_resid() only for underflow
https://git.kernel.org/mkp/scsi/c/74ae6d6a6805
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-01 5:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-21 1:51 [PATCH] scsi: fnic: set scsi_set_resid only for underflow Karan Tilak Kumar
2020-11-24 1:27 ` Arulprabhu Ponnusamy (arulponn)
2020-11-24 3:48 ` Martin K. Petersen
2020-12-01 5:04 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).