Skip to contentSkip to conversation

smartpqi updates

PATCH Applied Don Brace 2 participants 13 messages Jul 14, 2021 – Jul 24, 2021

Subsystems (2)
lore
Share & tools
lore

Don Brace

author maintainer
#0 lore raw

v3 cover smartpqi updates

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

      5.14/scsi-queue

Most of these patches consist of adding new PCI devices. The remainder are simple updates to correct some rare issues and clean up some driver messages.

This set of changes consist of:
* Add in new PCI-IDs.
5 of these patches are adding in new PCI-IDs.
* Update copyright information.
* Enhance reset messages.
- Add SCSI command CDB[0] value to message.
- Also check for a 0 length SCSI command that can occur if sg_reset is issued without any outstanding SCSI commands.
* Clean up a rare initialization issue where interrupts are enabled before the supporting controller context has been fully initialized. Found by internal testing only.
* Update the driver version to 2.1.10-020

Change since V1:
Changes resulting from Paul Menzel <[email protected]> review:
* Renamed some PCI-ID patches to reflect controller name
* Renamed patch smartpqi: fix isr accessing null structure member to smartpqi: fix isr accessing uninitialized data
* Split copyright patch. Removed driver name updates and placed them in a separate patch.
* Removed patch ("smartpqi: rm unsupported controller features msgs") May remove them in a future patch.

Change since V2:
Changes resulting from Paul Menzel <[email protected]> review:
* No code changes, just correcting an e-mail.
* Corrected misspelling on Martin Petersen's e-mail and name. Apologies.

Balsundar P (1):
smartpqi: add PCI IDs for new ZTE controllers

Don Brace (3):
smartpqi: change driver module MACROS to microchip
smartpqi: change Kconfig menu entry to microchip
smartpqi: update version to 2.1.10-020

Kevin Barnett (1):
smartpqi: update copyright notices

Mahesh Rajashekhara (1):
smartpqi: add pci ids for H3C P4408 controllers

Mike McGowen (2):
smartpqi: add PCI-ID for new ntcom controller
smartpqi: fix isr accessing uninitialized data

Murthy Bhat (1):
smartpqi: add SCSI cmd info for resets

 drivers/scsi/smartpqi/Kconfig                 |  8 +--
 drivers/scsi/smartpqi/smartpqi.h              |  6 +-
 drivers/scsi/smartpqi/smartpqi_init.c         | 64 +++++++++++++++----
 .../scsi/smartpqi/smartpqi_sas_transport.c    |  4 +-
 drivers/scsi/smartpqi/smartpqi_sis.c          |  4 +-
 drivers/scsi/smartpqi/smartpqi_sis.h          |  4 +-
 6 files changed, 64 insertions(+), 26 deletions(-)
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#1 lore raw

PATCH v3 1/9 smartpqi: add pci ids for H3C P4408 controllers

From: Mahesh Rajashekhara <[email protected]>

Add support for H3C P4408-Ma-8i-2GB device ID

     VID_9005, DID_028F, SVID_193D and SDID_1108
     VID_9005, DID_028F, SVID_193D and SDID_1109
---
 drivers/scsi/smartpqi/smartpqi_init.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +8 -0
index dcc0b9618a64..64ea4650ca10 100644
@@ -8711,6 +8711,14 @@ static const struct pci_device_id pqi_pci_id_table[] = {
 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
 			       0x193d, 0x1107)
 	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x193d, 0x1108)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x193d, 0x1109)
+	},
 	{
 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
 			       0x193d, 0x8460)
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#2 lore raw

PATCH v3 2/9 smartpqi: update copyright notices

In reply to Don Brace

From: Kevin Barnett <[email protected]>

Updated copyright notices and company name strings to reflect Microchip ownership.

---
 drivers/scsi/smartpqi/Kconfig                  | 2 +-
 drivers/scsi/smartpqi/smartpqi.h               | 6 +++---
 drivers/scsi/smartpqi/smartpqi_init.c          | 4 ++--
 drivers/scsi/smartpqi/smartpqi_sas_transport.c | 4 ++--
 drivers/scsi/smartpqi/smartpqi_sis.c           | 4 ++--
 drivers/scsi/smartpqi/smartpqi_sis.h           | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
drivers/scsi/smartpqi/Kconfig +1 -1
index cb9e4e968b60..eac7baecf42f 100644
@@ -1,7 +1,7 @@
 #
 # Kernel configuration file for the SMARTPQI
 #
-# Copyright (c) 2019-2020 Microchip Technology Inc. and its subsidiaries
+# Copyright (c) 2019-2021 Microchip Technology Inc. and its subsidiaries
 # Copyright (c) 2017-2018 Microsemi Corporation
 # Copyright (c) 2016 Microsemi Corporation
 # Copyright (c) 2016 PMC-Sierra, Inc.
