From nobody Thu Dec 18 16:46:34 2025 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 38DFFC83F0C for ; Fri, 25 Aug 2023 23:34:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231199AbjHYXdk (ORCPT ); Fri, 25 Aug 2023 19:33:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230491AbjHYXdU (ORCPT ); Fri, 25 Aug 2023 19:33:20 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2088.outbound.protection.outlook.com [40.107.223.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BD912109; Fri, 25 Aug 2023 16:33:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SEtyWq0o7Z//ExYh7gzA6fD5sM7dkYBX7yixE/+iWaQXeplZ1DimEeBtG22qAUqBPkMAbIhFzqJx3xsjzh3GHYXt0b5gSsiANBMTMVWmGqNAcqABQM0XzpzQhRhaFjVFwgLyvwG3AqXZUZzMg7yiuJng2Y97Rn4wmRNWlo8gXZ4msRz+PhGlnFL8ztX3XjUJ/jRRlW/JxDftrACQsHY/RBMFHEkwwhE+A8C04F6QmCZvD45RaiWVbD2Vg0eqCIQO5gNuavbA3l8rIE9sqs6Vd/5B5yiq76v5KqevV8ayDmGhKOlfamyBYNzXdUAiEG4KafBYboa3j6uRGL69o0kPSQ== 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=ez/GtIEBkZtSlarHIWr7C1gHp8BkLT1hF52qsJuG3DQ=; b=OZt+o/AQVSmoANPRYT6foB02apujBrkox4y6VWUkaZqzKoE2q0rwBjWI3UOjUSJvqZ+8T2oVYQPl1StD2VGyohnelyH5MdsGKBCc01mN3qWpw60+eWLe6VeLPZqC1+UgDUi06kVftulta95md8OC+QbisTwyaYW77Gv128gkeB+1pRAQCtWRwvRYQjVwO7ymnpBYCOwoQTbxsU6bvB9mylJbyA8l8Xslfgc5+kc+bh35dQYIOJcvHIofVVOXr7REtd6f9UaWgOdFGtCG5wgPBWrwKigk2XsmzLhuFh7xBIxpeQ0Qb8wBEzxAV5JUsJlLMDMPfH6can0+qxUGdYoujA== 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=ez/GtIEBkZtSlarHIWr7C1gHp8BkLT1hF52qsJuG3DQ=; b=njQC9IoIbcispZqbKnNANcaZ0wcBCVGNoXaYw1Byl9ODChiUYtviiZrZp6j64oDMYGyPFwIEugvDGBIOghtEBuvHlXXm3OR++W0gbE0RuOI6BebCkoId4g43kzTmAsGQtf8BxaY6k/Z8IDrZ667d4jG/D0z++G5JsJiQsMOZV+0= Received: from SN6PR05CA0014.namprd05.prod.outlook.com (2603:10b6:805:de::27) by BN9PR12MB5049.namprd12.prod.outlook.com (2603:10b6:408:132::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.29; Fri, 25 Aug 2023 23:33:16 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:805:de:cafe::6f) by SN6PR05CA0014.outlook.office365.com (2603:10b6:805:de::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6723.17 via Frontend Transport; Fri, 25 Aug 2023 23:33:15 +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 SN1PEPF0002636C.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6699.15 via Frontend Transport; Fri, 25 Aug 2023 23:33:15 +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; Fri, 25 Aug 2023 18:33:14 -0500 From: Terry Bowman To: , , , , , , , CC: , , , Subject: [PATCH v9 04/15] cxl/hdm: Use stored Component Register mappings to map HDM decoder capability Date: Fri, 25 Aug 2023 18:32:00 -0500 Message-ID: <20230825233211.3029825-5-terry.bowman@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230825233211.3029825-1-terry.bowman@amd.com> References: <20230825233211.3029825-1-terry.bowman@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SN1PEPF0002636C:EE_|BN9PR12MB5049:EE_ X-MS-Office365-Filtering-Correlation-Id: 7514e013-78e9-4d28-336d-08dba5c3a7c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YnXRETPWAC+/O0TPIo4clEXM+dp9CGGEfDGFaZARHgKyIoXoswx4rSawvtgpCLia6cSi+93zzp5RNJki66h3F8WK/kKSvhALBWNDvfiKn5AtiRgV/tKHJtgi+6Fp2/zSMBFHT9mIdPWpwFTGyAQfS5eVe8i9KGPz0RBIuaEAARh/Myn/pv4nBTSjxuZnBXJtXj0P6xA+l/WToEc4B1JSop+VTWwojrtMQgrM+cGVJYwY2Gloj4NDSshcSe+Ae4cly5a8J4YnaeLkP8K9RClXndxPfUi2G8RsSHo7EJpo73lTOCrbSdSVQn/lEb68Jw0zmjkXiN6Fq97LPgeRblwAKxL3w29NEpXjKHAuOxTup7zzpQMNgC5y3R816oM37aPyso/6uKBj6M4y3b00UtpWGOgQH9FtpMRvC0tLUJusECmEmNkngIEwgrt0nuZU9Ioi0jaT2ecEm0T2lQaNOVgLd/bobKq03MvmDW+C5IEdi0jyjr1AdJ0HGbPTUmB+EHxqPuCxZhF7npqmMhLOdYl+ZkpGeeqb6n5+JjDL6PjUF8vM6ANIsARS/fyXihawt+Xf1E0wF7eUofw7bWEzbOXn2zPbQCYvzO0NHuLElo37/Xiby0B+8MfzX99JRkqPOwNsF4qBm+UTsmC3ddgjZr8R0v1DX4UOXJxoPM6Jcxj5ykXli+fCjJo6BIGOEQERY2yOLvXN7hqSHlnXgaEdT933BDFOg6dylOes21Gqvll0Y3T0eW5C550GbZ7s2MtjJo44mM3T+gY+KGPmZ3a9pyovbg== 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)(376002)(396003)(346002)(136003)(1800799009)(82310400011)(451199024)(186009)(46966006)(36840700001)(40470700004)(82740400003)(81166007)(356005)(40460700003)(8676002)(4326008)(8936002)(54906003)(41300700001)(316002)(6666004)(36756003)(7696005)(70206006)(70586007)(86362001)(110136005)(40480700001)(47076005)(7416002)(26005)(478600001)(16526019)(336012)(36860700001)(1076003)(44832011)(83380400001)(2906002)(2616005)(426003)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2023 23:33:15.4094 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7514e013-78e9-4d28-336d-08dba5c3a7c1 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: SN1PEPF0002636C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5049 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Robert Richter Now, that the Component Register mappings are stored, use them to enable and map the HDM decoder capabilities. The Component Registers do not need to be probed again for this, remove probing code. The HDM capability applies to Endpoints, USPs and VH Host Bridges. The Endpoint's component register mappings are located in the cxlds and else in the port's structure. Provide a helper function cxl_port_get_comp_map() to locate the mappings depending on the component's type. Signed-off-by: Robert Richter Signed-off-by: Terry Bowman Reviewed-by: Jonathan Cameron Reviewed-by: Dave Jiang --- drivers/cxl/core/hdm.c | 65 +++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 17c8ba8c75e0..892a1fb5e4c6 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -81,27 +81,6 @@ static void parse_hdm_decoder_caps(struct cxl_hdm *cxlhd= m) cxlhdm->interleave_mask |=3D GENMASK(14, 12); } =20 -static int map_hdm_decoder_regs(struct cxl_port *port, void __iomem *crb, - struct cxl_component_regs *regs) -{ - struct cxl_register_map map =3D { - .dev =3D &port->dev, - .resource =3D port->component_reg_phys, - .base =3D crb, - .max_size =3D CXL_COMPONENT_REG_BLOCK_SIZE, - }; - - cxl_probe_component_regs(&port->dev, crb, &map.component_map); - if (!map.component_map.hdm_decoder.valid) { - dev_dbg(&port->dev, "HDM decoder registers not implemented\n"); - /* unique error code to indicate no HDM decoder capability */ - return -ENODEV; - } - - return cxl_map_component_regs(&map, &port->dev, regs, - BIT(CXL_CM_CAP_CAP_ID_HDM)); -} - static bool should_emulate_decoders(struct cxl_endpoint_dvsec_info *info) { struct cxl_hdm *cxlhdm; @@ -146,6 +125,22 @@ static bool should_emulate_decoders(struct cxl_endpoin= t_dvsec_info *info) return true; } =20 +static struct cxl_register_map *cxl_port_get_comp_map(struct cxl_port *por= t) +{ + /* + * HDM capability applies to Endpoints, USPs and VH Host + * Bridges. The Endpoint's component register mappings are + * located in the cxlds. + */ + if (is_cxl_endpoint(port)) { + struct cxl_memdev *memdev =3D to_cxl_memdev(port->uport_dev); + + return &memdev->cxlds->comp_map; + } + + return &port->comp_map; +} + /** * devm_cxl_setup_hdm - map HDM decoder component registers * @port: cxl_port to map @@ -156,7 +151,7 @@ struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *por= t, { struct device *dev =3D &port->dev; struct cxl_hdm *cxlhdm; - void __iomem *crb; + struct cxl_register_map *comp_map; int rc; =20 cxlhdm =3D devm_kzalloc(dev, sizeof(*cxlhdm), GFP_KERNEL); @@ -165,19 +160,29 @@ struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *p= ort, cxlhdm->port =3D port; dev_set_drvdata(dev, cxlhdm); =20 - crb =3D ioremap(port->component_reg_phys, CXL_COMPONENT_REG_BLOCK_SIZE); - if (!crb && info && info->mem_enabled) { - cxlhdm->decoder_count =3D info->ranges; - return cxlhdm; - } else if (!crb) { + comp_map =3D cxl_port_get_comp_map(port); + + if (comp_map->resource =3D=3D CXL_RESOURCE_NONE) { + if (info && info->mem_enabled) { + cxlhdm->decoder_count =3D info->ranges; + return cxlhdm; + } dev_err(dev, "No component registers mapped\n"); return ERR_PTR(-ENXIO); } =20 - rc =3D map_hdm_decoder_regs(port, crb, &cxlhdm->regs); - iounmap(crb); - if (rc) + if (!comp_map->component_map.hdm_decoder.valid) { + dev_dbg(&port->dev, "HDM decoder registers not implemented\n"); + /* unique error code to indicate no HDM decoder capability */ + return ERR_PTR(-ENODEV); + } + + rc =3D cxl_map_component_regs(comp_map, dev, &cxlhdm->regs, + BIT(CXL_CM_CAP_CAP_ID_HDM)); + if (rc) { + dev_dbg(dev, "Failed to map HDM capability.\n"); return ERR_PTR(rc); + } =20 parse_hdm_decoder_caps(cxlhdm); if (cxlhdm->decoder_count =3D=3D 0) { --=20 2.34.1