From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2040.outbound.protection.outlook.com [40.107.92.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 441672D3237; Tue, 24 Jun 2025 14:14:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.40 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750774464; cv=fail; b=M1dqX5GJ8duIYrIJyLOppf6R8yvWErMTMUO+znG4Ao6Ox49i4eWBAPu46uo6Xy2MT6xCsynv6rUDaGEK+GNZ9LlbdRjCowY69SzRprLb68b02CFFsrHm/O196C6fdUgrEmiDHwmFLb/7uwKO4+BPqLd7b7OCH5uCGJfB3k1XUoQ= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750774464; c=relaxed/simple; bh=3U9lfk8w9cXgUgNGXOHLF+vWPXh/zCaGD843V+ITXzU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rGVF002i07Oazr651T91596DXjS0dl1Q3F4ePdIId2FlCjCMJ2oOoB8mvs1Nt4YulSX+d8aXkpvPnqobI6G3T1cQg3f+jCKSSznIrRNvSTpdQCpiSn8+C+AiW/5d71y9O8sX8VX/DAWmEgiMLEuqi+6HpJizil7bU8mQxTgukqQ= 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=O/Efmiv9; arc=fail smtp.client-ip=40.107.92.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="O/Efmiv9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a9bw0DYBrpPwsVciJLS4jZ3GRiZRzTUX2pvfTYreRx92NM4peuxNjCZd0u2rfAqRfzIXNzfvxLlfgJ3bDvIwEtNa19rn3k5DeQc9pfBDrjp4wTBMnO2P3iStZIdMZKHyYfr8RV2b9cRaTqa7fLgd69UHl2IW9auuB9yRA8M7GdUaaJVJi0AV9/0BRmcmRuAJhmJjMbJSrEcSVfpQwcCrhaMROTQyjCmNQdRSH4QnrAeZEqyJxm2wvmguqnyh9HN98cpFwYYOVBMYRdlS3mtpvtbBNPiyVY0EygTBHyQbMy9YODmxtetNqG/+eYFRaMrwCLV4cxH8tWaLEFyNP1M6Qg== 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=4IGz8ELYD22KZW8tOcrZc1/mUQ2AJsIuRvLRu17D8/M=; b=ywzKFU6QRKBdmgXLU4e/m09TjLjjBOhZzpnoEECG9y3cB9TmW7jErACi5AEd0Msw36+uRcxG/uwDALre3jt3Ye6/1/Fa8fx2JcHCO01+dN4ZNoRL0BklVCi4WLNXpiXrsLbqGeTzR47yBPw2/jkzdUKKwBvt5M+LZ5VCAAdVB5826pkmrm+Ws4BZzeTMTTzyrrqcQHmlZSn7uRz1BfnLVn8ejvVrzBsyPTHufgXjMp+C6AvoLuss0Fc2M0QJaBoqchCcqWDXGKxqfKcYZRGE9IDwrTw8H0oB1JLwBVRGdWv09+lb4X2dmGaT/7f2TZ0ahZ0xJ6Z/v7630zJ1uAtNjw== 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=4IGz8ELYD22KZW8tOcrZc1/mUQ2AJsIuRvLRu17D8/M=; b=O/Efmiv9vV1VCSKXuPM2fBEfgAoLnyaJ3ymhAE94ytYkrpvhanVTqK1/FMOhf45dQsh3vGdux1XGBGAQocrDqjtJRkqr8UqA7fyBy+CPc04rL9yMQ8MpLJIfGphprOny6k1ulogEmOmteY7xuCT8bBeDzLcOwhyaa9vlv+B7FTU= Received: from SJ0PR13CA0158.namprd13.prod.outlook.com (2603:10b6:a03:2c7::13) by DS7PR12MB6119.namprd12.prod.outlook.com (2603:10b6:8:99::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.22; Tue, 24 Jun 2025 14:14:19 +0000 Received: from SJ1PEPF00001CE8.namprd03.prod.outlook.com (2603:10b6:a03:2c7:cafe::d7) by SJ0PR13CA0158.outlook.office365.com (2603:10b6:a03:2c7::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Tue, 24 Jun 2025 14:14:19 +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 SJ1PEPF00001CE8.mail.protection.outlook.com (10.167.242.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8880.14 via Frontend Transport; Tue, 24 Jun 2025 14:14:19 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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; Tue, 24 Jun 2025 09:14:17 -0500 Received: from xcbalucerop40x.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Tue, 24 Jun 2025 09:14:16 -0500 From: To: , , , , , , , , CC: Alejandro Lucero , Ben Cheatham , Fan Ni , Jonathan Cameron , Alison Schofield Subject: [PATCH v17 03/22] cxl: Move pci generic code Date: Tue, 24 Jun 2025 15:13:36 +0100 Message-ID: <20250624141355.269056-4-alejandro.lucero-palau@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624141355.269056-1-alejandro.lucero-palau@amd.com> References: <20250624141355.269056-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: SJ1PEPF00001CE8:EE_|DS7PR12MB6119:EE_ X-MS-Office365-Filtering-Correlation-Id: f8821778-5761-4f17-45ec-08ddb32968ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rrriZy3AoxnwL9YtYznsgIU+lCdHrQ3YNpJd3V0QITZjl/LeicxGgKTE0cGD?= =?us-ascii?Q?qp0jRY8It00ficNGUVSJYt3LAAOYAoow1hiUYEeJ1GjMd+3fWFYakvVzqbPI?= =?us-ascii?Q?ZKUc3pMCLZjVRDEIxllS0o9fv7jzz7k+EaPokkHDgAbPHo+SMCouTysFyHVt?= =?us-ascii?Q?zBfIPw0xOYByEM4gNYiK3+TccJNLIO4Lu9d8sqmmQFkleUK8rDnEdTqJNRHH?= =?us-ascii?Q?KLN8mBrcaZ9ipQIrW3So6/KzyW+vy0uG7wyHQd5Qsdd24RXDuImL0eWrkj1T?= =?us-ascii?Q?yX60sIOGK0SISDKaCtPYcncXdybX7AIlMpGfcL6yAyjC61eYxhxMMkY2NlEO?= =?us-ascii?Q?hnPUA0fI9YIQkTwhzuU/yKOXOrbuo4JjCpH7FxEc3swmmVfmwoCraBMkpACa?= =?us-ascii?Q?Zwdn0gPTY2rYnlk/HXSh8fMMc7m4wfVDmu26tK1jQkwfkwjaPxEmw6DMpA96?= =?us-ascii?Q?7lpj1dZoYrDcKy+Urw39q6pM/KZFV72MOXfP9mvRMLQ6fzY6n3+QYQxrY9b1?= =?us-ascii?Q?IvPt+Wx8aGp6sa83P/6wltGXzTvQ8qUiRrB5NxbuomZK9ie/mKbAOrbwYS3f?= =?us-ascii?Q?/3a8psctGv+aUUQ7GCy2V1VPNlqRhUujBTTEq2lPCJ92jT5cXukDph4qdOLO?= =?us-ascii?Q?dKVriATFhXww5lY5ZhnKGeEidjoZLPPvamd6WFxJJca/sjMspRnR9MAJOKIM?= =?us-ascii?Q?A3Uti2Afs6Yh2Tb9R1Thbj+tM8xjMqlRIohRukOcVW3CQV7vMYDAym9TyfdT?= =?us-ascii?Q?YVRhYxBHfgY8E8asG2Mak9Bi8y+npd3anc2MGreu+UQuLcjqQR9hcfon/7or?= =?us-ascii?Q?OvwMmQa+c9YCaf5nnrZoqp0IJkNSdVBnW/lAvcsZqA79pkcmep50+6ANO1C+?= =?us-ascii?Q?GcWmlwMhFZN56r2UNLcEXaOSrv/z168/RMArHKD1io9d2407jx20TRDTzx09?= =?us-ascii?Q?8PfLx7TAjx2R8+5lhU5IOXmxYptW9OJxxM9UOgGDrbwpoGIR+5QSk9yG+EkD?= =?us-ascii?Q?8AzGFlP+XzbCwgxKTOLfLWTpfr5zfAon9TGMygCw0TGmDAH50IhVwYC6VrXd?= =?us-ascii?Q?nBYyjqUusC4JqS2SL+FqUSbUwoqHnXsn/qiIVqbw2h/VqoSsOR5jkgAPz/EL?= =?us-ascii?Q?ZSU5Z8ywkPXAcyvV5AEDAE4ckx1p6+1Mxt/nnrRwL+4doRQoNxUv0AdVbDNR?= =?us-ascii?Q?WCatl3f6Dpm3v1fUbtn5uyh2bahR4kAEgZSnwxmcO9uzzd6SMZD0X2GbU4HL?= =?us-ascii?Q?LMC3+m1XZKETa69GtUhKJ7q8o/5WV/MBbYpzMEkWCOH4f/2ipr8mFSd5bV7R?= =?us-ascii?Q?PBDUBjC0F3peeO/M7wsjotFphjxZYMEh393/nWRNZRt6nY7JXoQeik/rYSND?= =?us-ascii?Q?XN6pzEvAi1ao/K60XNLQODsUzOjv41lTZmFNAZZ0HQQ/2gfW5X0mbK/Sp6wm?= =?us-ascii?Q?f7/A5jF9DxoRVSAtUe+6U7QaEMl9b51NBQ6LFKY8bM1axG4DKnY033PmLEMD?= =?us-ascii?Q?5hK6MWmmZtqkfhB4Syiali8+iFJH1P+TaURY?= 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:(13230040)(1800799024)(36860700013)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 14:14:19.0415 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8821778-5761-4f17-45ec-08ddb32968ea 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: SJ1PEPF00001CE8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6119 From: Alejandro Lucero Inside cxl/core/pci.c there are helpers for CXL PCIe initialization meanwhile cxl/pci.c implements the functionality for a Type3 device initialization. Move helper functions from cxl/pci.c to cxl/core/pci.c in order to be exported and shared with CXL Type2 device initialization. Fix cxl mock tests affected by the code move. Signed-off-by: Alejandro Lucero Reviewed-by: Dave Jiang Reviewed-by: Ben Cheatham Reviewed-by: Fan Ni Reviewed-by: Jonathan Cameron Reviewed-by: Alison Schofield Reviewed-by: Dan Williams --- drivers/cxl/core/core.h | 2 + drivers/cxl/core/pci.c | 62 +++++++++++++++++++++++++++++++ drivers/cxl/core/regs.c | 1 - drivers/cxl/cxl.h | 2 - drivers/cxl/cxlpci.h | 2 + drivers/cxl/pci.c | 70 ----------------------------------- include/cxl/pci.h | 13 +++++++ tools/testing/cxl/Kbuild | 1 - tools/testing/cxl/test/mock.c | 17 --------- 9 files changed, 79 insertions(+), 91 deletions(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 17b692eb3257..2f39944074f6 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -134,4 +134,6 @@ int cxl_set_feature(struct cxl_mailbox *cxl_mbox, const uuid_t *feat_uuid, u16 *return_code); #endif +resource_size_t cxl_rcd_component_reg_phys(struct device *dev, + struct cxl_dport *dport); #endif /* __CXL_CORE_H__ */ diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index 0eb339c91413..447dc8d3138f 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -1033,6 +1033,68 @@ bool cxl_endpoint_decoder_reset_detected(struct cxl_port *port) } EXPORT_SYMBOL_NS_GPL(cxl_endpoint_decoder_reset_detected, "CXL"); +static int cxl_rcrb_get_comp_regs(struct pci_dev *pdev, + struct cxl_register_map *map, + struct cxl_dport *dport) +{ + resource_size_t component_reg_phys; + + *map = (struct cxl_register_map) { + .host = &pdev->dev, + .resource = CXL_RESOURCE_NONE, + }; + + struct cxl_port *port __free(put_cxl_port) = + cxl_pci_find_port(pdev, &dport); + if (!port) + return -EPROBE_DEFER; + + component_reg_phys = cxl_rcd_component_reg_phys(&pdev->dev, dport); + if (component_reg_phys == CXL_RESOURCE_NONE) + return -ENXIO; + + map->resource = component_reg_phys; + map->reg_type = CXL_REGLOC_RBI_COMPONENT; + map->max_size = CXL_COMPONENT_REG_BLOCK_SIZE; + + return 0; +} + +int cxl_pci_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type, + struct cxl_register_map *map) +{ + int rc; + + rc = cxl_find_regblock(pdev, type, map); + + /* + * If the Register Locator DVSEC does not exist, check if it + * is an RCH and try to extract the Component Registers from + * an RCRB. + */ + if (rc && type == CXL_REGLOC_RBI_COMPONENT && is_cxl_restricted(pdev)) { + struct cxl_dport *dport; + struct cxl_port *port __free(put_cxl_port) = + cxl_pci_find_port(pdev, &dport); + if (!port) + return -EPROBE_DEFER; + + rc = cxl_rcrb_get_comp_regs(pdev, map, dport); + if (rc) + return rc; + + rc = cxl_dport_map_rcd_linkcap(pdev, dport); + if (rc) + return rc; + + } else if (rc) { + return rc; + } + + return cxl_setup_regs(map); +} +EXPORT_SYMBOL_NS_GPL(cxl_pci_setup_regs, "CXL"); + int cxl_pci_get_bandwidth(struct pci_dev *pdev, struct access_coordinate *c) { int speed, bw; diff --git a/drivers/cxl/core/regs.c b/drivers/cxl/core/regs.c index ecdb22ae6952..fdb99d05a66c 100644 --- a/drivers/cxl/core/regs.c +++ b/drivers/cxl/core/regs.c @@ -642,4 +642,3 @@ resource_size_t cxl_rcd_component_reg_phys(struct device *dev, return CXL_RESOURCE_NONE; return __rcrb_to_component(dev, &dport->rcrb, CXL_RCRB_UPSTREAM); } -EXPORT_SYMBOL_NS_GPL(cxl_rcd_component_reg_phys, "CXL"); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 844dc0782a5f..b60738f5d11a 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -221,8 +221,6 @@ int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type, struct cxl_register_map *map); int cxl_setup_regs(struct cxl_register_map *map); struct cxl_dport; -resource_size_t cxl_rcd_component_reg_phys(struct device *dev, - struct cxl_dport *dport); int cxl_dport_map_rcd_linkcap(struct pci_dev *pdev, struct cxl_dport *dport); #define CXL_RESOURCE_NONE ((resource_size_t) -1) diff --git a/drivers/cxl/cxlpci.h b/drivers/cxl/cxlpci.h index 570e53e26f11..0611d96d76da 100644 --- a/drivers/cxl/cxlpci.h +++ b/drivers/cxl/cxlpci.h @@ -114,4 +114,6 @@ void read_cdat_data(struct cxl_port *port); void cxl_cor_error_detected(struct pci_dev *pdev); pci_ers_result_t cxl_error_detected(struct pci_dev *pdev, pci_channel_state_t state); +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 0d3c67867965..57f125e39051 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -467,76 +467,6 @@ static int cxl_pci_setup_mailbox(struct cxl_memdev_state *mds, bool irq_avail) return 0; } -/* - * Assume that any RCIEP that emits the CXL memory expander class code - * is an RCD - */ -static bool is_cxl_restricted(struct pci_dev *pdev) -{ - return pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_END; -} - -static int cxl_rcrb_get_comp_regs(struct pci_dev *pdev, - struct cxl_register_map *map, - struct cxl_dport *dport) -{ - resource_size_t component_reg_phys; - - *map = (struct cxl_register_map) { - .host = &pdev->dev, - .resource = CXL_RESOURCE_NONE, - }; - - struct cxl_port *port __free(put_cxl_port) = - cxl_pci_find_port(pdev, &dport); - if (!port) - return -EPROBE_DEFER; - - component_reg_phys = cxl_rcd_component_reg_phys(&pdev->dev, dport); - if (component_reg_phys == CXL_RESOURCE_NONE) - return -ENXIO; - - map->resource = component_reg_phys; - map->reg_type = CXL_REGLOC_RBI_COMPONENT; - map->max_size = CXL_COMPONENT_REG_BLOCK_SIZE; - - return 0; -} - -static int cxl_pci_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type, - struct cxl_register_map *map) -{ - int rc; - - rc = cxl_find_regblock(pdev, type, map); - - /* - * If the Register Locator DVSEC does not exist, check if it - * is an RCH and try to extract the Component Registers from - * an RCRB. - */ - if (rc && type == CXL_REGLOC_RBI_COMPONENT && is_cxl_restricted(pdev)) { - struct cxl_dport *dport; - struct cxl_port *port __free(put_cxl_port) = - cxl_pci_find_port(pdev, &dport); - if (!port) - return -EPROBE_DEFER; - - rc = cxl_rcrb_get_comp_regs(pdev, map, dport); - if (rc) - return rc; - - rc = cxl_dport_map_rcd_linkcap(pdev, dport); - if (rc) - return rc; - - } else if (rc) { - return rc; - } - - return cxl_setup_regs(map); -} - static int cxl_pci_ras_unmask(struct pci_dev *pdev) { struct cxl_dev_state *cxlds = pci_get_drvdata(pdev); diff --git a/include/cxl/pci.h b/include/cxl/pci.h index 5729a93b252a..e1a1727de3b3 100644 --- a/include/cxl/pci.h +++ b/include/cxl/pci.h @@ -4,6 +4,19 @@ #ifndef __CXL_CXL_PCI_H__ #define __CXL_CXL_PCI_H__ +#include + +/* + * Assume that the caller has already validated that @pdev has CXL + * capabilities, any RCIEp with CXL capabilities is treated as a + * Restricted CXL Device (RCD) and finds upstream port and endpoint + * registers in a Root Complex Register Block (RCRB). + */ +static inline bool is_cxl_restricted(struct pci_dev *pdev) +{ + return pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_END; +} + /* CXL 2.0 8.1.3: PCIe DVSEC for CXL Device */ #define CXL_DVSEC_PCIE_DEVICE 0 #define CXL_DVSEC_CAP_OFFSET 0xA diff --git a/tools/testing/cxl/Kbuild b/tools/testing/cxl/Kbuild index 387f3df8b988..2455fabc317d 100644 --- a/tools/testing/cxl/Kbuild +++ b/tools/testing/cxl/Kbuild @@ -12,7 +12,6 @@ ldflags-y += --wrap=cxl_await_media_ready ldflags-y += --wrap=cxl_hdm_decode_init ldflags-y += --wrap=cxl_dvsec_rr_decode ldflags-y += --wrap=devm_cxl_add_rch_dport -ldflags-y += --wrap=cxl_rcd_component_reg_phys ldflags-y += --wrap=cxl_endpoint_parse_cdat ldflags-y += --wrap=cxl_dport_init_ras_reporting diff --git a/tools/testing/cxl/test/mock.c b/tools/testing/cxl/test/mock.c index af2594e4f35d..3c6a071fbbe3 100644 --- a/tools/testing/cxl/test/mock.c +++ b/tools/testing/cxl/test/mock.c @@ -268,23 +268,6 @@ struct cxl_dport *__wrap_devm_cxl_add_rch_dport(struct cxl_port *port, } EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_add_rch_dport, "CXL"); -resource_size_t __wrap_cxl_rcd_component_reg_phys(struct device *dev, - struct cxl_dport *dport) -{ - int index; - resource_size_t component_reg_phys; - struct cxl_mock_ops *ops = get_cxl_mock_ops(&index); - - if (ops && ops->is_mock_port(dev)) - component_reg_phys = CXL_RESOURCE_NONE; - else - component_reg_phys = cxl_rcd_component_reg_phys(dev, dport); - put_cxl_mock_ops(index); - - return component_reg_phys; -} -EXPORT_SYMBOL_NS_GPL(__wrap_cxl_rcd_component_reg_phys, "CXL"); - void __wrap_cxl_endpoint_parse_cdat(struct cxl_port *port) { int index; -- 2.34.1