drivers/scsi/smartpqi/smartpqi.h +3 -3
index d7dac5572274..f340afc011b5 100644
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- *    driver for Microsemi PQI-based storage controllers
- *    Copyright (c) 2019-2020 Microchip Technology Inc. and its subsidiaries
+ *    driver for Microchip PQI-based storage controllers
+ *    Copyright (c) 2019-2021 Microchip Technology Inc. and its subsidiaries
  *    Copyright (c) 2016-2018 Microsemi Corporation
  *    Copyright (c) 2016 PMC-Sierra, Inc.
  *
@@ -59,7 +59,7 @@ struct pqi_device_registers {
 /*
  * controller registers
  *
- * These are defined by the Microsemi implementation.
+ * These are defined by the Microchip implementation.
  *
  * Some registers (those named sis_*) are only used when in
  * legacy SIS mode before we transition the controller into
drivers/scsi/smartpqi/smartpqi_init.c +2 -2
index 64ea4650ca10..6ce17a191c0b 100644
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- *    driver for Microsemi PQI-based storage controllers
- *    Copyright (c) 2019-2020 Microchip Technology Inc. and its subsidiaries
+ *    driver for Microchip PQI-based storage controllers
+ *    Copyright (c) 2019-2021 Microchip Technology Inc. and its subsidiaries
  *    Copyright (c) 2016-2018 Microsemi Corporation
  *    Copyright (c) 2016 PMC-Sierra, Inc.
  *
drivers/scsi/smartpqi/smartpqi_sas_transport.c +2 -2
index dd628cc87f78..afd9bafebd1d 100644
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- *    driver for Microsemi PQI-based storage controllers
- *    Copyright (c) 2019-2020 Microchip Technology Inc. and its subsidiaries
+ *    driver for Microchip PQI-based storage controllers
+ *    Copyright (c) 2019-2021 Microchip Technology Inc. and its subsidiaries
  *    Copyright (c) 2016-2018 Microsemi Corporation
  *    Copyright (c) 2016 PMC-Sierra, Inc.
  *
drivers/scsi/smartpqi/smartpqi_sis.c +2 -2
index c954620628e0..d63c46a8e38b 100644
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- *    driver for Microsemi PQI-based storage controllers
- *    Copyright (c) 2019-2020 Microchip Technology Inc. and its subsidiaries
+ *    driver for Microchip PQI-based storage controllers
+ *    Copyright (c) 2019-2021 Microchip Technology Inc. and its subsidiaries
  *    Copyright (c) 2016-2018 Microsemi Corporation
  *    Copyright (c) 2016 PMC-Sierra, Inc.
  *
drivers/scsi/smartpqi/smartpqi_sis.h +2 -2
index 12cd2ab1aead..d29c1352a826 100644
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- *    driver for Microsemi PQI-based storage controllers
- *    Copyright (c) 2019-2020 Microchip Technology Inc. and its subsidiaries
+ *    driver for Microchip PQI-based storage controllers
+ *    Copyright (c) 2019-2021 Microchip Technology Inc. and its subsidiaries
  *    Copyright (c) 2016-2018 Microsemi Corporation
  *    Copyright (c) 2016 PMC-Sierra, Inc.
  *
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#3 lore raw

PATCH v3 3/9 smartpqi: change driver module MACROS to microchip

In reply to Don Brace

Change driver module MACROS to reflect copyright changes.
- Microsemi to Microchip.

---
 drivers/scsi/smartpqi/smartpqi_init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +4 -4
index 6ce17a191c0b..29382b290243 100644
@@ -39,7 +39,7 @@
 #define DRIVER_RELEASE		8
 #define DRIVER_REVISION		45
 
-#define DRIVER_NAME		"Microsemi PQI Driver (v" \
+#define DRIVER_NAME		"Microchip SmartPQI Driver (v" \
 				DRIVER_VERSION BUILD_TIMESTAMP ")"
 #define DRIVER_NAME_SHORT	"smartpqi"
 
@@ -48,8 +48,8 @@
 #define PQI_POST_RESET_DELAY_SECS			5
 #define PQI_POST_OFA_RESET_DELAY_UPON_TIMEOUT_SECS	10
 
-MODULE_AUTHOR("Microsemi");
-MODULE_DESCRIPTION("Driver for Microsemi Smart Family Controller version "
+MODULE_AUTHOR("Microchip");
+MODULE_DESCRIPTION("Driver for Microchip Smart Family Controller version "
 	DRIVER_VERSION);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
@@ -8451,7 +8451,7 @@ static void pqi_print_ctrl_info(struct pci_dev *pci_dev,
 	if (id->driver_data)
 		ctrl_description = (char *)id->driver_data;
 	else
-		ctrl_description = "Microsemi Smart Family Controller";
+		ctrl_description = "Microchip Smart Family Controller";
 
 	dev_info(&pci_dev->dev, "%s found\n", ctrl_description);
 }
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#4 lore raw

PATCH v3 4/9 smartpqi: change Kconfig menu entry to microchip

In reply to Don Brace

Change Microsemi to Microchip

---
 drivers/scsi/smartpqi/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/smartpqi/Kconfig +3 -3
index eac7baecf42f..6f83e2df4d64 100644
@@ -38,14 +38,14 @@
 # HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES
 
 config SCSI_SMARTPQI
-	tristate "Microsemi PQI Driver"
+	tristate "Microchip PQI Driver"
 	depends on PCI && SCSI && !S390
 	select SCSI_SAS_ATTRS
 	select RAID_ATTRS
 	help
-	This driver supports Microsemi PQI controllers.
+	This driver supports Microchip PQI controllers.
 
-	<http://www.microsemi.com>
+	<http://www.microchip.com>
 
 	To compile this driver as a module, choose M here: the
 	module will be called smartpqi.
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#5 lore raw

PATCH v3 5/9 smartpqi: add SCSI cmd info for resets

In reply to Don Brace

From: Murthy Bhat <[email protected]>

Report on SCSI command that has triggered the reset.
- Also add check for NULL SCSI commands resulting from issuing sg_reset when there is no outstanding commands.

Example:
sg_reset -d /dev/sgXY
smartpqi 0000:39:00.0: resetting scsi 4:0:1:0 due to cmd 0x12

---
 drivers/scsi/smartpqi/smartpqi_init.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +4 -2
index 29382b290243..ffc7ca221e27 100644
@@ -6033,8 +6033,10 @@ static int pqi_eh_device_reset_handler(struct scsi_cmnd *scmd)
 	mutex_lock(&ctrl_info->lun_reset_mutex);
 
 	dev_err(&ctrl_info->pci_dev->dev,
-		"resetting scsi %d:%d:%d:%d\n",
-		shost->host_no, device->bus, device->target, device->lun);
+		"resetting scsi %d:%d:%d:%d due to cmd 0x%02x\n",
+		shost->host_no,
+		device->bus, device->target, device->lun,
+		scmd->cmd_len > 0 ? scmd->cmnd[0] : 0xff);
 
 	pqi_check_ctrl_health(ctrl_info);
 	if (pqi_ctrl_offline(ctrl_info))
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#6 lore raw

PATCH v3 6/9 smartpqi: add PCI-ID for new ntcom controller

In reply to Don Brace

From: Mike McGowen <[email protected]>

Add support for Norsi ntcom Raid-24i controller VID_0x9005, DID_0x028f, SVID_0x1dfc, SDID_0x3161

---
 drivers/scsi/smartpqi/smartpqi_init.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +4 -0
index ffc7ca221e27..c0b181ba795c 100644
@@ -9181,6 +9181,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
 			       PCI_VENDOR_ID_GIGABYTE, 0x1000)
 	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x1dfc, 0x3161)
+	},
 	{
 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
 			       PCI_ANY_ID, PCI_ANY_ID)
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#7 lore raw

PATCH v3 7/9 smartpqi: add PCI IDs for new ZTE controllers

In reply to Don Brace

From: Balsundar P <[email protected]>

Added support for ZTE RM241-18i 2G device ID. VID_9005, DID_028F, SVID_1CF2 and SDID_5445

Added support for ZTE RM242-18i 4G device ID. VID_9005, DID_028F, SVID_1CF2 and SDID_5446

Added support for ZTE RM243-18i device ID. VID_9005, DID_028F, SVID_1CF2 and SDID_5447

Added support for ZTE SDPSA/B-18i 4G device ID. VID_9005, DID_028F, SVID_1CF2 and SDID_0B27

Added support for ZTE SDPSA/B_I-18i device ID. VID_9005, DID_028F, SVID_1CF2 and SDID_0B29

Added support for ZTE SDPSA/B_L-18i 2G device ID. VID_9005, DID_028F, SVID_1CF2 and SDID_0B45

---
 drivers/scsi/smartpqi/smartpqi_init.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +24 -0
index c0b181ba795c..f0e84354f782 100644
@@ -9185,6 +9185,30 @@ static const struct pci_device_id pqi_pci_id_table[] = {
 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
 			       0x1dfc, 0x3161)
 	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x1cf2, 0x5445)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x1cf2, 0x5446)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x1cf2, 0x5447)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x1cf2, 0x0b27)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x1cf2, 0x0b29)
+	},
+	{
+		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+			       0x1cf2, 0x0b45)
+	},
 	{
 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
 			       PCI_ANY_ID, PCI_ANY_ID)
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#8 lore raw

PATCH v3 8/9 smartpqi: fix isr accessing uninitialized data

In reply to Don Brace

From: Mike McGowen <[email protected]>

Correct driver's ISR accessing a data structure member that has not been fully initialized during driver initialization.
- The pqi queue groups can have uninitialized members when an interrupt fires. This has not resulted in any driver crashes. This was found during our own internal testing. No bugs were ever filed.

---
 drivers/scsi/smartpqi/smartpqi_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +2 -2
index f0e84354f782..ab1c9c483478 100644
@@ -7760,11 +7760,11 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)
 
 	pqi_init_operational_queues(ctrl_info);
 
-	rc = pqi_request_irqs(ctrl_info);
+	rc = pqi_create_queues(ctrl_info);
 	if (rc)
 		return rc;
 
-	rc = pqi_create_queues(ctrl_info);
+	rc = pqi_request_irqs(ctrl_info);
 	if (rc)
 		return rc;
 
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
author maintainer
#9 lore raw

PATCH v3 9/9 smartpqi: update version to 2.1.10-020

In reply to Don Brace
---
 drivers/scsi/smartpqi/smartpqi_init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +3 -3
index ab1c9c483478..c1f0f8da9fe2 100644
@@ -33,11 +33,11 @@
 #define BUILD_TIMESTAMP
 #endif
 
-#define DRIVER_VERSION		"2.1.8-045"
+#define DRIVER_VERSION		"2.1.10-020"
 #define DRIVER_MAJOR		2
 #define DRIVER_MINOR		1
-#define DRIVER_RELEASE		8
-#define DRIVER_REVISION		45
+#define DRIVER_RELEASE		10
+#define DRIVER_REVISION		20
 
 #define DRIVER_NAME		"Microchip SmartPQI Driver (v" \
 				DRIVER_VERSION BUILD_TIMESTAMP ")"
Signature · 1 line
2.28.0.rc1.9.ge7ae437ac1
#10 lore raw
In reply to Don Brace

Don,

Quoted 3 lines

Most of these patches consist of adding new PCI devices. The remainder are simple updates to correct some rare issues and clean up some driver messages.

Patches #3 and #4 are missing Signed-off-by: tags.

I can amend if you provide the relevant signoff chains for the patches in question.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
author maintainer Reviewed-by Scott Benesh Reviewed-by Gerry Morong Reviewed-by Justin Lindley
#11 lore raw

-----Original Message-----
From: Martin K. Petersen Subject: Re: [smartpqi updates V3 PATCH 0/9] smartpqi updates

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

Don,

Quoted 3 lines

Most of these patches consist of adding new PCI devices. The remainder are simple updates to correct some rare issues and clean up some driver messages.

Patches #3 and #4 are missing Signed-off-by: tags.

I can amend if you provide the relevant signoff chains for the patches in question.

Don:
Sorry about that.
#3 and #4

Thank-you for doing this.
Don

--
Martin K. Petersen Oracle Linux Engineering

#12 lore raw
In reply to Don Brace
Quoted 9 lines · Don Brace

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

      5.14/scsi-queue

Most of these patches consist of adding new PCI devices. The remainder are simple updates to correct some rare issues and clean up some driver messages.

[...]

Applied to 5.15/scsi-queue, thanks!

[1/9] smartpqi: add pci ids for H3C P4408 controllers

      https://git.kernel.org/mkp/scsi/c/d3af3f647bd5
[2/9] smartpqi: update copyright notices
      https://git.kernel.org/mkp/scsi/c/889653ecfc98
[3/9] smartpqi: change driver module MACROS to microchip
      https://git.kernel.org/mkp/scsi/c/6aa26b5a2c70
[4/9] smartpqi: change Kconfig menu entry to microchip
      https://git.kernel.org/mkp/scsi/c/8e505fceaa2b
[5/9] smartpqi: add SCSI cmd info for resets
      https://git.kernel.org/mkp/scsi/c/f0e473e0f603
[6/9] smartpqi: add PCI-ID for new ntcom controller
      https://git.kernel.org/mkp/scsi/c/e326b97c92cc
[7/9] smartpqi: add PCI IDs for new ZTE controllers
      https://git.kernel.org/mkp/scsi/c/09d9968a8eff
[8/9] smartpqi: fix isr accessing uninitialized data
      https://git.kernel.org/mkp/scsi/c/0777a3fb98f0
[9/9] smartpqi: update version to 2.1.10-020
      https://git.kernel.org/mkp/scsi/c/f339c7e491a8
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering