From patchwork Tue Mar 7 18:28:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65786 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2625209wrd; Tue, 7 Mar 2023 11:43:05 -0800 (PST) X-Google-Smtp-Source: AK7set8oWgEUdKlgsmG2f7O3GhSTkxo8vZlIrGe6hCzMPfuOQ5XxyVQZjMse5ut50JnzyxdynYrp X-Received: by 2002:a17:907:c292:b0:8b1:7569:b51a with SMTP id tk18-20020a170907c29200b008b17569b51amr15606484ejc.53.1678218185700; Tue, 07 Mar 2023 11:43:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218185; cv=none; d=google.com; s=arc-20160816; b=m0+kTbxoAgR2osEWllP4BBwHbpsolEQ+SvXJU/NIZDVAMByl+vOW0oYRvJCOvLp2Si +nSiX37MzdoEkXWGWDcJ1ShB19XauCo0M5YQLaTfUT1wnnmzcxc3EvoK1IqMF0EKCKsk jjU4Ch1dy+cCAUb2LlxrmcRVPZoMvN1mjXg1FSpkgQCxgLYtaymBpJ9haurN4YYlm3zY 4Ouw3Dcf8KNY5Qm5IOmbeyRXyXlIXAVDmD3S7t/2QPbUoYAFtqC1cIqAz+pCcal0ROXf 55mTWYt/EYcIJ4adMeWb1rnFmVMVDUWkhRo8IqJhWLcTWnZOpssXIdnWxdSk4CRv+kOG ciRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vqth9XyQw0nHi4+kR5qhYBvZivnG4d9gGVX5OOA3ErE=; b=GQjMdvNykfQTPTNIRDKrrYBw7BWdUw5HAu4brQ0u298woARM+0J9Au/QjfggVJDmZr wSQsEAEPpQHe5IXLFfctfl4ND+R2+dXBcOmHCRaXNa4B8wKNfM9B1u/UibiV8l3Y8aQ/ z+SBgkF7VMMx3Sv6HrEqSk7u0TFTJAR1v63APBTuT0VZAU8YSuysbUcnBlQt8H4EgAto k6tZeqxnBQTZiQ0jqjn7aHB9ZUMKA2Yp98sjqrAnRGDsXsPLIm6ddu89kgcCWPfEcuHy nfjtznci7KD39dvnWG1BmoEJycSUoj7o+R2vk1J8YMH7yFDyTjQQH5ws4Mq4E8lzu2R/ cITA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=s+aAKQ8c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xd7-20020a170907078700b008b3b05ca5ebsi2293831ejb.40.2023.03.07.11.42.42; Tue, 07 Mar 2023 11:43:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=s+aAKQ8c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233310AbjCGSuJ (ORCPT + 99 others); Tue, 7 Mar 2023 13:50:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233337AbjCGStt (ORCPT ); Tue, 7 Mar 2023 13:49:49 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91B069AA31; Tue, 7 Mar 2023 10:38:19 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AA1B561535; Tue, 7 Mar 2023 18:28:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3604C4339C; Tue, 7 Mar 2023 18:28:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213733; bh=XS+PFEsEIiwF3n0OJvyDRAlYdXATlWQBybPUUa+WKYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s+aAKQ8ciAPb9rvkw6XjR6NZIhXrGgsAd/Bs24BFlKdtLuQr3RB8e3V3c+wAKK3Oq 5ffQKPaJUcIhsDJHW6ltC6X9g1ziyQk4R6qs5xn2Pog4UdMS+ffKYuUY3W8Vt9uC2H NrVjtkjyjPVtiSblulTvcNS1I5VwEH3yB2jAED0ifXjLE3R3n5J/Rkg8BuFQwb2aAg /wE4bj5113RXlH2Zqt3tOikBVnKj4T27Npp08zqcaLUPY1UJ+wwMZ/9cdNOnzD0dpP z5yhPQHtdmxDZcXKbTrN9/EKJbADK8ZjrjO20YIuDVswFVFAJWk/WyBtrGmawOG/a0 GlygUW033hB9w== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Adaptec OEM Raid Solutions , Raghava Aditya Renukunta , Tomas Henzl , Johannes Thumshirn Subject: [PATCH 01/10] scsi: aacraid: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:28:33 -0600 Message-Id: <20230307182842.870378-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739311866756300?= X-GMAIL-MSGID: =?utf-8?q?1759739311866756300?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Also remove pci_disable_pcie_error_reporting() from the .error_detected() path, which was added by 5c63f7f710bd ("aacraid: Added EEH support") but looks unnecessary. Error reporting will be disabled by the device reset and will be re-enabled by the pci_restore_state() in aac_pci_slot_reset(). Signed-off-by: Bjorn Helgaas Cc: Adaptec OEM Raid Solutions Cc: Raghava Aditya Renukunta Cc: Tomas Henzl Cc: Johannes Thumshirn --- drivers/scsi/aacraid/linit.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 5ba5c18b77b4..43160bf4d6a8 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -1783,7 +1782,6 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) aac_scan_host(aac); - pci_enable_pcie_error_reporting(pdev); pci_save_state(pdev); return 0; @@ -1949,7 +1947,6 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev, scsi_host_complete_all_commands(shost, DID_NO_CONNECT); aac_release_resources(aac); - pci_disable_pcie_error_reporting(pdev); aac_adapter_ioremap(aac, 0); return PCI_ERS_RESULT_NEED_RESET; From patchwork Tue Mar 7 18:28:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65775 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2623136wrd; Tue, 7 Mar 2023 11:38:23 -0800 (PST) X-Google-Smtp-Source: AK7set/wRHcMGIji2WH9HHPfTyYQVhObeh1neukzh4KI1fxyqJSK2yYwEcU0QHDbK7G+lPiFW3Hs X-Received: by 2002:a17:907:7212:b0:8b1:75c4:abd with SMTP id dr18-20020a170907721200b008b175c40abdmr19101068ejc.15.1678217903044; Tue, 07 Mar 2023 11:38:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678217903; cv=none; d=google.com; s=arc-20160816; b=AxWH11RV6M/6ZlJTsApYoXzLXbJKVnr0b2YD5VuvvanfDgpXGObjKddkCoIdfOuEaS nto9ws68CKQr4iAGhiP1Ly4lDg1mkKxk4u5uq2IyZ9cK8DR8Q54GvWme4BoGJajneiaM vtXLo7jaIlk9aH9hSMSwPKqceXrl5/QqQvRYTKL17MZ7egO4UH/BbX7ZB0Ph53ZM9eS/ 8p08fv/XVq94F5bVUK0xDxFvfbz2T0LyjA/o/t3VrexM7ZWDbwysUbTAGGrpyB1okXKy rVaYHc3F+NWpj+teMNX8SKJJiKOLyUdQXvhXTsTH0ihnwYbBgDvy2bEih6adIOg24OrD BRMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4yrQVyMk/nCeAlfe37xGd+FF6RaUphSfoNcibVZTkJc=; b=IpXoo8tIEZC2I7IPp3/rM6NuvXy5nP8E9cnYsIodbsCt/MGA8kXGbQXLCqtxl8qoR6 HknkxRN7hPDL8U7X/IDwC3BXaykQY73bMNNmLfuqfU1i1yt2xgEmKZpIt90+xutsXERm 1k+bZEnaVNxciW6zFVmhJeRYVtCmohCBfKghkCmw0HWfA2jqIOpbEItQQu7wwG2y7yrI 4NOsjC+hwMQyN4AIbqwzfOiI0ksN6+CFs1eZJH14wjKMQRNGLdc8/E39l7lmRtgDFNS+ 6gIMNzuJqpfpV+/e4Itv8JvhnNn4EObFUpVjiTfsXDZkCrOU0DSxPHhlNp/H4C/wEzXr Xsfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pKAir1xm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ci15-20020a170906c34f00b008ddf3c182fesi4394517ejb.313.2023.03.07.11.37.59; Tue, 07 Mar 2023 11:38:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pKAir1xm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231483AbjCGSph (ORCPT + 99 others); Tue, 7 Mar 2023 13:45:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233304AbjCGSpJ (ORCPT ); Tue, 7 Mar 2023 13:45:09 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 371ACB7892; Tue, 7 Mar 2023 10:34:57 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 33930B819C8; Tue, 7 Mar 2023 18:28:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4B7EC433D2; Tue, 7 Mar 2023 18:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213735; bh=OIhHmt2mnVsj3tF12NCkxNkZk2sHr3gGQeR6T7IdeXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pKAir1xm950sFtlcYl80bwtjz9HkP1qTD3IAxsc2XVk1pbEzDWfub0f2moNJXbndc INf5FRhN+ARZEKaFr9yQw8MV23msDm6/wwu1gdEfzkpHZ/1zY+ETDfrklfKXpNGFiO kydB+qWt0GMjfu7JNuIb+TBNnm26+i3idJCIUir8CqQ+wc6ONRFyUFm+oxyItXSj+4 m06It2oCrrxW4owGhcWvGW5ctvOzgZKDlPOMWoHOdaKiKe2hUJKvjLwGLZv2WrV9Yt 0qKPHVyVH1RaefFkLQqtCcQxqtL2/HWMadJzJuHggFK6AuBohnnsGyNOMNxKj1ea8a 8EcmjP/nzoBvg== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 02/10] scsi: arcmsr: Remove unnecessary aer.h include Date: Tue, 7 Mar 2023 12:28:34 -0600 Message-Id: <20230307182842.870378-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739015576957758?= X-GMAIL-MSGID: =?utf-8?q?1759739015576957758?= From: Bjorn Helgaas is unused, so remove it. Signed-off-by: Bjorn Helgaas --- drivers/scsi/arcmsr/arcmsr_hba.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index d3fb8a9c1c39..9d04cb6e62fa 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include From patchwork Tue Mar 7 18:28:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2626651wrd; Tue, 7 Mar 2023 11:46:42 -0800 (PST) X-Google-Smtp-Source: AK7set+ZO9bQLGk160L5NkSpRNBwCwg3ZoxiRr1pFiOUcerMAqbQDgF+syWPdzFBkWt1WQebPGUW X-Received: by 2002:a17:907:728e:b0:88b:5798:2613 with SMTP id dt14-20020a170907728e00b0088b57982613mr19735529ejc.20.1678218402234; Tue, 07 Mar 2023 11:46:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218402; cv=none; d=google.com; s=arc-20160816; b=ARjftJxVDkyU/12aOYpGjBt8IdQJVhkeIxbOVvOQS8A55WHicRrlnJKPR8vLXIZHxD tZ7coUb8CQ+ZGiWBp8KcY0PVp8bRLj3elQn2hlwVI3iQWF6fi93cPg63islmRqYwR6NB y0RnuTPLWze7IygW5cICRIF60XP/5JvS2NNPpKkXdM0WiaJI0r/MJTtxfU7djtJWJG5n a1zDfIRpNGnQ2MStnUjNb5Ah5D0Wzfk6mmPZ3KDBSPUGpFFJjfxCFduz+QWI7yFEiksi kopoEQv83nTcc2D2MQrjKhXGfQA+Dx5hjS8GNq5QcmU3hqbHTF3JpqmW/gJJvR4b3ji7 +fSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=A1UAInyvnJ7QnBcUGEppkjtnRA2FcIJtyvz8e4Vv830=; b=COBpfBMUATVecGyhasmyOLaT2kHnWWO42c8Ty66YBIeGNLg6562nFqeFxN+EDQcr+H Zi4chUVc3O23ItxXZVW8ZRP5hQElmTtzS4Yw6TW1GilSKePN1waCfDBcoy+YacIspp7g w9bA9Y/5oaGJ90W8L/G1Ft276cswsttpHGiYIbz25MSFy0FvnUNRcoe/DLb3flP6NOz4 mYa26ytkfIpzzdSf7+n4yZKI488B7FXQHaK4RgXdbxi7eXVYe9cbsTsjMrnb3yRkLgCb ePGAh7iXgAfuJaRT+tNP9HlePW+DpIL6Y02HMjEmnZt7VY3gvuKB2JwKAUrhFVE9smuC rOeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tvRTfYfC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l19-20020aa7d953000000b004accda9fff4si14093108eds.299.2023.03.07.11.46.18; Tue, 07 Mar 2023 11:46:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tvRTfYfC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233520AbjCGS4c (ORCPT + 99 others); Tue, 7 Mar 2023 13:56:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233513AbjCGS4O (ORCPT ); Tue, 7 Mar 2023 13:56:14 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88EA69749E; Tue, 7 Mar 2023 10:43:42 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id A6799CE1C79; Tue, 7 Mar 2023 18:28:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0F30C433D2; Tue, 7 Mar 2023 18:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213736; bh=3JdjywG6DsWfWzdvnLIaNQak/6ZVrelHGxK1Jb+bRtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tvRTfYfCSLh/IziCDBzjHgXEvc0lyIja1XSjGQKUO6wnvdwH8JANNu7u651awRvem hX5/li75IpG+veKKl+988VGOcqNgjqGj2szYqfWShD4a60S0cOc5bMXjQXXB2AmBGA l83ZS7yFYNEUhHdcG3ElFzNtSZ6Brkz2aypJJlzaEliKmpXpNL3468i81xyqPf/YzM Frtn4G9z1RuT4gS95ggjuZd7qysoazZFtCzU0onGYJDUASzG0LV9OjaJ0e6wp7Bwgb +C/VVR/nFuAKNdQt1u/4ycjYeu2cL2OZTqGBKuAHNqluODtPXf6hVfQXMdjXt6+oMv 7CUHbBrFoQL7Q== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Ketan Mukadam Subject: [PATCH 03/10] scsi: be2iscsi: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:28:35 -0600 Message-Id: <20230307182842.870378-4-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739538894895727?= X-GMAIL-MSGID: =?utf-8?q?1759739538894895727?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Also remove the corresponding pci_disable_pcie_error_reporting() from the driver .remove() path. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: Ketan Mukadam --- drivers/scsi/be2iscsi/be_main.c | 9 --------- drivers/scsi/be2iscsi/be_main.h | 1 - 2 files changed, 10 deletions(-) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 50a577ac3bb4..0aaf6fc47683 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -5545,13 +5545,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, goto disable_pci; } - /* Enable EEH reporting */ - ret = pci_enable_pcie_error_reporting(pcidev); - if (ret) - beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_INIT, - "BM_%d : PCIe Error Reporting " - "Enabling Failed\n"); - pci_save_state(pcidev); /* Initialize Driver configuration Paramters */ @@ -5736,7 +5729,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, pci_disable_msix(phba->pcidev); pci_dev_put(phba->pcidev); iscsi_host_free(phba->shost); - pci_disable_pcie_error_reporting(pcidev); pci_set_drvdata(pcidev, NULL); disable_pci: pci_release_regions(pcidev); @@ -5779,7 +5771,6 @@ static void beiscsi_remove(struct pci_dev *pcidev) pci_dev_put(phba->pcidev); iscsi_host_free(phba->shost); - pci_disable_pcie_error_reporting(pcidev); pci_set_drvdata(pcidev, NULL); pci_release_regions(pcidev); pci_disable_device(pcidev); diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h index 98977c0700f1..71c95d144560 100644 --- a/drivers/scsi/be2iscsi/be_main.h +++ b/drivers/scsi/be2iscsi/be_main.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include From patchwork Tue Mar 7 18:28:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2629326wrd; Tue, 7 Mar 2023 11:53:38 -0800 (PST) X-Google-Smtp-Source: AK7set+hjtb4I8vFjHamOm5rEnJEdU/X38q7czkMWyfflV+YbYsbbn2yJ7JV2fQ+Frv9vksUVgh+ X-Received: by 2002:a17:906:2756:b0:878:79e6:4672 with SMTP id a22-20020a170906275600b0087879e64672mr12673560ejd.42.1678218818388; Tue, 07 Mar 2023 11:53:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218818; cv=none; d=google.com; s=arc-20160816; b=fRtpp2BbczmXfQnmBw+hkXpvjBWpl/yL0LP9YWOwTFcpcg7//k3gxeWc82Ey5s3NFx qHjgpIKk6BbTgB4J4dT9WB1AAW4/cUHcyhzAfRYFhvBESN+S5bh7WCPM+BbQkxpmn6us XEQZanvPVqly+FocNDEx0jlaZAI4P+Hgi16pk0Pe9zIBpsWoOfHGoGzHWspH8F+WMbuT RR1WCAAwrCUifMbDbU//PLAqFGf2O282FHCA0ZZGj7F31QYM66bgDlLEoyca4zxiSJWS 7PperEZ4QUgaW5GKrAXPKcWlEvpJwQGH9pDEaREFemsmbxcIzwAJyp128GxsQ86ul0lJ qiEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GBHdwrTrm2QwPw8BnhURtXmZqzzcgV+8tCoWv7/Ql2w=; b=yV4rqeZxJqB6bLV+9iKf4ewH8y39J11Zalgd6Fz/5A3GUwK/YxWl3Lsi1jatcLCxqd yA8sLnK26BQu1mnELWvzuTkWze16MLjMtQgltKFM0HNsoyw2XDpHyiwhwOhEKptYHgmQ nRqbmfjTemDSBkKwN2e5OLdfXPHH38bzWA0Otty6aaddN5MIZyPmSPI6vA2wqR6PEmQ3 ZQncu/Bq1EGWZn/9LMuvL5yGc4FU6rmPhRguACmH9/JAvlL6gIbLRKSymVKqmXbwNXvs LvE7XEUo0s9eiqfE8x5UkELLPdZFsx25lKmeEeUOH99iz7rlooklD4eqLPiw41Fp60EZ BOaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t8HGFNMk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ci15-20020a170906c34f00b008ddf3c182fesi4394517ejb.313.2023.03.07.11.53.14; Tue, 07 Mar 2023 11:53:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=t8HGFNMk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233175AbjCGSmu (ORCPT + 99 others); Tue, 7 Mar 2023 13:42:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231300AbjCGSlu (ORCPT ); Tue, 7 Mar 2023 13:41:50 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC4EC9E30E; Tue, 7 Mar 2023 10:32:26 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 726B1CE1C85; Tue, 7 Mar 2023 18:29:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95C80C433AE; Tue, 7 Mar 2023 18:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213738; bh=sxhOUKyK/NsC1MzrNzYBeE7kuwoED0rqhP9R9JiXQ3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t8HGFNMk4sJ7JvkVF9YJaqueJncGoydFlLJnNwSGxSxKXyYHv0fBeoPg3MUFQDLBa tPTfvdqfiyqOpnhWUEO2+AkaAbb5Chn8COeK6LZJrB++fwGRv+uI2HsOEQ9zquY19J KR1BYAzcUGIGArw5s6U7u6UIhUMnOwrq865wfsvERv1wiHGDaIDW5W77rPLxmlU1Nn +KlC8gboOR8gPABhqyHOsH/zh5K/duy25zCpG+cwCZCfU4DSZx68sYszBiZtf0VbpB RWVr5X2Y6IK7Y03amLzW6gewbFAq78Fe9ZhraC2i9gNkKAkg3wy4w4VnWE7UnDD+1g eAkS3AEfSP80A== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Anil Gurumurthy , Sudarsana Kalluru Subject: [PATCH 04/10] scsi: bfa: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:28:36 -0600 Message-Id: <20230307182842.870378-5-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739975376014934?= X-GMAIL-MSGID: =?utf-8?q?1759739975376014934?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Also remove the corresponding pci_disable_pcie_error_reporting() from the driver .remove() path. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: Anil Gurumurthy Cc: Sudarsana Kalluru --- drivers/scsi/bfa/bfad.c | 6 ------ drivers/scsi/bfa/bfad_drv.h | 1 - 2 files changed, 7 deletions(-) diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index e5aa982ffedc..529b73a83d69 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c @@ -738,9 +738,6 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) goto out_release_region; } - /* Enable PCIE Advanced Error Recovery (AER) if kernel supports */ - pci_enable_pcie_error_reporting(pdev); - bfad->pci_bar0_kva = pci_iomap(pdev, 0, pci_resource_len(pdev, 0)); bfad->pci_bar2_kva = pci_iomap(pdev, 2, pci_resource_len(pdev, 2)); @@ -801,8 +798,6 @@ bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad) pci_iounmap(pdev, bfad->pci_bar0_kva); pci_iounmap(pdev, bfad->pci_bar2_kva); pci_release_regions(pdev); - /* Disable PCIE Advanced Error Recovery (AER) */ - pci_disable_pcie_error_reporting(pdev); pci_disable_device(pdev); } @@ -1562,7 +1557,6 @@ bfad_pci_slot_reset(struct pci_dev *pdev) if (restart_bfa(bfad) == -1) goto out_disable_device; - pci_enable_pcie_error_reporting(pdev); dev_printk(KERN_WARNING, &pdev->dev, "slot_reset completed flags: 0x%x!\n", bfad->bfad_flags); diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h index eaee7c8bc2d2..7682cfa34265 100644 --- a/drivers/scsi/bfa/bfad_drv.h +++ b/drivers/scsi/bfa/bfad_drv.h @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include From patchwork Tue Mar 7 18:28:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65791 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2626476wrd; Tue, 7 Mar 2023 11:46:14 -0800 (PST) X-Google-Smtp-Source: AK7set8YxTfa3hEGaLko/1sz261amA7pT5/gf7ndEt0loROxPyrnen42FBgvPzh06V/Bl6LtVSoS X-Received: by 2002:a17:907:6d08:b0:88f:9445:f8df with SMTP id sa8-20020a1709076d0800b0088f9445f8dfmr17836207ejc.21.1678218374586; Tue, 07 Mar 2023 11:46:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218374; cv=none; d=google.com; s=arc-20160816; b=OSXKSVBj2Q2vxpumVrYj7P2C05mZcC7Tg3Bq+vHuU+LxPtdziIjbPpSqZ0+9nM7Yn4 vL63cpxI1QoCIZfy2ogtnNLZz96mi7DCuRJv0KQG0FFICG2PJXqdQ5Ms26JS2trOzISp syf5xVKuE897SQahjePHjWPrpm2TatRWOEjJWcM/StpUfj3kk9hEWceUqxNSDLKSZ+Oo 4pKBoznE2CE1HS88xqZd0v+jFouVySXjE0FjRjsnoBLQWCiRotZXViJQWMlTmQLa1JbK 9bUFC9ifCxFkiqTwCiTXYqKmOhoUWGDt4vbm/TfrRAHf5GagiFXP/18XC7JLJHNfvROs tEaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1dpRYGBNA/Gpa94psvOR1ELMGDm9ifLE2DzYyIAAH9o=; b=iiY8v/bNanKPRd/IIRipET8S6chuI4Qo3oXgBAsh1M6vEVWvpVxmhfpFh+DYoFwA0r sIk1hy2K6xU/bLGhBtDTNGIempa+8TaEM4CltXDcQMayTukhfJYOk/PoByO3p3rQxoFN xHMbggeS1IQFOyJ5Krfis+x5CCdWGQw1/XmQ7rs1xcM9FLPs9cEFA0C2xRcfKc52eZqo Nkh/JfGUSJuvKotWOVZAXk5/jddXm1c/kIOtCI9EPOAlGuHhB6qViK4mq42baed41HEs dpualHGR7OXHNqlJb9SuSYntUqQp1IMXkkhyuR9DKUD1xPaR5EgeKkYE6u5Ph7E+PjJh GArA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qID2ndgL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i23-20020aa7c717000000b004bd4b029f4fsi12192550edq.297.2023.03.07.11.45.50; Tue, 07 Mar 2023 11:46:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qID2ndgL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233190AbjCGSnv (ORCPT + 99 others); Tue, 7 Mar 2023 13:43:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233172AbjCGSnL (ORCPT ); Tue, 7 Mar 2023 13:43:11 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3363B9EF41; Tue, 7 Mar 2023 10:33:34 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 0AD26CE1C86; Tue, 7 Mar 2023 18:29:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67791C4339C; Tue, 7 Mar 2023 18:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213740; bh=86KQLMriTm2rEbApaorsRI4bA6ciwDz7r8N+iPI0q2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qID2ndgLHMBKTJVy/U/jXfv4TjPd/cIaAVgijlVrj1laJ87yNDO0eGQ0/hwasTYoc del+NqvbHWY5MvRVSX3m2CDfe4iADyLHbMAVnb81wcPsPgOenD5YCHFzlcbrZC8/yl nQukjG0jQiNEVh9ukSkKd21aUzfTHQv/uXomatL/8zFcLFvR+LFnb3Tx7+6UevX4nQ mJ8LxPPLBNmkg17nE//GYNYKXPaTAmi/kz7zGyZokTfrxW2IZCnaiQ+woUy0uH05g1 mWnscDXkBf2OAFhlvDcGzRtnewFThEQ6cdf+05Z7UvjwwHf/Cl3KyLD1W7kWt51Fi/ QrBG0sqxwN5gQ== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 05/10] scsi: csiostor: Remove unnecessary aer.h include Date: Tue, 7 Mar 2023 12:28:37 -0600 Message-Id: <20230307182842.870378-6-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739510228684296?= X-GMAIL-MSGID: =?utf-8?q?1759739510228684296?= From: Bjorn Helgaas is unused, so remove it. Signed-off-by: Bjorn Helgaas --- drivers/scsi/csiostor/csio_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c index ccbded3353bd..0c32faefad7c 100644 --- a/drivers/scsi/csiostor/csio_init.c +++ b/drivers/scsi/csiostor/csio_init.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include From patchwork Tue Mar 7 18:28:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65784 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2624888wrd; Tue, 7 Mar 2023 11:42:12 -0800 (PST) X-Google-Smtp-Source: AK7set8OTH/PktUYXqm5np70GlBTPUGL6rC4fZQ3LnDYw9hiTn3PScdlZNMbLCbpgJAklKEvFpfN X-Received: by 2002:a17:907:a602:b0:8f1:939b:9701 with SMTP id vt2-20020a170907a60200b008f1939b9701mr16505361ejc.66.1678218132589; Tue, 07 Mar 2023 11:42:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218132; cv=none; d=google.com; s=arc-20160816; b=dRbYtlWCKmtHsGEjnGaMRjAuRV68ocGNUPcKoGHoNeoKA7eufBJS+hzDV53pEZRsXT SHSib+Pi4WUcq1Q5r3ukqxPOBh9JUZqno7KdmUqxmCUFDgEs79Ot/04yYrlCIBqRAG7I pLFaouLfXAqa2nT2KBQZlOpdf/4CsnH5eWYVK4MTLu458cAWwzM509Clc2JrLkIy4hWN fj19JfEHPjvT+tgW+676xnVP+q1RS78ckXp2ApHxs8rQrmXEj/xobZ6LTwDwCDj+LVE1 cZbZjhVdJaMW2ysJxMQLAP01jg5+qVvejbHVG1vhX6iwkVNTTbNaL4Tps/CoP0okp7Ib lnHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KgbU4Qstjo3EDlpeAH8pczDHYe4I1K5K0fGV8IkBpBc=; b=Z5kWjuRepRfQF0bXzzpRJSvpzjlvFicW49WFYIyb0BAycYsGOfgEivqsytqBDOIQ/D ImiuZ5pgUrDzx+D8DgCV1yXYEcSNjsWEYgrQuMKaDMzoJQK370f8mlWmyzrx7xKcx6k3 zcgny3qRi5p6Se7yfAj/Rv3bUkAmD6i4B7S5dgjGJWJL8QMGtT8a2sGwtOx4kKQdm4sD 0FxAL6wdQs20SeaVb1lxorwre+us9bFo38VZ1v0uN2zYTI6ioGNOxjIFldKhWIbDYF3r sx3dUozvtRJaiP+tbxPFCZDEUxiDu7v/TzbX0vnOrHph/gvDNsscI6w/V4epotecQ882 Ma5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SY7quN1L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h12-20020a170906590c00b008c881a284c8si12761964ejq.395.2023.03.07.11.41.48; Tue, 07 Mar 2023 11:42:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SY7quN1L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233251AbjCGSus (ORCPT + 99 others); Tue, 7 Mar 2023 13:50:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233226AbjCGSu2 (ORCPT ); Tue, 7 Mar 2023 13:50:28 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E005B049D; Tue, 7 Mar 2023 10:38:50 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 97208B819CB; Tue, 7 Mar 2023 18:29:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 351E8C433A1; Tue, 7 Mar 2023 18:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213742; bh=+PdG7LuHo65TVW4uUUZYYgxV38NtxliWQLubFtzevCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SY7quN1LIgI9KYymuTOsWKvhQ5k0evvTaneTECnRFOvHxsEA9nDLe1yAlauzuEaeA wBJGLPGQ6jDCt2CFx+ELZyKZSjdC9s5tG/zRpS1jKQMONKJHjILx6cHD1fNc0DGCus dscMFNuOpEB57RsRHo4LyLf5ic1cTvp00XWxO7yady8VcOPU7UCWXyeaDT8wKw2Zyq QSfgdJCv5DNax4W3/7I06Aa5KCkov98uVmF8wh2ugIYWoPGmr9myfHHcbuWSQRD/K9 R9/V9++fAGNuVSVdwE+epUGjC9RTz3Hzjj+NSaOGVGBfDHBnpAOYeu9mKfaaqbw22M dOpMu/MIdj87g== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Don Brace , storagedev@microchip.com Subject: [PATCH 06/10] scsi: hpsa: Remove unnecessary pci_disable_pcie_error_reporting() comment Date: Tue, 7 Mar 2023 12:28:38 -0600 Message-Id: <20230307182842.870378-7-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739256714439957?= X-GMAIL-MSGID: =?utf-8?q?1759739256714439957?= From: Bjorn Helgaas 105a3dbc7452 ("hpsa: clean up driver init") added a comment about pci_disable_pcie_error_reporting(), but hpsa has never called either pci_enable_pcie_error_reporting() or pci_disable_pcie_error_reporting(). Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core is responsible for managing PCIe device error reporting. Remove the comment about pci_disable_pcie_error_reporting(). Signed-off-by: Bjorn Helgaas Cc: Don Brace Cc: storagedev@microchip.com --- drivers/scsi/hpsa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index f6da34850af9..fec7e17747f7 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -9108,7 +9108,6 @@ static void hpsa_remove_one(struct pci_dev *pdev) free_percpu(h->lockup_detected); /* init_one 2 */ h->lockup_detected = NULL; /* init_one 2 */ - /* (void) pci_disable_pcie_error_reporting(pdev); */ /* init_one 1 */ hpda_free_ctlr_info(h); /* init_one 1 */ } From patchwork Tue Mar 7 18:28:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2623039wrd; Tue, 7 Mar 2023 11:38:09 -0800 (PST) X-Google-Smtp-Source: AK7set98AN+LGJWuYp+9GyeTvQHaMTIt2pSKtN+ZViJlC3yVKKjgodaER+Bvo8tOGeF2H0L4XUzH X-Received: by 2002:a17:907:9694:b0:881:f2f:6633 with SMTP id hd20-20020a170907969400b008810f2f6633mr19049535ejc.50.1678217888956; Tue, 07 Mar 2023 11:38:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678217888; cv=none; d=google.com; s=arc-20160816; b=du41oZQt8M4CZNbBiih3Yi+jWQ2HKlEiXqMNiv95/9cIQswlAz8NJyu5FEMEeSaxBz Uk49IIFBcB7PkDLvH0i33Junf7HuvcRLKfAKnHZSZR9OVNsllFdGKz/yPDxdbXxnYLxJ 4swidSbB2e2m8mOPZlNM2vVWrgb/P5UDBrzXKvvvZgwzJmJEvMYi4MHds8boWO0bpJzZ GgtUX1kGU0QWl9Y0DOU7HVW0fGv7ztzFMp/+0IWFuqRGYSvoirHrHkSylyrGiimlf9UG KAJ/YAhN3aC89nrq1jEG7jbjYfRmYY9YE/8tLfyd8kIO8JGGJPFfRnRnCGADfLm3E/JW 34Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YtaGKVnbyFwPgGe7i5wo7CYiXpsvGmZX49sH8OhDWdY=; b=Y6L6v3pkiQSYgksf3rZ+I4uyC0yw53WJiB21u+9peS1g3i5DJJUewlVQMRYMxPHsL0 dv4it0JkA+Jamr6mxIzpp8/bCFwK9RIhu1hlX/Yo9p7IGbmf8Zuak1iTkqkmPONGxb7A 2iDjCIL4o3I5CQDAqDeZRgnyP9XNfRXSPrJXl3KpRqiW85fT6Z7uTh/ze6w68XEoSj0a cK7sC0ATgmwuUcJb6lXyRsW/EnDKE4l+ag8Z3RXIqqS72UtAm3GnospBRI2aly8SxEJe u/7tjCE73QKIxgLJsQkYUllVhi+77lU7IgVZjxTkEBXBooD6PvGPnjOCqhgwoyyKlRWK sGXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b7Xw7jP+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go16-20020a1709070d9000b008c3365f7aacsi17497996ejc.343.2023.03.07.11.37.43; Tue, 07 Mar 2023 11:38:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b7Xw7jP+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233102AbjCGSjb (ORCPT + 99 others); Tue, 7 Mar 2023 13:39:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232879AbjCGSi5 (ORCPT ); Tue, 7 Mar 2023 13:38:57 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 525278F72C; Tue, 7 Mar 2023 10:30:29 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BCE9C61539; Tue, 7 Mar 2023 18:29:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F25DDC433A1; Tue, 7 Mar 2023 18:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213744; bh=2W4mTqL66cnI3Q1Av2sbikshcnOcST9Zd6947tR9OmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b7Xw7jP+vrqoeZ3kp358N9bDL9hbc/5tMOAw0BN3Zh0SUfsuCIqjHBi9/nxJU32nK iz5liu5dZjx8FWdacyOWiLHowKtRI6W0svfKdqsYH4AfK7dGYJ/7MxXpYpu6El+Ahm JY7YBdT2AF/j6qcTiT8M2C59cMVZ3qEWuWFXe6lJY4POfXM9m0ycgM54aMrViaPkSQ liMfQPba+kTKD7WGXlkgJnXGnFSE38j6w5E08hl+iLoLfn642zZ4rSD24CA+O0K/f2 B+q8FBSmL7hO0tkUnp0ZR5lArcVYyMirPlX6YtcvonXA2gMzsqCfASw3WUVXE4+qRN UPJm8W09shCfg== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , James Smart , Dick Kennedy Subject: [PATCH 07/10] scsi: lpfc: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:28:39 -0600 Message-Id: <20230307182842.870378-8-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739001401057132?= X-GMAIL-MSGID: =?utf-8?q?1759739001401057132?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Also remove the corresponding pci_disable_pcie_error_reporting() from the driver .remove() path. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: James Smart Cc: Dick Kennedy --- drivers/scsi/lpfc/lpfc.h | 2 - drivers/scsi/lpfc/lpfc_attr.c | 96 ++++++++++------------------------- drivers/scsi/lpfc/lpfc_init.c | 1 - drivers/scsi/lpfc/lpfc_sli.c | 55 -------------------- 4 files changed, 27 insertions(+), 127 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h index cf55f8e3bd9f..5e3a93d13a91 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h @@ -1036,7 +1036,6 @@ struct lpfc_hba { #define FCF_TS_INPROG 0x200 /* FCF table scan in progress */ #define FCF_RR_INPROG 0x400 /* FCF roundrobin flogi in progress */ #define HBA_FIP_SUPPORT 0x800 /* FIP support in HBA */ -#define HBA_AER_ENABLED 0x1000 /* AER enabled with HBA */ #define HBA_DEVLOSS_TMO 0x2000 /* HBA in devloss timeout */ #define HBA_RRQ_ACTIVE 0x4000 /* process the rrq active list */ #define HBA_IOQ_FLUSH 0x8000 /* FCP/NVME I/O queues being flushed */ @@ -1190,7 +1189,6 @@ struct lpfc_hba { #define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_FCP #define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_FCP #endif - uint32_t cfg_aer_support; uint32_t cfg_sriov_nr_virtfn; uint32_t cfg_request_firmware_upgrade; uint32_t cfg_suppress_link_up; diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 22f2e046e8eb..5cc7b59b528f 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c @@ -4365,13 +4365,22 @@ static DEVICE_ATTR_RW(lpfc_link_speed); /* # lpfc_aer_support: Support PCIe device Advanced Error Reporting (AER) -# 0 = aer disabled or not supported # 1 = aer supported and enabled (default) -# Value range is [0,1]. Default value is 1. +# PCIe error reporting is always enabled by the PCI core, so this always +# shows 1. +# +# N.B. Parts of LPFC_ATTR open-coded since some of the underlying +# infrastructure (phba->cfg_aer_support) is gone. */ -LPFC_ATTR(aer_support, 1, 0, 1, - "Enable PCIe device AER support"); -lpfc_param_show(aer_support) +static uint lpfc_aer_support = 1; +module_param(lpfc_aer_support, uint, S_IRUGO); +MODULE_PARM_DESC(lpfc_aer_support, "Enable PCIe device AER support"); +static ssize_t +lpfc_aer_support_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + return scnprintf(buf, PAGE_SIZE, "%d\n", lpfc_aer_support); +} /** * lpfc_aer_support_store - Set the adapter for aer support @@ -4382,76 +4391,27 @@ lpfc_param_show(aer_support) * @count: unused variable. * * Description: - * If the val is 1 and currently the device's AER capability was not - * enabled, invoke the kernel's enable AER helper routine, trying to - * enable the device's AER capability. If the helper routine enabling - * AER returns success, update the device's cfg_aer_support flag to - * indicate AER is supported by the device; otherwise, if the device - * AER capability is already enabled to support AER, then do nothing. - * - * If the val is 0 and currently the device's AER support was enabled, - * invoke the kernel's disable AER helper routine. After that, update - * the device's cfg_aer_support flag to indicate AER is not supported - * by the device; otherwise, if the device AER capability is already - * disabled from supporting AER, then do nothing. + * PCIe error reporting is enabled by the PCI core, so drivers don't need + * to do anything. Retain this interface for backwards compatibility, + * but do nothing. * * Returns: - * length of the buf on success if val is in range the intended mode - * is supported. - * -EINVAL if val out of range or intended mode is not supported. + * length of the buf on success + * -EINVAL if val out of range **/ static ssize_t lpfc_aer_support_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - struct Scsi_Host *shost = class_to_shost(dev); - struct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata; - struct lpfc_hba *phba = vport->phba; - int val = 0, rc = -EINVAL; + int val = 0; if (!isdigit(buf[0])) return -EINVAL; if (sscanf(buf, "%i", &val) != 1) return -EINVAL; - switch (val) { - case 0: - if (phba->hba_flag & HBA_AER_ENABLED) { - rc = pci_disable_pcie_error_reporting(phba->pcidev); - if (!rc) { - spin_lock_irq(&phba->hbalock); - phba->hba_flag &= ~HBA_AER_ENABLED; - spin_unlock_irq(&phba->hbalock); - phba->cfg_aer_support = 0; - rc = strlen(buf); - } else - rc = -EPERM; - } else { - phba->cfg_aer_support = 0; - rc = strlen(buf); - } - break; - case 1: - if (!(phba->hba_flag & HBA_AER_ENABLED)) { - rc = pci_enable_pcie_error_reporting(phba->pcidev); - if (!rc) { - spin_lock_irq(&phba->hbalock); - phba->hba_flag |= HBA_AER_ENABLED; - spin_unlock_irq(&phba->hbalock); - phba->cfg_aer_support = 1; - rc = strlen(buf); - } else - rc = -EPERM; - } else { - phba->cfg_aer_support = 1; - rc = strlen(buf); - } - break; - default: - rc = -EINVAL; - break; - } - return rc; + dev_info_once(dev, "PCIe error reporting automatically enabled by the PCI core; sysfs write ignored\n"); + return strlen(buf); } static DEVICE_ATTR_RW(lpfc_aer_support); @@ -4464,16 +4424,16 @@ static DEVICE_ATTR_RW(lpfc_aer_support); * @count: unused variable. * * Description: - * If the @buf contains 1 and the device currently has the AER support - * enabled, then invokes the kernel AER helper routine + * If the @buf contains 1, invokes the kernel AER helper routine * pci_aer_clear_nonfatal_status() to clean up the uncorrectable * error status register. * * Notes: * * Returns: - * -EINVAL if the buf does not contain the 1 or the device is not currently - * enabled with the AER support. + * -EINVAL if the buf does not contain 1 + * -EPERM if the OS cannot clear AER error status, i.e., when platform + * firmware owns the AER Capability **/ static ssize_t lpfc_aer_cleanup_state(struct device *dev, struct device_attribute *attr, @@ -4491,8 +4451,7 @@ lpfc_aer_cleanup_state(struct device *dev, struct device_attribute *attr, if (val != 1) return -EINVAL; - if (phba->hba_flag & HBA_AER_ENABLED) - rc = pci_aer_clear_nonfatal_status(phba->pcidev); + rc = pci_aer_clear_nonfatal_status(phba->pcidev); if (rc == 0) return strlen(buf); @@ -7277,7 +7236,6 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) lpfc_sg_seg_cnt_init(phba, lpfc_sg_seg_cnt); lpfc_hba_queue_depth_init(phba, lpfc_hba_queue_depth); - lpfc_aer_support_init(phba, lpfc_aer_support); lpfc_sriov_nr_virtfn_init(phba, lpfc_sriov_nr_virtfn); lpfc_request_firmware_upgrade_init(phba, lpfc_req_fw_upgrade); lpfc_suppress_link_up_init(phba, lpfc_suppress_link_up); diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 61958a24a43d..d3d4477dd472 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index c5b69f313af3..b2294e638e29 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #ifdef CONFIG_X86 #include @@ -5204,13 +5203,9 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba) volatile struct MAILBOX_word0 mb; struct lpfc_sli *psli; void __iomem *to_slim; - uint32_t hba_aer_enabled; spin_lock_irq(&phba->hbalock); - /* Take PCIe device Advanced Error Reporting (AER) state */ - hba_aer_enabled = phba->hba_flag & HBA_AER_ENABLED; - psli = &phba->sli; /* Restart HBA */ @@ -5251,10 +5246,6 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba) /* Give the INITFF and Post time to settle. */ mdelay(100); - /* Reset HBA AER if it was enabled, note hba_flag was reset above */ - if (hba_aer_enabled) - pci_disable_pcie_error_reporting(phba->pcidev); - lpfc_hba_down_post(phba); return 0; @@ -5273,7 +5264,6 @@ static int lpfc_sli_brdrestart_s4(struct lpfc_hba *phba) { struct lpfc_sli *psli = &phba->sli; - uint32_t hba_aer_enabled; int rc; /* Restart HBA */ @@ -5281,9 +5271,6 @@ lpfc_sli_brdrestart_s4(struct lpfc_hba *phba) "0296 Restart HBA Data: x%x x%x\n", phba->pport->port_state, psli->sli_flag); - /* Take PCIe device Advanced Error Reporting (AER) state */ - hba_aer_enabled = phba->hba_flag & HBA_AER_ENABLED; - rc = lpfc_sli4_brdreset(phba); if (rc) { phba->link_state = LPFC_HBA_ERROR; @@ -5301,10 +5288,6 @@ lpfc_sli_brdrestart_s4(struct lpfc_hba *phba) memset(&psli->lnk_stat_offsets, 0, sizeof(psli->lnk_stat_offsets)); psli->stats_start = ktime_get_seconds(); - /* Reset HBA AER if it was enabled, note hba_flag was reset above */ - if (hba_aer_enabled) - pci_disable_pcie_error_reporting(phba->pcidev); - hba_down_queue: lpfc_hba_down_post(phba); lpfc_sli4_queue_destroy(phba); @@ -5725,25 +5708,6 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba) } phba->fcp_embed_io = 0; /* SLI4 FC support only */ - /* Enable PCIe device Advanced Error Reporting (AER) if configured */ - if (phba->cfg_aer_support == 1 && !(phba->hba_flag & HBA_AER_ENABLED)) { - rc = pci_enable_pcie_error_reporting(phba->pcidev); - if (!rc) { - lpfc_printf_log(phba, KERN_INFO, LOG_INIT, - "2709 This device supports " - "Advanced Error Reporting (AER)\n"); - spin_lock_irq(&phba->hbalock); - phba->hba_flag |= HBA_AER_ENABLED; - spin_unlock_irq(&phba->hbalock); - } else { - lpfc_printf_log(phba, KERN_INFO, LOG_INIT, - "2708 This device does not support " - "Advanced Error Reporting (AER): %d\n", - rc); - phba->cfg_aer_support = 0; - } - } - if (phba->sli_rev == 3) { phba->iocb_cmd_size = SLI3_IOCB_CMD_SIZE; phba->iocb_rsp_size = SLI3_IOCB_RSP_SIZE; @@ -9053,25 +9017,6 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) mod_timer(&phba->eratt_poll, jiffies + msecs_to_jiffies(1000 * phba->eratt_poll_interval)); - /* Enable PCIe device Advanced Error Reporting (AER) if configured */ - if (phba->cfg_aer_support == 1 && !(phba->hba_flag & HBA_AER_ENABLED)) { - rc = pci_enable_pcie_error_reporting(phba->pcidev); - if (!rc) { - lpfc_printf_log(phba, KERN_INFO, LOG_INIT, - "2829 This device supports " - "Advanced Error Reporting (AER)\n"); - spin_lock_irq(&phba->hbalock); - phba->hba_flag |= HBA_AER_ENABLED; - spin_unlock_irq(&phba->hbalock); - } else { - lpfc_printf_log(phba, KERN_INFO, LOG_INIT, - "2830 This device does not support " - "Advanced Error Reporting (AER)\n"); - phba->cfg_aer_support = 0; - } - rc = 0; - } - /* * The port is ready, set the host's link state to LINK_DOWN * in preparation for link interrupts. From patchwork Tue Mar 7 18:28:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65796 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2626776wrd; Tue, 7 Mar 2023 11:46:59 -0800 (PST) X-Google-Smtp-Source: AK7set+3RE09dAiPBhj5CyqP7Iz4nDkOKGCGhEcixIzLk4wmhRzsfqGNwMk9C2gdO6HBttWwBOII X-Received: by 2002:aa7:db53:0:b0:4b0:616d:48a8 with SMTP id n19-20020aa7db53000000b004b0616d48a8mr14290011edt.16.1678218418976; Tue, 07 Mar 2023 11:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218418; cv=none; d=google.com; s=arc-20160816; b=nBjD5uBYQI5+tPSO0/EPW3qWZY2sdlNkgZqQFRLstMP9YMhRYGfWyg6dA4M2V63H0k gXqdNTKoPEqjAobidspMHHCay/t8FZS33qv9dBuLco0uoG7FwcAxn8JuKVjNEtLmVu4Y gYSmkxnb/WwfJQFKZOWk1wCDkgNuiw7dAT1RG4W7hnH8ZJDr5uJs2pZWdSdKKnBi/l0e 5bjgctp7gcbEBHC3I3P2bV/rN4YVa59PxHJ/+vWbEFkBBH40aQ+A/ctk54KoKI5frd83 CBlRPdQvh3guMnvhXiLgpHXZaxXUitzfc7oI/9eetnq5AqhpKOwd8f73BaZzJJ58tLap F5YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KDCw7iHYTlaF37PBXDBKoLmEvmpc3sAkAMlVzFzvukI=; b=zgIkpitK/V/AjUbyq/MmL/Eq6Avro4tcRlbRUkCbV7O5GRPCKVM04k5iU50BBfeYkQ thyMyIvoZMmt+G1A8XbWAH1znCJQDbwwwMgA29v5DcXiLJNbjy3RzLGzFkiOmFa7gpFp mpVScaoS9Kqle8M7GBXxILWF6AOKX1XHDZbvZiIg0W3qUISo77TDZoKYWWojOybAua3T OtRNUlyGBGo6SZ9PPugd56NEZUX2N5ivofYig28PIVEhuE21bEAXNLziM6A/qW5aVmdv hqLXLYbb7AnbH41rIlBpHcXrMg4oFd0a1QOr++YxGTLS9STVqhV7rpNTBGfoZeWk9V8X LXcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pBDFXwGm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f9-20020a50ee89000000b004acc45a0577si2434589edr.277.2023.03.07.11.46.35; Tue, 07 Mar 2023 11:46:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pBDFXwGm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231592AbjCGSzJ (ORCPT + 99 others); Tue, 7 Mar 2023 13:55:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233478AbjCGSyd (ORCPT ); Tue, 7 Mar 2023 13:54:33 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2D01A5F6; Tue, 7 Mar 2023 10:42:21 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9371561538; Tue, 7 Mar 2023 18:29:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC636C4339E; Tue, 7 Mar 2023 18:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213746; bh=3BwaxeqR5K9UM6t70G9A7Zg8LXyh/lE1LnqW0l4i6Jk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pBDFXwGmb4NbFsnOLQNVjKfCxYBZQe6gNNlsx3x0rX+hVweeeTXZ9n6hO3ziosB6x WU0LRWK1gsud8ozmdXQVhaBQkzv5y6PwpV6rYIqxIU67i7XF2MAtI1v8CxbYHhOmh5 C2umXRpwPBPBw1hSxq2Q/Z/SB64Hkq4HpHnVsEmHpPPxn0pBRlCEI9GQ+qke617Epq Y+IpQ4mEHCEcdVsUjeLIGyYTAmmQalsQyGpejG5L22UcUdGDUJokGMhTC/s48i8ckt nRccsUU1YJ8NJn+8Y51wKPN23u+xDU4mdtFb6FEUoepcrTHyx0BWAkKd+Bk5wbROKT 3p+pYSz9Q3OLA== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH 08/10] scsi: mpt3sas: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:28:40 -0600 Message-Id: <20230307182842.870378-9-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739557058882775?= X-GMAIL-MSGID: =?utf-8?q?1759739557058882775?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Also remove the corresponding pci_disable_pcie_error_reporting() from the driver .remove() path. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: Sathya Prakash Cc: Sreekanth Reddy Cc: Suganath Prabu Subramani Cc: MPT-FusionLinux.pdl@broadcom.com --- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ----- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - 2 files changed, 6 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 2ee9ea57554d..a8b260f46796 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -60,7 +60,6 @@ #include #include #include /* To get host page size per arch */ -#include #include "mpt3sas_base.h" @@ -3535,7 +3534,6 @@ mpt3sas_base_unmap_resources(struct MPT3SAS_ADAPTER *ioc) if (pci_is_enabled(pdev)) { pci_release_selected_regions(ioc->pdev, ioc->bars); - pci_disable_pcie_error_reporting(pdev); pci_disable_device(pdev); } } @@ -3615,9 +3613,6 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) goto out_fail; } -/* AER (Advanced Error Reporting) hooks */ - pci_enable_pcie_error_reporting(pdev); - pci_set_master(pdev); diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 8e24ebcebfe5..e2f09833659f 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include From patchwork Tue Mar 7 18:28:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2626650wrd; Tue, 7 Mar 2023 11:46:42 -0800 (PST) X-Google-Smtp-Source: AK7set+YykhtCefZbK1bxwGo2wNWj3SpTxa2J3VmeJCbOvBlFUf2kYxKHTJoFNFKXmbDu2F8Sal9 X-Received: by 2002:a17:907:c282:b0:884:930:b017 with SMTP id tk2-20020a170907c28200b008840930b017mr19461651ejc.60.1678218402201; Tue, 07 Mar 2023 11:46:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218402; cv=none; d=google.com; s=arc-20160816; b=eVZoZPdbs4WSHny5cuv0WMIB4bn/xDjIlV5X5wPK3igJ5P9lVvT8DHHptVnNi77x+n wwIL96oO82YTMfCDcCmEA6Au+72TkSyZCgbbJ+bwbs22TMRiTJWZgwrXiq1TeElMYsTk UrGcPqNcUn8j5Tqr5dSn/GN9vtUKh2gPPEczCdbvCfPMbcobi2ZguFLiOfo7l3uNSjiK /4TvwBhvSj/LqvF2PhPJaeqEI7DmI/oO5mGJBx57VbAuP2IPClvP3eDglrpvOTVcQ7y2 O7Ujjbm9NcIP+TCgdpZgpYQARM3j1I0LLM0irAIMA7MH0iqppgT+hKXXetoAP0F2ykb3 FRrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wVkMRAQoQhZJA/H5UGlFvLMhyRn0a6lFEM40kQEkNzI=; b=rYvTgy+DngQxcu1xd0APVMm7HsyDVi7duJrUfOi16xGccPNtBH3l65b+KPWqukBfo1 +CremxcaIQXCdM5t5wfhbcIsBgIxtCRv4WCl7ZVsNrNjNb7udqBNFNNmydTVeosWQ9jP BzqTxCPb4MgP8mHHydJQT9sb9Q7VHzIg9UvnV0AEELF3uR04PruXMlunRTm+hUkEPQCa pwZmR0iIsv/KP+/EXkdqXg/uU3JRJ3W7vFUVY61H72cihF/8NCeIyD8vO/CePaZOLizM sxy8Ss/p0392tl7PgRU6sUuUPnuKe7JNWrNI0smVZjfqJ2IFP0vPBzhTT9nUF5SkTJVB ENWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DOCIwPdV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pj16-20020a170906d79000b008dbcb6cde3esi10351915ejb.526.2023.03.07.11.46.18; Tue, 07 Mar 2023 11:46:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DOCIwPdV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232960AbjCGSjK (ORCPT + 99 others); Tue, 7 Mar 2023 13:39:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232944AbjCGSin (ORCPT ); Tue, 7 Mar 2023 13:38:43 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9732B301A6; Tue, 7 Mar 2023 10:30:14 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6B37E6150E; Tue, 7 Mar 2023 18:29:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A696CC433EF; Tue, 7 Mar 2023 18:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213747; bh=zEI877upDLwimMSOZL/AiD7txmrPJ/Mr1O8OUkLbrS8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DOCIwPdVFuAn51LZbQFX+j+ni6gswOsPKQjmceJyKeogZo1kAP+xjM3o9TQCmbiUS 9fFhxJcelhr0gwqsMl7LAE/DGgxXRa1HS7mD/SKQ6blu8BwNQat6hwux/YxwMMflDv xFl4EQ0TD7ODRGIHo0W7UfCIXyIKhzIaWe2O51m06Jst5ZdKe45dgsgSn7nSVdFRY7 7gJCytW5wXD3mODPuZFjA/7IZdCZq4BMwoYcexhvVdjceBODy7OaOiNdgcQTix8wGJ 4SD0IqF74jAApjkM8fNK9FOm7f2ESh9IA/jtfg6TiFontpnELTK9KKJR4ZQbEvLJul B5uErx3JPanqQ== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Nilesh Javali , GR-QLogic-Storage-Upstream@marvell.com Subject: [PATCH 09/10] scsi: qla2xxx: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:28:41 -0600 Message-Id: <20230307182842.870378-10-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759739538986827366?= X-GMAIL-MSGID: =?utf-8?q?1759739538986827366?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Also remove the corresponding pci_disable_pcie_error_reporting() from the driver .remove() path. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: Nilesh Javali Cc: GR-QLogic-Storage-Upstream@marvell.com --- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index ec0e987b71fa..df5e5b7fdcfe 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 545167627e48..a6c5e0d8641d 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2940,9 +2940,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ql2xallocfwdump = 0; } - /* This may fail but that's ok */ - pci_enable_pcie_error_reporting(pdev); - ha = kzalloc(sizeof(struct qla_hw_data), GFP_KERNEL); if (!ha) { ql_log_pci(ql_log_fatal, pdev, 0x0009, @@ -3949,8 +3946,6 @@ qla2x00_remove_one(struct pci_dev *pdev) pci_release_selected_regions(ha->pdev, ha->bars); kfree(ha); - pci_disable_pcie_error_reporting(pdev); - pci_disable_device(pdev); } @@ -6825,7 +6820,6 @@ qla2x00_disable_board_on_pci_error(struct work_struct *work) qla2x00_unmap_iobases(ha); pci_release_selected_regions(ha->pdev, ha->bars); - pci_disable_pcie_error_reporting(pdev); pci_disable_device(pdev); /* From patchwork Tue Mar 7 18:28:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 65816 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2629853wrd; Tue, 7 Mar 2023 11:54:53 -0800 (PST) X-Google-Smtp-Source: AK7set+UX2SkMZgUmHJFg9C3vUxuEMUGNenmNi0g6Ch7RcnQhxbk488XiFASuA/b5T4b6HNVL0k3 X-Received: by 2002:a17:907:6e1b:b0:8e7:672f:23c0 with SMTP id sd27-20020a1709076e1b00b008e7672f23c0mr18654748ejc.33.1678218893646; Tue, 07 Mar 2023 11:54:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678218893; cv=none; d=google.com; s=arc-20160816; b=SNAohgq0JrIC+plNvt1QwAwlgsbsUIkZbzsTAhAVwxOvvTXFY0H3FxEd9KiIlTyUio WKSPvPlNTd0Hq2bx+8I2epB0r8GzxF39/ApeQYEberIXaYDeGeO4K7CIE0HTJ++/CdeK aX8DsQ8G94tcuPKcWWEwm+IA4WSipTpnrlYEP4LCjwYlAzJI8BvkkXvXvSMqGJJeomNm LdyJTeVEwd2eul5+LWjLYzuLEekEWpaAzPtCm0PV9r1iu/Mhx+PDYAs6vfiVlcYzW69g RRueMAxgQMAZsrWsCpu0AuaHFgT37h+PijT5tH+dZuIOuXOwRfa6/Kfqp0DT4+HqCw0c CbDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4qIwcVQvOWsjVSVZlIO48KmtBZo5ag6YtF+D7143z5U=; b=fGGB1U2OOnDVw6jFlMwYHaXr4A58Br/OZuN0aFJ2PBx2th9EhUy3WaMiVFRG3yqfg5 U+oCPDvVs6ok2XWkEf2huYdIGaGgKJnugpx+Qklypi0TR6eHLbnqY0Ew3Gr/ZLTG+Gl2 rk60cDDcUyAMUL2wJFlwFhdQCjlvKJu06aWG4U/+Dw7JEcAjNUnEh03+j5wM+407B5by aM3INdnoWyP9dqWDEiW7OEx1cH7amIHfNjqx0kfPVFs0Svj/htx3HkfMcIK3Qq/zXTan gEsE+8G5dPWlB34OtN3XIxiRTJZnoNKztk+hQNWiHtQCR87aeaRTFLOXj3d7r60NeWld EvEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A+QWpy5v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m12-20020a170906848c00b008d8313a36b4si4441314ejx.315.2023.03.07.11.54.30; Tue, 07 Mar 2023 11:54:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=A+QWpy5v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233062AbjCGSi4 (ORCPT + 99 others); Tue, 7 Mar 2023 13:38:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232821AbjCGSig (ORCPT ); Tue, 7 Mar 2023 13:38:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 355EDA226B; Tue, 7 Mar 2023 10:30:07 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E4138B819C2; Tue, 7 Mar 2023 18:29:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7AE31C4339C; Tue, 7 Mar 2023 18:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678213749; bh=5BE9wZCtaDseXu0/Lv+W7WCLDoimdI41Hg2fMs8HhDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A+QWpy5vzZ9/X3juu/fwf9cVoeaZqgxgUo3SAVMRWvYy2BXQA8ukuCt/CITD93mzl rGRACDKas4jH63jQpx2P3iqRMboehcUDh3Dp1QeWzku9yTa1e4b76VexBRJbSdAbpY z4cNtBYASorZ35SwDq3RcXProMs8qZ7s+7IaspemytoPzgI7nns8XNTadaAqLKIfpI vPYYUsTOL+GU5aafA3VhoMLb2HZu5lFUYUIjJtyF3Wy3WlBkLrCgjHnhvRQIEMicyy A1SFf2YukrqvJKeyoGfCOY35fhyAZtTe28Ww2t0Mf44DTtQXOy5J769iniV3zK8CPP qc0J5lpcBPI5g== From: Bjorn Helgaas To: "James E . J . Bottomley" , "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Nilesh Javali , Manish Rangankar , GR-QLogic-Storage-Upstream@marvell.com Subject: [PATCH 10/10] scsi: qla4xxx: Drop redundant pci_enable_pcie_error_reporting() Date: Tue, 7 Mar 2023 12:28:42 -0600 Message-Id: <20230307182842.870378-11-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307182842.870378-1-helgaas@kernel.org> References: <20230307182842.870378-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759740054336923721?= X-GMAIL-MSGID: =?utf-8?q?1759740054336923721?= From: Bjorn Helgaas pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"), the PCI core does this for all devices during enumeration, so the driver doesn't need to do it itself. Remove the redundant pci_enable_pcie_error_reporting() call from the driver. Also remove the corresponding pci_disable_pcie_error_reporting() from the driver .remove() path. Note that this only controls ERR_* Messages from the device. An ERR_* Message may cause the Root Port to generate an interrupt, depending on the AER Root Error Command register managed by the AER service driver. Signed-off-by: Bjorn Helgaas Cc: Nilesh Javali Cc: Manish Rangankar Cc: GR-QLogic-Storage-Upstream@marvell.com --- drivers/scsi/qla4xxx/ql4_def.h | 1 - drivers/scsi/qla4xxx/ql4_os.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h index 5f82c8afd5e0..5e683ba49fa5 100644 --- a/drivers/scsi/qla4xxx/ql4_def.h +++ b/drivers/scsi/qla4xxx/ql4_def.h @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 005502125b27..ee6d784c095c 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -8639,8 +8639,6 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, ha->host_no = host->host_no; ha->func_num = PCI_FUNC(ha->pdev->devfn); - pci_enable_pcie_error_reporting(pdev); - /* Setup Runtime configurable options */ if (is_qla8022(ha)) { ha->isp_ops = &qla4_82xx_isp_ops; @@ -8867,7 +8865,6 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, qla4xxx_free_adapter(ha); probe_failed_ioconfig: - pci_disable_pcie_error_reporting(pdev); scsi_host_put(ha->host); probe_disable_device: @@ -9022,7 +9019,6 @@ static void qla4xxx_remove_adapter(struct pci_dev *pdev) scsi_host_put(ha->host); - pci_disable_pcie_error_reporting(pdev); pci_disable_device(pdev); }