linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [smartpqi updates V3 PATCH 0/9] smartpqi updates
@ 2021-07-14 18:28 Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 1/9] smartpqi: add pci ids for H3C P4408 controllers Don Brace
                   ` (10 more replies)
  0 siblings, 11 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

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 <pmenzel@molgen.mpg.de>
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 <pmenzel@molgen.mpg.de>
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(-)

-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 1/9] smartpqi: add pci ids for H3C P4408 controllers
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 2/9] smartpqi: update copyright notices Don Brace
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

From: Mahesh Rajashekhara <mahesh.rajashekhara@microchip.com>

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

Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com>
Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: Murthy Bhat <Murthy.Bhat@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Mahesh Rajashekhara <mahesh.rajashekhara@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.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 dcc0b9618a64..64ea4650ca10 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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)
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 2/9] smartpqi: update copyright notices
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 1/9] smartpqi: add pci ids for H3C P4408 controllers Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 3/9] smartpqi: change driver module MACROS to microchip Don Brace
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

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

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

Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
---
 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(-)

diff --git a/drivers/scsi/smartpqi/Kconfig b/drivers/scsi/smartpqi/Kconfig
index cb9e4e968b60..eac7baecf42f 100644
--- a/drivers/scsi/smartpqi/Kconfig
+++ b/drivers/scsi/smartpqi/Kconfig
@@ -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.
diff --git a/drivers/scsi/smartpqi/smartpqi.h b/drivers/scsi/smartpqi/smartpqi.h
index d7dac5572274..f340afc011b5 100644
--- a/drivers/scsi/smartpqi/smartpqi.h
+++ b/drivers/scsi/smartpqi/smartpqi.h
@@ -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
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 64ea4650ca10..6ce17a191c0b 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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.
  *
diff --git a/drivers/scsi/smartpqi/smartpqi_sas_transport.c b/drivers/scsi/smartpqi/smartpqi_sas_transport.c
index dd628cc87f78..afd9bafebd1d 100644
--- a/drivers/scsi/smartpqi/smartpqi_sas_transport.c
+++ b/drivers/scsi/smartpqi/smartpqi_sas_transport.c
@@ -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.
  *
diff --git a/drivers/scsi/smartpqi/smartpqi_sis.c b/drivers/scsi/smartpqi/smartpqi_sis.c
index c954620628e0..d63c46a8e38b 100644
--- a/drivers/scsi/smartpqi/smartpqi_sis.c
+++ b/drivers/scsi/smartpqi/smartpqi_sis.c
@@ -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.
  *
diff --git a/drivers/scsi/smartpqi/smartpqi_sis.h b/drivers/scsi/smartpqi/smartpqi_sis.h
index 12cd2ab1aead..d29c1352a826 100644
--- a/drivers/scsi/smartpqi/smartpqi_sis.h
+++ b/drivers/scsi/smartpqi/smartpqi_sis.h
@@ -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.
  *
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 3/9] smartpqi: change driver module MACROS to microchip
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 1/9] smartpqi: add pci ids for H3C P4408 controllers Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 2/9] smartpqi: update copyright notices Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 4/9] smartpqi: change Kconfig menu entry " Don Brace
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

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(-)

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 6ce17a191c0b..29382b290243 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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);
 }
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 4/9] smartpqi: change Kconfig menu entry to microchip
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (2 preceding siblings ...)
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 3/9] smartpqi: change driver module MACROS to microchip Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 5/9] smartpqi: add SCSI cmd info for resets Don Brace
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

Change Microsemi to Microchip
---
 drivers/scsi/smartpqi/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/smartpqi/Kconfig b/drivers/scsi/smartpqi/Kconfig
index eac7baecf42f..6f83e2df4d64 100644
--- a/drivers/scsi/smartpqi/Kconfig
+++ b/drivers/scsi/smartpqi/Kconfig
@@ -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.
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 5/9] smartpqi: add SCSI cmd info for resets
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (3 preceding siblings ...)
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 4/9] smartpqi: change Kconfig menu entry " Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 6/9] smartpqi: add PCI-ID for new ntcom controller Don Brace
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

From: Murthy Bhat <Murthy.Bhat@microchip.com>

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

Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com>
Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Murthy Bhat <Murthy.Bhat@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
---
 drivers/scsi/smartpqi/smartpqi_init.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 29382b290243..ffc7ca221e27 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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))
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 6/9] smartpqi: add PCI-ID for new ntcom controller
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (4 preceding siblings ...)
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 5/9] smartpqi: add SCSI cmd info for resets Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 7/9] smartpqi: add PCI IDs for new ZTE controllers Don Brace
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

From: Mike McGowen <mike.mcgowen@microchip.com>

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

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

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index ffc7ca221e27..c0b181ba795c 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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)
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 7/9] smartpqi: add PCI IDs for new ZTE controllers
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (5 preceding siblings ...)
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 6/9] smartpqi: add PCI-ID for new ntcom controller Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 8/9] smartpqi: fix isr accessing uninitialized data Don Brace
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

From: Balsundar P <balsundar.p@microchip.com>

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

Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com>
Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Balsundar P <balsundar.p@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
---
 drivers/scsi/smartpqi/smartpqi_init.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index c0b181ba795c..f0e84354f782 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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)
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 8/9] smartpqi: fix isr accessing uninitialized data
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (6 preceding siblings ...)
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 7/9] smartpqi: add PCI IDs for new ZTE controllers Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 9/9] smartpqi: update version to 2.1.10-020 Don Brace
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

From: Mike McGowen <mike.mcgowen@microchip.com>

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.

Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Mike McGowen <mike.mcgowen@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.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 f0e84354f782..ab1c9c483478 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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;
 
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [smartpqi updates V3 PATCH 9/9] smartpqi: update version to 2.1.10-020
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (7 preceding siblings ...)
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 8/9] smartpqi: fix isr accessing uninitialized data Don Brace
@ 2021-07-14 18:28 ` Don Brace
  2021-07-19  2:45 ` [smartpqi updates V3 PATCH 0/9] smartpqi updates Martin K. Petersen
  2021-07-24  2:13 ` Martin K. Petersen
  10 siblings, 0 replies; 13+ messages in thread
