From patchwork Thu Aug 31 17:02:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bowman, Terry" X-Patchwork-Id: 13371737 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84A5BC83F2F for ; Thu, 31 Aug 2023 17:03:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245687AbjHaRDD (ORCPT ); Thu, 31 Aug 2023 13:03:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236107AbjHaRDC (ORCPT ); Thu, 31 Aug 2023 13:03:02 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2088.outbound.protection.outlook.com [40.107.243.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05C9E8F; Thu, 31 Aug 2023 10:03:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIoAPjtFnd077DKUg0oS9qaAT/8BqsDbz1GSiGf+O7BfLynLncmjqlvR4kjJ/81nsfyMEfnAD0hMaPNz8Y1J57p8TP+kMeMaChWhlBCj8OREhf1+MhpcTBEFIUTgpUf2sn3Tu7SgcGjibLGfgzhtA+WoMK4wVy4NtZnuW22ZEbkVmZZybbRwDMMExB2wB3ot/Hf8PDAIq9jelj8eR9C61FHKFP3F2pVDLZIUiXWogMdwHL1wGLl8CuYKUhauyGmog2FgPafLnjhNRdnTVKbdKliucJsl0ihgarxGjokXRk/Qf7M3T66N7Epw1OXMktFYKXic3hggP3r+bSgc0h/1FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nKTwBQSQJY0K9wjFNf9fNy55PIqVdxgtMnfwSIJGyk0=; b=W+ACGSWMQits/YGNu70lWWVhUPYPEzEkjXpN5YzympXyictA42jVBCbdI82JAgcBEYriYa8ckdm61URAg4Qb/6SmKM/N6X/ffmxu/3486Tc/oiUk66MBD0iqnvJLWj9FHLjeFlMmb/IQMbJBgqqjp40jPV8oGi4lFcNZZdH2SEQMUf/0B6K6TacGclTlTop78oN5iOEAdiOxDUGbcvnqtfg67zUO4ergVdjnNHuKsqFliwOY9LThV0Axq3peKnioeXFLhowRuA1RE7czkCGpAqbCQGVmA9uEo9gAvnE6N5dn1iL/+YysPkP9uRPJMYx2aZ4mM+pw4M0vccZ3JVotvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=intel.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nKTwBQSQJY0K9wjFNf9fNy55PIqVdxgtMnfwSIJGyk0=; b=kq76Lp/UvJHU3ZwWM3C74h0XrLxMRCnF0NGzsd0555o9yguZ8xhho/VuPqXTYLf0SAc+vSg66EBoZ5JjXRtIHm6kl82WtTL7Lkjn0Fl3Tm4GhB+mQbuIA/Et/F9wgrty2PNgE7ujPDsxsZBJ775dqFpvnjto9GPvcIzETWH9cjs= Received: from PH7PR13CA0002.namprd13.prod.outlook.com (2603:10b6:510:174::6) by CY5PR12MB6105.namprd12.prod.outlook.com (2603:10b6:930:2a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 17:02:57 +0000 Received: from SA2PEPF000015C8.namprd03.prod.outlook.com (2603:10b6:510:174:cafe::86) by PH7PR13CA0002.outlook.office365.com (2603:10b6:510:174::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.15 via Frontend Transport; Thu, 31 Aug 2023 17:02:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF000015C8.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 17:02:57 +0000 Received: from ethanolx7ea3host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 12:02:56 -0500 From: Terry Bowman To: , , , , , , , CC: , , , , Mahesh J Salgaonkar , Oliver O'Halloran , Subject: [PATCH v10 08/15] PCI/AER: Refactor cper_print_aer() for use by CXL driver module Date: Thu, 31 Aug 2023 12:02:41 -0500 Message-ID: <20230831170248.185078-1-terry.bowman@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C8:EE_|CY5PR12MB6105:EE_ X-MS-Office365-Filtering-Correlation-Id: a15e1a94-0741-46a9-375b-08dbaa441fcd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S0dUlgvG/otTPE1mpxZZ0Fjq1znelBCjtyRx3DDrTdvHdr58yisN5Y/2RQWy7dhzwrLmLhrFMnN/WkjXAeHSMylqHKivg3MCpioiDaWdQqvfimQ8RdWKR0Q7r1guxZMNCtvd16z+BQ6+9JgPtkmLKvNWI0TILwLhb6EK4YdzINPIe0jkH4P5ycJIe9qkZcN0lE2fNaz6r+mXihCdoM3whY8pSn/LzavdZIQl8s4H5amWyGdZZZDybBZrP7nW3zS1dl3iRhXrIJlDMhllmvcPR8xirqUEfMr2OVGFTiY9jL1KfMBUtMQjQsJPGmWqLuNd4qMY6AQy/1XH5YCjOnRbeatvvynPHxnnzonAWEt8C5tmEdpLirviVj/qecA+YbBtt38++5qBFGlpSl4jegsybXtoB7ZUPZmfr24NBhn+mNaNrk1yfrG+4POrGuPW361dXiIf0yqmWpE7fLwFKjTUepT6W10+HpbLOcqqAbigv2fVmrDO8K6L3I0anma95MPE8JUIQiJ7cGgMQyLtnhtSk2SzWZ1izxoRUZCaviACbPFUS/OeGH2W8EnWwA01gtfCf1GPb61sqQr1J7GKERmxduiP1DCJ9gybAIk8qqfhNhr5lQ+u1U9WR4B67x0mKj+Okm+2kufPWhjmBwqAM45S/s5UN8PnGBvgJbkxD4xeGQx9L6FkGRM2eZ+nptExu6bseW1QPey/jjMad+0mC68OYP64TuNdHFCcbVtTOgqHLkpZe2dWJucg/5jN/jGrdQIBcGEE7unkOdUHvkp1QyBtUg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(346002)(136003)(376002)(396003)(82310400011)(451199024)(1800799009)(186009)(40470700004)(46966006)(36840700001)(1076003)(2616005)(36860700001)(41300700001)(8936002)(8676002)(4326008)(5660300002)(44832011)(7696005)(6666004)(47076005)(83380400001)(336012)(26005)(16526019)(426003)(82740400003)(356005)(40480700001)(70206006)(70586007)(110136005)(54906003)(316002)(36756003)(2906002)(86362001)(7416002)(478600001)(81166007)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 17:02:57.0004 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a15e1a94-0741-46a9-375b-08dbaa441fcd X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6105 Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org The CXL driver plans to use cper_print_aer() for logging restricted CXL host (RCH) AER errors. cper_print_aer() is not currently exported and therefore not usable by the CXL drivers built as loadable modules. Export the cper_print_aer() function. Use the EXPORT_SYMBOL_NS_GPL() variant to restrict the export to CXL drivers. The CONFIG_ACPI_APEI_PCIEAER kernel config is currently used to enable cper_print_aer(). cper_print_aer() logs the AER registers and is useful in PCIE AER logging outside of APEI. Remove the CONFIG_ACPI_APEI_PCIEAER dependency to enable cper_print_aer(). The cper_print_aer() function name implies CPER specific use but is useful in non-CPER cases as well. Rename cper_print_aer() to pci_print_aer(). Also, update cxl_core to import CXL namespace imports. Co-developed-by: Robert Richter Signed-off-by: Robert Richter Signed-off-by: Terry Bowman Cc: Mahesh J Salgaonkar Cc: "Oliver O'Halloran" Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Reviewed-by: Jonathan Cameron Acked-by: Bjorn Helgaas Reviewed-by: Dave Jiang --- drivers/cxl/core/port.c | 1 + drivers/pci/pcie/aer.c | 9 +++++---- include/linux/aer.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index da4f1b303d6c..45f8846d8c8a 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -2063,3 +2063,4 @@ static void cxl_core_exit(void) subsys_initcall(cxl_core_init); module_exit(cxl_core_exit); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(CXL); diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index f6c24ded134c..d3344fcf1f79 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -771,9 +771,10 @@ int cper_severity_to_aer(int cper_severity) } } EXPORT_SYMBOL_GPL(cper_severity_to_aer); +#endif -void cper_print_aer(struct pci_dev *dev, int aer_severity, - struct aer_capability_regs *aer) +void pci_print_aer(struct pci_dev *dev, int aer_severity, + struct aer_capability_regs *aer) { int layer, agent, tlp_header_valid = 0; u32 status, mask; @@ -812,7 +813,7 @@ void cper_print_aer(struct pci_dev *dev, int aer_severity, trace_aer_event(dev_name(&dev->dev), (status & ~mask), aer_severity, tlp_header_valid, &aer->header_log); } -#endif +EXPORT_SYMBOL_NS_GPL(pci_print_aer, CXL); /** * add_error_device - list device to be handled @@ -1009,7 +1010,7 @@ static void aer_recover_work_func(struct work_struct *work) PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn)); continue; } - cper_print_aer(pdev, entry.severity, entry.regs); + pci_print_aer(pdev, entry.severity, entry.regs); if (entry.severity == AER_NONFATAL) pcie_do_recovery(pdev, pci_channel_io_normal, aer_root_reset); diff --git a/include/linux/aer.h b/include/linux/aer.h index 97f64ba1b34a..8f124b904314 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -64,7 +64,7 @@ static inline void pci_save_aer_state(struct pci_dev *dev) {} static inline void pci_restore_aer_state(struct pci_dev *dev) {} #endif -void cper_print_aer(struct pci_dev *dev, int aer_severity, +void pci_print_aer(struct pci_dev *dev, int aer_severity, struct aer_capability_regs *aer); int cper_severity_to_aer(int cper_severity); void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,