[PATCH v1 0/2] mpt3sas: Update driver version

[PATCH v1 0/2] mpt3sas: Update driver version

[Ranjan Kumar]

Update driver version along with minor Enhancement.

Ranjan Kumar (2):
  mpt3sas:  mpt3sas: Diag-Reset when Doorbell-In-Use bit is set during
    driver load time
  mpt3sas: Update driver version to 51.100.00.00

 drivers/scsi/mpt3sas/mpt3sas_base.c | 7 ++++++-
 drivers/scsi/mpt3sas/mpt3sas_base.h | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

-- 
2.31.1

[PATCH v1 1/2] mpt3sas: mpt3sas: Diag-Reset when Doorbell-In-Use bit is set during driver load time

[Ranjan Kumar]

Issue a Diag-reset when the "Doorbell-In-Use" bit
is set during the driver load/initialization.

Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com>
---
 drivers/scsi/mpt3sas/mpt3sas_base.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index ed5046593fda..16ac2267c71e 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -7041,11 +7041,12 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes,
 	int i;
 	u8 failed;
 	__le32 *mfp;
+	int ret_val;
 
 	/* make sure doorbell is not in use */
 	if ((ioc->base_readl_ext_retry(&ioc->chip->Doorbell) & MPI2_DOORBELL_USED)) {
 		ioc_err(ioc, "doorbell is in use (line=%d)\n", __LINE__);
-		return -EFAULT;
+		goto doorbell_diag_reset;
 	}
 
 	/* clear pending doorbell interrupts from previous state changes */
@@ -7135,6 +7136,10 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes,
 			    le32_to_cpu(mfp[i]));
 	}
 	return 0;
+
+doorbell_diag_reset:
+	ret_val = _base_diag_reset(ioc);
+	return ret_val;
 }
 
 /**
-- 
2.31.1

[PATCH v1 2/2] mpt3sas: Update driver version to 51.100.00.00

[Ranjan Kumar]

Update driver version to 51.100.00.00

Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com>
---
 drivers/scsi/mpt3sas/mpt3sas_base.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index eceb5eeb4651..d8d1a64b4764 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -77,11 +77,11 @@
 #define MPT3SAS_DRIVER_NAME		"mpt3sas"
 #define MPT3SAS_AUTHOR "Avago Technologies <MPT-FusionLinux.pdl@avagotech.com>"
 #define MPT3SAS_DESCRIPTION	"LSI MPT Fusion SAS 3.0 Device Driver"
-#define MPT3SAS_DRIVER_VERSION		"48.100.00.00"
-#define MPT3SAS_MAJOR_VERSION		48
+#define MPT3SAS_DRIVER_VERSION		"51.100.00.00"
+#define MPT3SAS_MAJOR_VERSION		51
 #define MPT3SAS_MINOR_VERSION		100
-#define MPT3SAS_BUILD_VERSION		0
-#define MPT3SAS_RELEASE_VERSION	00
+#define MPT3SAS_BUILD_VERSION		00
+#define MPT3SAS_RELEASE_VERSION		00
 
 #define MPT2SAS_DRIVER_NAME		"mpt2sas"
 #define MPT2SAS_DESCRIPTION	"LSI MPT Fusion SAS 2.0 Device Driver"
-- 
2.31.1

Re: [PATCH v1 0/2] mpt3sas: Update driver version

[Martin K. Petersen]

On Sun, 10 Nov 2024 23:03:39 +0530, Ranjan Kumar wrote:

> Update driver version along with minor Enhancement.
> 
> Ranjan Kumar (2):
>   mpt3sas:  mpt3sas: Diag-Reset when Doorbell-In-Use bit is set during
>     driver load time
>   mpt3sas: Update driver version to 51.100.00.00
> 
> [...]

Applied to 6.13/scsi-fixes, thanks!

[1/2] mpt3sas: mpt3sas: Diag-Reset when Doorbell-In-Use bit is set during driver load time
      https://git.kernel.org/mkp/scsi/c/3f5eb062e8aa
[2/2] mpt3sas: Update driver version to 51.100.00.00
      https://git.kernel.org/mkp/scsi/c/6050471545ee

-- 
Martin K. Petersen	Oracle Linux Engineering