linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] smartpqi updates
@ 2017-09-27 21:29 Don Brace
  2017-09-27 21:29 ` [PATCH 1/3] smartpqi: update controller ids Don Brace
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Don Brace @ 2017-09-27 21:29 UTC (permalink / raw)
  To: joseph.szczypek, gerry.morong, john.hall, jejb, Kevin.Barnett,
	Mahesh.Rajashekhara, bader.alisaleh, hch, scott.teel, Viswas.G,
	Justin.Lindley, scott.benesh, POSWALD
  Cc: linux-scsi

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

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

* [PATCH 1/3] smartpqi: update controller ids
  2017-09-27 21:29 [PATCH 0/3] smartpqi updates Don Brace
@ 2017-09-27 21:29 ` Don Brace
  2017-09-29 12:08   ` Tomas Henzl
  2017-09-27 21:30 ` [PATCH 2/3] smartpqi: cleanup raid map warning message Don Brace
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Don Brace @ 2017-09-27 21:29 UTC (permalink / raw)
  To: joseph.szczypek, gerry.morong, john.hall, jejb, Kevin.Barnett,
	Mahesh.Rajashekhara, bader.alisaleh, hch, scott.teel, Viswas.G,
	Justin.Lindley, scott.benesh, POSWALD
  Cc: linux-scsi

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)
 	},
 	{

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

* [PATCH 2/3] smartpqi: cleanup raid map warning message
  2017-09-27 21:29 [PATCH 0/3] smartpqi updates Don Brace
  2017-09-27 21:29 ` [PATCH 1/3] smartpqi: update controller ids Don Brace
@ 2017-09-27 21:30 ` Don Brace
  2017-09-29 12:08   ` Tomas Henzl
  2017-09-27 21:30 ` [PATCH 3/3] smartpqi: update driver version to 1.1.2-126 Don Brace
  2017-10-03  2:26 ` [PATCH 0/3] smartpqi updates Martin K. Petersen
  3 siblings, 1 reply; 8+ messages in thread
From: Don Brace @ 2017-09-27 21:30 UTC (permalink / raw)
  To: joseph.szczypek, gerry.morong, john.hall, jejb, Kevin.Barnett,
	Mahesh.Rajashekhara, bader.alisaleh, hch, scott.teel, Viswas.G,
	Justin.Lindley, scott.benesh, POSWALD
  Cc: linux-scsi

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;
 }

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

* [PATCH 3/3] smartpqi: update driver version to 1.1.2-126
  2017-09-27 21:29 [PATCH 0/3] smartpqi updates Don Brace
  2017-09-27 21:29 ` [PATCH 1/3] smartpqi: update controller ids Don Brace
  2017-09-27 21:30 ` [PATCH 2/3] smartpqi: cleanup raid map warning message Don Brace
@ 2017-09-27 21:30 ` Don Brace
  2017-09-29 12:08   ` Tomas Henzl
  2017-10-03  2:26 ` [PATCH 0/3] smartpqi updates Martin K. Petersen
  3 siblings, 1 reply; 8+ messages in thread
From: Don Brace @ 2017-09-27 21:30 UTC (permalink / raw)
  To: joseph.szczypek, gerry.morong, john.hall, jejb, Kevin.Barnett,
	Mahesh.Rajashekhara, bader.alisaleh, hch, scott.teel, Viswas.G,
	Justin.Lindley, scott.benesh, POSWALD
  Cc: linux-scsi

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

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

* Re: [PATCH 1/3] smartpqi: update controller ids
  2017-09-27 21:29 ` [PATCH 1/3] smartpqi: update controller ids Don Brace
@ 2017-09-29 12:08   ` Tomas Henzl
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Henzl @ 2017-09-29 12:08 UTC (permalink / raw)
  To: Don Brace, joseph.szczypek, gerry.morong, john.hall, jejb,
	Kevin.Barnett, Mahesh.Rajashekhara, bader.alisaleh, hch,
	scott.teel, Viswas.G, Justin.Lindley, scott.benesh, POSWALD
  Cc: linux-scsi

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>

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

* Re: [PATCH 2/3] smartpqi: cleanup raid map warning message
  2017-09-27 21:30 ` [PATCH 2/3] smartpqi: cleanup raid map warning message Don Brace
@ 2017-09-29 12:08   ` Tomas Henzl
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Henzl @ 2017-09-29 12:08 UTC (permalink / raw)
  To: Don Brace, joseph.szczypek, gerry.morong, john.hall, jejb,
	Kevin.Barnett, Mahesh.Rajashekhara, bader.alisaleh, hch,
	scott.teel, Viswas.G, Justin.Lindley, scott.benesh, POSWALD
  Cc: linux-scsi

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>

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

* Re: [PATCH 3/3] smartpqi: update driver version to 1.1.2-126
  2017-09-27 21:30 ` [PATCH 3/3] smartpqi: update driver version to 1.1.2-126 Don Brace
@ 2017-09-29 12:08   ` Tomas Henzl
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Henzl @ 2017-09-29 12:08 UTC (permalink / raw)
  To: Don Brace, joseph.szczypek, gerry.morong, john.hall, jejb,
	Kevin.Barnett, Mahesh.Rajashekhara, bader.alisaleh, hch,
	scott.teel, Viswas.G, Justin.Lindley, scott.benesh, POSWALD
  Cc: linux-scsi

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>

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

* Re: [PATCH 0/3] smartpqi updates
  2017-09-27 21:29 [PATCH 0/3] smartpqi updates Don Brace
                   ` (2 preceding siblings ...)
  2017-09-27 21:30 ` [PATCH 3/3] smartpqi: update driver version to 1.1.2-126 Don Brace
@ 2017-10-03  2:26 ` Martin K. Petersen
  3 siblings, 0 replies; 8+ messages in thread
From: Martin K. Petersen @ 2017-10-03  2:26 UTC (permalink / raw)
  To: Don Brace
  Cc: joseph.szczypek, gerry.morong, john.hall, jejb, Kevin.Barnett,
	Mahesh.Rajashekhara, bader.alisaleh, hch, scott.teel, Viswas.G,
	Justin.Lindley, scott.benesh, POSWALD, linux-scsi


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

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

end of thread, other threads:[~2017-10-03  2:27 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-27 21:29 [PATCH 0/3] smartpqi updates Don Brace
2017-09-27 21:29 ` [PATCH 1/3] smartpqi: update controller ids Don Brace
2017-09-29 12:08   ` Tomas Henzl
2017-09-27 21:30 ` [PATCH 2/3] smartpqi: cleanup raid map warning message Don Brace
2017-09-29 12:08   ` Tomas Henzl
2017-09-27 21:30 ` [PATCH 3/3] smartpqi: update driver version to 1.1.2-126 Don Brace
2017-09-29 12:08   ` Tomas Henzl
2017-10-03  2:26 ` [PATCH 0/3] smartpqi updates 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).