From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010056.outbound.protection.outlook.com [52.101.56.56]) (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 AACC519CCF5; Mon, 30 Mar 2026 14:38:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.56 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774881525; cv=fail; b=eeP9EUEm9xGHU+4ZExLYBvjL9YYhkFEDrt6s4H3wgROK2iEEKutWpVsgFrGx+4/yeYhyAAn0pMaPDmZHt6UTn1p2zgyd7bozEAce8HG04yAOxVfFeFSb2XfKoVT1QadPXrbTipywOff57bLeN6ySI1C385qXMfRMUOc/fvgntsM= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774881525; c=relaxed/simple; bh=Z7Krr2ZE2mu6kXneDLKoh6Vx2fBJxcy+zmlSpsDD7D4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VgBM04nx1Oxn5qLbDM6UdFZSZzBR1mnljlAURHUXkvC+hCVhmoC3iOgLmN02uVhKx21Ls+Us1A0dIlQRkO+LspL8KqpAhoQPmk+t1mP+hBPkTa5Uhs+Ls3uxY4di+upAZJB03a/ATuC+G7HJ8xX4lpTSheqEWj54+834WfMHUuQ= 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=QxnTqth0; arc=fail smtp.client-ip=52.101.56.56 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="QxnTqth0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CO0mP/LNo3mR/p87rQrqZzVU3YYJQi/niW+tWVkDOaiOvTUskjbKrWbSRUWMjPlvV1Y0y7+tj/P3jEwBoyNonJw41Don1SNMcIUYAKRPBkRQxeBO4ZyvDlnMVpPxH/bMKz1rSxDKlEtY8iQOoGvJMTu3GYsKytk+IH+wTp8awfctQVydbuH4F8HTfIsVQHvgf9YMx1O0mf0ZfDNnSgQVYawXAjiTneeDsevNVmn8Jm9wFDfUnAZx9O1ZCVpkcOfz67J4KihaH1qcPXJzl5l+O9tEy1zEmduX5aYQ2Yx7WXLeBVEVzyDLEccDgu/JkiEvJakITDcvB29fgFLWBZsOMA== 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=wVZ6/P54Z6jdbcVLL8f4ZDwwsv5Xo46UXb1N2doa/nA=; b=FPLxCy2pm2/DtpX1B+R6xxTEIvgMSVIxZscJ8N1NCZO5tZLEAxntN1k7itkhWVWooLBc2OgRctm7moDeB2RkVW/BhyCGcKHx765YA6Vl2upE6qHwo9frvMKgswi6SueSTKXpCtvAX1T4MCU0vn/7uAckWFHZa+QlrcVYrsKFfEFNE7jwCIJAHqh/Sh5ni3G7WeUkkYLl8nM6GJ15KpSUJ02VlH7w1lQYpCKuLH4Yw0h3u7bRhnkKhMW1DYUeeW5OI3GdeNYM0p7Offn03S/bEqAxLVWTIlLZDDj5W5swB6fYYaP0u/u9CVpajRpC1D9HH3OYIi4L8ywib0Sd1KxCkQ== 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=wVZ6/P54Z6jdbcVLL8f4ZDwwsv5Xo46UXb1N2doa/nA=; b=QxnTqth0lTKdCYWhxfipHjPrO0/X4z2rYpwYpgzO24IiOeBzFU4psBX9RJoFViLH1i4rAEjWWhuEM7EOSPsWWr9vTqc5rqI67rGPoW7rUWpQC0E84HjaCLZ6gsZyovQ5IdT9bghfv36+2rDLknn9zWKPFI2JBHTLbBEh/2y3jmU= Received: from MW4PR04CA0080.namprd04.prod.outlook.com (2603:10b6:303:6b::25) by SJ1PR12MB6051.namprd12.prod.outlook.com (2603:10b6:a03:48a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.15; Mon, 30 Mar 2026 14:38:37 +0000 Received: from MWH0EPF000A6735.namprd04.prod.outlook.com (2603:10b6:303:6b:cafe::46) by MW4PR04CA0080.outlook.office365.com (2603:10b6:303:6b::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9745.28 via Frontend Transport; Mon, 30 Mar 2026 14:38: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 MWH0EPF000A6735.mail.protection.outlook.com (10.167.249.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9745.21 via Frontend Transport; Mon, 30 Mar 2026 14:38: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.17; Mon, 30 Mar 2026 09:38:37 -0500 Received: from satlexmb07.amd.com (10.181.42.216) 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.17; Mon, 30 Mar 2026 07:38:36 -0700 Received: from xcbalucerop40x.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17 via Frontend Transport; Mon, 30 Mar 2026 09:38:35 -0500 From: To: , , , , , , , , CC: Alejandro Lucero , Jonathan Cameron , Edward Cree , "Alison Schofield" Subject: [PATCH v25 01/11] sfc: add cxl support Date: Mon, 30 Mar 2026 15:38:17 +0100 Message-ID: <20260330143827.1278677-2-alejandro.lucero-palau@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260330143827.1278677-1-alejandro.lucero-palau@amd.com> References: <20260330143827.1278677-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: MWH0EPF000A6735:EE_|SJ1PR12MB6051:EE_ X-MS-Office365-Filtering-Correlation-Id: d86b9e0e-058a-46ad-0bfa-08de8e6a077d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700016|1800799024|82310400026|22082099003|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: v92yiiwkc3Ep6lcNEG24/rYCRV8NXF/vF6wOEKwuwg6D4A3tJwZ3x0uGaIybtnyVc9XkTqzzZSzUSTU3FeKRBKSRCgcB7/6swlOcJT/wUqLnaKyy0EF9eunr40nTDojXL5STFpGgMsY4UN/3P2RnCHsnqQ1mwzMld/tiV6oz9tCVK8CApL0yJ6uSUrtxd+ibi7iyUq7vf64MiuxjLy8/OrsEyDHPadt0GfpA4t939SrP7UK9Q6n3T3UsK4Q8mlgLZy8f0HrCE9l3hBS9YxHT2LPOUjEWODTBs2GDtV5LKRWGe/HqEMx2Tvrwzb7aeFLw4+ra+TQ1MBIZ+LXoLdwpwUgleoYqs+VNqu2FmBUeK6dOdqccvMcihCtCTF8bCNcFXmxJ574WAbBuJgP/zfd9ahrpM1AzRbujjgjcsRnxWqXuKQs822Nk4kpigV92M8zFIz349frpJUVNP4SiTgrczIhqZjPnQs33vgmUfNLsHZgaOKjTeG0+GnjmU57fNSBxS3Jlv4K+bi4nPxy6T/a3HOUf6LdQJXefjTCjA8NlH48OSJ34aatqW4EeAFk/e+0g3VptMMLqedMZKSLT1F7iQ34j5ZcffXPeJE7OXKeMqBx8RZ8Z8OXY40LY9YagiDr8tYZkHpUqXiCD63RvkvQAMK/LzPy+70QLBiHnbKYHy3mSxLA8rcajPe1OOJIXRmK7sGZ5e+9EK1ejY9a8rjqXFsAy0ZRA6rqvsM11K9aMjkzy4NC8R+DOcDAby0jD5T9IusLr8oa0wbDAGLmITjaASA== 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)(376014)(7416014)(36860700016)(1800799024)(82310400026)(22082099003)(56012099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DphOKnoWrBetOR/2ciQFIhyibSHAAV/T4CypIFCdEs3kIzzwX+8e+zG72tEcFf6Cl4zOxfy4fF4rk2fGz32zRGWBEWdzbe4YDImBj/TgrbJoftXd2ly85BxT3AoA2HAsvNuT765maOOsCXtHN/2ispfdQmvbEY+9T8G/i5dr80tMufiZA68XuDTnIjKmv/VJ2pIrd1LApoI3G3+bfm434aHSBqWWqPOuJBFq+KK4da5hhUUohcEdQG763Kao6sJsJfwSMyXu5DszRXStZKmUeelOQvq3FKk8iTjvbpxRObTSTcfAMmvczP85tEtUoeoUPmRcbv2XzIRx8XcDaIYnvMkk5iQYhXEWt0SqcC5OXBguC8U8NX/dGiPqxVO7Fwp75LAiVEYNUec/q19KpQuSUBaTvMlPE2sTLhEyg1Mcf34i2a6HqT4VjniNImbyAEV/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2026 14:38:37.5748 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d86b9e0e-058a-46ad-0bfa-08de8e6a077d 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: MWH0EPF000A6735.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6051 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 | 15 ++++++- drivers/net/ethernet/sfc/efx_cxl.c | 56 +++++++++++++++++++++++++++ drivers/net/ethernet/sfc/efx_cxl.h | 40 +++++++++++++++++++ drivers/net/ethernet/sfc/net_driver.h | 10 +++++ 6 files changed, 130 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..c1e6e31f07cf 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,15 @@ 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); + efx_cxl_exit(probe_data); + 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 +1194,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, efx_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..f66db976fde9 --- /dev/null +++ b/drivers/net/ethernet/sfc/efx_cxl.c @@ -0,0 +1,56 @@ +// 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_dev->dev.id, dvsec, struct efx_cxl, + cxlds, false); + + if (!cxl) + return -ENOMEM; + + probe_data->cxl = cxl; + + return 0; +} + +void efx_cxl_exit(struct efx_probe_data *probe_data) +{ +} + +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..961639cef692 --- /dev/null +++ b/drivers/net/ethernet/sfc/efx_cxl.h @@ -0,0 +1,40 @@ +/* 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 cxl_root_decoder; +struct cxl_port; +struct cxl_endpoint_decoder; +struct cxl_region; +struct efx_probe_data; + +struct efx_cxl { + struct cxl_dev_state cxlds; + struct cxl_memdev *cxlmd; + struct cxl_root_decoder *cxlrd; + struct cxl_port *endpoint; + struct cxl_endpoint_decoder *cxled; + struct cxl_region *efx_region; + void __iomem *ctpio_cxl; +}; + +int efx_cxl_init(struct efx_probe_data *probe_data); +void efx_cxl_exit(struct efx_probe_data *probe_data); +#else +static inline int efx_cxl_init(struct efx_probe_data *probe_data) { return 0; } +static inline void efx_cxl_exit(struct efx_probe_data *probe_data) {} +#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