From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012015.outbound.protection.outlook.com [40.107.200.15]) (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 5EDD63770B for ; Thu, 23 Apr 2026 17:25:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.15 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776965162; cv=fail; b=XeLe92wPDj3CZc025mFazYfUqEx35mTiBS4hD6/dP+GwAs4KPfXCtlqVZajlU3NU8zD0/xs0Zg9R1b5XdX2eebMsYF2PkEO0r1Oajk1uCkuB6cH00Pv7eUGpT6ao6ekFWlj32HgzA+GnbKImcdzHPL20dgNI8ntpwuIL4sE5LuI= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776965162; c=relaxed/simple; bh=Kp14qcnUZs2Su2Vr+omoFnjZ4fQcqWYFsu69K+neA8s=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QWareXlO7Usu32GQ1/PIjbTVqnpCXNYW2osRs2JhdZ9vB229XzuhqyZ1bSmK+sPhnUmcTSsMWK/ApAw4gsS3CFAgyJo8jGGkXLsmHA9xyA/VNJ6ZVs2su3eAZ1koj3vvxqnyVZFr4SBBYhTu4Hp1yzGxtcEfaL24/k0/h5M0+54= 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=v7YzieGF; arc=fail smtp.client-ip=40.107.200.15 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="v7YzieGF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u0egnArakt99PY/YPDucJSwJG8V+jF+mNbxasRtlDd4ppYMMI5i23axNGdPxDDxEXVjLx1lY6ysQXtLkOB6OGM01qzDuTJGuROI2ekJZrgMi/YmfBzLTp1hVq33LWuX5e9/iMEeDWrjV5F+iwofo6v3NMgdI9cKfimKnynwlGrhgjdI1bHJkGEF+bsQVKZAHhWPZ8y0Kn90w++KPit8qLhyPKVaHtnz8x0Q/LM7i17kfgFp4LO2DiBgk6+lhruSd5+es3xzB9p+TlmTJsWmYc+9wvZr0hvVbOQJIQcPNvZXNnidfhv7EVYFuqVbAuRenvouphZI6a9FKCyGMg/40eg== 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=adjIC0eSc2KjoCQUt1SBSjYNCuIiRRHqDue4h/W0wLY=; b=v4DEeQ0FtWLa+TJ7GwG8HuuThv6wTviEZrMqmuf8YD5ALaAcjOULXntAdjFVC2VhHt1rj25qIB/cI74VXiCY16L+IEgJFfUcybQzzKRWXp9B0Lvvc4M55ydOnPrh9y9c36koXeFO9yKBqQcMKrGcmozSM428wkEzyB+Pjd2IejCsJ/ZBgC7vfGwr8EcPftyZpqRu5ExDvJGNCnvMdRI+nmHdWKHM1zJihrJx7qRprvc1EFq+Dq7sRreq1BOmz7W+elWjeMZ0NBJw11ct6ldVoZTtr+PolaK8uGiRO4/IAUNlsiqT3T5tXyIGs8U1D5pWq1JWguDzWttFz2TZhkEQtg== 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=adjIC0eSc2KjoCQUt1SBSjYNCuIiRRHqDue4h/W0wLY=; b=v7YzieGF5lpV64SAUvKN1sliIdtcUFFteQwXZI5mE8sAsWL29c3+uKXhWfZgsf2yr/VvODjCsEsmmtCGepijnse8OMTJPsTfClw7+4yTd7PAfoGJKdcBAXHvDmE/4SDMJ17+NnO8tuOhbElUkuwdYxEFGhPrBcwAF6AyBpfuMlA= Received: from BN9PR03CA0516.namprd03.prod.outlook.com (2603:10b6:408:131::11) by DS0PR12MB6462.namprd12.prod.outlook.com (2603:10b6:8:c6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.12; Thu, 23 Apr 2026 17:25:45 +0000 Received: from BN3PEPF0000B370.namprd21.prod.outlook.com (2603:10b6:408:131:cafe::c4) by BN9PR03CA0516.outlook.office365.com (2603:10b6:408:131::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9846.22 via Frontend Transport; Thu, 23 Apr 2026 17:25:45 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN3PEPF0000B370.mail.protection.outlook.com (10.167.243.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.4 via Frontend Transport; Thu, 23 Apr 2026 17:25:45 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Thu, 23 Apr 2026 12:25:26 -0500 Received: from satlexmb08.amd.com (10.181.42.217) 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.39; Thu, 23 Apr 2026 12:25:26 -0500 Received: from galena-46a8.xcblab.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.17 via Frontend Transport; Thu, 23 Apr 2026 12:25:24 -0500 From: To: , , , , , , , CC: Alejandro Lucero , Jonathan Cameron , Edward Cree , "Alison Schofield" , Dan Williams Subject: [PATCH v26 1/8] sfc: add cxl support Date: Thu, 23 Apr 2026 19:05:21 +0100 Message-ID: <20260423180528.17166-2-alejandro.lucero-palau@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260423180528.17166-1-alejandro.lucero-palau@amd.com> References: <20260423180528.17166-1-alejandro.lucero-palau@amd.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Received-SPF: None (SATLEXMB04.amd.com: alejandro.lucero-palau@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B370:EE_|DS0PR12MB6462:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e6dd438-5e78-4bcb-c488-08dea15d5a53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700016|7416014|1800799024|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: C4K3WB0Rgeujx4ngAAytKXf7wpNB484I2N29YXhmobR1KwTEpezPu1tQBtvHeCMsNqZd4xhIkYLp8QcyOfXFOrJkpHGvHz1Lij7tZKoHhXV+/NCUJeh2P0BOD6o+BunpRHV+QI+DDFiE4i/Yg8rhDvgfb24cWtW16fDW4W+zY0yA/ip7sgfgCjULQy3Je4kN+LVtQaYj6J/aA+cWQgPZWYQNMyWBafMaKtkeeQ9GzX1oOV9OdORv8dysm7TSiZqU7jNA4igC6YOWmrfrvBrFQLdWzW0yfdL5mjlsHCanmtLg0lD3mf842LE/P7DhmT2KNoW1WnhDWblDBsAofu4FUrNBU6kF99E5F9ZcV2cY/NvbYcD+2LPNkryhj+Qq8OekSm3/aoyazevnErcPSPogSzkALqUysPnNJThV4HqYluBXLI7+cwzN3KXEno21/BMQe8IN76Z/myGoDu1TRF4YilnMwJvZP1xjnr60DDNoZD50ENg0dgg++ha2IG4PeJcH9kNHu9JHFf1/7YOuCnbobhKewaWWZzAG/Wklf+OvAgY5KCJUA1R4Gq36O5SFIrI5Q0gP8Irf3f0V9Yvl/ih/3zl7TljeZhBOh66LrQuJGo54wEodFcKT4YXKyH4DvDfNuHSMKBfMJi7xUKPG+1Dxfu58CkMypIEUjQRQkTa4x4bvdvtGgQdcKv/jf4aMEsr52kqSFMs8gl9uYVaj4UKHPFCG6hhDsWjZ6wqKGB4MtrtfYO0wvJ0Oail2NO7dcAnecp89MbV92v8K+nUfGUhwKw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700016)(7416014)(1800799024)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WN5MkIRA+xCBD46sGLRdgGEQZe5HN7Pag503VjR2YAXkdO2XxxfuYNcxdYLrS7vATDJXEi8b0ipGl91MZvm+ek7k7pJjMcqW9e06rpg91chvpQlkcKFrXUzkjKo4kegODqMQ4ry9PS/IvO5zUsYilU1YNplVSMCmfAmt73gbd4YaIvvMqB/XtDoGFYFGMKXoTyFpM51WmC0LRrs5oK73YAG6QZO2xXV/4P2rt2SlRNKRKPUKo1a1p3P8WNcenCrYfy+pYlbAl1vl6S3r9T/zM30Vx7q4IjVuLKczdR8sgb3AT/vQ0neVjAOUm+yufwbV40ShTGb+P9S706kTcJ4w8xFFnUehA45Y6faW6XtlOWY0pcl80lSmpWaHdQoeviPmZPZ8btMSb6+zWL2log6cRIJ1OF6YzIwwf042xeBPyRI6Vm4I8oGuzICfiWVXL1Ll X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2026 17:25:45.2241 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e6dd438-5e78-4bcb-c488-08dea15d5a53 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B370.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6462 From: Alejandro Lucero Add CXL initialization based on new CXL API for accel drivers and make it dependent on kernel CXL configuration. Signed-off-by: Alejandro Lucero Reviewed-by: Jonathan Cameron Acked-by: Edward Cree Reviewed-by: Alison Schofield Reviewed-by: Dan Williams Reviewed-by: Dave Jiang --- drivers/net/ethernet/sfc/Kconfig | 9 +++++ drivers/net/ethernet/sfc/Makefile | 1 + drivers/net/ethernet/sfc/efx.c | 14 +++++++- drivers/net/ethernet/sfc/efx_cxl.c | 52 +++++++++++++++++++++++++++ drivers/net/ethernet/sfc/efx_cxl.h | 29 +++++++++++++++ drivers/net/ethernet/sfc/net_driver.h | 10 ++++++ 6 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/sfc/efx_cxl.c create mode 100644 drivers/net/ethernet/sfc/efx_cxl.h diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index c4c43434f314..979f2801e2a8 100644 --- a/drivers/net/ethernet/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -66,6 +66,15 @@ config SFC_MCDI_LOGGING Driver-Interface) commands and responses, allowing debugging of driver/firmware interaction. The tracing is actually enabled by a sysfs file 'mcdi_logging' under the PCI device. +config SFC_CXL + bool "Solarflare SFC9100-family CXL support" + depends on SFC && CXL_BUS >= SFC + default SFC + help + This enables SFC CXL support if the kernel is configuring CXL for + using CTPIO with CXL.mem. The SFC device with CXL support and + with a CXL-aware firmware can be used for minimizing latencies + when sending through CTPIO. source "drivers/net/ethernet/sfc/falcon/Kconfig" source "drivers/net/ethernet/sfc/siena/Kconfig" diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile index d99039ec468d..bb0f1891cde6 100644 --- a/drivers/net/ethernet/sfc/Makefile +++ b/drivers/net/ethernet/sfc/Makefile @@ -13,6 +13,7 @@ sfc-$(CONFIG_SFC_SRIOV) += sriov.o ef10_sriov.o ef100_sriov.o ef100_rep.o \ mae.o tc.o tc_bindings.o tc_counters.o \ tc_encap_actions.o tc_conntrack.o +sfc-$(CONFIG_SFC_CXL) += efx_cxl.o obj-$(CONFIG_SFC) += sfc.o obj-$(CONFIG_SFC_FALCON) += falcon/ diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 8f136a11d396..90ccbe310386 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -34,6 +34,7 @@ #include "selftest.h" #include "sriov.h" #include "efx_devlink.h" +#include "efx_cxl.h" #include "mcdi_port_common.h" #include "mcdi_pcol.h" @@ -981,12 +982,14 @@ static void efx_pci_remove(struct pci_dev *pci_dev) efx_pci_remove_main(efx); efx_fini_io(efx); + + probe_data = container_of(efx, struct efx_probe_data, efx); + pci_dbg(efx->pci_dev, "shutdown successful\n"); efx_fini_devlink_and_unlock(efx); efx_fini_struct(efx); free_netdev(efx->net_dev); - probe_data = container_of(efx, struct efx_probe_data, efx); kfree(probe_data); }; @@ -1190,6 +1193,15 @@ static int efx_pci_probe(struct pci_dev *pci_dev, if (rc) goto fail2; + /* A successful cxl initialization implies a CXL region created to be + * used for PIO buffers. If there is no CXL support, or initialization + * fails, cxl_pio_initialised will be false and legacy PIO buffers + * defined at specific PCI BAR regions will be used. + */ + rc = efx_cxl_init(probe_data); + if (rc) + pci_err(pci_dev, "CXL initialization failed with error %d\n", rc); + rc = efx_pci_probe_post_io(efx); if (rc) { /* On failure, retry once immediately. diff --git a/drivers/net/ethernet/sfc/efx_cxl.c b/drivers/net/ethernet/sfc/efx_cxl.c new file mode 100644 index 000000000000..b7e8d85a43d3 --- /dev/null +++ b/drivers/net/ethernet/sfc/efx_cxl.c @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0-only +/**************************************************************************** + * + * Driver for AMD network controllers and boards + * Copyright (C) 2025, Advanced Micro Devices, Inc. + */ + +#include + +#include "net_driver.h" +#include "efx_cxl.h" + +#define EFX_CTPIO_BUFFER_SIZE SZ_256M + +int efx_cxl_init(struct efx_probe_data *probe_data) +{ + struct efx_nic *efx = &probe_data->efx; + struct pci_dev *pci_dev = efx->pci_dev; + struct efx_cxl *cxl; + u16 dvsec; + + probe_data->cxl_pio_initialised = false; + + /* Is the device configured with and using CXL? */ + if (!pcie_is_cxl(pci_dev)) + return 0; + + dvsec = pci_find_dvsec_capability(pci_dev, PCI_VENDOR_ID_CXL, + PCI_DVSEC_CXL_DEVICE); + if (!dvsec) { + pci_info(pci_dev, "CXL_DVSEC_PCIE_DEVICE capability not found\n"); + return 0; + } + + pci_dbg(pci_dev, "CXL_DVSEC_PCIE_DEVICE capability found\n"); + + /* Create a cxl_dev_state embedded in the cxl struct using cxl core api + * specifying no mbox available. + */ + cxl = devm_cxl_dev_state_create(&pci_dev->dev, CXL_DEVTYPE_DEVMEM, + pci_get_dsn(pci_dev), dvsec, + struct efx_cxl, cxlds, false); + + if (!cxl) + return -ENOMEM; + + probe_data->cxl = cxl; + + return 0; +} + +MODULE_IMPORT_NS("CXL"); diff --git a/drivers/net/ethernet/sfc/efx_cxl.h b/drivers/net/ethernet/sfc/efx_cxl.h new file mode 100644 index 000000000000..04e46278464d --- /dev/null +++ b/drivers/net/ethernet/sfc/efx_cxl.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/**************************************************************************** + * Driver for AMD network controllers and boards + * Copyright (C) 2025, Advanced Micro Devices, Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation, incorporated herein by reference. + */ + +#ifndef EFX_CXL_H +#define EFX_CXL_H + +#ifdef CONFIG_SFC_CXL + +#include + +struct efx_probe_data; + +struct efx_cxl { + struct cxl_dev_state cxlds; + struct cxl_memdev *cxlmd; +}; + +int efx_cxl_init(struct efx_probe_data *probe_data); +#else +static inline int efx_cxl_init(struct efx_probe_data *probe_data) { return 0; } +#endif +#endif diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index b98c259f672d..3964b2c56609 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -1197,14 +1197,24 @@ struct efx_nic { atomic_t n_rx_noskb_drops; }; +#ifdef CONFIG_SFC_CXL +struct efx_cxl; +#endif + /** * struct efx_probe_data - State after hardware probe * @pci_dev: The PCI device * @efx: Efx NIC details + * @cxl: details of related cxl objects + * @cxl_pio_initialised: cxl initialization outcome. */ struct efx_probe_data { struct pci_dev *pci_dev; struct efx_nic efx; +#ifdef CONFIG_SFC_CXL + struct efx_cxl *cxl; + bool cxl_pio_initialised; +#endif }; static inline struct efx_nic *efx_netdev_priv(struct net_device *dev) -- 2.34.1