From patchwork Mon Mar 18 21:09:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 13595842 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2046.outbound.protection.outlook.com [40.107.92.46]) (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 B543558ABE; Mon, 18 Mar 2024 21:09:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710796176; cv=fail; b=XR8i8fsKFJOC6ZPKKsAabLG+xEbJxqu4OFTzLAzWNAArdspMmnXEalaBBeaaut5Z5NocRqlVq6ZIqXNeGUexMYxmYoRDuSF5b32KmY1T+9I5dIXNkaD8IgM7TVGMuEUuOufUxteb0ACsZsrUGd2Lpy7QfGRuA8fJdxEp/q98ZKk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710796176; c=relaxed/simple; bh=nk1BgPKRoO5icOGB2FzyrMY0rbvumy19SCcLeZeu6R0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=f4f9UVCHKyv+q00XwMvK2xG+jyPxIrpUT8VvrUscLqak/CO+szyF7jLcLjXZzae3WIKULmUAVR2ZpQEZc8u2eSjAyhC+zNyTuX0WTEA384RaZqrPdCSwgEfJo+5HF67p+eVtK7N25CPgQpNgmXEzQXQKFCDHWPKVfL0vlTdoLYs= 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=rgDaR5E0; arc=fail smtp.client-ip=40.107.92.46 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="rgDaR5E0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VQQEsrrVz+JQMG77uPaNHTnh/EI/fKvmlY3tpAeZAzbj0nUGHtdLFnSIKp0fSG7AYAhH0Q+2uJ/3LGZJjJRtGNm+EqIz0O4Zycnp3GEtk/RriinTOxIsR3EZLBhSf7X3jBxmYnHSXO0aif4sm8oZ6YE4h6jnd3srXLa2dkpBlwTEbALyO45fRQZszXA8QfPkiz2CpJO7YolRPKp5128shhSg2DKzQIYd0NI+/caJIlYjnJsjet2bYH33kha31DFIWzRbROgnlf279/I47Z/5ytQA8mUwqo6M/GXtUSp36fzM1K0k7eiAhNMs1KIb2HT5ypPDCGWfaey4AFIt2urKKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=zoLFzG2MgkwNippgJ7PxCr/qYu5ZBNIIQFdlZpjxFkA=; b=hTtqa8OT6Xx6pzAjkbeEIPZ0rMFKBg6uloFwo+1wD3Yn0rBgI63EXdNZHVIoQQInEpClem2zv2uT1cYlyZYf8cyKfdsFmO5dGFm1VIm2J/70n1WLkssatiCZYHucovTnk7vSgDV8THyFi8xSB4h7r23N7dVG1/V879Nj5Htr9va46zkC0yVL1wfzly9YRScZX4UPPxF4zg7dP4/oGMRwrHduHkWxW8fNVQ/bmB0uqAjFqx2+IvVV6pcpQrZiu21MjLK7LlBl16d+wOlvysFsXga+gvnPIl9aEz+QcGCo75XBp4pMYOZw8JaFxzgJz3M8LiIjp05v3UUuSFjGykOIDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=zoLFzG2MgkwNippgJ7PxCr/qYu5ZBNIIQFdlZpjxFkA=; b=rgDaR5E0Oaxrgpdr/zvsSFOvQcsYZNGogiTGUzRKgZI7Jo3ywz3RpI3acE1XMHNsmhEwFxWwSJln/HwG+zamcmujOuqa2US5IhEcStw36PyPqtMsEJmRWSR/DfZdJFO5qE60Y393TIZLA/2rjyMnI/9h97JEQ/+dj+tza+QFpCI= Received: from DM6PR11CA0040.namprd11.prod.outlook.com (2603:10b6:5:14c::17) by DS7PR12MB5790.namprd12.prod.outlook.com (2603:10b6:8:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.26; Mon, 18 Mar 2024 21:09:32 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:5:14c:cafe::68) by DM6PR11CA0040.outlook.office365.com (2603:10b6:5:14c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.27 via Frontend Transport; Mon, 18 Mar 2024 21:09:32 +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 CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7409.10 via Frontend Transport; Mon, 18 Mar 2024 21:09:31 +0000 Received: from rric.localdomain (10.180.168.240) 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.35; Mon, 18 Mar 2024 16:09:28 -0500 From: Robert Richter To: "Rafael J. Wysocki" , Alison Schofield , Dan Williams , "Dave Hansen" CC: , , , Robert Richter , Derick Marks , Len Brown Subject: [PATCH 1/3] x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks() Date: Mon, 18 Mar 2024 22:09:00 +0100 Message-ID: <20240318210904.2188120-2-rrichter@amd.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318210904.2188120-1-rrichter@amd.com> References: <20240318210904.2188120-1-rrichter@amd.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|DS7PR12MB5790:EE_ X-MS-Office365-Filtering-Correlation-Id: 86bfa99f-47b8-4947-3770-08dc478fb4e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: agGpJoZ+W4No8AfIAyJTPBFyo0Hj7j4i/4KP7S+LE8saTSvGCqrQR0QgsZ9Un4W3cGtWcBhKhmQjzXNVYY6oeK0byxyH3thm9Erw3PaBSO2f5/dFgHNq77KMNuuf+WrRku3YRoya5rpHmXRYsLoB4+P58KYtaInIwZsM2+CSDLUdhHlh0yOgNZpFqTyhzVFWIKkII193sKLxtFr5sJrJYFnJwkoWpSySSW7kv2IRM1DRus/KontrRq1O02UjmawlmwrLaVYuu9odaizW6SVs+KOq72uWl5CWllw4yfLJTTXTKXjLYrIZ9fpk1e81aw005a5DvaV+jNf/36z5x7TMVIo30DnZH9s2VQi+UmUBUrD9+cMUn3FxL00DrjPEFEM8YtyMuKefvpxDCsU2Uz1Pbsj7stLuZJV8l543NDJy+HlGJfb21X2jDSRhvAQu/6dPFAV4Nm+pdv3Fv0R21D0zKB49wQmCgEIEUdRuthC3t9DzzlFjHbjqRCQfknY3b8cTkoAcIJ0aX5pFeRKcsXcjDfS/ik68xE/H/clmMAPJR2XNEsABgxC1OJLQBVpvb4LRipxkbVww5v+o9a+iLlbao8q6BYEbRCpijBru3tImbUha/s8HieiDNW5I6Q3RNmNhi261ygPsBaWpN9V3Yog0Rp9OBejiZA2nsBjSVq81JLNiQkmx1TEpVE500PpQ1QQCDq/ey4ZKvo8UHW9ALu2PJGpTKWXs5FLhSsQeHvshtPnj5vNaIkUcKwBmsK3Cb56x 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:(13230031)(376005)(82310400014)(1800799015)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2024 21:09:31.7926 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86bfa99f-47b8-4947-3770-08dc478fb4e3 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: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5790 With kconfig option NUMA_KEEP_MEMINFO disabled the SRAT lookup done with numa_fill_memblks() fails returning NUMA_NO_MEMBLK (-1). An existing SRAT memory range cannot be found for a CFMWS address range. This causes the addition of a duplicate numa_memblk with a different node id and a subsequent page fault and kernel crash during boot. Note that the issue was initially introduced with [1]. But since phys_to_target_node() was originally used that returned the valid node 0, an additional numa_memblk was not added. Though, the node id was wrong too. Fix this by enabling NUMA_KEEP_MEMINFO for x86 with ACPI and NUMA enabled. [1] fd49f99c1809 ("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT") Fixes: 8f1004679987 ("ACPI/NUMA: Apply SRAT proximity domain to entire CFMWS window") Cc: Derick Marks Cc: Dan Williams Cc: Alison Schofield Signed-off-by: Robert Richter --- drivers/acpi/numa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig index 849c2bd820b9..2f4ac6ac6768 100644 --- a/drivers/acpi/numa/Kconfig +++ b/drivers/acpi/numa/Kconfig @@ -3,6 +3,7 @@ config ACPI_NUMA bool "NUMA support" depends on NUMA depends on (X86 || ARM64 || LOONGARCH) + select NUMA_KEEP_MEMINFO if X86 default y if ARM64 config ACPI_HMAT From patchwork Mon Mar 18 21:09:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 13595844 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2079.outbound.protection.outlook.com [40.107.223.79]) (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 AE42C5A4ED; Mon, 18 Mar 2024 21:09:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710796191; cv=fail; b=eUbnCz5szBwXI7avaQ4XE7zr2r+jxRpyWk+GUX1U1USooBmIbeaqx2Xr7tcFF2fUOR6dayEEuDoc9XEOOx+tPzdOAXJ4XBLAMD1ZIeDEbXDoh31PdFvVE1sz0vWGS8Ca126UNxSOgdwyDLQv5nyD2diRr3nL7s+2Wv6FBxyPnS8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710796191; c=relaxed/simple; bh=l2m1bnbrTTCkx/CENgd0NhaNMcXWzJYKNa6R76senbw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=q/tvwZW1/tV58gzXAKeqXoAAJ8o1Ac1gg4mQF9pla9F4gzjQLh7YrXRVk0LrB5XPQXARy3OYjNEWY79yELj5BN9SzDrek7WWCh9f1LmGDt4omoAWklaIO7CzRQ+E/p4ngiAZsHL8N1ZrelVOL3VZcyzsYN4CB4yypnJbzRh6W/I= 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=dWHMcFaS; arc=fail smtp.client-ip=40.107.223.79 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="dWHMcFaS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dzuWk5iIfQS/ek/L2nCimDNYGnvOqDgr7+pWlbJNn+1HLox0JvljrE21KhcvB/LjSOOCgGQmazagVP/GtvuDwdgQueY/3gpDrZdwpVRd9nh5Ci5nyJDl1t+2jqm71pX2YWBVm4kDbkl2etAIZKP5gjSPz/9A2FVEr2lOd7degqowKfd0EpmolHNHmApUVyr4pp3xFJxZPwsPbVi7L62tNeyubRJS7K3KN4TBCUK10rkVwaX+D2x354D7Z0H3HlgdjdGwiKlX3eilaX3G7hSEtbsUvgyUuHJ6XgXGmWFkhiknXAA2KWdUofp7ifixlikSme2scu2FkgogSoD+gE/2aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=0EBbmY+EBezwVQPkDMJqdiHHAQP3kBoX9VkXI55EaPg=; b=BrtmotaCWBbt4FfZ4lGZXQFTRCyOnyL8UcSLbf+9DqiVKd1/Y0e5SubXtSNqvKVKZzYjL+YHGo0HLpnhIg5TmINuS9ypqxd/kmfeK1e1yFVGbz9d+12eP4CmE7zhNX/PrWwjNDkeaffuoIAK8s5YEjsl0Wb1PWWbSD2OV6UmaTAqlEh6/thF/gS4+WaGAEviLarlpvoMC9otXSmiecWlGwBRUM76/TymoScuA8Lnb2G8rOWKRSCJO8DHXpUI52NI0kKZjf1J4vNVHuQ3hxqIqiopLGqo8Jw3tGCqUgkSamyukjLlURYBchpf1Wcayu0aD9P1UKE1CNhduqtWVYwubw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=0EBbmY+EBezwVQPkDMJqdiHHAQP3kBoX9VkXI55EaPg=; b=dWHMcFaSRo7tdaGmv+5pTkgMRpQfi/Uj/pazTCiWgaBeuok2JqH6ysQcU6uA4hlxua3FEi9whuSOOgpRYYe1xhQhg336hKkoNmtrpJP4QXJq1lZ4eccJRzrkcb+FwRXIvoR1mqh2Jahx6hbNJFL8ggXulrdXoaCT2Xnnw461f20= Received: from CY5PR15CA0215.namprd15.prod.outlook.com (2603:10b6:930:88::8) by PH7PR12MB8153.namprd12.prod.outlook.com (2603:10b6:510:2b0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.26; Mon, 18 Mar 2024 21:09:46 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:930:88:cafe::39) by CY5PR15CA0215.outlook.office365.com (2603:10b6:930:88::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.27 via Frontend Transport; Mon, 18 Mar 2024 21:09:46 +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 CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7409.10 via Frontend Transport; Mon, 18 Mar 2024 21:09:46 +0000 Received: from rric.localdomain (10.180.168.240) 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.35; Mon, 18 Mar 2024 16:09:34 -0500 From: Robert Richter To: "Rafael J. Wysocki" CC: Dave Hansen , Dan Williams , Alison Schofield , , , , Robert Richter , Len Brown Subject: [PATCH 2/3] ACPI/NUMA: Print CXL Early Discovery Table (CEDT) Date: Mon, 18 Mar 2024 22:09:02 +0100 Message-ID: <20240318210904.2188120-4-rrichter@amd.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318210904.2188120-1-rrichter@amd.com> References: <20240318210904.2188120-1-rrichter@amd.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|PH7PR12MB8153:EE_ X-MS-Office365-Filtering-Correlation-Id: daecfb19-a1e5-44dd-72b3-08dc478fbd92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: leuYkoynjpe804QrJ0Ux1qzWF456Naaowv7VRS8gHRiBxYzXmm1K3Q9P9xucZ6Vh0GMkQNPCnU6NnZyIUdeLyNteafND9OP9/EYPXKxRM/u8WV2UMsBKB1Fe1bFC7gxfRgFj77Q06/Dff1hptlcejYe0PbmRt4QhnBXq+IoMn2veGq0zNlBJ335JuKnTy7b/wgqDkQiQTp8QcavQ/TyYBQDmBYn90R7hqFqcRb6hUMDkNk50kV/6pNTkyCeKzJbDAGovfi1wriG7v3c57wFG8YMEuX1A3dQpAouz92+aIQKQ1t+XY5ht7Cej0Pt2bXzR+Uo6hO6QroJhM5WaNG8n68Ux0uT1nOPYA20VTVUpfdjRhg21Hp55DoBcA2wN0vLkxajBmpwnIwz7FcMAZJnQELrTkpyZ56SafL4knqk0mVjDRGR0NZvGYP6OmJzllgiYicB2qi02qxE/LfG9jjSe6aJn56gU73sa7bHgH40aJY/Kt6njZXkZ3wRbDEN64YTt+Kw05/DgTRXUDfqUrpyHUa7ucYwuyGkS6decDdNb0vvTdh3Y6PI3zmeH6ks6KMLEojZWmIcB5EOTNpQTnWvTN/EIGxGMKEAfW3ZoPuoCg35GHuYqV9vclvDH7ho9Gma9OhNy5yrtuMhF64P0eLnOwRAYa3eBUYyu5PtlDeviVOUk7quEjyIbQZPMHogvcoRcc55PzIcC8emivyx5V91/9Yw+AnWinMDcC7b8/EKtRZlL5i5+N9LZSJjic6+cWzVs 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:(13230031)(376005)(82310400014)(1800799015)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2024 21:09:46.4133 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: daecfb19-a1e5-44dd-72b3-08dc478fbd92 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: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8153 The CEDT contains similar entries as the SRAT. For diagnostic reasons print the CEDT same style as the SRAT. Signed-off-by: Robert Richter --- drivers/acpi/numa/srat.c | 112 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index e45e64993c50..50ae8557e8d1 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -300,6 +300,114 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) return -EINVAL; } +static int __init +__acpi_table_print_cedt_entry(union acpi_subtable_headers *__header, + void *arg, const unsigned long table_end) +{ + struct acpi_cedt_header *header = (struct acpi_cedt_header *)__header; + + switch (header->type) { + case ACPI_CEDT_TYPE_CHBS: + { + struct acpi_cedt_chbs *p = + (struct acpi_cedt_chbs *)header; + + if (header->length < sizeof(struct acpi_cedt_chbs)) { + pr_warn("CEDT: unsupported CHBS entry: size %d\n", + header->length); + break; + } + + pr_info("CEDT: CHBS (0x%llx length 0x%llx uid %lu) %s (%d)\n", + (unsigned long long)p->base, + (unsigned long long)p->length, + (unsigned long)p->uid, + (p->cxl_version == ACPI_CEDT_CHBS_VERSION_CXL11) ? + "cxl11" : + (p->cxl_version == ACPI_CEDT_CHBS_VERSION_CXL20) ? + "cxl20" : + "unsupported version", + p->cxl_version); + } + break; + case ACPI_CEDT_TYPE_CFMWS: + { + struct acpi_cedt_cfmws *p = + (struct acpi_cedt_cfmws *)header; + int eiw_to_ways[] = {1, 2, 4, 8, 16, 3, 6, 12}; + int targets = -1; + + if (header->length < sizeof(struct acpi_cedt_cfmws)) { + pr_warn("CEDT: unsupported CFMWS entry: size %d\n", + header->length); + break; + } + + if (p->interleave_ways < ARRAY_SIZE(eiw_to_ways)) + targets = eiw_to_ways[p->interleave_ways]; + if (header->length < struct_size( + p, interleave_targets, targets)) + targets = -1; + + pr_info("CEDT: CFMWS (0x%llx length 0x%llx) with %d target%s", + (unsigned long long)p->base_hpa, + (unsigned long long)p->window_size, + targets, targets > 1 ? "s" : ""); + for (int i = 0; i < targets; i++) + pr_cont("%s%lu", i ? ", " : " (", + (unsigned long)p->interleave_targets[i]); + pr_cont("%s%s%s%s%s%s\n", + targets > 0 ? ")" : "", + (p->restrictions & ACPI_CEDT_CFMWS_RESTRICT_TYPE2) ? + " type2" : "", + (p->restrictions & ACPI_CEDT_CFMWS_RESTRICT_TYPE3) ? + " type3" : "", + (p->restrictions & ACPI_CEDT_CFMWS_RESTRICT_VOLATILE) ? + " volatile" : "", + (p->restrictions & ACPI_CEDT_CFMWS_RESTRICT_PMEM) ? + " pmem" : "", + (p->restrictions & ACPI_CEDT_CFMWS_RESTRICT_FIXED) ? + " fixed" : ""); + } + break; + case ACPI_CEDT_TYPE_CXIMS: + { + struct acpi_cedt_cxims *p = + (struct acpi_cedt_cxims *)header; + + if (header->length < sizeof(struct acpi_cedt_cxims)) { + pr_warn("CEDT: unsupported CXIMS entry: size %d\n", + header->length); + break; + } + + pr_info("CEDT: CXIMS (hbig %u nr_xormaps %u)\n", + (unsigned int)p->hbig, + (unsigned int)p->nr_xormaps); + } + break; + default: + pr_warn("CEDT: Found unsupported entry (type = 0x%x)\n", + header->type); + break; + } + + return 0; +} + +static void __init acpi_table_print_cedt_entry(enum acpi_cedt_type id) +{ + acpi_table_parse_cedt(id, __acpi_table_print_cedt_entry, NULL); +} + +static void __init acpi_table_print_cedt(void) +{ + /* Print only implemented CEDT types */ + acpi_table_print_cedt_entry(ACPI_CEDT_TYPE_CHBS); + acpi_table_print_cedt_entry(ACPI_CEDT_TYPE_CFMWS); + acpi_table_print_cedt_entry(ACPI_CEDT_TYPE_CXIMS); +} + static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, void *arg, const unsigned long table_end) { @@ -341,6 +449,7 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, return 0; } #else +static inline void acpi_table_print_cedt(void) {} static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, void *arg, const unsigned long table_end) { @@ -526,6 +635,9 @@ int __init acpi_numa_init(void) /* SLIT: System Locality Information Table */ acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit); + /* CEDT: CXL Early Discovery Table */ + acpi_table_print_cedt(); + /* * CXL Fixed Memory Window Structures (CFMWS) must be parsed * after the SRAT. Create NUMA Nodes for CXL memory ranges that From patchwork Mon Mar 18 21:09:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 13595845 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2051.outbound.protection.outlook.com [40.107.220.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 4E32E5A4FE; Mon, 18 Mar 2024 21:09:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710796191; cv=fail; b=fCmBez3YbEwsDIGoFAcemZiT6vTxXc+YVhdw3VMALoKXDmszC8DQTsf0TidHLjRONxkDasqIFYtIK6oSC+oyTAA31znaXqlOjYWILth0KeyG/ekcjB6xOmsBZBl0jqfXsFGUVr0QXQc7NWHkhgsIOPR15oUZnNIiDRQzAQ3urpA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710796191; c=relaxed/simple; bh=KNZGmdsVCrLf3seRR2GfWIW1FELjR4OvC92jm/nXvNg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qqTxYgQ/RaQPt5YKujrebkxdESQTgKYdndaUAm/XfKJoM1XiD75/zUtKG/nkJKqVYsDU/bp4GOL1EyooGqdUS5nb+kns/+rI4U+kWKKm43S0OVSXciJqhTO4QUDcMga/SttDoWcKRTFlUMyHWwSU/5npEyjh+wcoZoPy3xTRqV0= 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=5NGiaLiX; arc=fail smtp.client-ip=40.107.220.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="5NGiaLiX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NqnaixNS3jRPKCkgph9YK9hPUYAn29q3GijOOgLrrDnyvx9R45WbAzEUjdC7c52sqolo8KQQptyXlhEkvzKwoLlQN590EfKHkYhGwNQLZsFeuOrVQpnYCNtjUYppF8W1SgIwaMhQXOpl3WA0gqSJKavE6fT5+bHgPOQZtrIlcfflYIT+EiHsw3S/46H0R+GOztvFKWq7VxVNu60Jty51BadVcPCMYCfDMHQAgykAW/XzI0jCBdC5iOWvCT0lb70uml/cINpDg7Tso6eNudjJbA5CR6K3lujgPcL3zktTlcD6hmawT04epxK9Mp+qCgHVnoBmYn3tdRCrSGuTa8bm4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=wDxjGRs+Pnxp2qPVtzcKnQXIHHdNTBtT0ek0PmSYo4U=; b=OoR1dchD/D9UL+OtQnWYAQkyezmkKMRc6olmRmVnsCzrysKmmgQ0QgIduDe1WlxmpYI87SA++hmkjT4jg345Ruwy1SY8gUK7/2SIHDhsYW8L3Zl2DZRST5swXKrTKJULxFADFTWFrm+1uLavTXLIzMzqQW1gTB4ZStqfAEH62Bwe2A+BF0bdZUZLMlitkWIzUYg1mwZbDUFUfk/MmPSwSc+naHxr11dbacObu4K+bwsozWEJ3Ry+KUo+d+8jITO7cK8Jt5xemzQ8NPyyBJNGgLUoAT41Z2fXuMrEYOJwpZ8Jn42QBNtRjGHSUZltgkl6K19VMl5poSOhI1IKjsvf5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=wDxjGRs+Pnxp2qPVtzcKnQXIHHdNTBtT0ek0PmSYo4U=; b=5NGiaLiXO38JPH9Xbu+BH37FNrOr25cRG0q5qmHmjSvp/gQh7PHeodz4bTXOtjlyH/hlNzJlB1HoQxjzxleAoEXIJr2Cef2Mt84uPhZOlGc+NV7x3tIlZoysfDtGRP35htSsj0vlLZ65ZvcKtNqkFd/UMj2QyUhG09fBcrEXt1c= Received: from DS7PR06CA0020.namprd06.prod.outlook.com (2603:10b6:8:2a::21) by DS7PR12MB6333.namprd12.prod.outlook.com (2603:10b6:8:96::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.23; Mon, 18 Mar 2024 21:09:48 +0000 Received: from CY4PEPF0000EE30.namprd05.prod.outlook.com (2603:10b6:8:2a:cafe::7b) by DS7PR06CA0020.outlook.office365.com (2603:10b6:8:2a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.27 via Frontend Transport; Mon, 18 Mar 2024 21:09:47 +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 CY4PEPF0000EE30.mail.protection.outlook.com (10.167.242.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7409.10 via Frontend Transport; Mon, 18 Mar 2024 21:09:47 +0000 Received: from rric.localdomain (10.180.168.240) 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.35; Mon, 18 Mar 2024 16:09:38 -0500 From: Robert Richter To: "Rafael J. Wysocki" CC: Dave Hansen , Dan Williams , Alison Schofield , , , , Robert Richter , Len Brown Subject: [PATCH 3/3] ACPI/NUMA: Remove architecture dependent remainings Date: Mon, 18 Mar 2024 22:09:03 +0100 Message-ID: <20240318210904.2188120-5-rrichter@amd.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318210904.2188120-1-rrichter@amd.com> References: <20240318210904.2188120-1-rrichter@amd.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE30:EE_|DS7PR12MB6333:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f380fa9-0f50-4715-0e8a-08dc478fbe52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xkxZ+qX//aGx2SwF9DFZDZh2TaLpDfDiKmRLkazKMIX67wnFxx7a4bpzSAs/Tf1nhajC5cptbcCuF75GcDAupyZu58vCpvE4zJWem9DZISG/sYjk5Dow1iVVC2xwGfMNrNTlqLgpphfixh3oaaTKSoEAhCtjNNM3ZeO+MF9rqy56vfVNag5bcl3QEAVXL4xvMSI9/mCRyf5EjsFlBxIuVp02N1/66egR6TKVygaafLRcEAmHhDAAiLHa3xYjSZbj+W3WeMc6FpZ1NmewZ98M4Rj0/sRoiBUR8hw6k3+OBP4y+Fgj8nRPILMz0ULqerFPt5QcBMdTSNFN/UCbedLH3sXdu6ppOb4mZU2SmIQlPDuif52qPQOoOWeyJgnRSj27fYM0j1V6/729uGKl2ao1nHDgSQRsKsttLvVK4PH/AiGgmT7EvImJM4GhQONL5LpHtuqVFMzkhij6i4gqP8PmspBxL+lIM0krLtroG3Q6nbrDXY7vp79i384PEukkvHfyQzQODyYPSkTcJQ0wziLMkKqVP+6SK/IuUDs3XFb3kn2sldWhTStV5sEitBBBmIVbRMUyxCRY9rJbNseit9pR8/66QG0I5E73e+9RSLKQSYXzv4KuEfOzSNBJ5Er4QeZfbEECWUdjUpHJgmhGQg8juk2CPt57TTKbe5j8f4fx6hn8NJADS/WYOIXJsb83OQLLW5LK718VtagGaXU0hKCAsw9Y6nPHm2T+ju5Gi4y06MnonQteAvAut9xLrPkUS7eh 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:(13230031)(1800799015)(36860700004)(376005)(82310400014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2024 21:09:47.6425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f380fa9-0f50-4715-0e8a-08dc478fbe52 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: CY4PEPF0000EE30.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6333 With the removal of the Itanium architecture [1] the last architecture dependent functions: acpi_numa_slit_init(), acpi_numa_memory_affinity_init() were removed. Remove its remainings in the header files too an make them static. [1] cf8e8658100d arch: Remove Itanium (IA-64) architecture Signed-off-by: Robert Richter --- drivers/acpi/numa/srat.c | 68 +++++++++++++--------------------------- include/linux/acpi.h | 5 --- 2 files changed, 21 insertions(+), 52 deletions(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 50ae8557e8d1..910609a9754b 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -208,16 +208,21 @@ int __init srat_disabled(void) return acpi_numa < 0; } -#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH) /* * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for * I/O localities since SRAT does not list them. I/O localities are * not supported at this point. */ -void __init acpi_numa_slit_init(struct acpi_table_slit *slit) +static int __init acpi_parse_slit(struct acpi_table_header *table) { + struct acpi_table_slit *slit = (struct acpi_table_slit *)table; int i, j; + if (!slit_valid(slit)) { + pr_info("SLIT table looks invalid. Not used.\n"); + return -EINVAL; + } + for (i = 0; i < slit->locality_count; i++) { const int from_node = pxm_to_node(i); @@ -234,19 +239,25 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) slit->entry[slit->locality_count * i + j]); } } + + return 0; } -/* - * Default callback for parsing of the Proximity Domain <-> Memory - * Area mappings - */ -int __init -acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) +static int __initdata parsed_numa_memblks; + +static int __init +acpi_parse_memory_affinity(union acpi_subtable_headers * header, + const unsigned long table_end) { + struct acpi_srat_mem_affinity *ma; u64 start, end; u32 hotpluggable; int node, pxm; + ma = (struct acpi_srat_mem_affinity *)header; + + acpi_table_print_srat_entry(&header->common); + if (srat_disabled()) goto out_err; if (ma->header.length < sizeof(struct acpi_srat_mem_affinity)) { @@ -293,6 +304,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) max_possible_pfn = max(max_possible_pfn, PFN_UP(end - 1)); + parsed_numa_memblks++; + return 0; out_err_bad_srat: bad_srat(); @@ -448,27 +461,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, (*fake_pxm)++; return 0; } -#else -static inline void acpi_table_print_cedt(void) {} -static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, - void *arg, const unsigned long table_end) -{ - return 0; -} -#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ - -static int __init acpi_parse_slit(struct acpi_table_header *table) -{ - struct acpi_table_slit *slit = (struct acpi_table_slit *)table; - - if (!slit_valid(slit)) { - pr_info("SLIT table looks invalid. Not used.\n"); - return -EINVAL; - } - acpi_numa_slit_init(slit); - - return 0; -} void __init __weak acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) @@ -559,24 +551,6 @@ acpi_parse_gi_affinity(union acpi_subtable_headers *header, } #endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ -static int __initdata parsed_numa_memblks; - -static int __init -acpi_parse_memory_affinity(union acpi_subtable_headers * header, - const unsigned long end) -{ - struct acpi_srat_mem_affinity *memory_affinity; - - memory_affinity = (struct acpi_srat_mem_affinity *)header; - - acpi_table_print_srat_entry(&header->common); - - /* let architecture-dependent part to do it */ - if (!acpi_numa_memory_affinity_init(memory_affinity)) - parsed_numa_memblks++; - return 0; -} - static int __init acpi_parse_srat(struct acpi_table_header *table) { struct acpi_table_srat *srat = (struct acpi_table_srat *)table; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 2a7c4b90d589..5f6472a7997c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -242,9 +242,6 @@ static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc) return gicc->flags & ACPI_MADT_ENABLED; } -/* the following numa functions are architecture-dependent */ -void acpi_numa_slit_init (struct acpi_table_slit *slit); - #if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH) void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); #else @@ -267,8 +264,6 @@ static inline void acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { } #endif -int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); - #ifndef PHYS_CPUID_INVALID typedef u32 phys_cpuid_t; #define PHYS_CPUID_INVALID (phys_cpuid_t)(-1)