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: 12361059 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:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12361065 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 1DCB8C07E9C 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 0344961C7B for ; Tue, 6 Jul 2021 18:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231286AbhGFSTB (ORCPT ); Tue, 6 Jul 2021 14:19:01 -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 S231246AbhGFSS6 (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=Va5Tn4D1ElEIsTt42mitEm2Zc+DYV4qL4YotBj8gr5Q=; b=vC6RxBN3py7PLNgRUMnmGG4gbDYtUO/QICeAQmyr+QBb2MO6wzFmOh/c q3qBmJQs9O0Jojs0I5zJhBlTzmlIWYX9UpuUnUIUzID33mwe5GDyCIzJ+ 1BozkWNDFXpnD4B2WEcgcPkUmHaU5m0RUyZe/Mehn28I2hKY8HX2xF8Aq vKO1Q4q3Z2NHnlhxev93tM+IS56PwQo1WDIzOgS+cvGrLYkGPh0VD2CaJ dOlaY5ZpgETVp8U2XgVdVeYJHop1BGM1CjPvNGDmHYnluJ6kwXz71nBVI pb4E5JoJKCFGody5rpdTnWlB/lWFN747WngANPkak7AK/+kqHK67104oL Q==; IronPort-SDR: WIblwKlWmPODgDevCcx7j2OBYr0gaBHioLmRXgFPvzM3iU07m9iYSZY+mO2Q3R4aMcETDDzWg2 1Qrkm/+VOpHrvbIVMIZ601kRQaMKVDY8o9ykfy98CEF0nZzqbwEsiHChBI4hZMpc7UM5sqRCSa Ivd5AgFHCUKb/gIyaagXTs13SnbiKQyHS0TEkj3N91VJRM+AYgb9Q5lUzrViq8QCBvItAxIwsA 78f3QOIDjNo7F+DDNhqBMvM9pC5zwtN6HPcX9n7xNV1TrwYGxotIN1mrXHXRchTopozRUkyuy4 1pY= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="134786019" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2021 11:16:18 -0700 Received: from AUSMBX2.microsemi.net (10.10.76.218) by AVMBX2.microsemi.net (10.10.46.68) 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 ausmbx2.microsemi.net (10.10.76.218) 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 5DC9D7024C2; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 2/9] smartpqi: rm unsupported controller features msgs Date: Tue, 6 Jul 2021 13:16:11 -0500 Message-ID: <20210706181618.27960-3-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 Remove "Feature XYZ not supported by controller" messages. During driver initialization, the driver examines the PQI Table Feature bits. These bits are used by the controller to advertise features supported by the controller. For any features not supported by the controller, the driver would display a message in the form: "Feature XYZ not supported by controller" Some of these "negative" messages were causing customer confusion. 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_init.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index d977c7b30d5c..7958316841a4 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -7255,11 +7255,8 @@ struct pqi_firmware_feature { static void pqi_firmware_feature_status(struct pqi_ctrl_info *ctrl_info, struct pqi_firmware_feature *firmware_feature) { - if (!firmware_feature->supported) { - dev_info(&ctrl_info->pci_dev->dev, "%s not supported by controller\n", - firmware_feature->feature_name); + if (!firmware_feature->supported) return; - } if (firmware_feature->enabled) { dev_info(&ctrl_info->pci_dev->dev, 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: 12361063 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:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12361057 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 3B941C07E9C 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 1FFBC61C5D for ; Tue, 6 Jul 2021 18:16:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231262AbhGFSS7 (ORCPT ); Tue, 6 Jul 2021 14:18:59 -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 S231192AbhGFSS6 (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=OA+71b/TLdI1LxAdJVq9KKP8JUaFaLf4wnqPPllcBoY=; b=L+kZRDvCG3JKnO+4uPLJ7N0RifM+hsFndkRmUhusOO82XV2yqQQ7xyuW 2Xc/fviGcl+cIOGw7j69+yq+a76ZeEcfAJtEmYrJkIWAOxXY2YcU9twBX ECPpVZYtcTd0U8cB5Iw6EaCU7L0x5MdPDVc0GIS7MYmET0WsHNmmCfNZv pRVyJDXBTF+MvZmH2hWyHuGKwqpNMthArzS+lWsXv3XZDO+oU/UTd8ErC NLv2qk6tk+TX3yQSfXUTzLNIP7m72T6xaW3NsbVdBsCk3kVd4ipIIdInU 7m7RbtM8xpDCoIucTzLJD3cUx1HP9enG5dqLvNO2WxbGu5meX6CdFrLyS A==; IronPort-SDR: 4JOawFvAbQYOprt4nGOegK7Z+8QHaZXMNxrT2kytqqKkb/o4g+IV1mNqtfwtvXbl91TStVZp69 ZP2UJN6LCneo4g3MpbuS1gW+Po0wjqkoxWruDyxsNUkBsfZgUCK7/Qp9cGE4xUrwsuviV5jJfd W0F1nBneM1eqepWSKBnR6gLEpRqZ4kNcL9rmkts6j5ic2EKaw0r5JnExH9nHEeAJey3GIUBIsS 3GCOZ8DYuOfVGo0Pyuc9osIeQAbplm8SMKG+MwwPkoTB4XvpZmXxd0ZbIMZoofBpYpx9rUmSIg AHE= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="127846822" 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:18 -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 6AA067025B5; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 4/9] smartpqi: add SCSI cmd info for resets Date: Tue, 6 Jul 2021 13:16:13 -0500 Message-ID: <20210706181618.27960-5-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: Murthy Bhat Report on SCSI command that has triggered the reset. - Also add check for 0 length SCSI commands. Reviewed-by: Kevin Barnett Reviewed-by: Mike McGowen Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Signed-off-by: Murthy Bhat Signed-off-by: Don Brace --- 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 5ce1c41a758d..c2ddb66b5c2d 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)) 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: 12361071 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:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12361069 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 032D1C07E9E for ; Tue, 6 Jul 2021 18:16:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E262261C20 for ; Tue, 6 Jul 2021 18:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231302AbhGFSTC (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 S231254AbhGFSS6 (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=1625595380; x=1657131380; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DYUJjYUnIibuQ0qciSCkTmQL4WLi2jb8O8bLKJYtXbw=; b=ZrA0PJo6g1OVQWIPel5hiPzwPdZ0vuvD0n5bTR8TJHYphdIwO9apMnyu FimxwtwB56icbbnO/uhV5L5/6gRtmSOMy5krheiJiFZwaa3UXRCzraqu/ g6rh6qTA16DeExnvYAnG2qUEYQPgsjXKWrdFY3kfOJmIYOo9SwFO0exC0 JVTCCxLv4Q8jhNQGPu0X4CTi6uoJoQOV90cFPGNK83DKIlNA2uCxjWrg0 9JnbOPEsWiKPXrLxFJZ4T2G2T14tP4Y4vQ10OR7euj4xvzkwBkDB6WGpG kEWilo9PfCZxAkaEYgJ4KpfIcW/+AaF+V0hX1R9s0hnv0p8ZmEbBbQF0G A==; IronPort-SDR: fGT4vnuCjMfNKKhE4FIDSViVAuSbT3Ajd/lk/bjF8Niv5oRq5raWci7mwzFOHH7j9rKHR9i5Sx ehS8xJ0am2/HNKF/K047e0uUDeCh0HXOuOUNU5oY/27WEa8HbdGwja/dcat/5X+cDIwIBaOHoc 5K9AhfxeYbkaUNfqEWTW2oLHnbK25sWI7eZU9BTCFl6vLWWdb6GZsnotwYeN3rKrleKbHKcqbX jz3HM3jC90MOX6UJtA3QYdrm5vkb7EPrEZXKx8pi3wKlRT14gFdvO46x8OKUfagWHoZW0Jgs7u /HI= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="134786021" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2021 11:16:19 -0700 Received: from AUSMBX2.microsemi.net (10.10.76.218) by AVMBX2.microsemi.net (10.10.46.68) 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 ausmbx2.microsemi.net (10.10.76.218) 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 778E97025BB; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 6/9] smartpqi: add PCI-ID for new Norsi controller Date: Tue, 6 Jul 2021 13:16:15 -0500 Message-ID: <20210706181618.27960-7-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 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, 4 insertions(+) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 1195e70b6ec3..a8dfb6101830 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -9178,6 +9178,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) From patchwork Tue Jul 6 18:16:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12361073 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 6EB14C07E96 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 5978361C74 for ; Tue, 6 Jul 2021 18:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231316AbhGFSTE (ORCPT ); Tue, 6 Jul 2021 14:19:04 -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 S231265AbhGFSS7 (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=ldqiC7CNWigza5Hejv0x/2uNN/zOYOOFUpjvptBNJBE=; b=RXgWp+yxaXFNZ0a4vlvE0w3HQHJfemCqEBZe8qNPUbZUDG09jDcIlI6o JoTKSt1AUE1kUT4VVSxzsNQ9whUPEkz7cMfjpI8CJUVhb0SbuHgtGXlHy DyFyEz59kadHrHsbkm0DTjcUgY8Mcvtz+kzKSVuvTImrOdeKHAbWwIj18 R3qMRlc11QSRB3S6+267lbk79A8/PtuZZrItI0ckLsri2sW9Y6jYMeRZp hc6hm20wJ7bl3fKLnJd0KrVS8INP5SRFEZ0yu7VmqyyBXgjUhpgK4O3bp D8MCHpZYqXa9PcqI1VzBwTql2oRfNHfluGAz/RYKz83QFWvKN2Tk9IhIy A==; IronPort-SDR: UxK+95aAWgU3EKHmOqoYDBlqA3ILiPq+0bg/iDSpXQgSza46XjL53AbEpMoDxbg4QWG12ejKAi xtdb3RrZx6nDijNT2aGScpXc0+6D9rM3326F2iMRcBaWfelzMMb9Cp6g92fyr34v5s/mJTgLyR TmHmdqiOrLz1yilluFseo4xjFwNiToMqHq4B9n3XSDrbRx7bB3PzEZJdZPLwIsYv5NlD/kXAuU 4lzVqnFAbseapx6rZqtrIb2kRFH4b9iFUdNq+fq+hfsRMQbDL2N5VnetXW7UqKnzhhhrOo0vmj WB0= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="127846838" 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:20 -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 7DABF702753; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 7/9] smartpqi: add PCI IDs for new ZTE controllers Date: Tue, 6 Jul 2021 13:16:16 -0500 Message-ID: <20210706181618.27960-8-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 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 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index a8dfb6101830..6f2263abaa8c 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -9182,6 +9182,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) 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: 12361067 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; From patchwork Tue Jul 6 18:16:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12361061 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 E0FF1C07E96 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 CF3E061C69 for ; Tue, 6 Jul 2021 18:16:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231281AbhGFSTB (ORCPT ); Tue, 6 Jul 2021 14:19:01 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:56937 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231244AbhGFSS6 (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=1625595381; x=1657131381; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c0MUWPA6+1IpPLjFc8iGB0brGn+MCUu7WL0cx4xm9H8=; b=K7Gu9NBAcSUbdyutfxkuZ30tboZrcauPp1obYHakRwDq3kTO0DCO5BkD TTllm/BTni4XkHAvNU37lPKvrO6R2MXAoJwGNqAkyOp5Nx4vh9qXnDo85 ysx6zYk4FPgb9/cOoCniZ+3jF3svkopUOg0TFyKXxdlnjqZAUqU9hVmp0 QGvYrmG9mWC0uflIqfBLs/Ys3A8bHbisu3ju3ubsKvaB5eYRV8Tri40xf f/9obD7EhriSJSlff7pe3HSOKGqfT4CK8wPNvMgzwFiNY2DkBF9UJk7iP JvGsm5TwnU8w/2Xcrchleg2yBzntLR0DKC84sgaquCs6kjQdggzTxO7Bb Q==; IronPort-SDR: GARfzhiZYUNM1EADB18XH6P67QTK8XhQKpHHQjzz355of4BDewy7SqxMt09ZMAud1wHJZ7RZjn RKIqNZaevA0AEnw0EgniLqmwNskNlIoFBGwDFhpTgD+yGRKnu+ri6CHFEZLJWo2fPwCVy4dh13 H2GU8mhGQLtSOhhw7XqVpDMCxr+Lq7apdBee4zQE4sj6dBIy39qYUlW25YWhAZMe3BV96K83to cXGXgYb4QgeIOMDK8q3UbKBUJeE+esIOQsM29uEgzazT+LFYQmjDAw96+WV9CrWYbi3AqmfDWd Qv4= X-IronPort-AV: E=Sophos;i="5.83,329,1616482800"; d="scan'208";a="127272699" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Jul 2021 11:16:20 -0700 Received: from AUSMBX1.microsemi.net (10.10.76.217) by AUSMBX2.microsemi.net (10.10.76.218) 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 893C570295C; Tue, 6 Jul 2021 13:16:18 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates PATCH 9/9] smartpqi: update version to 2.1.10-020 Date: Tue, 6 Jul 2021 13:16:18 -0500 Message-ID: <20210706181618.27960-10-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 Reviewed-by: Kevin Barnett Reviewed-by: Mike McGowen Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Reviewed-by: Gerry Morong Signed-off-by: Don Brace --- 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 eeaf0568b5e3..a41acf8729a3 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 ")"