From patchwork Tue Jul 13 21:02:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375071 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,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 9C64FC11F69 for ; Tue, 13 Jul 2021 21:02:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 81E92613AB for ; Tue, 13 Jul 2021 21:02:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235772AbhGMVFi (ORCPT ); Tue, 13 Jul 2021 17:05:38 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:24255 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234726AbhGMVFf (ORCPT ); Tue, 13 Jul 2021 17:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210165; x=1657746165; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LVDDdK+yZdK6U3WZYWD6evcFgcekDy5NcMaTSBH6FMo=; b=Fsutb8SuTx8TCSDC1FZOaaS143LwWfHE1o83VjklETySfDzb1vMZZOng bXVXAA4FHSh0hi5eJoPvHP/YI5ULemD4k2zpay1nfgaofcvVX3/R3Dwh4 0f3Jt2gbGuXWZDrd5E9UMyjgiRrSrsStSxui61gL03CQGqi2uibsJUQhN 1uZtAMCxfNf7+5ufe6KhFyJseHw4VjbzCkRE/EMSm+KZfRjqNFxLdGa+o dzpwBLBMekgX0mdzbM1+d5vjQj+H2YKYbpruSudCU3N18ausvK7Y/4rWp uKBfqbPUG7calUXHbTbukV8hy5Q0DTImZulJ//IUUBj03HufriiBDATap w==; IronPort-SDR: nkYtEUPV6GNHCNVB1gqd+QRo92hXE8PJLMgb/itFM3khgWvWrHdZpF3/8f8utHtLBa7Uj384PS huwue+pLTJB0QFtdLD3UerMENlneCMiae6sRDRhjvRCnfJfrwEuX630JKFt/OfvnGvySPpyMAh gXVqfwNFkp3SYu1u6kZgFxvLHnyU55mVD1mHk7Gh69N9g2pwwwY94nqbXgU3IQlqOpys3pbfo0 acsEpVuxIfSKNw03ugksocGPkzUo7hmc1AuL1IJqAvsSgc6Qa9Kp+uRkMdluSiZ1JcImWrtNP4 lC8= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="124447485" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:44 -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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 65E4D70347A; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 1/9] smartpqi: add pci ids for H3C P4408 controllers Date: Tue, 13 Jul 2021 16:02:35 -0500 Message-ID: <20210713210243.40594-2-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-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 VID_9005, DID_028F, SVID_193D and SDID_1109 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 Acked-by: John Donnelly --- drivers/scsi/smartpqi/smartpqi_init.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index dcc0b9618a64..64ea4650ca10 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -8711,6 +8711,14 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, 0x193d, 0x1107) }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x193d, 0x1108) + }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x193d, 0x1109) + }, { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, 0x193d, 0x8460) From patchwork Tue Jul 13 21:02:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375061 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,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 A503BC07E95 for ; Tue, 13 Jul 2021 21:02:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87EE061152 for ; Tue, 13 Jul 2021 21:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235149AbhGMVFf (ORCPT ); Tue, 13 Jul 2021 17:05:35 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:5638 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbhGMVFe (ORCPT ); Tue, 13 Jul 2021 17:05:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210164; x=1657746164; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KCeMB1351RaaFzihjYpmyZpKn1nIlXa9kenq/xuiRIQ=; b=AwvvS/mRU6H7NFPIjctMvhN11mRtJOJxfTOmIJiG2BMaziDf0Eifq75P Rm9Nt5tKYkyzVi2j05Bz8cXsAidiMCzp12QC/7k7qbWU2+plebcLoIv9z 5hVyY6znBux3ORurti42Y83AWu48JTSWoLTEGy1biwfxNINO8qCEBBieZ 8qP3nI5hIZK0u296ewfmsnbp8fOgZYIJH7xiGvvyYVbix8Wj7jM4RqHjZ R+1lzOK9V5OrSiR3IC96kH6MfQN/WPt2H+t/SPkjaMEeTMJzyDJlK0o9B D6/ihv9gMtfaIbwSL+Jp57k3MpehFFYN+RhklEyDlrnXWAPwzrJfHUe66 A==; IronPort-SDR: DaLvutn5ou+r6oygKF1SV7AIboNxfxvRruGq8n9Un5pV8dYlW1YwibfBqcUTvaJxRNs32U5yhW gt7dSsJbFBnWN8LosbilerJ/cylQP99gBTlBj3AynyVR0J3vX1GBxMNcZRC4VNKwZRQnSyseSy AR77pNaLJJoMjX/VnwNE/rkflzEzf3Cn0hyqLPRVYT9sikoVjsjX1kOAoUceezpeuepBmCOqhh kKnSGzdZqWXOlLE621lPkNQR4Gv2CADL2OCjLh1l0ZPYxqM2GFAKM16ep4W8pVQyneWn7pxnZ4 LOU= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="62103594" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:43 -0700 Received: from AUSMBX2.microsemi.net (10.10.76.218) 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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 6BD5570347F; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 2/9] smartpqi: update copyright notices Date: Tue, 13 Jul 2021 16:02:36 -0500 Message-ID: <20210713210243.40594-3-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-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 Acked-by: John Donnelly --- 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. * From patchwork Tue Jul 13 21:02:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375065 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=-11.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 5E436C11F68 for ; Tue, 13 Jul 2021 21:02:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 447CD60FED for ; Tue, 13 Jul 2021 21:02:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235708AbhGMVFh (ORCPT ); Tue, 13 Jul 2021 17:05:37 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:8300 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234615AbhGMVFf (ORCPT ); Tue, 13 Jul 2021 17:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210164; x=1657746164; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7GWo7ZtH3qsEMz3OZG0KlNbXjxhc+zeAxPNwHr5M6lE=; b=KlNfozfaSW/ig0SrVQHwNbi87MjnggARLBAS0/ZYE0mrM9xdplmh8uP8 dHmGKm8f9Q8kj8wERxyoo8T5KwEtX7c5mrRRqz57Ihx9ihMTXuiG2KBRP 6PJ6TfLjYbYp9P3fWuBwRWMj/HsRSRprl/BaS2ifZaN19T6igXUaSJT/g O45cemAf/QAjbR5mTBFiMbNt54rr5FT/uNJoXe9i1hvZRocYdTin204v2 u+NjUUCrsTUeUb8nmNk2GVBbH8kPjhLLp3guKamYhCVNJtfutE13oPNTn Yzssvo/SUsq7ZFQdZ7k3zA+7zRSt/uKv5VDU+SwrrOU2p6M3Hte8zktZf w==; IronPort-SDR: LWzUZb3I1b9Y+1MrXmJqIDdeS4Aw4CApibCBNyVziCplz8H2bnfs5qBTcuF2lw7KtXTnHe7G5t gOwrHzpiOA7u5pGZQbGacz0uwfPOqVIVccGQ3cZpTxAd/ns0DqDH2smtilt22kpRE3nW4r4RVb 9FkRmztu4JdwpeUSJpnPv0ISRxVD1Xw6Xb9x/2bTU+YC3+uV4YWI1S9tyOjRRSUIOkyehjzKLD IinlloYnhc1OH03rwjhDe7Wh3uYGg6PDe6K8jdGPjycgkVBF7vtpaXi71+1o1+oTk3kP7HhG77 SLw= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="121925987" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:44 -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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 72463703483; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 3/9] smartpqi: change driver module MACROS to microchip Date: Tue, 13 Jul 2021 16:02:37 -0500 Message-ID: <20210713210243.40594-4-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-1-don.brace@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Change driver module MACROS to reflect copyright changes. - Microsemi to Microchip. --- drivers/scsi/smartpqi/smartpqi_init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 6ce17a191c0b..29382b290243 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -39,7 +39,7 @@ #define DRIVER_RELEASE 8 #define DRIVER_REVISION 45 -#define DRIVER_NAME "Microsemi PQI Driver (v" \ +#define DRIVER_NAME "Microchip SmartPQI Driver (v" \ DRIVER_VERSION BUILD_TIMESTAMP ")" #define DRIVER_NAME_SHORT "smartpqi" @@ -48,8 +48,8 @@ #define PQI_POST_RESET_DELAY_SECS 5 #define PQI_POST_OFA_RESET_DELAY_UPON_TIMEOUT_SECS 10 -MODULE_AUTHOR("Microsemi"); -MODULE_DESCRIPTION("Driver for Microsemi Smart Family Controller version " +MODULE_AUTHOR("Microchip"); +MODULE_DESCRIPTION("Driver for Microchip Smart Family Controller version " DRIVER_VERSION); MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL"); @@ -8451,7 +8451,7 @@ static void pqi_print_ctrl_info(struct pci_dev *pci_dev, if (id->driver_data) ctrl_description = (char *)id->driver_data; else - ctrl_description = "Microsemi Smart Family Controller"; + ctrl_description = "Microchip Smart Family Controller"; dev_info(&pci_dev->dev, "%s found\n", ctrl_description); } From patchwork Tue Jul 13 21:02:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375063 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=-11.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 E4C75C11F66 for ; Tue, 13 Jul 2021 21:02:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC16F61152 for ; Tue, 13 Jul 2021 21:02:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235633AbhGMVFg (ORCPT ); Tue, 13 Jul 2021 17:05:36 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:8300 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbhGMVFe (ORCPT ); Tue, 13 Jul 2021 17:05:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210164; x=1657746164; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hXxOvXw4eeJpjDBFqXC+wHjs9TywmXrN9BduamjpANo=; b=ZTBfYZsFMDQx2qAZvO+c1M5k+fGNS8gCmHFhwVBosHctbZkv2BCNCGfJ b5QfSf+aygW8gwvXiMfYbAnhkjLAwfByJCqYCDNJks+mMBxHeqhQcrxoT V2MkzVZW6C/J69xSBBEJe4fwgJZKE8GLAb65/E3dE7MT1RKobWnB6BC4/ Lowf7c8k8WLetozIkF/R3NTdCSEE/a8NU1jh5ZSV6agEPQBE+iR52MN09 dQ2T5rgqqdpvDR/sAIPwGJaLLjVjMNMrgF4LbAJuMsZlhz60+q78BAB/A B0Kao0gbD+BxQkFtbHXsagcHJGJiWwONR3/eKO26SZPk+cYiAkJO03gI2 Q==; IronPort-SDR: IhsL5cQhikQeaQ8DZnSaerswgEfwS6AOAthUx9lAbBbyE4vVY4Tu1sSR8+R/uC0BG+VjfUbBfR Mn/d1cl21NxswkXXIm56wsqBBR2naE2/hp8H6wbr3GYfqrI1amP12qzostnrADhVaCvrts6YYF Yi9I+8xk5SXiRwL9JlPaIvims0CDPSFOGv9CFmH7CfT/YBdOEjX44u3p6aJrYrs1N37PDwpMVt VKMlq5AgdoMYfuAwnNoi/E0uhk2lwY5fi3rYeGU+PjmrlT9oxU4ELpNP4j6DmzpwuGJ6TESJif vcY= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="121925986" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:43 -0700 Received: from AUSMBX1.microsemi.net (10.10.76.217) 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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 782A470349B; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 4/9] smartpqi: change Kconfig menu entry to microchip Date: Tue, 13 Jul 2021 16:02:38 -0500 Message-ID: <20210713210243.40594-5-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-1-don.brace@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Change Microsemi to Microchip --- drivers/scsi/smartpqi/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/smartpqi/Kconfig b/drivers/scsi/smartpqi/Kconfig index eac7baecf42f..6f83e2df4d64 100644 --- a/drivers/scsi/smartpqi/Kconfig +++ b/drivers/scsi/smartpqi/Kconfig @@ -38,14 +38,14 @@ # HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES config SCSI_SMARTPQI - tristate "Microsemi PQI Driver" + tristate "Microchip PQI Driver" depends on PCI && SCSI && !S390 select SCSI_SAS_ATTRS select RAID_ATTRS help - This driver supports Microsemi PQI controllers. + This driver supports Microchip PQI controllers. - + To compile this driver as a module, choose M here: the module will be called smartpqi. From patchwork Tue Jul 13 21:02:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375077 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,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 E864AC07E96 for ; Tue, 13 Jul 2021 21:02:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D221461152 for ; Tue, 13 Jul 2021 21:02:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235936AbhGMVFm (ORCPT ); Tue, 13 Jul 2021 17:05:42 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:24255 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235536AbhGMVFf (ORCPT ); Tue, 13 Jul 2021 17:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210165; x=1657746165; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A12LawP3oulzMcsMcOVjEE4RtDeE3oxjrT+YdNBnJlM=; b=LADUZM0wnjXRMzVwURsfEVbJReyvgmy2leGDl+sLrQfBTa/ltKbP7aJx NeUf9js9WeywV6Zk9R6ZIda9noE1/11MOfHKRyvb34xJjXmemTH4l1GEF ihvYC+lGT9DDx6SFy1cAeLhwRm9GXnbQ3BhACK07QoRfsaUglSqWcG9Nr 9dwxl1Mn26Wwcv9zhMwgyW38D4+2I4XqylPPoIczPwE2z076V5aUB0eTL nDxNsea3m4s+36EUr6w5Bt2boIK/F8t/NZleCPV2tdAnk3jEKQ487Nt3+ 4wWT7Qilo6ywCNH8e73SqyU+h6eoMk4rXgNlqzmAv6nufVwnnu4ELpACz w==; IronPort-SDR: DcXKj7Lq9JsM241q2cq5ZpnN7AUjfhFioe/gs/OfeUnHM121s/OouebGIG1VXf2AZwIpxE7iTH xGYo6COJlupNqTEUUXjzOtKb13cgTHZSK0H/AEw+3ZTjAfrkoPtqsZpg5F1Mb2DVtzculhqXkZ zCspJb1qSObGBnkcLQYlTQexjf6sRLwGMZfaqq69rprDL1VX6SwJwyY8mTTxufCdsp+ZBoF8e0 o2o5vGNpM+ymW0pHTcdXASIipOFUWqfzeZdKUUCIdowylFcYI2Jxsyxqy1cK/gAWc89f6fDR76 61E= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="124447486" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:45 -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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 7E37B7034C6; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 5/9] smartpqi: add SCSI cmd info for resets Date: Tue, 13 Jul 2021 16:02:39 -0500 Message-ID: <20210713210243.40594-6-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-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 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 Reviewed-by: Mike McGowen Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Signed-off-by: Murthy Bhat Signed-off-by: Don Brace Acked-by: John Donnelly --- 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)) From patchwork Tue Jul 13 21:02:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375073 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,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 116C4C07E96 for ; Tue, 13 Jul 2021 21:02:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF9866115B for ; Tue, 13 Jul 2021 21:02:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235838AbhGMVFk (ORCPT ); Tue, 13 Jul 2021 17:05:40 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:24265 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235601AbhGMVFg (ORCPT ); Tue, 13 Jul 2021 17:05:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210166; x=1657746166; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eC9h7AuB2uBlbeufFeAaVi7C6flhHEAtOrptRD5MlTE=; b=S/sJTjVKVbFJOPHO7LwzrBXu2IdFodv0qm/Yg2Jutfg0dUjqN/tbsIud iWmpOMwKjNpCO9tYQsJyD3drGXRTM/MbqQ/Hr7sGGa9mOCVcvS8Ao40nH e1uuNIAVM4QayrLEazDZS7lBmaCri0DtL3Xb29guk0JU4ckvqWWte/liK wYBO+E26OgTRPPvnXMLzeh68MhTTuGOvv4MriY36AIo5pvSEDGNZGWrz8 rZzxvM8+hfDlIIEohr6a6IgjrWMe3WGRVt3KaTcKEW9T9T3JzuVE+WInw V1hs0bG/ST88hmqXo0QbP7TdR1JVywncq0RGUrUJmPbCgungXFECaWZl8 g==; IronPort-SDR: x9DE1I3L4QYAKX7NQYwYt5LO84qKfarHuzsNeckxREcIBKy6Ml3K3NP4A5kExL+pOC9STOTgFE 2JwjiQ4EqFPiyV1vHHVcWuYWP0qk2FxKthbcQvREte7AwWMn7/UZYxxRo/md4QcRnC6sFgZRSh p8fP+DuvNtuF7vkYczppCZNURd88fznEORPA4QZkhCalF4I5p50tKeDBlKSIom//hNWCu91I/+ OJdvilckfGzERjVMt0VM2deOwyEVmMf/M9bxDmi0GAG7ebuDKzFmfaIfUamtW3z0GiaOoPmBQe Byo= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="124447488" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:45 -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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 8431E703501; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 6/9] smartpqi: add PCI-ID for new ntcom controller Date: Tue, 13 Jul 2021 16:02:40 -0500 Message-ID: <20210713210243.40594-7-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-1-don.brace@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Mike McGowen Add support for Norsi ntcom Raid-24i controller VID_0x9005, DID_0x028f, SVID_0x1dfc, SDID_0x3161 Reviewed-by: Kevin Barnett Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Signed-off-by: Mike McGowen Signed-off-by: Don Brace Acked-by: John Donnelly --- 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) From patchwork Tue Jul 13 21:02:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375079 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,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 7A920C07E95 for ; Tue, 13 Jul 2021 21:02:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6334B61164 for ; Tue, 13 Jul 2021 21:02:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235961AbhGMVFm (ORCPT ); Tue, 13 Jul 2021 17:05:42 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:8300 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235139AbhGMVFf (ORCPT ); Tue, 13 Jul 2021 17:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210165; x=1657746165; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LFpZ+CYZzqb1YpQvsDbpspaRBSX0vQfqNpAp5FAHVuQ=; b=OLnRdWJywAW/30tvDfduSmMT1gx/U+cxeB3ZeuLWl1Cs0AGASzq+MXz/ b3ea97ifZzmjSOQ1bgkHzEdLUl8DqmGwGQlv/e2eb0NavLZvczrXSLxPy GymxEJ9EzWHwlgm3Y8wufhQ9Esr4WQMRmkAUgzWCwupsN7CzXbObrnRWm F+Ay/hnTFZA3NAKW9EjNOBz/nX0r30WEgr4XUl0EZ6S9Zbqg21HQnRFmd wlyHjKmCZ7kIBBj4UVgabXC6j9V6gjPMykHjzgN3Mw/eT3Hp3X9EG/rth ui9BDBAbpDyxIutcroNxKjayWuLW9aBa2GSURLlLgOHmBEp17k/7eN0Ef g==; IronPort-SDR: 20HJmPvh+kFpkYFfhCpUA9X3rTmxu5UMNEXppSZ5b30i5lhoDyPjwy1ACZQKj/G56lxwUPi32w +AGxUD3q4MESw+oupBzyobJwr2j2RHtxwI15/u9ED7ZtqAF4BnB/s+VBI8pzeibO25elWcV+pG EkOuQixX/lGZOJVlqnoCkJhUeo3ZlgQFTxPGxEzUN88ZVqGAFnNwf0zKaB6hgSsB1hC8EPYz2E Lw+x3PiHe/srXHWTWFN1MFur5x8buZN2VqabYfgBABzWQnxgy6XdOIMMJT5yFyRGGbFSReuZWe 3kE= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="121925988" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:44 -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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 8A8B4703503; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 7/9] smartpqi: add PCI IDs for new ZTE controllers Date: Tue, 13 Jul 2021 16:02:41 -0500 Message-ID: <20210713210243.40594-8-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-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 Acked-by: John Donnelly --- drivers/scsi/smartpqi/smartpqi_init.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index c0b181ba795c..f0e84354f782 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -9185,6 +9185,30 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, 0x1dfc, 0x3161) }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x1cf2, 0x5445) + }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x1cf2, 0x5446) + }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x1cf2, 0x5447) + }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x1cf2, 0x0b27) + }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x1cf2, 0x0b29) + }, + { + PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, + 0x1cf2, 0x0b45) + }, { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_ANY_ID, PCI_ANY_ID) From patchwork Tue Jul 13 21:02:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375075 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,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 F1C11C11F67 for ; Tue, 13 Jul 2021 21:02:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC1706115B for ; Tue, 13 Jul 2021 21:02:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235821AbhGMVFl (ORCPT ); Tue, 13 Jul 2021 17:05:41 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:8300 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235545AbhGMVFf (ORCPT ); Tue, 13 Jul 2021 17:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210165; x=1657746165; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YCU1lNbnN3QiScgV4I4qmlBlxDGRHX9C+VP7ZGwbfYg=; b=pisslaDmmA7ROmT7kCGx/w0VZ2aQOnowOnwoQhMyWBzwcXEioeqz1vdW e8CeV8NTZU6qhGTVlXdZQ5q7AzDRKVFy28KmCd2iRXe9Wfuzn/v+xW7Wp or1vwKGlpJyUVgXKxcHkrslctIX8nqATe2fQ6I8XI/9SJVXjGIZwJilnS 7hXUhLYImsyCdXqUOuTmYgsVNV05m5zmWVTqAiw3L092PoQ4RvXENBWC3 S+SMkefWCTdCOLsxT043/gvHTLiLc/FxrboTlr0qm6f7dQ+FCJ3J011KK T8iAWh1FeT3DN6W/O1lrXAqx0c31/Wop/E09uaN+yDZ92KI7zbT/QA8Eq g==; IronPort-SDR: 5ni/sRww5tZghr+xVpS/r2c7ExmTKUt4lrY4IDXe6EMQAGhqOjVGsipd/4nyqCUw3iUNYSrsJf G7E+0H4HV4r0PTjDVXEDAyig2/Wti4FGRuFOLlUQh53ahTB4/5SwozXTcyYj8FGHPS3VTv290n fuMHY/7bueWscMHkUGsNmtHgI2gdYrRjZun6i1VSUOMEHQlwdqxzPi4HxYeWAvhGKX6J37W+Mg OATm+3q8nr/cFOQ4LlVq7eRc/Ru2bqopzb8hDofJPg8cweUPPzj5ENAsUme1TNBwVYSi9nOIio EC8= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="121925990" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:44 -0700 Received: from AUSMBX1.microsemi.net (10.10.76.217) 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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 917F0703519; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 8/9] smartpqi: fix isr accessing uninitialized data Date: Tue, 13 Jul 2021 16:02:42 -0500 Message-ID: <20210713210243.40594-9-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-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 initialization. - The pqi queue groups can have uninitialized members when an interrupt fires. This has not resulted in any driver crashes. This was found during our own internal testing. No bugs were ever filed. Reviewed-by: Kevin Barnett 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 f0e84354f782..ab1c9c483478 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -7760,11 +7760,11 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info) pqi_init_operational_queues(ctrl_info); - rc = pqi_request_irqs(ctrl_info); + rc = pqi_create_queues(ctrl_info); if (rc) return rc; - rc = pqi_create_queues(ctrl_info); + rc = pqi_request_irqs(ctrl_info); if (rc) return rc; From patchwork Tue Jul 13 21:02:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 12375069 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,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 D560CC07E95 for ; Tue, 13 Jul 2021 21:02:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7E9B61164 for ; Tue, 13 Jul 2021 21:02:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235717AbhGMVFi (ORCPT ); Tue, 13 Jul 2021 17:05:38 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:5638 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234665AbhGMVFf (ORCPT ); Tue, 13 Jul 2021 17:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626210164; x=1657746164; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nUrPuatobHKMHbBSvnB/MtWNobqFZh/U9CeTgX581Hc=; b=wpmMuCVm9hfBijUqFBSawTbg+Pm6sTwaZYRIwqsR5EYfDZu2meiBbNWq kl1p3R/uWsMrtSwD0zRRBvCwHhZcVykbUss8ipIVx+ENidhoZ25XOCIqX Di0GYYPMkwPh7H3Wp+rJMFhJ5dc0ctxwV7DQff8mpO2WvYSWeOFvdxhPA hv0wtduyMh8WY8LGNqC3+znUFxHglxdSC9zT5GznU4wvV5v3ErLIQhZLM 8kGOfT0pWi8+L1wsEJtUgRMcaXrY1j/09h9j1pudz8PvYtUEwwP31j5zL Y51TDvHlqxYG2mabTTf4xrjlvo4YycTqACweKYHs8PyDTPy+Wp2qffPZn w==; IronPort-SDR: g6tbyTzKs1+3GBtk5hG4hicJsghGiQH/QBGg6IxkpPO4NLeeoLFgJDJKhkNtck6QAJOB6EllLD lZTac1rPpXRwjHYPfDYbNPPZluzIt11so+V3ZG4ZL9gwgM4orobhG/PtjfRwMMxMQ6osEUUBod syfYMnX3wOzVbZuZ6MVDaO744M+8soxCdw4/VeE7eAdZUxlglVx2lN/1cFeUDlfjmepnFbtIzj CCbx/ycyR3bVSsZAJs/j5qUZmxlB2XhMaIGVyB96cVuPurds3rmPE/luOn62VwtBXxLd/hTEZ7 wog= X-IronPort-AV: E=Sophos;i="5.84,237,1620716400"; d="scan'208";a="62103595" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 Jul 2021 14:02:44 -0700 Received: from AVMBX2.microsemi.net (10.10.46.68) 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, 13 Jul 2021 14:02:43 -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, 13 Jul 2021 14:02:43 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 97D6770352F; Tue, 13 Jul 2021 16:02:43 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V2 PATCH 9/9] smartpqi: update version to 2.1.10-020 Date: Tue, 13 Jul 2021 16:02:43 -0500 Message-ID: <20210713210243.40594-10-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210713210243.40594-1-don.brace@microchip.com> References: <20210713210243.40594-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 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 ")"