[PATCH 0/3] smartpqi updates

[PATCH 0/3] smartpqi updates

[Don Brace]

These patches are based on Linus's tree

The changes are:
 - update list of controllers
 - cleanup warning message
 - change driver version to 1.1.2-126
---

Don Brace (1):
      smartpqi: update driver version to 1.1.2-126

Kevin Barnett (2):
      smartpqi: update controller ids
      smartpqi: cleanup raid map warning message


 drivers/scsi/smartpqi/smartpqi_init.c |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

--
Signature

[PATCH 1/3] smartpqi: update controller ids

[Don Brace]

From: Kevin Barnett <kevin.barnett@microsemi.com>

Update the driver’s PCI IDs

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
---
 drivers/scsi/smartpqi/smartpqi_init.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 83bdbd8..677b88e 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -6926,6 +6926,14 @@ static const struct pci_device_id pqi_pci_id_table[] = {
 	},
 	{
 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       PCI_VENDOR_ID_ADAPTEC2, 0x1302)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       PCI_VENDOR_ID_ADAPTEC2, 0x1303)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
 			       PCI_VENDOR_ID_ADAPTEC2, 0x1380)
 	},
 	{

[PATCH 2/3] smartpqi: cleanup raid map warning message

[Don Brace]

From: Kevin Barnett <kevin.barnett@microsemi.com>

Fix a small cosmetic bug in a very rarely encountered
error message that can occur when a LD has a corrupted
raid map.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
---
 drivers/scsi/smartpqi/smartpqi_init.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 677b88e..be83d92 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -1078,9 +1078,9 @@ static int pqi_validate_raid_map(struct pqi_ctrl_info *ctrl_info,
 
 bad_raid_map:
 	dev_warn(&ctrl_info->pci_dev->dev,
-		"scsi %d:%d:%d:%d %s\n",
-		ctrl_info->scsi_host->host_no,
-		device->bus, device->target, device->lun, err_msg);
+		"logical device %08x%08x %s\n",
+		*((u32 *)&device->scsi3addr),
+		*((u32 *)&device->scsi3addr[4]), err_msg);
 
 	return -EINVAL;
 }

[PATCH 3/3] smartpqi: update driver version to 1.1.2-126

[Don Brace]

Reviewed-by: Gerry Morong <gerry.morong@microsemi.com>
Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
---
 drivers/scsi/smartpqi/smartpqi_init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index be83d92..8fe9183 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -40,11 +40,11 @@
 #define BUILD_TIMESTAMP
 #endif
 
-#define DRIVER_VERSION		"1.1.2-125"
+#define DRIVER_VERSION		"1.1.2-126"
 #define DRIVER_MAJOR		1
 #define DRIVER_MINOR		1
 #define DRIVER_RELEASE		2
-#define DRIVER_REVISION		125
+#define DRIVER_REVISION		126
 
 #define DRIVER_NAME		"Microsemi PQI Driver (v" \
 				DRIVER_VERSION BUILD_TIMESTAMP ")"

Re: [PATCH 1/3] smartpqi: update controller ids

[Tomas Henzl]

On 27.9.2017 23:29, Don Brace wrote:
> From: Kevin Barnett <kevin.barnett@microsemi.com>
>
> Update the driver’s PCI IDs
>
> Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
> Reviewed-by: Scott Teel <scott.teel@microsemi.com>
> Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
> Signed-off-by: Don Brace <don.brace@microsemi.com>

Reviewed-by: Tomas Henzl <thenzl@redhat.com>

Re: [PATCH 2/3] smartpqi: cleanup raid map warning message

[Tomas Henzl]

On 27.9.2017 23:30, Don Brace wrote:
> From: Kevin Barnett <kevin.barnett@microsemi.com>
>
> Fix a small cosmetic bug in a very rarely encountered
> error message that can occur when a LD has a corrupted
> raid map.
>
> Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
> Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
> Signed-off-by: Don Brace <don.brace@microsemi.com>

Reviewed-by: Tomas Henzl <thenzl@redhat.com>

Re: [PATCH 3/3] smartpqi: update driver version to 1.1.2-126

[Tomas Henzl]

On 27.9.2017 23:30, Don Brace wrote:
> Reviewed-by: Gerry Morong <gerry.morong@microsemi.com>
> Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
> Reviewed-by: Scott Teel <scott.teel@microsemi.com>
> Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
> Signed-off-by: Don Brace <don.brace@microsemi.com>

Reviewed-by: Tomas Henzl <thenzl@redhat.com>

Re: [PATCH 0/3] smartpqi updates

[Martin K. Petersen]

Don,

