From patchwork Wed Jul 14 18:28: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: 477169 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 193B0C11F66 for ; Wed, 14 Jul 2021 18:28:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3888613C9 for ; Wed, 14 Jul 2021 18:28:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240041AbhGNSbl (ORCPT ); Wed, 14 Jul 2021 14:31:41 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:34842 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229603AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287328; x=1657823328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LVDDdK+yZdK6U3WZYWD6evcFgcekDy5NcMaTSBH6FMo=; b=bkA5J7PXjmZa65ns39Xo7icsCawiMtTFGH+h/AzJeuFBOEGN9EWHQ0B/ BfN/F6VRJFLnvl2W4/qlmHrGBD8BWbbtfqjbAdOsjNQOEG8YjEN/jaoI8 67wj/DYtYw3ZkRnJ8dIlEFkgxhu50u9CWQOTAC8ewDsh6ALZbaViAM5rj J7JYX/lZLiXLgU75Pw88RkN3CWzrt3CL5KXvxpHtemiEPyOO2QEaLlS0m 9Vg8eeOMaZcN0GTdt/Lc/gtlmAPPiPLsnWHggrLfGUYDD7/WUBprjwJUH QduFKmGbFHDwzvSrjLutp8Zfw7mGUJGpq8Xmbm7cCjY18luNwD/TpCSuV Q==; IronPort-SDR: gZBnCSGDGupGympTqBbigN98oVJlK2Y54qFgsDguLBREkh6uOWy+TwS0oYoDjju818PfhXnkv7 nILPlD3P3aSYDL28RWo8dP1Fy/axIw45cVCacHEA0etQ+YFowcg9cGcg7PE6htVHNqu4j9O/d4 LNQgTANUHVtVYg/ABOmkjnm/0+k6NfriMdwWiY2A70BwdojCD/yp4+51IIKC8z0Op+JJFlqsC/ W43LYYyySXClyEx2R2cr993gtqGZHosg6Iedo+59e1gscBTIMpjkS1riEBExnUjy+W+zEFioGy aC8= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="122053846" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:47 -0700 Received: from AVMBX1.microsemi.net (10.10.46.67) 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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 2D0567025D4; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 1/9] smartpqi: add pci ids for H3C P4408 controllers Date: Wed, 14 Jul 2021 13:28:39 -0500 Message-ID: <20210714182847.50360-2-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 --- 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 Wed Jul 14 18:28: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: 477167 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 20665C11F69 for ; Wed, 14 Jul 2021 18:28:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BDEE613C5 for ; Wed, 14 Jul 2021 18:28:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240071AbhGNSbo (ORCPT ); Wed, 14 Jul 2021 14:31:44 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:36768 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230240AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287329; x=1657823329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KCeMB1351RaaFzihjYpmyZpKn1nIlXa9kenq/xuiRIQ=; b=RU3E/GaF7jouPSzsRG3qrUxIb9LwONZxZcQL+yHqJordnS0s0VwGVmfa 25Y9pNAZ4/DvtIQmpaKBoy0Dimv8kmTv+d58SahSf87x36aGzmkH9nrq8 qrfyiM76zLxVyvW4ZNR6DcfTIGaK/yQBXnt1hOJDNr0bjrciwEL+HUjmT scUEKKjHVR2kJTPjhLrX7Pj0im4PUIPT/UgQEobD8viIxysw45uBBUhrW pCzi2IwUm6u6Y+ke0H5k4xOZ5j9zS4p7+KWteEMRGuPj06o0EZb/eAarN n0tSHseTHJ0UsKHJf2QqjcCM/azUjUmmiaqALYRf5vOW2TFPpTYG4dl+y w==; IronPort-SDR: R/UJecjkn+ryGiP98Qaz4qUHoSknoEIa2mP0pcc3S2CDIafx1DMsuvjZLvUbk9YZRnBP5Mg5y/ j+EirzZNO/jlzIfdVAJ/gSyE/F66vE/qibhvw6U1UebyVJRNLcIVvfBIy/Kzr385ZKZHL6lD69 siqS0cQJT6BnKBwO6rI80gHvmNThbrZs64S7jA1lkAvmnagUaBVH4/8B3uBzdRP3yknNtSBhix yVF6UwIdsZWHidXnQ52riIecE3KYWBUa0TLPyTL/LRhyTzG8Qu0KJGEGDC3whrFZVpRrySreyU TsY= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="124579308" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:48 -0700 Received: from AUSMBX2.microsemi.net (10.10.76.218) 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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 339DC70260E; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 2/9] smartpqi: update copyright notices Date: Wed, 14 Jul 2021 13:28:40 -0500 Message-ID: <20210714182847.50360-3-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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/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 Wed Jul 14 18:28: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: 477793 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 983DFC07E9C for ; Wed, 14 Jul 2021 18:28:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7CAD6613C8 for ; Wed, 14 Jul 2021 18:28:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240055AbhGNSbm (ORCPT ); Wed, 14 Jul 2021 14:31:42 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:36768 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229806AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287328; x=1657823328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7GWo7ZtH3qsEMz3OZG0KlNbXjxhc+zeAxPNwHr5M6lE=; b=ZStwnPkfB4WqERe0VDBUOnX+1KAzOEocykGz1YvSvBsCqfj/8jZfLh8A cFaJjY6liGdB5bEHC0t6idZo1ugPNT6F3xIEOukEJmCSBHeX0OnUFsakv VegyyYpl0Rr8H499spXwotGiF9BsH6pW+tXbyaIA1hpts20VQFDof3rDj 8d3VT69xMANFawjuMuFoOBmycn33VX8+lvUImRD8MhkrQIEUmNI7ssyd5 48FQtUuRk/11b1xBqxjdDmvlJdXMpjmUvrIK5zy7TBio9vaVIdM9dsSIo YX9m2AeyY0HC+D/16juaiKCc7RYb3KcHM7970AaYEialiezeaaW2Xz4eG w==; IronPort-SDR: rsGY4UadCLikoJ2XBTGXz3xFiGGwI3CyaSPeSo1T2Bt9hVKzM6crPFrolNp+cbtHs6hzcoDih8 Am2slXikLIQldo0Z4zaTZmc4kJh+ulsCNCj54thgVqWafBr9HWFqi5V6qQH4r5nO6r9VYOe+7f /r6HRdv6XQc5O+ELb/FqWrnenL2ow/brN5Qmfh0csrd8h4ZrNV8TaQG32Lsg98er/dilsam4sp wzx8U0l8qQ8e+vmQUC3seRTlmGLHBU/NFkCJy+LsJYa0NxOJTi118EGKmlIgfvIf9L1z+ttqha BnE= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="124579306" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:48 -0700 Received: from AUSMBX1.microsemi.net (10.10.76.217) 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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 39FD27026B1; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 3/9] smartpqi: change driver module MACROS to microchip Date: Wed, 14 Jul 2021 13:28:41 -0500 Message-ID: <20210714182847.50360-4-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 Wed Jul 14 18:28: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: 477794 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,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 BCF44C07E9A for ; Wed, 14 Jul 2021 18:28:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 976F4613C5 for ; Wed, 14 Jul 2021 18:28:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239944AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:55496 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287328; x=1657823328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hXxOvXw4eeJpjDBFqXC+wHjs9TywmXrN9BduamjpANo=; b=mbWddmUBwDQEuKk1RrHIBmEXbWH8Quw1aiD8L8pHLeLXFQlH1aLdabif 4FPA0lv9NPMmUKNxD1yP3RqhHNDekhJ4DVKopcS8M3y6zdjY4f6uLJjyr d7xFMy5is93NJJkT0+/xMReGYobY1TZPmG/xZcPJYTxi35euCpELU5pdB mWNX1xftWyGQ+i4/Od0HqsRpCWGZnjUJ+T25efAw56C7YsKjyBihgLWeb AiICXL2BLwjpVtqu6h5GQeXIeZBXb+K+bx7Z6bFa0ggdlDcIxS7o7hEQT 3A5wRCFxVho74mU6XML3gLnwS6nSHHcaIIjoAeDyBlxFVAgznJ+jv+hgo Q==; IronPort-SDR: uf8EjJDclI18xmegvKNl088WOALhUrO7tBiGBr49v6XyTzkPyGKIQujuWRYbmSTnJqRUbwAtfj Fg5H+HNZWClFogcgVxzfA/2BrLfRDOFDAr1dj+XoDfV3LSDOwcvBqn9+pTb/byHjS3E0tnMKVB yl6vqut+o0YmyVUSpgYCHifzGszFEw/GaxUQZF31JAkoEQPmkBSqw5VjBf7+vymGqSp84IrwE5 ahm5g7D+tE6KawofbTY6YWIKI24q+f32nDKyUUQH32q7XBbWFjgC9h7Ke529qXG2LxfVTpY8yQ sr8= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="135875338" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 40494702821; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 4/9] smartpqi: change Kconfig menu entry to microchip Date: Wed, 14 Jul 2021 13:28:42 -0500 Message-ID: <20210714182847.50360-5-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 Wed Jul 14 18:28: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: 477166 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 66942C07E9C for ; Wed, 14 Jul 2021 18:28:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C45D613C3 for ; Wed, 14 Jul 2021 18:28:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240088AbhGNSbr (ORCPT ); Wed, 14 Jul 2021 14:31:47 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:34842 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240016AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287328; x=1657823328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A12LawP3oulzMcsMcOVjEE4RtDeE3oxjrT+YdNBnJlM=; b=d//LhpRsqwyarJ5npGwjGDVeFOUyAnpArvgTobB1tWvAPHfDEFnmcdld kVg2SdCArnDjYW6JjtqJv+6jhm1aqI55K98H7x7dL+zEOkcghRpd0X6dq HeUdS1d5ocIDpCi5IIKZpHzrscTtPTwcQeeTBaicjTszE25toyKqqeGGU VNCZX5Lfv1NrLSo9CUrnn8vUgB5k6pG4Y8WnzUjx9MJq2Jqcmp5j5jEmU YHc+mcZaSdONXWPZLw/GGHRihJ3OjTmDUyNIlDA/xti9S90vedHMw2g4h TGFCf8h0nMTHCzE4tBXGD/nDEkp1AgVt/12KaiB84CGd5mLANm422W2J0 w==; IronPort-SDR: rXLpnLRoaJ2ct6fhaUO/WCzh0HngpBXrCMUJw2Or4XaTebaBJQ76RUv4b1vcy/ozEbkTbUmFO2 vElFU1GNEMObDrTxUhJrltIQDyolkZRWJKw8wVy1kRel+VzieRRZRz7UlGlx+7sWc1Qi/UJSR1 K1iWqMcsHe7DO4wiulWlTkc/g75F1dGX/BFQnNiUMUj2zuidwY5FjSLI9kam6+0pgi3HV/L/7x FMgXuq8MJSk1mlnVrFvMR7eHsDcODpCAl7XuCDMHSC0M7ouZY0+X4k9yVWR7qIoWZh9FRjW/zg e70= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="122053850" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:48 -0700 Received: from AVMBX2.microsemi.net (10.10.46.68) 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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 46A8B703451; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 5/9] smartpqi: add SCSI cmd info for resets Date: Wed, 14 Jul 2021 13:28:43 -0500 Message-ID: <20210714182847.50360-6-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 --- 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 Wed Jul 14 18:28:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 477165 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 DB20BC11F69 for ; Wed, 14 Jul 2021 18:28:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8DE861374 for ; Wed, 14 Jul 2021 18:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240098AbhGNSbs (ORCPT ); Wed, 14 Jul 2021 14:31:48 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:36768 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240049AbhGNSbm (ORCPT ); Wed, 14 Jul 2021 14:31:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287330; x=1657823330; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eC9h7AuB2uBlbeufFeAaVi7C6flhHEAtOrptRD5MlTE=; b=TECis2EjB2eULH23xLuaH1FPvCGrrRGIHCPY5//kndMLZJ267KJp4Uj+ EBcNoVARCdIpgnBNSpbhYGL5lOVZZOFnAZ3tdF05EFV2WxmpETfA/ZLUc HxDmuu4uezDIMwqNknrGoFDCwaOuUdZ2S8ISpJ76lNiiUhrzZoACJlKVd xvM3cssKM/T1On85cCR6TFo2UZCIl+5gMs+UQgGvoFQj1ootH4gsG+EyG 39fTJbzrnqVnq0wJmT4Dr2yAFAoV6oxabEIQ3iwYuOa4X1mSQzWMvhEOq NRm1FZMJACK1wbxo67FFQ0mJOgOR+v43gnymTy1hXT7EATKw15WAhQPt4 w==; IronPort-SDR: 5PuP2DScttMCZQHbUPc3nXur2vM/wUIw/Q8/cphuMP2PORCeAtXgLV6R2YEAccQsyYiUb1wi46 GukW6VUEljgO8V/z3XyMo/BTpB9UPkQcppVmDGlJcJgTS7XR6YuBIaw6GiLCxx91yQuDzVk7nD biHGY5QZRhDhMK14XyJN7VvcGj105csjzWklbk7441Bs9gXvIhNjixV7Ldy0LJCa8J7DDf2aKq KCH7KJTizqd01bQWO+nc8AD5hNrnKEV37bjgl6xNphCtl5/d7V+ji0tUYCJZGbAbFY8BMEXrlV xX0= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="124579313" Received: from smtpout.microchip.com (HELO smtp.microsemi.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:49 -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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 4CBE270345A; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 6/9] smartpqi: add PCI-ID for new ntcom controller Date: Wed, 14 Jul 2021 13:28:44 -0500 Message-ID: <20210714182847.50360-7-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 --- 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 Wed Jul 14 18:28:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 477168 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 D2FECC11F68 for ; Wed, 14 Jul 2021 18:28:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC5E4613C8 for ; Wed, 14 Jul 2021 18:28:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240065AbhGNSbn (ORCPT ); Wed, 14 Jul 2021 14:31:43 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:34842 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230154AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287328; x=1657823328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LFpZ+CYZzqb1YpQvsDbpspaRBSX0vQfqNpAp5FAHVuQ=; b=j7BDWbX7mOX0+uLI+1lvTR6fCJSKdX+8Ud2z5ZWvxGXpgUJ2+V33s7nx 2+Af/vb/q2BU9pXfMfRrWNb+hS7BLcQCZYqEKym4c8KNp52Z6XMvRGrGJ d6ypvRhBAk+aiaWx8KfIR29kdYh9OKaUNVyYsjLG4/iUkgw4NiQa+bN+T XOvmWuODJmpJTRjD5hgVNSGVjeuRfIca3S+3hyEZ9J5NBrEFo6RoYCfCc 9QTHHp5oVkxapDmVMn6qFxpR7MQk5ZduOqvlOcA8A9ixJSkxkQkNEEMYL DD39Zm8/z6NEEj2yzF+XiwuzmnrwIQdq7jH/vCQ/ovUmxDE9XG0D2mSk0 g==; IronPort-SDR: 7aXrA4IZH8g+83YxKBqJV7n6Xpe9JLzBdqblJxp6iHPkFs3jdiBtKMm1YtOZQlwPstkBtycIU4 8wqlNHj7U+rkrn4h0VuUTk1lNmGQPZgi/nCcE/ELG9BaZan+MbdTOjsso/EQDIjU5d1nUAosOr E/movizdG9gfsUWP8VG3uYwcbmpF2NHpVyzyWvq9IAn09O07UNj8gqPsxFn4zmicTYp5+jECq4 6127XDwkC+kk7YvUo/zPWTl8u4MPOVf3hMlfXREhCPQziNOL8H1PDF+X66Z5cClOolfjz3U9ZR Xyk= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="122053848" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:47 -0700 Received: from AVMBX1.microsemi.net (10.10.46.67) 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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 52FE370345B; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 7/9] smartpqi: add PCI IDs for new ZTE controllers Date: Wed, 14 Jul 2021 13:28:45 -0500 Message-ID: <20210714182847.50360-8-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 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 Wed Jul 14 18:28:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 477791 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 F07DBC07E9A for ; Wed, 14 Jul 2021 18:28:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC29F613C3 for ; Wed, 14 Jul 2021 18:28:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240083AbhGNSbq (ORCPT ); Wed, 14 Jul 2021 14:31:46 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:55496 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240007AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287328; x=1657823328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YCU1lNbnN3QiScgV4I4qmlBlxDGRHX9C+VP7ZGwbfYg=; b=2AEGO/AArr5VDQPA9ujtadgIRaQqgyhWRjl/hot8O7Q9t1Ii1DqN1Ru9 oP9/w2Jt8uXIBcAIKEb+mepy6ImWspXcJDDyR+Ip+HVotrIBIAbi/aJBD KAz7sskl8cw7uGar9PcIW6nRg/igU5HrBLkaRM5WnKYnX6qYpNvpLXELo AP5fVlHeyvhbz/bIilmTKlL+5xWfNsf7Nt4+LtWNLoNHncL8YmEUx5NKg T51pxvYFLu1tUVAU4DSgy9KDEAWEvSrB2JtIecoNlGToNymySoC1lSbOf 4777scFpKVQGmX3YqyGLvuD6BNqeaJN51vGf2Gn+DfgfqbnH18eDK3s99 A==; IronPort-SDR: RvAJnvaO8m8cdFmG/3ImMEzxHkbbN8HR9VpV9Njb78jnlN/p3xJqiixc8wi63QDcEl15T36lMG k3ZDKbJm5Ubsn2rx3poZdTje0gtI4yPpxDW3FfNR46aP+IgyuD0wif3OwxR+tOkYz2Ck1anIbd 1b45doyga8gwT4rf+8B1GwNdjBbIaUGr4ht0y946npZXOXxHF98j3R9sxCKAjsoXKNcJDRnL2D aEr2R3/LI3Illk4cmRPpxMf7BmFUeW5nY52Qr1iG3elyjrfE+ogfreJaRzmqpT4qmsbyf7DQq/ 4qs= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="135875340" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:48 -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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 5956C703469; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 8/9] smartpqi: fix isr accessing uninitialized data Date: Wed, 14 Jul 2021 13:28:46 -0500 Message-ID: <20210714182847.50360-9-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 Wed Jul 14 18:28:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 477792 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 8B669C07E9A for ; Wed, 14 Jul 2021 18:28:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7354761374 for ; Wed, 14 Jul 2021 18:28:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240057AbhGNSbn (ORCPT ); Wed, 14 Jul 2021 14:31:43 -0400 Received: from esa.microchip.iphmx.com ([68.232.153.233]:55496 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230211AbhGNSbk (ORCPT ); Wed, 14 Jul 2021 14:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1626287328; x=1657823328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nUrPuatobHKMHbBSvnB/MtWNobqFZh/U9CeTgX581Hc=; b=qJDWQj9pchcc9Ppv0sgI0jHpFHKWkm5Mo4Cw0c1PzZLabubXsyV/XMMV Q9AmWCtkSCtzVlwFTTzuINUiS2roqUtrTnBJ6f+ijFGxRQ1vh9YJwC2W6 kTWLq5Qnfc/r1RBMsjAe84Au1zYfivW4cLeG4UO4FQGuajGkXpHvWmCoY BEfuE1WOmb9uJRekFeI9BySvvRIwnjRodFW9xMtNdKWHSSLhFVW82M5V/ tO6b2k05naeRcQgKx12INc4whUhUmGcyRvzn7CAOHJo/cHHOXUDAndgFR jIG0wen96ctq6LHdQJJIns68vjmd1uvJD/VD3ik39MDapavlcbhAUDD9/ Q==; IronPort-SDR: BVVGlpckuDz33Y4MPxP6wSu1Mnj93l+4QZYQKMwyRtw7AV566LwsOxFydKj3Eixkz0IzehaVw2 wQfJ4v2dTOKTppqCyTFWECjyTUnj265Cdpf1J2viRpOSSmg4GZMMyNNxupRck9CzDv8Rx992/+ xnSuHVvpgqf2wDe55kch6pU2ItgsYhpAqfT1LyWhdcw720ppU+uzEzcQ507u3qqXXrZyh5uWcz i5Fdy5GURDp9frwXLT6je5TE43bblNDt/ccdpZCqOY+jdWBaWmlt78XwhwrBsjUwVFyCFC2qN9 bXY= X-IronPort-AV: E=Sophos;i="5.84,239,1620716400"; d="scan'208";a="135875339" Received: from f5out.microchip.com (HELO smtp.microsemi.com) ([198.175.253.81]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -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; Wed, 14 Jul 2021 11:28:47 -0700 Received: by brunhilda.pdev.net (Postfix, from userid 1467) id 5FF0F703472; Wed, 14 Jul 2021 13:28:47 -0500 (CDT) From: Don Brace To: , , , CC: , , , , , , , , , , , , , , , Subject: [smartpqi updates V3 PATCH 9/9] smartpqi: update version to 2.1.10-020 Date: Wed, 14 Jul 2021 13:28:47 -0500 Message-ID: <20210714182847.50360-10-don.brace@microchip.com> X-Mailer: git-send-email 2.28.0.rc1.9.ge7ae437ac1 In-Reply-To: <20210714182847.50360-1-don.brace@microchip.com> References: <20210714182847.50360-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 ")"