From patchwork Tue Jul 6 18:16:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 470687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE043C07E9E for ; Tue, 6 Jul 2021 18:16:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C19B661C5D for ; Tue, 6 Jul 2021 18:16:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231271AbhGFSS7 (ORCPT ); Tue, 6 Jul 2021 14:18:59 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:47117 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbhGFSS6 (ORCPT ); Tue, 6 Jul 2021 14:18:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1625595379; x=1657131379; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zRLm1m85t9VWbNKqEZHfeP3cKUleVf2WkqeWJ1Wz34k=; b=W6H3E4EFdxaRTk/dd9vrxDHkukCCgbieyu80KSxCXCduFKhIj8cc9q0F VaVErFXcMnUsdzYvG6tEyS4wfrMglMZx51DEwnKGTEmssNOy2bK4LT7O8 Gu4H23FAk+7HbdPsnVM910zba6BScfSA7qk0yL6XAOv6SNsUI5nhlI45V f/qm/h9i4rbYFECwbJ7fkmvDAZUUhW59Db0pkSALQ1N4rOpu3WvcAms+S h7zgZEOjdEOUbrPZS/o2Co12QxDzQwoucHb7e7DQCInSIG3tbS/i/WUMF IR5AIZSkMHBHsuiEUsYqbkxX0tNXhv2pNKcUm1PCppSSpZnfGw2hsaxlh w==; IronPort-SDR: AihNXkbkY0ZO227P7vqAnF6nacR7OwPYnAasfqB9jh4eTzRwuxP44vVR0j46JNnodCJyW5Y14m CEPS70G7ly4u7CKDhTAhX8oDNuI3D6btRBO6d2j4neIKzxzC9lwJC1OPZBU5TdFXVVhgc+P6sm SyJYJB/nm0woZe8yKnGJqJFDd3WPKqdtzGPzzIZ7ponVNu6ZMUlNVi/1M0ZUORwYpUFIMyu+cd q7h12uoD2/eNO8GW8xvO8pHPIiYF/T7MUZPCkd4TRAuHlK0n/q0ElcYexAFmfRJiAyVmODA4Za xlM= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="134786018" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2021 11:16:18 -0700 Received: from AVMBX1.microsemi.net (10.10.46.67) by AUSMBX1.microsemi.net (10.10.76.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 6 Jul 2021 11:16:18 -0700 Received: from brunhilda.pdev.net (10.238.32.34) by avmbx1.microsemi.net (10.10.46.67) with Microsoft SMTP Server id 15.1.2176.2 via Frontend Transport; Tue, 6 Jul 2021 11:16:18 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 5907770249B; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 1/9] smartpqi: add pci id for H3C controller Date: Tue, 6 Jul 2021 13:16:10 -0500 Message-ID: <20210706181618.27960-2-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210706181618.27960-1-don.brace@microchip.com> References: <20210706181618.27960-1-don.brace@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Mahesh Rajashekhara Add support for H3C P4408-Ma-8i-2GB device ID VID_9005, DID_028F, SVID_193D and SDID_1108 Reviewed-by: Kevin Barnett Reviewed-by: Mike McGowen Reviewed-by: Murthy Bhat Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Signed-off-by: Mahesh Rajashekhara Signed-off-by: Don Brace --- 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 dcc0b9618a64..d977c7b30d5c 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -8711,6 +8711,10 @@ 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, 0x8460) From patchwork Tue Jul 6 18:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 470686 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A078BC07E9B for ; Tue, 6 Jul 2021 18:16:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8762161C6D for ; Tue, 6 Jul 2021 18:16:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231274AbhGFSTA (ORCPT ); Tue, 6 Jul 2021 14:19:00 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:6083 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231245AbhGFSS6 (ORCPT ); Tue, 6 Jul 2021 14:18:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1625595379; x=1657131379; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V2chWj2/gMJdpAGu1YDTieYmQTYA83+VsJXUuMEEYoE=; b=uLQo8pTfl0dhiLuKaxKWa2Ia8w+kEqHhSefOfCulrUEEVFtQRpxCKWfN kH6SflnS5J3IA8gomauYh+uV1NUUULEbFYXnTkCkQmsM1qeOA2RDubNgT 6X8ngvAAUY6GrvGBY7Drbp8Zu/w9iFzk5M9my4a709ktUMrzu4FT1giYT sqlFD5vbDUs18FY0+WaTcgivk6T9Z3RlyqUuyLz0ku7iK+Ol+/cR7jy7B wfAVGsd052b+KKEs+eNPD7d1YS9/kV3MIKbZ8ek6FRae/MVa0LPanWua9 tRvPWk+Rp5W3gV8rdfDtcZgC+seHjLTzljmnFIw+uBrwC8ewu0gMik8s9 w==; IronPort-SDR: wijzAQ+iywefoz7tELKjLhc3B/DXFVWOdcAMkMmy/r/PeXvMQElq26N2tw1GF7iFhm2KgXla4F SAPhWq46KJ37dhcmnRyyR8DspufcgFpwFnWmLpETYuM/dimEknis/IOWCLqfauvKqz8jpdkqYG JSNG8A1BMJ27/1h7iBVDccQNeLwTrfu1OIaMUaSm7uBYE49gxteWjKv+dUzwChfUOklolJz5f0 yGVMsyQr/LanfbXHCJ45xRQwDyBn021JitQhiXRGxbYdxptW8L0766R/nl1MAHy05B6oG0J4NP e44= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="127846827" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2021 11:16:19 -0700 Received: from AUSMBX1.microsemi.net (10.10.76.217) by AVMBX1.microsemi.net (10.10.46.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 6 Jul 2021 11:16:18 -0700 Received: from brunhilda.pdev.net (10.238.32.34) by ausmbx1.microsemi.net (10.10.76.217) with Microsoft SMTP Server id 15.1.2176.2 via Frontend Transport; Tue, 6 Jul 2021 11:16:18 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 6414C702572; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 3/9] smartpqi: update copyright notices Date: Tue, 6 Jul 2021 13:16:12 -0500 Message-ID: <20210706181618.27960-4-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210706181618.27960-1-don.brace@microchip.com> References: <20210706181618.27960-1-don.brace@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Kevin Barnett Updated copyright notices and company name strings to reflect Microchip ownership. Reviewed-by: Mike McGowen Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Signed-off-by: Kevin Barnett Signed-off-by: Don Brace --- drivers/scsi/smartpqi/smartpqi.h | 6 +++--- drivers/scsi/smartpqi/smartpqi_init.c | 12 ++++++------ drivers/scsi/smartpqi/smartpqi_sas_transport.c | 4 ++-- drivers/scsi/smartpqi/smartpqi_sis.c | 4 ++-- drivers/scsi/smartpqi/smartpqi_sis.h | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) 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 7958316841a4..5ce1c41a758d 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. * @@ -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"); @@ -8448,7 +8448,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); } 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. * From patchwork Tue Jul 6 18:16:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 470684 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 211D4C11F69 for ; Tue, 6 Jul 2021 18:16:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 085E361C68 for ; Tue, 6 Jul 2021 18:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229996AbhGFSTD (ORCPT ); Tue, 6 Jul 2021 14:19:03 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:6083 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231258AbhGFSS7 (ORCPT ); Tue, 6 Jul 2021 14:18:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1625595380; x=1657131380; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TyV0MIcOMOIMTZB5HtlzGaCyLDdHL59A5foxIGfMkY8=; b=va9aoKXoafDcszS+l9130EUbgvVf9etZD7GLw3dljsJnD6NlZxP8GDKr GPLwvji0fBWtlszYCcrh/736kUxCnYRdxuTV42QXA5zXjEFADhFrcx6KR vo6klJFPYDuCsT3ZItXvkpPqsjIJ1PCnynGMR9xItHc0Rn7S+unDVmMph MW/e5orByMuUL4MSP7RpUQDTvPe5C/9j4vlen0r40aNFEtyeHqtq9Xvk8 dtzlOikAtLYaQW6AsSrqsNM9KIxpvzbObpCmJ7BTztjXYfsBygBTG3WCJ 6TGNzgc7EElm+QBOelrhKIR2RcMT86yCOcgUb7fHvCQPC3QBAjIM6w49O g==; IronPort-SDR: Li9h16rUzmPvkaMqym3WnygXilxw+EP5XcISbIaRop3Wd5UZcq8zuVM+TNvfc0iOEAVFXn1JeC Ll6SYzVTOVzirNEekIc+znezuO9kGucCYY7WFLIfIyP8EMXb6b5KqlRi38bGJV0wXA3wp3tgKu 7a4eVBY3vHXYZttXrXujZzfbDN1j6TUVNVQj1lqJxlm9SFiX3qZPOfQLFPOkx6CvaYRPJseV1J SSPnM7Dfdy9479pYgQIDZams1TODmpajjkkZZgHk7Zzxh4gkSIFGnyjdWXS1XN8ALav40/mCvB 0Ec= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="127846832" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2021 11:16:19 -0700 Received: from AVMBX2.microsemi.net (10.10.46.68) by AVMBX1.microsemi.net (10.10.46.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 6 Jul 2021 11:16:18 -0700 Received: from brunhilda.pdev.net (10.238.32.34) by avmbx2.microsemi.net (10.10.46.68) with Microsoft SMTP Server id 15.1.2176.2 via Frontend Transport; Tue, 6 Jul 2021 11:16:18 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 7123B7025BA; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 5/9] smartpqi: add PCI id for H3C P4408 controller Date: Tue, 6 Jul 2021 13:16:14 -0500 Message-ID: <20210706181618.27960-6-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210706181618.27960-1-don.brace@microchip.com> References: <20210706181618.27960-1-don.brace@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Balsundar P Added support for H3C P4408-Mr-8i-2GB device ID. VID_9005, DID_028F, SVID_193D and SDID_1109 Reviewed-by: Kevin Barnett Reviewed-by: Mike McGowen Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Signed-off-by: Balsundar P Signed-off-by: Don Brace --- 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 c2ddb66b5c2d..1195e70b6ec3 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -8714,6 +8714,10 @@ static const struct pci_device_id pqi_pci_id_table[] = { 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) From patchwork Tue Jul 6 18:16:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 470685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BE32C11F68 for ; Tue, 6 Jul 2021 18:16:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8186461C20 for ; Tue, 6 Jul 2021 18:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231293AbhGFSTC (ORCPT ); Tue, 6 Jul 2021 14:19:02 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:47117 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231247AbhGFSS6 (ORCPT ); Tue, 6 Jul 2021 14:18:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1625595379; x=1657131379; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PWhEyabNaITf6RM3jWHD6lHoANm2XfzHlMwWkA8Z0Tg=; b=fxVFAAaTGyLT8gnK/l5rPNsY8PhkN7pesR82s7hC+F12lZ8BrZUlpVQv cz3h2Dl1/qnY1xBMn8Ei0/drS/F+uanHGf5lR5FsB8Pad8DoEPezzVtI6 eSoFiMhd1YvnEP6Qac0WTDakS/dYWTbvNBedkcnsfhhRAGkZuoN587IzA lDG7wU4WpzBF8gTKS5Yqe2MzQrY+t2L79WUjjpZkiM2UeVspm2h+KBHXk eP5y1Abz7B8KO6/bHmEK+i2Xgk244YhDpR0f9aZeaws2Ukhp/CrkvJ77D rk7UkqNybekCGeLJMjW4dfX2TbVyqXGjB3dZxfQeiPh+26B4JDuQ249xk A==; IronPort-SDR: ASe4NugIuaRQQh4A9twHNnFpWehphxvbWRGXL6DXUa0HGDwjG7g/PeFnB/4Vfp5JtNYtaetgq3 +DONyuvwD+8JD2vGw8vDUToaTZZD9l7Cs3C7orzDCNSjLd/8ztExH5bAVx36gUjcGRQIHqGL67 BtH+xrSIMtqC/BpuETR112Xkff/TyX7ulmDwWgz9lMLHL0mtfzh+gInDXJVMQdkFwOA89Pt8zG ie0xmerL9gp495RGNecWZDP7MtBiHs6M3T+2BrVBUDFt32EOeEVIPSdhrHG3SFltCdZNxM3zB+ TM8= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="134786020" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2021 11:16:19 -0700 Received: from AVMBX1.microsemi.net (10.10.46.67) by AUSMBX1.microsemi.net (10.10.76.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 6 Jul 2021 11:16:18 -0700 Received: from brunhilda.pdev.net (10.238.32.34) by avmbx1.microsemi.net (10.10.46.67) with Microsoft SMTP Server id 15.1.2176.2 via Frontend Transport; Tue, 6 Jul 2021 11:16:18 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 83EAF702821; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 8/9] smartpqi: fix isr accessing null structure member Date: Tue, 6 Jul 2021 13:16:17 -0500 Message-ID: <20210706181618.27960-9-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210706181618.27960-1-don.brace@microchip.com> References: <20210706181618.27960-1-don.brace@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Mike McGowen Correct driver's ISR accessing a data structure member that has not been fully initialized during driver init. - The pqi queue groups can be null when an interrupt fires. Reviewed-by: Kevin Barnett Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Signed-off-by: Mike McGowen Signed-off-by: Don Brace --- 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 6f2263abaa8c..eeaf0568b5e3 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -7757,11 +7757,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;