From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazon11011051.outbound.protection.outlook.com [40.93.194.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC1113ABDB3; Mon, 22 Jun 2026 12:40:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.194.51 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782132048; cv=fail; b=QZ3v6pfWGKRPqM6wuptCRnqKHVSON/JbNLNTLKal8Ss1gilcmP4RRntGhIANlRzJg7iVFuP6oq8K+CACK80O142Ruo8NUCFh0uh2HFzm7j+p8Ivo+cSjDaMkj+3YP/gOPpf1KJVPPvyENAr4ruT957SXR4CfcQluXMPWZgkUo68= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782132048; c=relaxed/simple; bh=78jSCrvXuase7W6w3IVWmf1ztYtZANKkC9RKvvIHpGE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OoSMikUb/EemiS15fBp21iUJjfOnKnTc9+yQE/cjE/PyHGiYV15gRpQGPqlCRl67ujq6qfZfwlLSGRLWbpjADiIbPlMr5TO8ti7W/47JgImyhgpnvZpC78/nYJ56F3lZoz6QvXLBjc580Jvl/tn3xudBC1fkKcQsagq6za/Uo6g= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=IjesScPM; arc=fail smtp.client-ip=40.93.194.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="IjesScPM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Dtni9Qlc79yIFp4kt/EpUjASOLYLV+FXm2ACTmAnHfEaZ5qxwqVD2lBsNULLqBQCgFdH8OPTcg7+MiJApkB62Tpl+JYKs+B+0gg1FPVzmNB6xzOuq8UK1Z4a9aBR3cHgws+3OAujJhkt4Os71Vbx78Ifu3wdYJVlVSUcDxp/3/FVKbAe5F3i5K/HpYa2oXlRSrA4TnM51ztsN+kVQjJ4Dh6fRgRL00y86CE1bowEOQcIhaZaUTdE5xJvCupPTxbtiC5TLlm4/69BmDguptJ34yXSzmVZbAu9Q0RtX+nafADTPLMR9r8u7CMlbZslfmwNlq0vlE8MgOWKb8nYepsw2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=o+sfC5uH0ekwUs07YpJWEW1e0YHlBACtEFds8ukdNLo=; b=uGPmiRkSrjrOn3K8NB0ya+xhMGexAvZ8uvMbMTgtrKPIkyF8yISGC8Zt71r9Dcy+7pRm+zVGL1qOzoKWRUYDvvV6/fx5KDXQqI+xQPyZCdYZ5uRjvlAAYTyhPkNgsj+3fYcDNMTmU76Z9av2ScztfmJaNb/G4sfjrSZ5YsQEaOJjgXNPgj7fx1eWv0JZcJ7oTAD0XHhm9wzXKAEvyvgg8iLKAWJxTo5hS5vpw90WaXEujntLwYfUormWN8B6VKn1+xQnomEmrtKRG5jYGZu8twWHGrJO4/WOQtDWwtviTjMtY7TGF8n6FuMNCtd6oWJXwzubyd9dnSpVRD6XlgVx6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 (0) 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=o+sfC5uH0ekwUs07YpJWEW1e0YHlBACtEFds8ukdNLo=; b=IjesScPMv0OUslBUEqxjgjPDi0nlRbvqwKx7QQfPHaWyQmXMC/Hv0T9k1o7MTWLO46Ao0NK+fqgEpyAhV34b15RJFktRktS+9OtToh724RxbWf/KSB4y528Jld8V1htXxiCvnNKfU5ECCzY2DX96wqI8/qU74Gb8z8/9AlWQHpg= Received: from BN9PR03CA0761.namprd03.prod.outlook.com (2603:10b6:408:13a::16) by BL1PR12MB5852.namprd12.prod.outlook.com (2603:10b6:208:397::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.20; Mon, 22 Jun 2026 12:40:37 +0000 Received: from BN3PEPF0000B071.namprd04.prod.outlook.com (2603:10b6:408:13a:cafe::12) by BN9PR03CA0761.outlook.office365.com (2603:10b6:408:13a::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.139.13 via Frontend Transport; Mon, 22 Jun 2026 12:40:37 +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=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by BN3PEPF0000B071.mail.protection.outlook.com (10.167.243.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.8 via Frontend Transport; Mon, 22 Jun 2026 12:40:37 +0000 Received: from Satlexmb09.amd.com (10.181.42.218) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Mon, 22 Jun 2026 07:40:27 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb09.amd.com (10.181.42.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Mon, 22 Jun 2026 05:40:26 -0700 Received: from xcbalucerop40x.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41 via Frontend Transport; Mon, 22 Jun 2026 07:40:25 -0500 From: To: , , , , , , , , CC: Alejandro Lucero , Dan Williams , Jonathan Cameron , Ben Cheatham , Edward Cree Subject: [PATCH v29 2/5] cxl/sfc: Map cxl regs Date: Mon, 22 Jun 2026 13:40:07 +0100 Message-ID: <20260622124010.2192888-3-alejandro.lucero-palau@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260622124010.2192888-1-alejandro.lucero-palau@amd.com> References: <20260622124010.2192888-1-alejandro.lucero-palau@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B071:EE_|BL1PR12MB5852:EE_ X-MS-Office365-Filtering-Correlation-Id: b3a2a784-3919-4059-81ac-08ded05b7658 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|36860700016|1800799024|23010399003|6133799003|11063799006|18002099003|22082099003|56012099006; X-Microsoft-Antispam-Message-Info: zre1CKYZxUg+H4LTW83Fg+oetzenURveFmM217a+rkZGONnpv1vW/H4PVv+ktODfABMRmsUhplBqCarVFoYAMaoDtEtC8nZiUDRpI5O/ci5gCPylK2yTyVE1gJg1J//B1O4Iism0t0pEPnuWMSgW/j15TVX0xDJCLlXbO0L2oaBMWiHUxkf1bDyIxqaBHbvpzKhdQKS2wQ0Qz7FB3A1k091S7Qdjci625qsm0PlDRbXTBmSkOHXg0gwg3Mk5yn5qjKct4Tf5oH+Qm8PihhDYwERNaqg1oyIQnuE5ZWZOjqhVImDS12JajDWbJiWAgtYr3S3yEKHd4utYp8sHu2CYz0yjgFVH5mILHfhy4NiLSlH3s5ZbdD/d5rIqS/IAqdy8O02FHQiHx3Nt3skEM2Sz6c3cjQkbjA40cyoVkONWH1risTsChMqH8hKBQpYrY/b9kWApxhafx1LazwPL0CEbq/UlOy3KoFCnnOl2IUozUSZ7vH5UcvFtBJLBf9UzJXA9oWSY1IcqMMdEw5fU3LxsMjGb8YKev7PrCnR7PUCupPU42HFGY5rTv0pVOui+Z3CqBSHCVPGfGoC+t9uFfXDp55k9bwGt3pwSLjM5gXXKifap4UaSsWBejFan+1DLKN7HzLQXaFbP75REm9u9H9UzbV0iFE2VENbar7yFBtI1TSZ3UrCW867sRohWHq043zk/wRLb/c2sweftRMfgLTu0Zw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(7416014)(376014)(36860700016)(1800799024)(23010399003)(6133799003)(11063799006)(18002099003)(22082099003)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GVdiR3iLFsen9Ti9rtibxGb+zt4xYtOjRPgmLGNfxV9IkrZSNsd0WDzqFuZ6zdbTEKi5a6gQ1+IzOZKXGgfEXoNx14WxjAA3PijtXFjCUBzrsTcAZJHFA/SXCXkv+979b0InOf8Yvj5T/v6TzSfQLGEZKeDJ2FQgrGvHhKtVJp9XIu699Ks3P8VFf8wiUVhLgyjWcO1Mz/rM07qXUhCCUfSsub4e7622BxLdhbfAO9GO/f/IOMQNq+8+Q7JFHCKbp/yG9Z8wowSbtJFgPivV4mEdXGtCYPzJxD9ySQTnkiZ27HoOiejCp4CHOMMJuwGvTHbZFJbpxxvEExft+l8lfD9FnN0JJ3UwEzc+MdjLE7ukmQwSbCE/uqQi4pFiIvZ4+Pe1jabbPJuNT8s6O3amSm5xaiJ9o8dQrTku1/FJ9gcgBSt1UGfa2B0TCx7Qsejs X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2026 12:40:37.8895 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b3a2a784-3919-4059-81ac-08ded05b7658 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B071.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5852 From: Alejandro Lucero Export cxl core functions for a Type2 driver being able to discover and map the device registers. Use it in sfc driver cxl initialization. Signed-off-by: Alejandro Lucero Reviewed-by: Dan Williams Reviewed-by: Jonathan Cameron Reviewed-by: Dave Jiang Reviewed-by: Ben Cheatham Acked-by: Edward Cree --- drivers/cxl/core/pci.c | 1 + drivers/cxl/core/port.c | 1 + drivers/cxl/core/regs.c | 1 + drivers/cxl/cxlpci.h | 12 ------------ drivers/cxl/pci.c | 1 + drivers/net/ethernet/sfc/efx_cxl.c | 26 ++++++++++++++++++++++++++ include/cxl/pci.h | 22 ++++++++++++++++++++++ 7 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 include/cxl/pci.h diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index d1f487b3d809..2bcd683aa286 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 1215ee4f4035..cb633e19151b 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/cxl/core/regs.c b/drivers/cxl/core/regs.c index 93710cf4f0a6..20c2d9fbcfe7 100644 --- a/drivers/cxl/core/regs.c +++ b/drivers/cxl/core/regs.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/cxl/cxlpci.h b/drivers/cxl/cxlpci.h index b826eb53cf7b..110ec9c44f09 100644 --- a/drivers/cxl/cxlpci.h +++ b/drivers/cxl/cxlpci.h @@ -13,16 +13,6 @@ */ #define CXL_PCI_DEFAULT_MAX_VECTORS 16 -/* Register Block Identifier (RBI) */ -enum cxl_regloc_type { - CXL_REGLOC_RBI_EMPTY = 0, - CXL_REGLOC_RBI_COMPONENT, - CXL_REGLOC_RBI_VIRT, - CXL_REGLOC_RBI_MEMDEV, - CXL_REGLOC_RBI_PMU, - CXL_REGLOC_RBI_TYPES -}; - /* * Table Access DOE, CDAT Read Entry Response * @@ -112,6 +102,4 @@ static inline void devm_cxl_port_ras_setup(struct cxl_port *port) } #endif -int cxl_pci_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type, - struct cxl_register_map *map); #endif /* __CXL_PCI_H__ */ diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 267c679b0b3c..bb892dbfdd6d 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "cxlmem.h" #include "cxlpci.h" diff --git a/drivers/net/ethernet/sfc/efx_cxl.c b/drivers/net/ethernet/sfc/efx_cxl.c index be252af972ab..704b0ebae937 100644 --- a/drivers/net/ethernet/sfc/efx_cxl.c +++ b/drivers/net/ethernet/sfc/efx_cxl.c @@ -7,6 +7,8 @@ #include +#include +#include #include "net_driver.h" #include "efx_cxl.h" @@ -18,6 +20,7 @@ int efx_cxl_init(struct efx_probe_data *probe_data) struct pci_dev *pci_dev = efx->pci_dev; struct efx_cxl *cxl; u16 dvsec; + int rc; /* Is the device configured with and using CXL? */ if (!pcie_is_cxl(pci_dev)) @@ -42,6 +45,29 @@ int efx_cxl_init(struct efx_probe_data *probe_data) if (!cxl) return -ENOMEM; + rc = cxl_pci_setup_regs(pci_dev, CXL_REGLOC_RBI_COMPONENT, + &cxl->cxlds.reg_map); + if (rc) { + pci_err(pci_dev, "No component registers\n"); + return rc; + } + + if (!cxl->cxlds.reg_map.component_map.hdm_decoder.valid) { + pci_err(pci_dev, "Expected HDM component register not found\n"); + return -ENODEV; + } + + if (!cxl->cxlds.reg_map.component_map.ras.valid) { + pci_err(pci_dev, "Expected RAS component register not found\n"); + return -ENODEV; + } + + /* Set media ready explicitly as there are neither mailbox for checking + * this state nor the CXL register involved, both not mandatory for + * type2. + */ + cxl->cxlds.media_ready = true; + probe_data->cxl = cxl; return 0; diff --git a/include/cxl/pci.h b/include/cxl/pci.h new file mode 100644 index 000000000000..3e0000015871 --- /dev/null +++ b/include/cxl/pci.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ + +#ifndef __CXL_CXL_PCI_H__ +#define __CXL_CXL_PCI_H__ + +/* Register Block Identifier (RBI) */ +enum cxl_regloc_type { + CXL_REGLOC_RBI_EMPTY = 0, + CXL_REGLOC_RBI_COMPONENT, + CXL_REGLOC_RBI_VIRT, + CXL_REGLOC_RBI_MEMDEV, + CXL_REGLOC_RBI_PMU, + CXL_REGLOC_RBI_TYPES +}; + +struct cxl_register_map; +struct pci_dev; + +int cxl_pci_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type, + struct cxl_register_map *map); +#endif -- 2.34.1