From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012040.outbound.protection.outlook.com [52.101.53.40]) (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 887352F1FD7; Mon, 30 Mar 2026 14:38:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.40 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774881532; cv=fail; b=D4V7/TolvOhoQ0HVAoNg4SsNh7zrvK/QHhZbq11LeQb3fyqkW/kZVGJ1p29WrZXOb+/fGcDKXFeXIJheM1fwrGc321GlYXniSCHgpwGZiAoGabWoB3IFgF/2VVZ4W7dzlXApy4Bb2V8J/yjzwLDWARFq/K2S+LOEUtFBBybVm7s= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774881532; c=relaxed/simple; bh=pnDxxH860zweNIxOtraP2NqKmiCZxv4AUwjUCHQ7VB0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SZkWP6gPtJXurG5/Lo/8pfYJVzI2fI7N5Bg0NbcFiAZVzE4wd+c7mI11SH1rcmEnJL6F6nW8S/3wMLPjHhZr+1knE31YXTCnYWjNKi0LwrsZnt3QRXenF2S6/WF8Y2fG+Fx9uOZwx33mmYSfHHpKuTRUre2X28iMerryH01aX30= 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=jFsC19r2; arc=fail smtp.client-ip=52.101.53.40 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="jFsC19r2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FMT3pxKqHTZu3pF3zGTbXVVTRN90mbJgHp9k59LRPyYiuQ109KoASNyrjs2x9tVqzekmxva/nuYYyHfKhGE8BCzC+7TctpKSK1qfymdYsdRNlCoOxvxsgDQyLrKyJmlDAfhdrUwR4H4qFGE7CsH0+dhzrkPTM2KFyffV+uWIF6KaDcfiR8YyjKAr5ov0mI1ltGlxYfAmei+Dqvqfr5zET3NZcoOfLqKiH/8J0aKet/t1R15gFBWFXmo0NI5BBGqYTNYnn2epaCDVvE6H0WJ229Q8Na3WWI8T3laqrk1X2OHAnKxk4osS1VTFijd7I3vEGwZxsaU9aUZC5XafR3kTqQ== 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=TbUD5fXmbR5LEvU8M8WiheDV6yL6b8efHuXS7Jpm1l4=; b=Y6o6J047ivlvG1mGZmRi+jqUa2mbsLmo115MRt/e1AmzTqFbr8CdnhfiSKr6MTT3E8l+QqLvmLXQMWueXHD/mtaiGbPFL8Dz0wUEEjGidKP791MAPwTs3etSet3jDjucspLEPgVrreYS6hOePVkKQoXXnLmvRr6d3sYZQxbR/WUMt25XdlETWO3/ykP1O5gRuliz6vfGmBq26WIGbDXz0xOfCVqlmfp5RA9eQLtElQbZ83oUVnQLIQPeuLC5yYZgdYabVm4qWq1ZwadEZFKpygzCCHHDEeTlXwo+OiXUeauQ168NGTLbso3U3CSRIRgXhBegEp9NxP/ZaNBLD7fSpw== 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=TbUD5fXmbR5LEvU8M8WiheDV6yL6b8efHuXS7Jpm1l4=; b=jFsC19r238zhzMTquINB9qDKX3J5K+4qjwIlgRuxmVBSsRuLEzhECs6OBMqmXVdFP2WEInobp7RwJ//dXnmuHHLNjrEz053HU5hGCHe22ziDl+F4YNHkNZiowgHDd6ifVnHbCPLKsWpwbZCAi49+ruxZcYDQKqDG8AYCsi9xqIw= Received: from MW4PR04CA0066.namprd04.prod.outlook.com (2603:10b6:303:6b::11) by CH1PR12MB9671.namprd12.prod.outlook.com (2603:10b6:610:2b0::8) 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:42 +0000 Received: from MWH0EPF000A6735.namprd04.prod.outlook.com (2603:10b6:303:6b:cafe::35) by MW4PR04CA0066.outlook.office365.com (2603:10b6:303:6b::11) 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:42 +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:42 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Mon, 30 Mar 2026 09:38:41 -0500 Received: from satlexmb07.amd.com (10.181.42.216) 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; Mon, 30 Mar 2026 09:38:41 -0500 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:40 -0500 From: To: , , , , , , , , CC: Alejandro Lucero , Ben Cheatham , Jonathan Cameron , Alison Schofield Subject: [PATCH v25 04/11] cxl: Prepare memdev creation for type2 Date: Mon, 30 Mar 2026 15:38:20 +0100 Message-ID: <20260330143827.1278677-5-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 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: MWH0EPF000A6735:EE_|CH1PR12MB9671:EE_ X-MS-Office365-Filtering-Correlation-Id: aa8178a8-63c3-4e20-07b7-08de8e6a0a5d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700016|7416014|376014|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: gnhl7oiesXdX/ypYE7SZ8A5eHWrNHL1k/FeeA8l931wlJkS0Y9paVnX5By9DBXxDycxwpCIGw9I4HK1iRQGHLh1T3PLiEDiu8mdu1CIWd1AIYM+ILoN4qqqVWBk3NAe4Zyc7VOCgtPWYQapKJHP2aEEnndV6K5wZrpa+yVOanD/hqQzScBfuJHH5+F3hamiB5mnNjZLLGeIGPKCpEXbzfvoEcXUbHDklsg36nQi1TycUpBIr89b5pbdeW3T7hT9+kBX4OWjzE3LT9m4Fpky/i5Uih9jdHYyhWbLeuzEP1bUXdUJ9rluxiSoIHQB0NhxAGgtg9R0Z6PwGh0dtp/x05Q3I+441xctJcMaPn62bxXOgailyGrU23A1rcX6XdolXrs0tTE8zhUYHCGgxCTc7D35JgXoOq+GUJmxUuY/EkjmsF8oKyycUX4iD6jaruzFh7DXa7EIqnTLAoI7u868NDPA1riDka5xTqHNzDr91psNoqIsEpyxYPI6jUK2Z4Z0o6dVQfmvIFk0MmzO7hZiKHq52DoBxF54r42ZM8LWAY3PBpnHiNHt5ViU8KtzSq+MqiDiv498q8abi8t66Q8slL+c3zW5/S4VaZ3kQiFMUvo1ZG7sViHrX3ufFxa5WsKgEwrWiM7IjvoMwCIGXmiNcepBTAqIrDuJ86t1u11E/+CTV/cV7Wq+i8WkhOFuw3/QzQZyDsXrd68Bpt4AN54XfmO01Wvg0a5d+9Ic4fYakDTx4GzyJbTw1fq2zTr40zLRUQDEyvLK6tb85BjTnkaNztw== 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)(1800799024)(36860700016)(7416014)(376014)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wjlKFsQqUXfliwmcwo1ZN3YVOwREKs22jnrHZ9jilyY1oTMs0HSfGc9xQmXmIox7dueZYhaYW167FiwqnSu0UALyUH8g14NrKQBrdb6IiYtDEE5Z/AUsSykSXGsfKLc8NHFss0o+GCfuUxkNiY5r8kmRpIeqLDnVDU/aAVgQezMDuP6uUNFs9eJWV0C2SgD02sUuIEzO0BoAT+CJOCVpv77NgKI034F/0/87the1N65f8RDGf4B1R0IHx3SbdGMPItvOyNv1ujLLfG50WPWWxVhXb1dhI0nxLvzYsQc4UughTIJXbKjz7jXDr1nuaYapBQWYE5GY/85XY5IZOvIv1JaT82eJVptzCFptIXwd4iF+O4ZYhDGEIFLATTNCMKZrvGkMsSLrI7RIZq/+rGiVYxLcsSQ1uEDEJdq/sQFMC6yd64GJq9BCleum0OkIyQmC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2026 14:38:42.3987 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa8178a8-63c3-4e20-07b7-08de8e6a0a5d 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: CH1PR12MB9671 From: Alejandro Lucero Current cxl core is relying on a CXL_DEVTYPE_CLASSMEM type device when creating a memdev leading to problems when obtaining cxl_memdev_state references from a CXL_DEVTYPE_DEVMEM type. Modify check for obtaining cxl_memdev_state adding CXL_DEVTYPE_DEVMEM support. Make devm_cxl_add_memdev accessible from an accel driver. Signed-off-by: Alejandro Lucero Reviewed-by: Ben Cheatham Reviewed-by: Jonathan Cameron Reviewed-by: Dave Jiang Reviewed-by: Alison Schofield Reviewed-by: Dan Williams --- drivers/cxl/core/memdev.c | 15 +++++++++++-- drivers/cxl/cxlmem.h | 6 ------ drivers/cxl/mem.c | 45 +++++++++++++++++++++++++++++---------- include/cxl/cxl.h | 6 ++++++ 4 files changed, 53 insertions(+), 19 deletions(-) diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index 166ec6b7d041..759b43364ed7 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "trace.h" #include "core.h" @@ -576,9 +577,16 @@ static const struct device_type cxl_memdev_type = { .groups = cxl_memdev_attribute_groups, }; +static const struct device_type cxl_accel_memdev_type = { + .name = "cxl_accel_memdev", + .release = cxl_memdev_release, + .devnode = cxl_memdev_devnode, +}; + bool is_cxl_memdev(const struct device *dev) { - return dev->type == &cxl_memdev_type; + return (dev->type == &cxl_memdev_type || + dev->type == &cxl_accel_memdev_type); } EXPORT_SYMBOL_NS_GPL(is_cxl_memdev, "CXL"); @@ -773,7 +781,10 @@ static struct cxl_memdev *cxl_memdev_alloc(struct cxl_dev_state *cxlds, dev->parent = cxlds->dev; dev->bus = &cxl_bus_type; dev->devt = MKDEV(cxl_mem_major, cxlmd->id); - dev->type = &cxl_memdev_type; + if (cxlds->type == CXL_DEVTYPE_DEVMEM) + dev->type = &cxl_accel_memdev_type; + else + dev->type = &cxl_memdev_type; device_set_pm_not_required(dev); INIT_WORK(&cxlmd->detach_work, detach_memdev); diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 281546de426e..c98db6f18aa2 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -34,10 +34,6 @@ (FIELD_GET(CXLMDEV_RESET_NEEDED_MASK, status) != \ CXLMDEV_RESET_NEEDED_NOT) -struct cxl_memdev_attach { - int (*probe)(struct cxl_memdev *cxlmd); -}; - /** * struct cxl_memdev - CXL bus object representing a Type-3 Memory Device * @dev: driver core device object @@ -103,8 +99,6 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) struct cxl_memdev *__devm_cxl_add_memdev(struct cxl_dev_state *cxlds, const struct cxl_memdev_attach *attach); -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds, - const struct cxl_memdev_attach *attach); int devm_cxl_sanitize_setup_notifier(struct device *host, struct cxl_memdev *cxlmd); struct cxl_memdev_state; diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c index fcffe24dcb42..ff858318091f 100644 --- a/drivers/cxl/mem.c +++ b/drivers/cxl/mem.c @@ -65,6 +65,26 @@ static int cxl_debugfs_poison_clear(void *data, u64 dpa) DEFINE_DEBUGFS_ATTRIBUTE(cxl_poison_clear_fops, NULL, cxl_debugfs_poison_clear, "%llx\n"); +static void cxl_memdev_poison_enable(struct cxl_memdev_state *mds, + struct cxl_memdev *cxlmd, + struct dentry *dentry) +{ + /* + * Avoid poison debugfs for DEVMEM aka accelerators as they rely on + * cxl_memdev_state. + */ + if (!mds) + return; + + if (test_bit(CXL_POISON_ENABLED_INJECT, mds->poison.enabled_cmds)) + debugfs_create_file("inject_poison", 0200, dentry, cxlmd, + &cxl_poison_inject_fops); + + if (test_bit(CXL_POISON_ENABLED_CLEAR, mds->poison.enabled_cmds)) + debugfs_create_file("clear_poison", 0200, dentry, cxlmd, + &cxl_poison_clear_fops); +} + static int cxl_mem_probe(struct device *dev) { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); @@ -92,12 +112,7 @@ static int cxl_mem_probe(struct device *dev) dentry = cxl_debugfs_create_dir(dev_name(dev)); debugfs_create_devm_seqfile(dev, "dpamem", dentry, cxl_mem_dpa_show); - if (test_bit(CXL_POISON_ENABLED_INJECT, mds->poison.enabled_cmds)) - debugfs_create_file("inject_poison", 0200, dentry, cxlmd, - &cxl_poison_inject_fops); - if (test_bit(CXL_POISON_ENABLED_CLEAR, mds->poison.enabled_cmds)) - debugfs_create_file("clear_poison", 0200, dentry, cxlmd, - &cxl_poison_clear_fops); + cxl_memdev_poison_enable(mds, cxlmd, dentry); rc = devm_add_action_or_reset(dev, remove_debugfs, dentry); if (rc) @@ -206,16 +221,24 @@ static ssize_t trigger_poison_list_store(struct device *dev, } static DEVICE_ATTR_WO(trigger_poison_list); -static umode_t cxl_mem_visible(struct kobject *kobj, struct attribute *a, int n) +static bool cxl_poison_attr_visible(struct kobject *kobj, struct attribute *a) { struct device *dev = kobj_to_dev(kobj); struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_memdev_state *mds = to_cxl_memdev_state(cxlmd->cxlds); - if (a == &dev_attr_trigger_poison_list.attr) - if (!test_bit(CXL_POISON_ENABLED_LIST, - mds->poison.enabled_cmds)) - return 0; + if (!mds || + !test_bit(CXL_POISON_ENABLED_LIST, mds->poison.enabled_cmds)) + return false; + + return true; +} + +static umode_t cxl_mem_visible(struct kobject *kobj, struct attribute *a, int n) +{ + if (a == &dev_attr_trigger_poison_list.attr && + !cxl_poison_attr_visible(kobj, a)) + return 0; return a->mode; } diff --git a/include/cxl/cxl.h b/include/cxl/cxl.h index 1346771edc4e..10a9b8fa2f6b 100644 --- a/include/cxl/cxl.h +++ b/include/cxl/cxl.h @@ -149,6 +149,10 @@ struct cxl_dpa_partition { #define CXL_NR_PARTITIONS_MAX 2 +struct cxl_memdev_attach { + int (*probe)(struct cxl_memdev *cxlmd); +}; + /** * struct cxl_dev_state - The driver device state * @@ -225,4 +229,6 @@ struct cxl_dev_state *_devm_cxl_dev_state_create(struct device *dev, }) int cxl_set_capacity(struct cxl_dev_state *cxlds, u64 capacity); +struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds, + const struct cxl_memdev_attach *attach); #endif /* __CXL_CXL_H__ */ -- 2.34.1