> These patches are based on Linus's tree
>
> The changes are:
>  - update list of controllers
>  - cleanup warning message
>  - change driver version to 1.1.2-126

Applied to 4.15/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering

[PATCH 0/3] smartpqi updates

[Don Brace]

These patches are based on Linus's tree

This small set of changes consist of two minor bug fixes:
  * Remove an unbalanced call to pqi_ctrl_unbusy in the smp
    handler. There is not a call to pqi_ctrl_busy.
  * Correct driver rmmod hang when using HBA disks with
    write cache enabled. During removal, SCSI SYNCHRONIZE CACHE
    requests are blocked with SCSI_MLQUEUE_HOST_BUSY which cause
    the hang.
Also included is a version change.

---

Don Brace (3):
      smartpqi: correct driver removal with HBA disks
      smartpqi: correct pqi_sas_smp_handler busy condition
      smartpqi: update version to 1.2.16-012


 drivers/scsi/smartpqi/smartpqi_init.c          | 4 ++--
 drivers/scsi/smartpqi/smartpqi_sas_transport.c | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

--
Signature

Re: [PATCH 0/3] smartpqi updates

[Martin K. Petersen]

Don,

> This small set of changes consist of two minor bug fixes:
>   * Remove an unbalanced call to pqi_ctrl_unbusy in the smp
>     handler. There is not a call to pqi_ctrl_busy.
>   * Correct driver rmmod hang when using HBA disks with
>     write cache enabled. During removal, SCSI SYNCHRONIZE CACHE
>     requests are blocked with SCSI_MLQUEUE_HOST_BUSY which cause
>     the hang.

Applied to 5.11/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 0/3] smartpqi updates

[Martin K. Petersen]

On Wed, 11 Nov 2020 14:24:33 -0600, Don Brace wrote:

> These patches are based on Linus's tree
> 
> This small set of changes consist of two minor bug fixes:
>   * Remove an unbalanced call to pqi_ctrl_unbusy in the smp
>     handler. There is not a call to pqi_ctrl_busy.
>   * Correct driver rmmod hang when using HBA disks with
>     write cache enabled. During removal, SCSI SYNCHRONIZE CACHE
>     requests are blocked with SCSI_MLQUEUE_HOST_BUSY which cause
>     the hang.
> Also included is a version change.

Applied to 5.11/scsi-queue, thanks!

[1/3] scsi: smartpqi: Correct driver removal with HBA disks
      https://git.kernel.org/mkp/scsi/c/1bdf6e934387
[2/3] scsi: smartpqi: Correct pqi_sas_smp_handler busy condition
      https://git.kernel.org/mkp/scsi/c/408bdd7e5845
[3/3] scsi: smartpqi: Update version to 1.2.16-012
      https://git.kernel.org/mkp/scsi/c/5443bdc4cc77

-- 
Martin K. Petersen	Oracle Linux Engineering

[PATCH 0/3] smartpqi updates

[Don Brace]

These patches are based on Martin Petersen's 6.8/scsi-queue tree
  https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
  6.8/scsi-queue

The only functional change to smartpqi is correction of a race condition
during a scan/rescan operation. The device->rescan flag can be updated
by multiple threads causing issues.

The other two patches add PCI-IDs for new controllers and change the
driver version.

This set of changes consists of:
* smartpqi-Add-new-controller-PCI-IDs
  No functional changes. Just adding in more device support.
* smartpqi: fix logical volume rescan race condition
  The driver has several threads that can contend for accessing
  a controller instance wide 'rescan' flag. In some rare cases
  a race condition can occur that bypasses a call to rescan for
  device changes. Some of these changes are; device removal, logical
  volume changes, and device adds. We basically added a spin-lock
  to protect the 'rescan' flag.
* smartpqi-change-driver-version-to-2.1.26-030
  No functional changes.

---

David Strahan (1):
  smartpqi: Add new controller PCI IDs

Don Brace (1):
  smartpqi: bump driver version to 2.1.26-030

Mahesh Rajashekhara (1):
  smartpqi: fix logical volume rescan race condition

 drivers/scsi/smartpqi/smartpqi.h      |  1 -
 drivers/scsi/smartpqi/smartpqi_init.c | 89 ++++++++++++++++++++++++---
 2 files changed, 79 insertions(+), 11 deletions(-)

-- 
2.43.0.76.g1a87c842ec

Re: [PATCH 0/3] smartpqi updates

[Martin K. Petersen]

Don,

> The only functional change to smartpqi is correction of a race
> condition during a scan/rescan operation. The device->rescan flag can
> be updated by multiple threads causing issues.

Applied to 6.8/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering