| Message ID | 20210713210243.40594-1-don.brace@microchip.com |
|---|---|
| Headers | show |
| Series | smartpqi updates | expand |
On 7/13/21 4:02 PM, Don Brace wrote: > 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> John Donnelly <john.p.donnelly@oracle.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. > * >
On 7/13/21 4:02 PM, Don Brace wrote: > 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> John Donnelly <john.p.donnelly@oracle.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)) >
On 7/13/21 4:02 PM, Don Brace wrote: > 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> John Donnelly <john.p.donnelly@oracle.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) >
On 7/13/21 4:02 PM, Don Brace wrote: > 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> Acked-by : John Donnelly <john.p.donnelly@oracle.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 ")" >
On 7/13/21 4:02 PM, Don Brace wrote: > 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> Acked-by: John Donnelly <john.p.donnelly@oracle.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. > * >
On 7/13/21 4:02 PM, Don Brace wrote: > 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> Acked-by: John Donnelly <john.p.donnelly@oracle.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)) >
On 7/13/21 4:02 PM, Don Brace wrote: > 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> Acked-by: John Donnelly <john.p.donnelly@oracle.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) >
Dear Don, You misspelled Martin’s address again (peters*e*n). Please resend as v3, so it’s ensured Martin received the messages. Kind regards, Paul
These patches are based on Martin Peterson'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. 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(-)