From patchwork Wed Sep 27 15:43:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 13401325 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 9B80FE82CA7 for ; Wed, 27 Sep 2023 15:56:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232603AbjI0Pz7 (ORCPT ); Wed, 27 Sep 2023 11:55:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232578AbjI0Pzn (ORCPT ); Wed, 27 Sep 2023 11:55:43 -0400 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2083.outbound.protection.outlook.com [40.107.101.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F4412729D; Wed, 27 Sep 2023 08:45:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONhg2+Ovj43GUwF9jXx21p+ngA1wnS8eOe4c/AeniKCQ9mOaJVZuzcQgatiWdrXE3OZvh9UHxFSJO1hk4P7zh4pOsCBOQaKnhVFyB0MdPN2tm0rvLOQ2d7+79HI62E2qneI4vuIzdk8jNuqPaOEnmozmin+dGkN1cixeZySZhDeeZOgwQHcnm/ZJoJxr9besUlM6hPzWhOh7iEDxtxb0wYiSvBbjCZYSqps3Qut+ypQ2XzTyWbrI2T1kli7j70MxHCrKRKjhq+epFC8oO7XPRB3xHVq5a2KHUubCM0eWPkI1Q3uH3p+V7g3+WTARjVcwKpvX8t/nXFdFKMeXxnAz5w== 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=gsm53eVxyt2ze07CeY25P9sm3evxNsVE8sH0W+ZeAdU=; b=Kqu8qcY67dK+kIHY3RrYrMut5u7V4G4VcAWHxsRtNCw4gPx5eTkT/4DL9Ia34cepl1G/J69wlpMzumUMFDwjcxEuv0MtMKCvIpELI9mfYVI491etJfR1Znau8uj2bhDNG7BmJbf1nsTECqHQT/+kjfMO16lrRfd6jM1/R8hTNEb4dDqj6VvSRu2giXSo0JRD2lytjMdVTgsOuBBss9w77ztqi+CFY4cW32V5v6ytr/vMmCUZuOjEXW2GGVG5R/MyfAeg0veOb5JKEzJ4zWsOx5ocMXkPoz2ptnYXuKvAQ0KRFjALThi6Bp3bT4xwZEIej4bHBsk7Jt7VeOMqRWBwRw== 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=gsm53eVxyt2ze07CeY25P9sm3evxNsVE8sH0W+ZeAdU=; b=P1fRtDD184eK9Y99VlXJBlAEpnY9FDz8TwSJipU5tZ3o9ImCwQrjB6ODMp6cUHEGJfL2siKeKQfeZ1o9nnphPYQTbe0EuiB6Nt7IcZIi7kj2SEKnnT3NCI8wTgMbLPk52KYnzSfLwJUfwDNdjdN+kyaokFSEfrnxDaaNK/Bjv3w= Received: from BL0PR0102CA0026.prod.exchangelabs.com (2603:10b6:207:18::39) by LV3PR12MB9266.namprd12.prod.outlook.com (2603:10b6:408:21b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.21; Wed, 27 Sep 2023 15:45:10 +0000 Received: from BL02EPF0001A101.namprd05.prod.outlook.com (2603:10b6:207:18:cafe::ea) by BL0PR0102CA0026.outlook.office365.com (2603:10b6:207:18::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Wed, 27 Sep 2023 15:45:09 +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 BL02EPF0001A101.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Wed, 27 Sep 2023 15:45:08 +0000 Received: from rric.localdomain (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; Wed, 27 Sep 2023 10:45:00 -0500 From: Robert Richter To: Alison Schofield , Vishal Verma , Ira Weiny , Ben Widawsky , Dan Williams CC: , , Bjorn Helgaas , Terry Bowman , Jonathan Cameron , Robert Richter Subject: [PATCH v11 00/20] cxl/pci: Add support for RCH RAS error handling Date: Wed, 27 Sep 2023 17:43:19 +0200 Message-ID: <20230927154339.1600738-1-rrichter@amd.com> X-Mailer: git-send-email 2.30.2 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: BL02EPF0001A101:EE_|LV3PR12MB9266:EE_ X-MS-Office365-Filtering-Correlation-Id: c029f94e-e9f3-406e-592f-08dbbf70ba7e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tiKnepak4gt88vBW5cbUQuVRW+ZeS1SCqpu/IENQ2AZ2ks9wMWZPAqSKkDYaq/TsGldF2Tb1/3l/g/F+TxOiy0uMkf8JnCCKOI57XxX3pkugBXsawfV9ORRerfYKMyfojoAchX6vMpPbXPFoaC3mvRP16i12xKXIfiy846fse0VG/Vv9xVDidDH/vPhUM51/+cjVqBG/6+uIVJeJ2AR1K9W3h+Pl2DgKdwLA9amuz8Dfpc872yLXNq6Uofl2MvisntuZDZCGY6WtPqW+Yz2LZPGkYLsmWkgXjiZPpe4NErDLOpL1jLKd69I4PJtiCOmVpSQ3zdbGoRx/16b97JyeR/wQRXCXdsg1HnQ20IR8fhe9RjaQacB9wq4q9jk5cOZWJE2QKOF/OtBOQfdFlEw6cLK/vTBYVceIgMKUQTMjCJLrVJPwYBsAawjzfB9IPUPBNIRlD1TxbdWFZqUXt4WZBNcIawmbHwwHka3Rj/HQki1PTKjiBdI/BqtA09BOKcI8UrdovJDClLh718nIqeqqrzChC/fW7GnFNZ1OeaTaxdJ0OelChue557kGWCZzmPoNNMDxu7LjGGCkLL+ANdXO42LFywG6kcH78mlI+XPFBfgLBH14cEXICn5vzMSuGqXwDnc/1yxEhCbqJ1eGpIlQARM/bADw8VNEyJvsENvrQdmW7KnSx0jAdqKvjZhzuHMmbbKa8rYPEgzEX2Dj2G9a8/7s5/LgpcfBM2N9klKPuJqlvyulUyudpUfymZGyyCx4EFw+s4/psBVH3hzczzy4yQ== 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)(346002)(39860400002)(136003)(376002)(396003)(230922051799003)(1800799009)(82310400011)(186009)(451199024)(40470700004)(36840700001)(46966006)(40460700003)(2906002)(316002)(30864003)(41300700001)(40480700001)(8936002)(36756003)(8676002)(4326008)(5660300002)(70586007)(54906003)(110136005)(2616005)(6666004)(1076003)(426003)(70206006)(81166007)(356005)(336012)(83380400001)(36860700001)(82740400003)(26005)(16526019)(478600001)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2023 15:45:08.8673 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c029f94e-e9f3-406e-592f-08dbbf70ba7e 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: BL02EPF0001A101.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9266 Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org This patchset enables CXL RCH error handling. This is necessary because RCH downstream port protocol error handling is implemented uniquely and not currently supported. These patches address the following: * Discovery and mapping of RCH downstream port AER registers. * AER portdrv changes to support CXL RCH protocol errors. * Interrupt setup specific to RCH mode: enabling RCEC internal errors and disabling root port interrupts. * Logging RCH downstream port AER and RAS errors. Changes in v11: - Rebased onto cxl/fixes (c66650d29764) - Added: cxl/port: Fix release of RCD endpoints - Added: cxl/core/regs: Rename @dev to @host in struct cxl_register_map - Added: cxl/port: Fix @host confusion in cxl_dport_setup_regs() - Added: cxl/port: Rename @comp_map to @reg_map in struct cxl_register_map - Removed: cxl/regs: Prepare for multiple users of register mappings - Modified: cxl/hdm: Use stored Component Register mappings to map HDM decoder capability - Dan: rework to drop cxl_port_get_comp_map() - Added: cxl/pci: Introduce config option PCIEAER_CXL - Modified: cxl/pci: Add RCH downstream port AER register discovery - Moved AER discovery to devm_cxl_setup_parent_dport() called when memdev is probed - Fixed devm_cxl_iomap_block() release by fixing devm host - Modified: cxl/pci: Map RCH downstream AER registers for logging protocol errors - Reworded description - Moved register mappings to devm_cxl_setup_parent_dport() called when memdev is probed - Modified: cxl/pci: Disable root port interrupts in RCH mode - Call cxl_disable_rch_root_ints() in devm_cxl_setup_parent_dport() called when memdev is probed - Fixed resource release by fixing devm host - Reworded description of PCIEAER_CXL config option - Added: cxl/core/regs: Rework cxl_map_pmu_regs() to use map->dev for devm Changes in v10: - Updated cxl_setup_comp_regs() in patch#1 to include cxl_register_map::reg_type default value initialization. Changes in v9: - Added: cxl/regs: Prepare for multiple users of register mappings, - Updated use of cxl_map_component_regs() and cxl_map_device_regs Changes in V8: - Rebased onto: commit 0c0df63177e3 ("Merge branch 'for-6.5/cxl-rch-eh' into for-6.5/cxl") - cxl/port: Pre-initialize component register mappings - Added patch to pre-initialize component register mappings. - cxl/pci: Remove Component Register base address from - Separated removal of Component Register base address in struct cxl_dev_state to not break functionality. - cxl/hdm: Use stored Component Register mappings to map HDM decoder capability - Implemented a less strict check in devm_cxl_setup_hdm(), be tolerant if HDM decoder registers are not implemented. - cxl/pci: Map RCH downstream AER registers for logging protocol errors - Fixed uninitialized access of map->dev in cxl_dport_map_regs(). - PCI/AER: Forward RCH downstream port-detected errors to the CXL.mem dev handler - Fix typo in patch description. - cxl/pci: Update CXL error logging to use RAS register address - Fix typo in patch description. Changes in V7: - cxl: Updates for CXL Test to work with RCH - Removed Robert's DSO. - cxl/core/regs: Add @dev to cxl_register_map - Corrected typo in patch description. - PCI/AER: Unmask RCEC internal errors to enable RCH downstream port error handling. - Changed int variable to bool. - cxl/pci: Map RCH downstream AER registers for logging protocol errors - Corrected patch description. - cxl/pci: Add RCH downstream port AER register discovery - Reverted empty line removal. - cxl/port: Store the port's Component Register mappings in struct cxl_port - Update to use structure initialization in cxl_setup_comp_regs(). - Remove first patch (already in the tree) and added patch 27/27. - Was a one-off error caused when merging branches during internal review. Changes in V6: - Added patch for cxl test fixes: 'cxl: Update CXl Test to Work with RCH'. Patch from Dan. - Simplified: 'cxl/rch: Prepare for caching the MMIO mapped PCIe AER capability'. Patch from Dan. - Added patch: 'cxl: Rename 'uport' to 'uport_dev'' - Updated patch: 'cxl: Rename member @dport of struct cxl_dport to @dport_dev' - Updated *map assignment to use structure init in 'cxl/core/regs: Add @dev to cxl_register_map'. Also fixed whitespace. - Removed extra whitespace in 'cxl/core/regs: Add @dev to cxl_register_map' - Updated patch subject: 'cxl/acpi: Move add_host_bridge_uport() after cxl_get_chbs()' - Changes to work with CXL test. 'cxl/acpi: Directly bind the CEDT detected CHBCR to the Host Bridge's port' - 'cxl/pci: Early setup RCH dport component registers from RCRB' - Removed parameter from cxl_rcrb_get_comp_regs(). - Changed return value to EPROBE_DEFER for retry during ACPI initialization. - Changed map to us struct initialization. - Remove ENODEV check in 'cxl/port: Store the downstream port's Component Register mappings in struct cxl_dport' - 'cxl/port: Remove Component Register base address from struct cxl_dport' - Moved earlier with same removal for cxl_port. - cxl/pci: Add RCH downstream port AER register discovery - Flattened {request,release}_mem_region() and ioremap() into cxl_rcrb_to_aer(). - Add check if OS is assigned AER handling before discovering AER. - Added CXL namespace import to cxl_core (drivers/cxl/core/port.c). Needed for using pci_print_aer(). In 'PCI/AER: Refactor cper_print_aer() for use by CXL driver module'. - cxl/pci: Map RCH downstream AER registers for logging protocol errors - Changed dport device used in devm_cxl_iomap_block() call to be port->dev. - Removed ENODEV check. - cxl/pci: Disable root port interrupts in RCH mode - Removed unnecessary 'rch' check. - Moved cxl_disable_rch_root_ints() into core/pci.c. - Added OSC AER assignment check before accessing AER registers. - cxl/pci: Update CXL error logging to use RAS register address - Renamed function handlers. - cxl/pci: Add RCH downstream port error logging - Moved RCD check to caller. - Added put_dev() after call to cxl_pci_find_port(). Changes in V5: - Split 'cxl/rch: Prepare for logging RCH downstream port protocol errors' patch into 2 patches. - Added: cxl/core/regs: Rename phys_addr in cxl_map_component_regs() cxl/mem: Prepare for early RCH dport component register setup - Correct comments CXL3.0 to CXL 3.0. - changed cxl_port_get_comp_map() to static. Changes in V4: - Made port RAS register discovery common and called from __devm_cxl_add_dport(). - Changed RCH AER register discovery to be called from __devm_cxl_add_dport(). - Changed RAS and RCH AER register mapping to be called from __devm_cxl_add_dport(). - Changed component register mapping to support all CXL component mapping, cxl_map_component_regs(). - Added cxl_regs to 'struct cxl_dport' for providing RCH downstream port mapped registers USED in error handler. - PCI/AER: - Improved description of PCIEAER_CXL option in Kconfig. - Renamed function to pci_aer_unmask_internal_errors(), added pcie_aer_is_native() check. - Improved comments and added spec refs. - Renamed functions to cxl_rch_handle_error*(). - Modified cxl_rch_handle_error_iter() to only call the handler callbacks, this also simplifies refcounting of the pdev. - Refactored handle_error_source(), created pci_aer_handle_error(). - Changed printk messages to pci_*() variants. - Added check for pcie_aer_is_native() to the RCEC. - Introduced function cxl_rch_enable_rcec(). - Updated patch description ("PCI/AER: Forward RCH downstream port-detected errors to the CXL.mem dev handler"). Changes in V3: - Correct base commit in cover sheet. - Change hardcoded return 0 to NULL in regs.c. - Remove calls to pci_disable_pcie_error_reporting(pdev) and pci_enable_pcie_error_reporting(pdev) in mem.c; - Move RCEC interrupt unmask to PCIe port AER driver's probe. - Fixes missing PCIEAER and PCIEPORTBUS config option error. - Rename cxl_rcrb_setup() to cxl_setup_rcrb() in mem.c. - Update cper_mem_err_unpack() patch subject and description. Changes in V2: - Refactor RCH initialization into cxl_mem driver. - Includes RCH RAS and AER register discovery and mapping. - Add RCEC protocol error interrupt forwarding to CXL endpoint handler. - Change AER and RAS logging to use existing trace routines. - Enable RCEC AER internal errors. Dan Williams (1): cxl/port: Fix @host confusion in cxl_dport_setup_regs() Robert Richter (13): cxl/port: Fix release of RCD endpoints cxl/core/regs: Rename @dev to @host in struct cxl_register_map cxl/port: Rename @comp_map to @reg_map in struct cxl_register_map cxl/port: Pre-initialize component register mappings cxl/pci: Store the endpoint's Component Register mappings in struct cxl_dev_state cxl/hdm: Use stored Component Register mappings to map HDM decoder capability cxl/pci: Remove Component Register base address from struct cxl_dev_state cxl/port: Remove Component Register base address from struct cxl_port cxl/pci: Introduce config option PCIEAER_CXL PCI/AER: Forward RCH downstream port-detected errors to the CXL.mem dev handler PCI/AER: Unmask RCEC internal errors to enable RCH downstream port error handling cxl/core/regs: Rename phys_addr in cxl_map_component_regs() cxl/core/regs: Rework cxl_map_pmu_regs() to use map->dev for devm Terry Bowman (6): cxl/pci: Add RCH downstream port AER register discovery PCI/AER: Refactor cper_print_aer() for use by CXL driver module cxl/pci: Update CXL error logging to use RAS register address cxl/pci: Map RCH downstream AER registers for logging protocol errors cxl/pci: Add RCH downstream port error logging cxl/pci: Disable root port interrupts in RCH mode drivers/cxl/core/core.h | 1 + drivers/cxl/core/hdm.c | 48 +++----- drivers/cxl/core/mbox.c | 2 + drivers/cxl/core/pci.c | 223 +++++++++++++++++++++++++++++++++-- drivers/cxl/core/port.c | 104 +++++++++++----- drivers/cxl/core/regs.c | 72 ++++++++--- drivers/cxl/cxl.h | 34 ++++-- drivers/cxl/cxlmem.h | 4 +- drivers/cxl/mem.c | 7 +- drivers/cxl/pci.c | 14 +-- drivers/pci/pcie/Kconfig | 9 ++ drivers/pci/pcie/aer.c | 162 ++++++++++++++++++++++++- include/linux/aer.h | 2 +- tools/testing/cxl/test/mem.c | 1 - 14 files changed, 559 insertions(+), 124 deletions(-) base-commit: c66650d29764e228eba40b7a59fdb70fa6567daa