From: Don Brace @ 2021-07-14 18:28 UTC (permalink / raw)
  To: hch, martin.petersen, jejb, linux-scsi
  Cc: Kevin.Barnett, scott.teel, Justin.Lindley, scott.benesh,
	gerry.morong, mahesh.rajashekhara, mike.mcgowen, murthy.bhat,
	balsundar.p, joseph.szczypek, jeff, POSWALD, john.p.donnelly,
	mwilck, pmenzel, linux-kernel

Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com>
Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Reviewed-by: Gerry Morong <gerry.morong@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.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 ab1c9c483478..c1f0f8da9fe2 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -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 ")"
-- 
2.28.0.rc1.9.ge7ae437ac1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [smartpqi updates V3 PATCH 0/9] smartpqi updates
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (8 preceding siblings ...)
  2021-07-14 18:28 ` [smartpqi updates V3 PATCH 9/9] smartpqi: update version to 2.1.10-020 Don Brace
@ 2021-07-19  2:45 ` Martin K. Petersen
  2021-07-19 18:10   ` Don.Brace
  2021-07-24  2:13 ` Martin K. Petersen
  10 siblings, 1 reply; 13+ messages in thread
From: Martin K. Petersen @ 2021-07-19  2:45 UTC (permalink / raw)
  To: Don Brace
  Cc: hch, martin.petersen, jejb, linux-scsi, Kevin.Barnett,
	scott.teel, Justin.Lindley, scott.benesh, gerry.morong,
	mahesh.rajashekhara, mike.mcgowen, murthy.bhat, balsundar.p,
	joseph.szczypek, jeff, POSWALD, john.p.donnelly, mwilck, pmenzel,
	linux-kernel


Don,

> 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.

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 13+ messages in thread

* RE: [smartpqi updates V3 PATCH 0/9] smartpqi updates
  2021-07-19  2:45 ` [smartpqi updates V3 PATCH 0/9] smartpqi updates Martin K. Petersen
@ 2021-07-19 18:10   ` Don.Brace
  0 siblings, 0 replies; 13+ messages in thread
From: Don.Brace @ 2021-07-19 18:10 UTC (permalink / raw)
  To: martin.petersen
  Cc: hch, jejb, linux-scsi, Kevin.Barnett, Scott.Teel, Justin.Lindley,
	Scott.Benesh, Gerry.Morong, Mahesh.Rajashekhara, Mike.McGowen,
	Murthy.Bhat, Balsundar.P, joseph.szczypek, jeff, POSWALD,
	john.p.donnelly, mwilck, pmenzel, linux-kernel

-----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,

> 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
 Signed-off-by: Don Brace <don.brace@microchip.com>
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Gerry Morong <gerry.morong@microchip.com>
Reviewed-by: Justin Lindley <Justin.lindley@microchip.com>

Thank-you for doing this.
Don

--
Martin K. Petersen      Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [smartpqi updates V3 PATCH 0/9] smartpqi updates
  2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
                   ` (9 preceding siblings ...)
  2021-07-19  2:45 ` [smartpqi updates V3 PATCH 0/9] smartpqi updates Martin K. Petersen
@ 2021-07-24  2:13 ` Martin K. Petersen
  10 siblings, 0 replies; 13+ messages in thread
From: Martin K. Petersen @ 2021-07-24  2:13 UTC (permalink / raw)
  To: hch, jejb, Don Brace, linux-scsi
  Cc: Martin K . Petersen, jeff, pmenzel, john.p.donnelly,
	mahesh.rajashekhara, scott.benesh, scott.teel, POSWALD,
	gerry.morong, Justin.Lindley, murthy.bhat, joseph.szczypek,
	mike.mcgowen, mwilck, balsundar.p, linux-kernel, Kevin.Barnett

On Wed, 14 Jul 2021 13:28:38 -0500, Don Brace wrote:

> 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

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-07-24  2:15 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-14 18:28 [smartpqi updates V3 PATCH 0/9] smartpqi updates Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 1/9] smartpqi: add pci ids for H3C P4408 controllers Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 2/9] smartpqi: update copyright notices Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 3/9] smartpqi: change driver module MACROS to microchip Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 4/9] smartpqi: change Kconfig menu entry " Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 5/9] smartpqi: add SCSI cmd info for resets Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 6/9] smartpqi: add PCI-ID for new ntcom controller Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 7/9] smartpqi: add PCI IDs for new ZTE controllers Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 8/9] smartpqi: fix isr accessing uninitialized data Don Brace
2021-07-14 18:28 ` [smartpqi updates V3 PATCH 9/9] smartpqi: update version to 2.1.10-020 Don Brace
2021-07-19  2:45 ` [smartpqi updates V3 PATCH 0/9] smartpqi updates Martin K. Petersen
2021-07-19 18:10   ` Don.Brace
2021-07-24  2:13 ` 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).