From nobody Sun Feb 8 00:12:26 2026 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2042.outbound.protection.outlook.com [40.107.223.42]) (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 6511A70CCB; Thu, 14 Mar 2024 16:36:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434171; cv=fail; b=oxs4913jv4ZfYSWeZnzj1fKfmvCOLQCi9C4GIFH44dp8lajNBZ8tmX3syxSoz40YdTndHAZz0Y4u4/sTi3c2lG8e1FZdv82hJZWs3lfcJAUXnzvwGUabvktQ80ftUapjExN5Jdn/9RLcSXm68u0ap66o/HFjAdTNyRot4CTwKqs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434171; c=relaxed/simple; bh=JGw+B+B+a+NQDc95++I+5KlrS3srAzM+aVMCrVq8FbM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XOKXxQ5RHTexS6a7O6UkObVRexN/mBowXE6omZp6QmWAoP0Bl0Gy/R8Z+VtLAxod0Jt8UNsHWrC++Rx008cAuqB0FxilbIj9adG1LwLCeeoHsR8X9mWSsibZj+ao4v4heML96bQaJpepoh21vhojO7u/fD/1eJWfVq80Xco2bdI= 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=Oyp28NC+; arc=fail smtp.client-ip=40.107.223.42 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="Oyp28NC+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kl31H7xhz8rhfM2GJhIM4whc4V9OZW8ACXK3UjW74A5IP76zB1paXtkUtHRhoi+FftdBagLh7IvUb4MLvD0rp83EElyR8Y0hxeS/DDbsaj2RbPn22BdZPv0tPaYq3I2KaW5YVJt6ekTje01KhGqYNTjHuYnXE9/bNj4pyXRm9ZZ8nYXRgpgdBs0ARu82rxBJ5Z1WK+I4gRkxOf1q6WWJfXQOGuBHC+2TpOipeXH9rVkmpEF/coRxLEqYPBramdNtWYWN4EYgKJ5ROP+FIozVoRXjYoGvEcjrDccnSNC1RDypsFZ1L6mAELfvqQmE+ePw8rz9MF6ybrNF2/2myctQXw== 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=KzWK9uW1Y/rIgtjRO5hT5FlfBEUx27JSe/1LrRnpi5A=; b=XEKiNRyyZiKSHMlm+QrN+pOgSWjUJw9x30RNRHm8TMLCc58Wwu3Z3vvHRevX4bsQ0ZoVEu3eDyWc6CbgnFuByWFpJSkmbzIUSp+78KHfXRb6BhyBsKK4Eux6n0jVNYVe3Ib8PoDwJYaJT4j7+p6j5pvHSIbuZcp3RaTpe+mM1XGsn+kHDTfJ8KRQk5Q1EoTbb62jFbButR6o/2m6/ED9sJLCDPGWZTaXGr17Vi99K9h/oGVRfahOlykMSpBSjN+hfkujc6MujYtQX5lDmobTK3DmkEEWmq4cNIZPSfuBEGof+9ftsFDvUzVYmcDUvhrf+23rJ1U19Pmb0x9uZSOzew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=KzWK9uW1Y/rIgtjRO5hT5FlfBEUx27JSe/1LrRnpi5A=; b=Oyp28NC+y/GYfkFHY3g1WlxtdoBhge+Lj+LbAy59uVA6gMWQu73TM9zCs5B1qd9HobMhxhnaR7BzQHtik26wTh8YfMEWF+0qVDNZVxA12QHiLQ0h7llos8JR9Hv7qusOgS9TbzoraUM8wtJwrDN4I51DUNkmie5tso7CqNXbXNQ= Received: from CH0PR03CA0226.namprd03.prod.outlook.com (2603:10b6:610:e7::21) by LV8PR12MB9272.namprd12.prod.outlook.com (2603:10b6:408:201::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.20; Thu, 14 Mar 2024 16:36:05 +0000 Received: from CH3PEPF0000000B.namprd04.prod.outlook.com (2603:10b6:610:e7:cafe::eb) by CH0PR03CA0226.outlook.office365.com (2603:10b6:610:e7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.19 via Frontend Transport; Thu, 14 Mar 2024 16:36:05 +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 CH3PEPF0000000B.mail.protection.outlook.com (10.167.244.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7386.12 via Frontend Transport; Thu, 14 Mar 2024 16:36:05 +0000 Received: from jallen-jump-host.amd.com (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; Thu, 14 Mar 2024 11:36:04 -0500 From: John Allen To: , , CC: , , , , John Allen Subject: [PATCH 1/4] RAS: ATL: Read DRAM hole base early Date: Thu, 14 Mar 2024 16:35:24 +0000 Message-ID: <20240314163527.63321-2-john.allen@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240314163527.63321-1-john.allen@amd.com> References: <20240314163527.63321-1-john.allen@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0000000B:EE_|LV8PR12MB9272:EE_ X-MS-Office365-Filtering-Correlation-Id: f7124e76-9bd5-4d37-f828-08dc4444d830 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xvWqTioXNISHlFNEk05PJWe0OOo81BgIyI/vOZuKKvO9am7GW+dHmrEmLUovVtG5d3B+1S/E7HPexi2sZGweZd9gREQr7oa6gtTiERHl2PkchJbzxXqSzX6nsWMqiFVG8KiozNnCguKZYdOLumWZcvcO0qXvAkDi+DJrJVNAjkVxqUKuX8TGKLlWbA2FSgFBvWcIthWgxdkc91wBrHAEaw2XhOZeJRMnOcuwl1x9cBX8E8tedOpkMr0KYGTQE0fIwtsWEteF6WsXp3SeH2GF2/PwXC7EtB8hNy2EKjWThfs5OCvLEx27PCy94m2URp7ewSPXcLehCBZOdQ00dMEN0U3rbXIyxIUbAPzOSHi2h5/92JrhJ6/sxPUCbitmDyKJOFwGUZhEUZ33a5ZBhe6oAZ/BxnJh/U1rVrTrP9jF9kFZonUsq/tEe0gPDUscObPU+LGAqVcu8GOE4VwN+NcWfhJcvd6yLn2g5QEUnnLijClqW01iVTgUzgsR/Lv5GZKLF/z1DojTrajrWM6JTyjXdwJ9Eegz/E6ddDrmLboj2kpClBrt1/F5bbdiN7OZcvw+aY/23dmlJpgvi8/d1krl9z4qmm3qStxUClcrAFxQfICNcrCqNRkkKnxQQFF+89kunXtlY9sq/pU0n+kj7tCkik3k2d9o140GVCJ81f0pQaPc82mkDGujQkpOC7RUIMgPveNj8lvzICBsM6+9nLNHwMwkIbmqCRyRne5x/QAei71nzo2+vwOU4vWnD2u6IECy 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)(82310400014)(376005)(1800799015)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 16:36:05.4695 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f7124e76-9bd5-4d37-f828-08dc4444d830 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: CH3PEPF0000000B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9272 Content-Type: text/plain; charset="utf-8" Read DRAM hole base when constructing the address map as the value will not change during translation. Signed-off-by: John Allen --- drivers/ras/amd/atl/core.c | 15 ++------------- drivers/ras/amd/atl/internal.h | 2 ++ drivers/ras/amd/atl/system.c | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/ras/amd/atl/core.c b/drivers/ras/amd/atl/core.c index 6dc4e06305f7..c1710d233adb 100644 --- a/drivers/ras/amd/atl/core.c +++ b/drivers/ras/amd/atl/core.c @@ -51,22 +51,11 @@ static bool legacy_hole_en(struct addr_ctx *ctx) =20 static int add_legacy_hole(struct addr_ctx *ctx) { - u32 dram_hole_base; - u8 func =3D 0; - if (!legacy_hole_en(ctx)) return 0; =20 - if (df_cfg.rev >=3D DF4) - func =3D 7; - - if (df_indirect_read_broadcast(ctx->node_id, func, 0x104, &dram_hole_base= )) - return -EINVAL; - - dram_hole_base &=3D DF_DRAM_HOLE_BASE_MASK; - - if (ctx->ret_addr >=3D dram_hole_base) - ctx->ret_addr +=3D (BIT_ULL(32) - dram_hole_base); + if (ctx->addr >=3D df_cfg.dram_hole_base) + ctx->addr +=3D (BIT_ULL(32) - df_cfg.dram_hole_base); =20 return 0; } diff --git a/drivers/ras/amd/atl/internal.h b/drivers/ras/amd/atl/internal.h index 5de69e0bb0f9..1413c8ddc6c5 100644 --- a/drivers/ras/amd/atl/internal.h +++ b/drivers/ras/amd/atl/internal.h @@ -132,6 +132,8 @@ struct df_config { /* Number of DRAM Address maps visible in a Coherent Station. */ u8 num_coh_st_maps; =20 + u32 dram_hole_base; + /* Global flags to handle special cases. */ struct df_flags flags; }; diff --git a/drivers/ras/amd/atl/system.c b/drivers/ras/amd/atl/system.c index 701349e84942..6f6fe24dec81 100644 --- a/drivers/ras/amd/atl/system.c +++ b/drivers/ras/amd/atl/system.c @@ -223,6 +223,21 @@ static int determine_df_rev(void) return -EINVAL; } =20 +static int get_dram_hole_base(void) +{ + u8 func =3D 0; + + if (df_cfg.rev >=3D DF4) + func =3D 7; + + if (df_indirect_read_broadcast(0, func, 0x104, &df_cfg.dram_hole_base)) + return -EINVAL; + + df_cfg.dram_hole_base &=3D DF_DRAM_HOLE_BASE_MASK; + + return 0; +} + static void get_num_maps(void) { switch (df_cfg.rev) { @@ -266,6 +281,7 @@ static void dump_df_cfg(void) =20 pr_debug("num_coh_st_maps=3D%u", df_cfg.num_coh_st_maps); =20 + pr_debug("dram_hole_base=3D%x", df_cfg.dram_hole_base); pr_debug("flags.legacy_ficaa=3D%u", df_cfg.flags.legacy_ficaa); pr_debug("flags.socket_id_shift_quirk=3D%u", df_cfg.flags.socket_id_shift= _quirk); } @@ -282,6 +298,11 @@ int get_df_system_info(void) =20 get_num_maps(); =20 + if (get_dram_hole_base()) { + pr_warn("amd_atl: Failed to read DRAM hole base"); + return -EINVAL; + } + dump_df_cfg(); =20 return 0; --=20 2.34.1 From nobody Sun Feb 8 00:12:26 2026 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2051.outbound.protection.outlook.com [40.107.100.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 3AC0A74431; Thu, 14 Mar 2024 16:36:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434179; cv=fail; b=Wxq+pQg10t15n9VR0RjOGlogly8hu5XbvefzB8SOo99EyT2PAmlLBZe8IFcVwg04Ya6GxqDcYxvhHXQh5Y8blE+xzoAk9a0NRtI59hHSMrPEUYp4vjeDTLYHn7297gEumfbkmI3tv1cxZKn9rDR0PkLSNG7it+gx+rrhipH4p90= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434179; c=relaxed/simple; bh=kFVZLTkjeaKGZ4/AJqyDyJ5CY6i5qhZETETG80yL1pM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bo9+Xv+TmGDeWIl6jVrwV4aj5qQ+NXYoZAVva894mmTpBKnYEbExn3BhApzD3oY+sPSwrGXgEbfONmFMQPjKVbShRBqf/aubMRwgb5l3DvLghs5vNyWouo0TJMOIWXNdiecAiYN8/rGzsoMasaLCtDdQ3EFXgSlUXJzBSHtUJCs= 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=EbQNrW/v; arc=fail smtp.client-ip=40.107.100.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="EbQNrW/v" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U3juoocdkM4gr2pkj+Jd7atFoZ6IH+G9CukHmB71bqZzxqnVfodKAVVuqO0xdv5x8rFbNeQFcU43AsvbUXm5X2mb+mazwlbyCMEVFXR5dvbM+rnYV1dNGE5+9Sg7QyMAGhcwxRnL3UC8SYHzr0YZCGCMOMdssLTp1pkIyLRVdv75BXIsS6ybd3bQ2IImPmUplFwoeN++SI3dqvMQOfZgZeFMUSDdH2uYgOTFOo4/C8+2TtgoDZZgfb702Krp5ZWoQ1WR0C/455vAzAMMhdUsLP1aLEAAKBXULb3PSbDREjOiVs+LfD7gLGs1mksXHxtDPxaUPyt0aXYZGyxy04RUMQ== 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=B9tos26d//B80CeKPRcDsnnu705GDSi9a6KVhmLZG6A=; b=a56Ix3CfeNrMWiB4mDj8EfDx+cEwy4PjF7wq4wL8gcYlk+RZw8DHE4YcNDcxSVo0UWshVASDNCFYLth/aQa7InJ48MEE2IASMQUYjbOtyRuhJsCMfdHQYMuk6OmxMR2P832EnxUgTr4AM1d297nXGaeFiXOtALDazpyrck+3TUfXWWAJSGI0ikxD6Fui+B90Cb+5V2/jKsr3Qkr68d2ailbGYM+dMXbLPEaYoCOOI5ivsNL3e8ODotqw6RuLRTEdkpu2CXJEcX7KOnjbTFZ4y3MTazcfviHw8PkaUuqwJ2rTnjrDeFit2k23c7+XJJp2nMPRMuipo2F94zJni5zxJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=B9tos26d//B80CeKPRcDsnnu705GDSi9a6KVhmLZG6A=; b=EbQNrW/vArhKSZNiNhlTELx7HgFfT+d8VA4PmpnbgglZE/pSqM/J2QzcY8EU4vzhE/OzhuKdA2FZOxxjpdGoSGIY3d5DeOHOq9/YfPrmzUc+98AKJrt2uejgmq8Vd0DmREDwncNzpwQrDs/a7rqWkOZMuI595YFJExmy1KFHDkc= Received: from CH0PR03CA0285.namprd03.prod.outlook.com (2603:10b6:610:e6::20) by DM4PR12MB7599.namprd12.prod.outlook.com (2603:10b6:8:109::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Thu, 14 Mar 2024 16:36:11 +0000 Received: from CH3PEPF00000010.namprd04.prod.outlook.com (2603:10b6:610:e6:cafe::38) by CH0PR03CA0285.outlook.office365.com (2603:10b6:610:e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.35 via Frontend Transport; Thu, 14 Mar 2024 16:36:11 +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 CH3PEPF00000010.mail.protection.outlook.com (10.167.244.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7386.12 via Frontend Transport; Thu, 14 Mar 2024 16:36:11 +0000 Received: from jallen-jump-host.amd.com (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; Thu, 14 Mar 2024 11:36:10 -0500 From: John Allen To: , , CC: , , , , John Allen Subject: [PATCH 2/4] RAS: ATL: Expand helpers for adding and removing base and hole Date: Thu, 14 Mar 2024 16:35:25 +0000 Message-ID: <20240314163527.63321-3-john.allen@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240314163527.63321-1-john.allen@amd.com> References: <20240314163527.63321-1-john.allen@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF00000010:EE_|DM4PR12MB7599:EE_ X-MS-Office365-Filtering-Correlation-Id: ebc20536-5fed-4cd0-f792-08dc4444db87 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vbCMIxvmj7Prd7fxEMKheFuhwq+dYgH3Ojk9BlD0Nc2D1l6llJAxYJsm9QzAZxe19levW0SoElCTi5UZebFWNfQVpCtRz2FW4jaEOvOyKnfXY6+U2yXRKlsE7F9FbMWGGSbC1GsUG4l6WAiLQDaRdqS6xLdLdGN+kclyvhrjEkEsYQxiM2CnDIleeYSQOmJfJw8+XpKR0usUH5cvrP1VImo3T1WO/s3Pgw9Lrtxalz3aD0GowTnGwt6N2fu5Ox42rftaK7B+33QhpSJlf+NT/JHuNm6LeVFIx0DMbSDwcYjvXkLVyGS/iRAJWvz8g6TrPxEQ6/dyDzKZcNHxtg/Gm6a7SPtnDfoIZHzovw0cEoA/ftY1FC7Ipook9X5BYkU+3xXtLs3+r44MNiAynwUaAeezgPOqvZldKLBctd64Hoy6mlrVcVoVqmSAv5uCF98Ui923K5i7O0Hcfajo3DO0a+pkC0EEO5XvkcaX3hwZghhCGzqsuZ9hEX/33IIYYpuJnWm/fgke1lr87eJl+GAhOJeMu9O72OmlEmExJqu/1ERUJ8ItY0LGxl3+zGiP0qHlgcFgD+lIqdlTTTNotykuKgIFbvkJpTBYsg5O2hvM4OHu1Tg+WQMMxy61C3Gn78mKnpYEJaE2WYCFJkDec+XuA2t1/RoCGhkqXs5ZoRaxAPG45+39UeOlkBrCJN2B2A02R0QDWoqfWcelz2bMuMFPGvpXisOcMSawCV+CZEbJFbzKdNqEPjBEJR1Qo9VSNgsE 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: 14 Mar 2024 16:36:11.0572 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ebc20536-5fed-4cd0-f792-08dc4444db87 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: CH3PEPF00000010.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7599 Content-Type: text/plain; charset="utf-8" Data fabric 4.5 denormalization will need to frequently add and remove the base and the legacy MMIO hole. Modify existing helpers to improve DF 4.5 denormalization flow and add helper to remove the base and hole. Signed-off-by: John Allen --- drivers/ras/amd/atl/core.c | 43 ++++++++++++++++++++++------------ drivers/ras/amd/atl/internal.h | 3 +++ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/drivers/ras/amd/atl/core.c b/drivers/ras/amd/atl/core.c index c1710d233adb..cafdfc57d929 100644 --- a/drivers/ras/amd/atl/core.c +++ b/drivers/ras/amd/atl/core.c @@ -49,15 +49,26 @@ static bool legacy_hole_en(struct addr_ctx *ctx) return FIELD_GET(DF_LEGACY_MMIO_HOLE_EN, reg); } =20 -static int add_legacy_hole(struct addr_ctx *ctx) +static u64 add_legacy_hole(struct addr_ctx *ctx, u64 addr) { if (!legacy_hole_en(ctx)) - return 0; + return addr; =20 - if (ctx->addr >=3D df_cfg.dram_hole_base) - ctx->addr +=3D (BIT_ULL(32) - df_cfg.dram_hole_base); + if (addr >=3D df_cfg.dram_hole_base) + addr +=3D (BIT_ULL(32) - df_cfg.dram_hole_base); =20 - return 0; + return addr; +} + +static u64 remove_legacy_hole(struct addr_ctx *ctx, u64 addr) +{ + if (!legacy_hole_en(ctx)) + return addr; + + if (addr >=3D df_cfg.dram_hole_base) + addr -=3D (BIT_ULL(32) - df_cfg.dram_hole_base); + + return addr; } =20 static u64 get_base_addr(struct addr_ctx *ctx) @@ -72,14 +83,16 @@ static u64 get_base_addr(struct addr_ctx *ctx) return base_addr << DF_DRAM_BASE_LIMIT_LSB; } =20 -static int add_base_and_hole(struct addr_ctx *ctx) +u64 add_base_and_hole(struct addr_ctx *ctx, u64 addr) { - ctx->ret_addr +=3D get_base_addr(ctx); - - if (add_legacy_hole(ctx)) - return -EINVAL; + addr +=3D get_base_addr(ctx); + return add_legacy_hole(ctx, addr); +} =20 - return 0; +u64 remove_base_and_hole(struct addr_ctx *ctx, u64 addr) +{ + addr -=3D get_base_addr(ctx); + return remove_legacy_hole(ctx, addr); } =20 static bool late_hole_remove(struct addr_ctx *ctx) @@ -123,14 +136,14 @@ unsigned long norm_to_sys_addr(u8 socket_id, u8 die_i= d, u8 coh_st_inst_id, unsig if (denormalize_address(&ctx)) return -EINVAL; =20 - if (!late_hole_remove(&ctx) && add_base_and_hole(&ctx)) - return -EINVAL; + if (!late_hole_remove(&ctx)) + ctx.ret_addr =3D add_base_and_hole(&ctx, ctx.ret_addr); =20 if (dehash_address(&ctx)) return -EINVAL; =20 - if (late_hole_remove(&ctx) && add_base_and_hole(&ctx)) - return -EINVAL; + if (late_hole_remove(&ctx)) + ctx.ret_addr =3D add_base_and_hole(&ctx, ctx.ret_addr); =20 if (addr_over_limit(&ctx)) return -EINVAL; diff --git a/drivers/ras/amd/atl/internal.h b/drivers/ras/amd/atl/internal.h index 1413c8ddc6c5..05b870fcb24e 100644 --- a/drivers/ras/amd/atl/internal.h +++ b/drivers/ras/amd/atl/internal.h @@ -236,6 +236,9 @@ int dehash_address(struct addr_ctx *ctx); unsigned long norm_to_sys_addr(u8 socket_id, u8 die_id, u8 coh_st_inst_id,= unsigned long addr); unsigned long convert_umc_mca_addr_to_sys_addr(struct atl_err *err); =20 +u64 add_base_and_hole(struct addr_ctx *ctx, u64 addr); +u64 remove_base_and_hole(struct addr_ctx *ctx, u64 addr); + /* * Make a gap in @data that is @num_bits long starting at @bit_num. * e.g. data =3D 11111111'b --=20 2.34.1 From nobody Sun Feb 8 00:12:26 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2085.outbound.protection.outlook.com [40.107.220.85]) (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 07E2F74421; Thu, 14 Mar 2024 16:36:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434182; cv=fail; b=iN+Qd1/pwXAM9IIrDER7Et46ItLW7zT6R7A9vL7CGv/gRJ3qTLP0am8aCLAPL+RSHM6a4zwe+5yani3+m11K7KktPTVU+XnLjbwkYfBbDQBKfxpj3AW5aRaxFhivMY2zzZjApIUf0AkpKFlYyX2UjHq0/s6eRPXBinpHyG9FeJU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434182; c=relaxed/simple; bh=dq2OsqdLiRpUwMnygJA1SWm2iRncEMEqBz28lL+5G0E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eoasb13lMJLn96fqLyum2opSU+ZRDHzxCdTxpGpnpsgErg+ZPOGnbWt3kd+0/8XHnnAHyJttQgyIf5TLo+RdfmCwGNTrTjXAfFJNYZpOOrX4SUAmpE5F5Hy/j9rOVqjWPCt20Fo2U/7Gx6NIlGwhvYXrAACnoamYsjUHtkt4pLQ= 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=WWXPhIoS; arc=fail smtp.client-ip=40.107.220.85 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="WWXPhIoS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nrCtftqXG4hxmqjMSkH8G/jiwBZa+ObJBdOjLvTFLr9JW34PDAJaKFj6dXfmdlixgZ1FebxEWGZqXoSFsK3E+MH0bD5WlxemcsypVEvTCFrKvMw2HAVYGTwbNDdyX0acGhjY2Xbcq5AEw0cHSiqSgbtP7xEbyeHz5TjYRhMHtrazkU7BUSBxQBY9j/OpBRvab89b9jLCIhzAvcoBEtgRntdZCrNKtYsz/rcxVJ9AqW/ArSRZ33nRtGszvN8zRawq2EHY1FYLbcXtH9X9w8hLh6UKUZsvC5aCEhoTMY9p5lAz+eSwrg3tPhkus0vRb9nuQJqqTFCOaCojqObRmTkzuA== 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=bBqNmbsczIpnV/KRwLcTHsc286ka5D64xhtZPEA1A6A=; b=A31mrDEmK/GC8f5naP+3UcRWX7jVfjT2areb8zJVElUmz9n1Mq7vVrxRnw/S3+qNq4kOjLpu6331pmA9HFqLPVUSyK6yB3WY3GrRKY/vDdibXGmVEpOxoKww3RpWy59LJDx3NReTluRKRXjeh7do4SfNLVCDagh8FVEMbRskI9zrPNpMXQVvBqb3X2cbwf3/APtzkQWVmycugM+Br3KYcYBw3FUfLOvTCFMVGrg/Vj7cu3IOuPcRdPQjV5rJmzvivhjJlCVlmv5z0wcLx1mn/7qHya322PdmCpJvtiraCFgRmfcvmSow7qOnb6hof+L7Ug4gG20cUidpNl5abT4aaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=bBqNmbsczIpnV/KRwLcTHsc286ka5D64xhtZPEA1A6A=; b=WWXPhIoSPS+RpPWTz4MyDOMOuw6Jjg+FPdHL9IK5eowcOwv1ad8RJe47wf6xbfmp8rWxTvK+fwhZTNdylFLhKAlQZK2n4UWfKnAW62jIOOQ1hOplym+sA+nI5l8BB+gNd71urLCCVVjH0KlElmCaTlccfSPrQtz9hxgN9MsUKtk= Received: from BL1P223CA0030.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:2c4::35) by SA1PR12MB8093.namprd12.prod.outlook.com (2603:10b6:806:335::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.20; Thu, 14 Mar 2024 16:36:18 +0000 Received: from BL6PEPF0001AB73.namprd02.prod.outlook.com (2603:10b6:208:2c4:cafe::c2) by BL1P223CA0030.outlook.office365.com (2603:10b6:208:2c4::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21 via Frontend Transport; Thu, 14 Mar 2024 16:36:18 +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 BL6PEPF0001AB73.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7386.12 via Frontend Transport; Thu, 14 Mar 2024 16:36:17 +0000 Received: from jallen-jump-host.amd.com (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; Thu, 14 Mar 2024 11:36:15 -0500 From: John Allen To: , , CC: , , , , John Allen Subject: [PATCH 3/4] RAS: ATL: Add map_bits_valid to header Date: Thu, 14 Mar 2024 16:35:26 +0000 Message-ID: <20240314163527.63321-4-john.allen@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240314163527.63321-1-john.allen@amd.com> References: <20240314163527.63321-1-john.allen@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB73:EE_|SA1PR12MB8093:EE_ X-MS-Office365-Filtering-Correlation-Id: efd39d18-dd5f-44a2-7cec-08dc4444df8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v1trHWqb9/X7v9GeFKKzb8Rr3o2ZIVT+utxIt0tqpgGPhJg9/VQZrnClcSV5JJQrCWb5WUwW8vBdatUtx8lELKSZpsbXhgjzemVs3QwrwKQjfCevSqvctAriIjR8PJbiOHScpCyBy8PgW6C45xLbvk0hRbtXJ/4EyuH6Pk+12QETWDcfSbeb4rH4gdtf8Ppyg//Gzs02X/26tArvwMr7gQnIgOEDcYGoQnHsUpuPzbdv7lp6NohuI5IWizQ4ML5MtVQp+SqBE0ieGpASar+1skMWsHcj+4L1zPUvXu9I9lUNSeV85o5s+GrMw00dZBt+KB2DD89bdPFvalStlzApAGhgJY0ZvHNZ+QaXAZNFNAXm6FGBzLaFbxUF2FtnZ31WCqbc11c8+L1Sp8biHf9s7M7k5pb4VVqiGP0ylRX3aNuiqGDQSYeYFX0XaXanbdW/Nvg2VhzE7WiAK8Ms+3ljhMEboTh0gTbIh03uA6GlQzQUcFfB3OqzgzDlUoQJTTl+vZ/oxPnzq+823SU6FIVK/Y+IZJsoTxStAtGtGudLHqmZVu41F1lQ4eof0roldqvLutqkMbY/WVA8n+l+6jLBW9CnAl4kmtOZH6JlHTuDWUl6TXxTtMySlVcD+xWvgKT3CcrlSd9Pev21S/txMn51v+mfuAPKiAxncgJCMMmVjnVnWc9uKGiHX9hU9ahrlTLeMMRuyKSX2vLYiuARWeXVIzT0aBN/MG39w/JiSSGpJcZazoy/dmJycWoD1hyaa/vN 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: 14 Mar 2024 16:36:17.8421 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efd39d18-dd5f-44a2-7cec-08dc4444df8e 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: BL6PEPF0001AB73.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8093 Content-Type: text/plain; charset="utf-8" Make map_bits_valid available in the AMD ATL internal header as the function can be used in other parts of the library. Signed-off-by: John Allen --- drivers/ras/amd/atl/dehash.c | 2 +- drivers/ras/amd/atl/internal.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/ras/amd/atl/dehash.c b/drivers/ras/amd/atl/dehash.c index 4ea46262c4f5..a20cf615b83a 100644 --- a/drivers/ras/amd/atl/dehash.c +++ b/drivers/ras/amd/atl/dehash.c @@ -19,7 +19,7 @@ * If @num_intlv_dies and/or @num_intlv_sockets are 1, it means the * respective interleaving is disabled. */ -static inline bool map_bits_valid(struct addr_ctx *ctx, u8 bit1, u8 bit2, +inline bool map_bits_valid(struct addr_ctx *ctx, u8 bit1, u8 bit2, u8 num_intlv_dies, u8 num_intlv_sockets) { if (!(ctx->map.intlv_bit_pos =3D=3D bit1 || ctx->map.intlv_bit_pos =3D=3D= bit2)) { diff --git a/drivers/ras/amd/atl/internal.h b/drivers/ras/amd/atl/internal.h index 05b870fcb24e..4681449321de 100644 --- a/drivers/ras/amd/atl/internal.h +++ b/drivers/ras/amd/atl/internal.h @@ -239,6 +239,9 @@ unsigned long convert_umc_mca_addr_to_sys_addr(struct a= tl_err *err); u64 add_base_and_hole(struct addr_ctx *ctx, u64 addr); u64 remove_base_and_hole(struct addr_ctx *ctx, u64 addr); =20 +inline bool map_bits_valid(struct addr_ctx *ctx, u8 bit1, u8 bit2, + u8 num_intlv_dies, u8 num_intlv_sockets); + /* * Make a gap in @data that is @num_bits long starting at @bit_num. * e.g. data =3D 11111111'b --=20 2.34.1 From nobody Sun Feb 8 00:12:26 2026 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2058.outbound.protection.outlook.com [40.107.212.58]) (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 58CCB7352C; Thu, 14 Mar 2024 16:36:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434198; cv=fail; b=Akc277SXNFcprsQE1rFav5eQma3Uk5pzaJ8yIUK7ckMdePb6H7kcz8RNaAnTx7bCKI4lWBq35nEpYXoQpvZHIrBjnjToOsRbyOfLu4StsJ/hY1dscne00382UU+iPrtKzs3OWf20D/eZ66eFGVjqHY1rs10hgrQUzjBgMdyvLwI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710434198; c=relaxed/simple; bh=IXa7wY3G5lblqD2vhQgg+aEKVTQFc/FtmAceGLZHFho=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SI0G89P/Hhro3LjaR4Nqx440ifUV4qAQGXN51lQ1y3wl0oRmRWlwhz0clXqEU5dtYAGLGtio6rJJIUUrXJDXj2Qr//Ih57Lg7H4EKBBwecQdzHt0XJIn+STlFECgdBbLO61N7zgagnhnljVNNxJAjV7/ljE/FZ/ZR3DxvLQuTAU= 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=l481hXlB; arc=fail smtp.client-ip=40.107.212.58 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="l481hXlB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IL+cfnMLrOcE0qEi1jwXxzZ5Iav+pP472yLUpP+NoHebyJyrNlxRsPpArwSXoQjW/meGKV9GZc0gVeJhm8mABoKXUMq7OVRsCzkbvmJiI//ew2M1oCE0uQmgQbUU23+1tUNdHRl6jDyU85XB5XNGejcekqlcntdCsken7AgsTJBlNTwXV38nYh2gphxQDN/IIuGJ7s11Op5oILmwAzPW2d5nl9bRr9ohgg9JEvBLUByZld3ejbfmDlbx5BOEEUVziJNXaAZT8Dypul92lfea7zK6lK74Su4KB8d7KOm56Dn6vWEiRd9rPhIM7CSOkf8Y3hoEe31yn8aOLVJBzDAGGw== 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=rDEHI7t7yTtn+rcFrlJQmC3pqcXviCsYl2DRKHCLaP4=; b=UqOIwZa46l8bXSf0KznFYT7VmqcBu4B7suOIZQqUAVr6HXau1kgTr6tsb7vVoeesFgJBWTuh8bf3sqSmtMdrFSxjrvCOBszUI5OiCkm2/PX92yKJ0LgF1O94y3q76mNObxFcUH0UvowXrpEDwnyi1SdBjBQF9ksfTt7Pcf6yi3WNZMaeLc0Pv6QB69EjbJ0gvDlM/kl6uyL0alQQs5UPGRL54QmFhxfQoP7au3ugmTWPvg7U69VzsFRuOY/p4MlT3kkGHnm45nQ+/N1n7dGB6uztniNkjMiPgCtMoWLz2blPZhIA8PzBHm/sYaqAgCkuDjiYipxZHQAGN5Fh5QXIIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=rDEHI7t7yTtn+rcFrlJQmC3pqcXviCsYl2DRKHCLaP4=; b=l481hXlBNnm8zgwJBKAu5KilN/mr63aFngd/ja6GfurTi0jtHk9F7NYVrAr9Fyoe3kwr0PXhbUbSNGosxc5H57SpVV1d6KbVXuNqhjQmsXN5EAQARovtVHWqtpgD/dUlpLRj5t+4u+UNWp+eXMC92+3xDPZNvXcHII1Xk8N24ws= Received: from BL6PEPF0001641A.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:6) by SA0PR12MB7001.namprd12.prod.outlook.com (2603:10b6:806:2c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.20; Thu, 14 Mar 2024 16:36:32 +0000 Received: from BL6PEPF0001AB74.namprd02.prod.outlook.com (2a01:111:f403:f903::) by BL6PEPF0001641A.outlook.office365.com (2603:1036:903:4::a) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21 via Frontend Transport; Thu, 14 Mar 2024 16:36: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 BL6PEPF0001AB74.mail.protection.outlook.com (10.167.242.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7386.12 via Frontend Transport; Thu, 14 Mar 2024 16:36:22 +0000 Received: from jallen-jump-host.amd.com (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; Thu, 14 Mar 2024 11:36:21 -0500 From: John Allen To: , , CC: , , , , John Allen Subject: [PATCH 4/4] RAS: ATL: Implement DF 4.5 NP2 denormalization Date: Thu, 14 Mar 2024 16:35:27 +0000 Message-ID: <20240314163527.63321-5-john.allen@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240314163527.63321-1-john.allen@amd.com> References: <20240314163527.63321-1-john.allen@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB74:EE_|SA0PR12MB7001:EE_ X-MS-Office365-Filtering-Correlation-Id: 67281d8f-1e4b-48a3-d1db-08dc4444e249 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3/ArjGH5gO9UoLRbe2sMFBN40972uvVj6rbcJH3Syh9vhOdbXvpj/FbE/YlKx8rGOovaZ4ZsvxXAPXr0PUMmJc1RFaBuDOZMf45iL5PF3wCxkaBG7zFG3zTQxW/KIhFfbPJJ6QjGlKStzRrHKiS/49vh+9DB9TxnKeYZCH6zDZQrDLWLUlCO4DZyvOGDlqlLFmZRftfD1Tm2j+WfLpzO3y9kaIcFooi5Ezt64kccEZ+X6f9dKg1GiJrKgpsG8vyOX/B86SXLXqHNeaQzvljqXRNmCPpGvQJXyJs2QsyFvmEnc0qGCVc6jsH26qdMSdhDT4MNeKQvSM5t7oCXpOxSx+44QU4isEzJ7iy7B/UZh76xJaNbd5LtRNbRjyAyFDJOrv28FAE3qNocBL1A8BHOaEsAbGVM1pEbkeZzDuQgYGNFS+hwdmsY48G04HyDx/XcY2XazwP46qTvDQStaS2t+xlHSVqFSZZdP2mM3hkehfnkoz1jIeeooslqZq6yAZxPtCNzDUhKx2BFW7KlMg8djO5+fCIJYXHk6OeZeO8JpVNAFPW9nFN6UNImW2lI7TC9C/eGF3IICx6BH000b5bIIP1tBIKvVfKx061jlKDsYSh6o4kB6U4NMlF7WCCti74wWNAb+32DANUnhAZ7CaH4Ag0/8FvmvDAFe6rRKWWybJ2DZFaJMth5k3NwCuy1ouwvU9u9ND8Jwm88+FMWPM0HyexwPijar3hZb9tY8YL6WKwg+mTRJGCmxNnx4qmLCtf2 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)(36860700004)(1800799015)(376005)(82310400014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2024 16:36:22.4252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67281d8f-1e4b-48a3-d1db-08dc4444e249 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: BL6PEPF0001AB74.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7001 Content-Type: text/plain; charset="utf-8" Unlike with previous Data Fabric versions, with Data Fabric 4.5, there are bits of the system physical address that can't be reconstructed from the normalized address. Using NPS0_24CHAN_1K_HASH as an example, the normalized address consists of bits [63:13] (divided by 3), bits [11:10], and bits [7:0] of the system physical address. In this case, the remainder from the divide by 3 and bits 8, 9, and 12 are missing. To determine the proper combination of missing system physical address bits, iterate through each possible combination of these bits, normalize the resulting system physical address, and compare to the original address that is being translated. If the addresses match, then the correct permutation of bits has been found. Signed-off-by: John Allen --- drivers/ras/amd/atl/denormalize.c | 530 ++++++++++++++++++++++++++++++ drivers/ras/amd/atl/internal.h | 40 +++ drivers/ras/amd/atl/map.c | 37 +++ 3 files changed, 607 insertions(+) diff --git a/drivers/ras/amd/atl/denormalize.c b/drivers/ras/amd/atl/denorm= alize.c index e279224288d6..b03bba851e14 100644 --- a/drivers/ras/amd/atl/denormalize.c +++ b/drivers/ras/amd/atl/denormalize.c @@ -448,6 +448,105 @@ static u16 get_logical_coh_st_fabric_id(struct addr_c= tx *ctx) return (phys_fabric_id & df_cfg.node_id_mask) | log_fabric_id; } =20 +static u64 get_logical_coh_st_fabric_id_for_current_spa(struct addr_ctx *c= tx, + struct df4p5_denorm_ctx *denorm_ctx) +{ + bool hash_ctl_64k, hash_ctl_2M, hash_ctl_1G, hash_ctl_1T; + bool hash_pa8, hash_pa9, hash_pa12, hash_pa13; + u64 cs_id =3D 0; + + hash_ctl_64k =3D FIELD_GET(DF4_HASH_CTL_64K, ctx->map.ctl); + hash_ctl_2M =3D FIELD_GET(DF4_HASH_CTL_2M, ctx->map.ctl); + hash_ctl_1G =3D FIELD_GET(DF4_HASH_CTL_1G, ctx->map.ctl); + hash_ctl_1T =3D FIELD_GET(DF4p5_HASH_CTL_1T, ctx->map.ctl); + + hash_pa8 =3D FIELD_GET(BIT_ULL(8), denorm_ctx->current_spa); + hash_pa8 ^=3D FIELD_GET(BIT_ULL(14), denorm_ctx->current_spa); + hash_pa8 ^=3D FIELD_GET(BIT_ULL(16), denorm_ctx->current_spa) & hash_ctl_= 64k; + hash_pa8 ^=3D FIELD_GET(BIT_ULL(21), denorm_ctx->current_spa) & hash_ctl_= 2M; + hash_pa8 ^=3D FIELD_GET(BIT_ULL(30), denorm_ctx->current_spa) & hash_ctl_= 1G; + hash_pa8 ^=3D FIELD_GET(BIT_ULL(40), denorm_ctx->current_spa) & hash_ctl_= 1T; + + hash_pa9 =3D FIELD_GET(BIT_ULL(9), denorm_ctx->current_spa); + hash_pa9 ^=3D FIELD_GET(BIT_ULL(17), denorm_ctx->current_spa) & hash_ctl_= 64k; + hash_pa9 ^=3D FIELD_GET(BIT_ULL(22), denorm_ctx->current_spa) & hash_ctl_= 2M; + hash_pa9 ^=3D FIELD_GET(BIT_ULL(31), denorm_ctx->current_spa) & hash_ctl_= 1G; + hash_pa9 ^=3D FIELD_GET(BIT_ULL(41), denorm_ctx->current_spa) & hash_ctl_= 1T; + + hash_pa12 =3D FIELD_GET(BIT_ULL(12), denorm_ctx->current_spa); + hash_pa12 ^=3D FIELD_GET(BIT_ULL(18), denorm_ctx->current_spa) & hash_ctl= _64k; + hash_pa12 ^=3D FIELD_GET(BIT_ULL(23), denorm_ctx->current_spa) & hash_ctl= _2M; + hash_pa12 ^=3D FIELD_GET(BIT_ULL(32), denorm_ctx->current_spa) & hash_ctl= _1G; + hash_pa12 ^=3D FIELD_GET(BIT_ULL(42), denorm_ctx->current_spa) & hash_ctl= _1T; + + hash_pa13 =3D FIELD_GET(BIT_ULL(13), denorm_ctx->current_spa); + hash_pa13 ^=3D FIELD_GET(BIT_ULL(19), denorm_ctx->current_spa) & hash_ctl= _64k; + hash_pa13 ^=3D FIELD_GET(BIT_ULL(24), denorm_ctx->current_spa) & hash_ctl= _2M; + hash_pa13 ^=3D FIELD_GET(BIT_ULL(33), denorm_ctx->current_spa) & hash_ctl= _1G; + hash_pa13 ^=3D FIELD_GET(BIT_ULL(43), denorm_ctx->current_spa) & hash_ctl= _1T; + + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_1K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 13), denorm_ctx->current_spa) << 3; + cs_id %=3D denorm_ctx->mod_value; + cs_id <<=3D 2; + cs_id |=3D (hash_pa9 | (hash_pa12 << 1)); + cs_id |=3D hash_pa8 << df_cfg.socket_id_shift; + break; + case DF4p5_NPS0_24CHAN_2K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 14), denorm_ctx->current_spa) << 4; + cs_id %=3D denorm_ctx->mod_value; + cs_id <<=3D 2; + cs_id |=3D (hash_pa12 | (hash_pa13 << 1)); + cs_id |=3D hash_pa8 << df_cfg.socket_id_shift; + break; + case DF4p5_NPS1_12CHAN_1K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 12), denorm_ctx->current_spa) << 2; + cs_id %=3D denorm_ctx->mod_value; + cs_id <<=3D 2; + cs_id |=3D (hash_pa8 | (hash_pa9 << 1)); + break; + case DF4p5_NPS1_12CHAN_2K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 13), denorm_ctx->current_spa) << 3; + cs_id %=3D denorm_ctx->mod_value; + cs_id <<=3D 2; + cs_id |=3D (hash_pa8 | (hash_pa12 << 1)); + break; + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 12), denorm_ctx->current_spa) << 2; + cs_id |=3D (FIELD_GET(BIT_ULL(9), denorm_ctx->current_spa) << 1); + cs_id %=3D denorm_ctx->mod_value; + cs_id <<=3D 1; + cs_id |=3D hash_pa8; + break; + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 12), denorm_ctx->current_spa) << 2; + cs_id %=3D denorm_ctx->mod_value; + cs_id <<=3D 1; + cs_id |=3D hash_pa8; + break; + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 12), denorm_ctx->current_spa) << 2; + cs_id |=3D FIELD_GET(GENMASK_ULL(9, 8), denorm_ctx->current_spa); + cs_id %=3D denorm_ctx->mod_value; + break; + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + cs_id =3D FIELD_GET(GENMASK_ULL(63, 12), denorm_ctx->current_spa) << 2; + cs_id |=3D FIELD_GET(BIT_ULL(8), denorm_ctx->current_spa) << 1; + cs_id %=3D denorm_ctx->mod_value; + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return 0; + } + + return cs_id; +} + static int denorm_addr_common(struct addr_ctx *ctx) { u64 denorm_addr; @@ -699,6 +798,424 @@ static int denorm_addr_df4_np2(struct addr_ctx *ctx) return 0; } =20 +static u64 normalize_addr_df4p5_np2(struct addr_ctx *ctx, struct df4p5_den= orm_ctx *denorm_ctx, + u64 addr) +{ + u64 temp_addr_a, temp_addr_b; + + temp_addr_a =3D 0; + temp_addr_b =3D 0; + + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_1K_HASH: + case DF4p5_NPS1_12CHAN_1K_HASH: + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + temp_addr_a =3D FIELD_GET(GENMASK_ULL(11, 10), addr) << 8; + break; + case DF4p5_NPS0_24CHAN_2K_HASH: + case DF4p5_NPS1_12CHAN_2K_HASH: + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + temp_addr_a =3D FIELD_GET(GENMASK_ULL(11, 9), addr) << 8; + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return 0; + } + + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_1K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 13), addr) / denorm_ctx->mod_v= alue; + temp_addr_b <<=3D 10; + break; + case DF4p5_NPS0_24CHAN_2K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 14), addr) / denorm_ctx->mod_v= alue; + temp_addr_b <<=3D 11; + break; + case DF4p5_NPS1_12CHAN_1K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 12), addr) / denorm_ctx->mod_v= alue; + temp_addr_b <<=3D 10; + break; + case DF4p5_NPS1_12CHAN_2K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 13), addr) / denorm_ctx->mod_v= alue; + temp_addr_b <<=3D 11; + break; + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 12), addr) << 1; + temp_addr_b |=3D FIELD_GET(BIT_ULL(9), addr); + temp_addr_b /=3D denorm_ctx->mod_value; + temp_addr_b <<=3D 10; + break; + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 12), addr) / denorm_ctx->mod_v= alue; + temp_addr_b <<=3D 11; + break; + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 12), addr) << 2; + temp_addr_b |=3D FIELD_GET(GENMASK_ULL(9, 8), addr); + temp_addr_b /=3D denorm_ctx->mod_value; + temp_addr_b <<=3D 10; + break; + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + temp_addr_b =3D FIELD_GET(GENMASK_ULL(63, 12), addr) << 1; + temp_addr_b |=3D FIELD_GET(BIT_ULL(8), addr); + temp_addr_b /=3D denorm_ctx->mod_value; + temp_addr_b <<=3D 11; + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return 0; + } + + return denorm_ctx->base_denorm_addr | temp_addr_a | temp_addr_b; +} + +static void recalculate_hashed_bits_df4p5_np2(struct addr_ctx *ctx, + struct df4p5_denorm_ctx *denorm_ctx) +{ + bool hash_ctl_64k, hash_ctl_2M, hash_ctl_1G, hash_ctl_1T, hashed_bit; + + if (!denorm_ctx->rehash_vector) + return; + + hash_ctl_64k =3D FIELD_GET(DF4_HASH_CTL_64K, ctx->map.ctl); + hash_ctl_2M =3D FIELD_GET(DF4_HASH_CTL_2M, ctx->map.ctl); + hash_ctl_1G =3D FIELD_GET(DF4_HASH_CTL_1G, ctx->map.ctl); + hash_ctl_1T =3D FIELD_GET(DF4p5_HASH_CTL_1T, ctx->map.ctl); + + if (denorm_ctx->rehash_vector & BIT_ULL(8)) { + hashed_bit =3D FIELD_GET(BIT_ULL(8), denorm_ctx->current_spa); + hashed_bit ^=3D FIELD_GET(BIT_ULL(14), denorm_ctx->current_spa); + hashed_bit ^=3D FIELD_GET(BIT_ULL(16), denorm_ctx->current_spa) & hash_c= tl_64k; + hashed_bit ^=3D FIELD_GET(BIT_ULL(21), denorm_ctx->current_spa) & hash_c= tl_2M; + hashed_bit ^=3D FIELD_GET(BIT_ULL(30), denorm_ctx->current_spa) & hash_c= tl_1G; + hashed_bit ^=3D FIELD_GET(BIT_ULL(40), denorm_ctx->current_spa) & hash_c= tl_1T; + + if (FIELD_GET(BIT_ULL(8), denorm_ctx->current_spa) !=3D hashed_bit) + denorm_ctx->current_spa ^=3D BIT_ULL(8); + } + + if (denorm_ctx->rehash_vector & BIT_ULL(9)) { + hashed_bit =3D FIELD_GET(BIT_ULL(9), denorm_ctx->current_spa); + hashed_bit ^=3D FIELD_GET(BIT_ULL(17), denorm_ctx->current_spa) & hash_c= tl_64k; + hashed_bit ^=3D FIELD_GET(BIT_ULL(22), denorm_ctx->current_spa) & hash_c= tl_2M; + hashed_bit ^=3D FIELD_GET(BIT_ULL(31), denorm_ctx->current_spa) & hash_c= tl_1G; + hashed_bit ^=3D FIELD_GET(BIT_ULL(41), denorm_ctx->current_spa) & hash_c= tl_1T; + + if (FIELD_GET(BIT_ULL(9), denorm_ctx->current_spa) !=3D hashed_bit) + denorm_ctx->current_spa ^=3D BIT_ULL(9); + } + + if (denorm_ctx->rehash_vector & BIT_ULL(12)) { + hashed_bit =3D FIELD_GET(BIT_ULL(12), denorm_ctx->current_spa); + hashed_bit ^=3D FIELD_GET(BIT_ULL(18), denorm_ctx->current_spa) & hash_c= tl_64k; + hashed_bit ^=3D FIELD_GET(BIT_ULL(23), denorm_ctx->current_spa) & hash_c= tl_2M; + hashed_bit ^=3D FIELD_GET(BIT_ULL(32), denorm_ctx->current_spa) & hash_c= tl_1G; + hashed_bit ^=3D FIELD_GET(BIT_ULL(42), denorm_ctx->current_spa) & hash_c= tl_1T; + + if (FIELD_GET(BIT_ULL(12), denorm_ctx->current_spa) !=3D hashed_bit) + denorm_ctx->current_spa ^=3D BIT_ULL(12); + } + + if (denorm_ctx->rehash_vector & BIT_ULL(13)) { + hashed_bit =3D FIELD_GET(BIT_ULL(13), denorm_ctx->current_spa); + hashed_bit ^=3D FIELD_GET(BIT_ULL(19), denorm_ctx->current_spa) & hash_c= tl_64k; + hashed_bit ^=3D FIELD_GET(BIT_ULL(24), denorm_ctx->current_spa) & hash_c= tl_2M; + hashed_bit ^=3D FIELD_GET(BIT_ULL(33), denorm_ctx->current_spa) & hash_c= tl_1G; + hashed_bit ^=3D FIELD_GET(BIT_ULL(43), denorm_ctx->current_spa) & hash_c= tl_1T; + + if (FIELD_GET(BIT_ULL(13), denorm_ctx->current_spa) !=3D hashed_bit) + denorm_ctx->current_spa ^=3D BIT_ULL(13); + } +} + +static bool check_logical_coh_st_fabric_id(struct addr_ctx *ctx, + struct df4p5_denorm_ctx *denorm_ctx) +{ + unsigned int logical_coh_st_fabric_id; + + /* + * The logical CS fabric ID of the permutation must be calculated from the + * current SPA with the base and with the MMIO hole. + */ + logical_coh_st_fabric_id =3D get_logical_coh_st_fabric_id_for_current_spa= (ctx, denorm_ctx); + + atl_debug(ctx, "Checking calculated logical coherent station fabric id:\n= "); + atl_debug(ctx, " calculated fabric id =3D 0x%x\n", logical_coh_s= t_fabric_id); + atl_debug(ctx, " expected fabric id =3D 0x%x\n", denorm_ctx->c= oh_st_fabric_id); + + if (denorm_ctx->coh_st_fabric_id !=3D logical_coh_st_fabric_id) + return false; + + return true; +} + +static bool check_norm_addr(struct addr_ctx *ctx, struct df4p5_denorm_ctx = *denorm_ctx) +{ + u64 current_spa_without_base =3D remove_base_and_hole(ctx, denorm_ctx->cu= rrent_spa); + u64 norm_addr; + + /* + * The normalized address must be calculated with the current SPA without + * the base and without the MMIO hole. + */ + norm_addr =3D normalize_addr_df4p5_np2(ctx, denorm_ctx, current_spa_witho= ut_base); + + atl_debug(ctx, "Checking calculated normalized address:\n"); + atl_debug(ctx, " calculated normalized addr =3D 0x%016llx\n", norm_addr); + atl_debug(ctx, " expected normalized addr =3D 0x%016llx\n", ctx->ret_a= ddr); + + if (norm_addr !=3D ctx->ret_addr) + return false; + + return true; +} + +static int check_permutations(struct addr_ctx *ctx, struct df4p5_denorm_ct= x *denorm_ctx) +{ + u64 test_perm, temp_addr, denorm_addr, num_perms; + unsigned int dropped_remainder; + + denorm_ctx->div_addr *=3D denorm_ctx->mod_value; + + /* + * The high order bits of num_permutations represent the permutations + * of the dropped remainder. This will be either 0-3 or 0-5 depending + * on the interleave mode. The low order bits represent the + * permutations of other "lost" bits which will be any combination of + * 1, 2, or 3 bits depending on the interleave mode. + */ + num_perms =3D denorm_ctx->mod_value << denorm_ctx->perm_shift; + + for (test_perm =3D 0; test_perm < num_perms; test_perm++) { + denorm_addr =3D denorm_ctx->base_denorm_addr; + dropped_remainder =3D test_perm >> denorm_ctx->perm_shift; + temp_addr =3D denorm_ctx->div_addr + dropped_remainder; + + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_2K_HASH: + denorm_addr |=3D temp_addr << 14; + break; + case DF4p5_NPS0_24CHAN_1K_HASH: + case DF4p5_NPS1_12CHAN_2K_HASH: + denorm_addr |=3D temp_addr << 13; + break; + case DF4p5_NPS1_12CHAN_1K_HASH: + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + denorm_addr |=3D temp_addr << 12; + break; + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + denorm_addr |=3D FIELD_GET(BIT_ULL(0), temp_addr) << 9; + denorm_addr |=3D FIELD_GET(GENMASK_ULL(63, 1), temp_addr) << 12; + break; + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + denorm_addr |=3D FIELD_GET(GENMASK_ULL(1, 0), temp_addr) << 8; + denorm_addr |=3D FIELD_GET(GENMASK_ULL(63, 2), (temp_addr)) << 12; + break; + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + denorm_addr |=3D FIELD_GET(BIT_ULL(0), temp_addr) << 8; + denorm_addr |=3D FIELD_GET(GENMASK_ULL(63, 1), temp_addr) << 12; + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return -EINVAL; + } + + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_1K_HASH: + denorm_addr |=3D FIELD_GET(BIT_ULL(0), test_perm) << 8; + denorm_addr |=3D FIELD_GET(BIT_ULL(1), test_perm) << 9; + denorm_addr |=3D FIELD_GET(BIT_ULL(2), test_perm) << 12; + break; + case DF4p5_NPS0_24CHAN_2K_HASH: + denorm_addr |=3D FIELD_GET(BIT_ULL(0), test_perm) << 8; + denorm_addr |=3D FIELD_GET(BIT_ULL(1), test_perm) << 12; + denorm_addr |=3D FIELD_GET(BIT_ULL(2), test_perm) << 13; + break; + case DF4p5_NPS1_12CHAN_2K_HASH: + denorm_addr |=3D FIELD_GET(BIT_ULL(0), test_perm) << 8; + denorm_addr |=3D FIELD_GET(BIT_ULL(1), test_perm) << 12; + break; + case DF4p5_NPS1_12CHAN_1K_HASH: + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + denorm_addr |=3D FIELD_GET(BIT_ULL(0), test_perm) << 8; + denorm_addr |=3D FIELD_GET(BIT_ULL(1), test_perm) << 9; + break; + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + denorm_addr |=3D FIELD_GET(BIT_ULL(0), test_perm) << 8; + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return -EINVAL; + } + + denorm_ctx->current_spa =3D add_base_and_hole(ctx, denorm_addr); + recalculate_hashed_bits_df4p5_np2(ctx, denorm_ctx); + + atl_debug(ctx, "Checking potential system physical address 0x%016llx\n", + denorm_ctx->current_spa); + + if (!check_logical_coh_st_fabric_id(ctx, denorm_ctx)) + continue; + + if (!check_norm_addr(ctx, denorm_ctx)) + continue; + + if (denorm_ctx->resolved_spa =3D=3D INVALID_SPA || + denorm_ctx->current_spa > denorm_ctx->resolved_spa) + denorm_ctx->resolved_spa =3D denorm_ctx->current_spa; + } + + if (denorm_ctx->resolved_spa =3D=3D INVALID_SPA) { + atl_debug(ctx, "Failed to find valid SPA for normalized address 0x%016ll= x\n", + ctx->ret_addr); + return -EINVAL; + } + + /* Return the resolved SPA without the base, without the MMIO hole */ + ctx->ret_addr =3D remove_base_and_hole(ctx, denorm_ctx->resolved_spa); + + return 0; +} + +static int init_df4p5_denorm_ctx(struct addr_ctx *ctx, struct df4p5_denorm= _ctx *denorm_ctx) +{ + denorm_ctx->current_spa =3D INVALID_SPA; + denorm_ctx->resolved_spa =3D INVALID_SPA; + + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_1K_HASH: + denorm_ctx->perm_shift =3D 3; + denorm_ctx->rehash_vector =3D BIT(8) | BIT(9) | BIT(12); + break; + case DF4p5_NPS0_24CHAN_2K_HASH: + denorm_ctx->perm_shift =3D 3; + denorm_ctx->rehash_vector =3D BIT(8) | BIT(12) | BIT(13); + break; + case DF4p5_NPS1_12CHAN_1K_HASH: + denorm_ctx->perm_shift =3D 2; + denorm_ctx->rehash_vector =3D BIT(8); + break; + case DF4p5_NPS1_12CHAN_2K_HASH: + denorm_ctx->perm_shift =3D 2; + denorm_ctx->rehash_vector =3D BIT(8) | BIT(12); + break; + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + denorm_ctx->perm_shift =3D 1; + denorm_ctx->rehash_vector =3D BIT(8); + break; + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + denorm_ctx->perm_shift =3D 2; + denorm_ctx->rehash_vector =3D 0; + break; + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + denorm_ctx->perm_shift =3D 1; + denorm_ctx->rehash_vector =3D 0; + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return -EINVAL; + } + + denorm_ctx->base_denorm_addr =3D FIELD_GET(GENMASK_ULL(7, 0), ctx->ret_ad= dr); + + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_1K_HASH: + case DF4p5_NPS1_12CHAN_1K_HASH: + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + denorm_ctx->base_denorm_addr |=3D FIELD_GET(GENMASK_ULL(9, 8), ctx->ret_= addr) << 10; + denorm_ctx->div_addr =3D FIELD_GET(GENMASK_ULL(63, 10), ctx->re= t_addr); + break; + case DF4p5_NPS0_24CHAN_2K_HASH: + case DF4p5_NPS1_12CHAN_2K_HASH: + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + denorm_ctx->base_denorm_addr |=3D FIELD_GET(GENMASK_ULL(10, 8), ctx->ret= _addr) << 9; + denorm_ctx->div_addr =3D FIELD_GET(GENMASK_ULL(63, 11), ctx->re= t_addr); + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return -EINVAL; + } + + if (ctx->map.num_intlv_chan % 3 =3D=3D 0) + denorm_ctx->mod_value =3D 3; + else + denorm_ctx->mod_value =3D 5; + + denorm_ctx->coh_st_fabric_id =3D get_logical_coh_st_fabric_id(ctx) - get_= dst_fabric_id(ctx); + + atl_debug(ctx, "Initialized df4p5_denorm_ctx:"); + atl_debug(ctx, " mod_value =3D %d", denorm_ctx->mod_value); + atl_debug(ctx, " perm_shift =3D %d", denorm_ctx->perm_shift); + atl_debug(ctx, " rehash_vector =3D 0x%x", denorm_ctx->rehash_vector); + atl_debug(ctx, " base_denorm_addr =3D 0x%016llx", denorm_ctx->base_deno= rm_addr); + atl_debug(ctx, " div_addr =3D 0x%016llx", denorm_ctx->div_addr); + atl_debug(ctx, " coh_st_fabric_id =3D 0x%x", denorm_ctx->coh_st_fabric_= id); + + return 0; +} + +/* + * For DF 4.5, parts of the physical address can be directly pulled from t= he + * normalized address. The exact bits will differ between interleave modes= , but + * using NPS0_24CHAN_1K_HASH as an example, the normalized address consist= s of + * bits [63:13] (divided by 3), bits [11:10], and bits [7:0] of the system + * physical address. + * + * In this case, there is no way to reconstruct the missing bits (bits 8, = 9, + * and 12) from the normalized address. Additionally, when bits [63:13] are + * divided by 3, the remainder is dropped. Determine the proper combinatio= n of + * "lost" bits and dropped remainder by iterating through each possible + * permutation of these bits and then normalizing the generated system phy= sical + * addresses. If the normalized address matches the address we are trying = to + * translate, then we have found the correct permutation of bits. + */ +static int denorm_addr_df4p5_np2(struct addr_ctx *ctx) +{ + struct df4p5_denorm_ctx denorm_ctx; + int ret =3D 0; + + memset(&denorm_ctx, 0, sizeof(denorm_ctx)); + + atl_debug(ctx, "Denormalizing DF 4.5 normalized address 0x%016llx", ctx->= ret_addr); + + ret =3D init_df4p5_denorm_ctx(ctx, &denorm_ctx); + if (ret) + return ret; + + return check_permutations(ctx, &denorm_ctx); +} + int denormalize_address(struct addr_ctx *ctx) { switch (ctx->map.intlv_mode) { @@ -710,6 +1227,19 @@ int denormalize_address(struct addr_ctx *ctx) case DF4_NPS2_5CHAN_HASH: case DF4_NPS1_10CHAN_HASH: return denorm_addr_df4_np2(ctx); + case DF4p5_NPS0_24CHAN_1K_HASH: + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS1_12CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS1_12CHAN_2K_HASH: + case DF4p5_NPS0_24CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + return denorm_addr_df4p5_np2(ctx); case DF3_6CHAN: return denorm_addr_df3_6chan(ctx); default: diff --git a/drivers/ras/amd/atl/internal.h b/drivers/ras/amd/atl/internal.h index 4681449321de..0c67ceedfc60 100644 --- a/drivers/ras/amd/atl/internal.h +++ b/drivers/ras/amd/atl/internal.h @@ -34,6 +34,8 @@ #define DF_DRAM_BASE_LIMIT_LSB 28 #define MI300_DRAM_LIMIT_LSB 20 =20 +#define INVALID_SPA ~0ULL + enum df_revisions { UNKNOWN, DF2, @@ -90,6 +92,44 @@ enum intlv_modes { DF4p5_NPS1_10CHAN_2K_HASH =3D 0x49, }; =20 +struct df4p5_denorm_ctx { + /* perm_shift: Indicates the number of "lost" bits. This will be 1, 2, or= 3. */ + u8 perm_shift; + + /* rehash_vector: A mask indicating the bits that need to be rehashed. */ + u16 rehash_vector; + + /* + * mod_value: Represents the value that the high bits of the normalized + * address are divided by during normalization. This value will be 3 + * for interleave modes with a number of channels divisible by 3 or the + * value will be 5 for interleave modes with a number of channels + * divisible by 5. Power-of-two interleave modes are handled + * separately. + */ + u8 mod_value; + + /* + * base_denorm_addr: Represents the bits that can be directly pulled + * from the normalized address. In each case, pass through bits [7:0] + * of the normalized address. The other bits depend on the interleave + * bit position which will be bit 10 for 1K interleave stripe cases and + * bit 11 for 2K interleave stripe cases. + */ + u64 base_denorm_addr; + + /* + * div_addr: Represents the high bits of the physical address that have + * been divided by the mod_value. + */ + u64 div_addr; + + u64 current_spa; + u64 resolved_spa; + + u16 coh_st_fabric_id; +}; + struct df_flags { __u8 legacy_ficaa : 1, socket_id_shift_quirk : 1, diff --git a/drivers/ras/amd/atl/map.c b/drivers/ras/amd/atl/map.c index 8b908e8d7495..1a32a52be942 100644 --- a/drivers/ras/amd/atl/map.c +++ b/drivers/ras/amd/atl/map.c @@ -642,6 +642,39 @@ static int get_global_map_data(struct addr_ctx *ctx) return 0; } =20 +static int validate_address_map(struct addr_ctx *ctx) +{ + switch (ctx->map.intlv_mode) { + case DF4p5_NPS0_24CHAN_1K_HASH: + case DF4p5_NPS0_24CHAN_2K_HASH: + if (ctx->map.num_intlv_sockets < 2 || !map_bits_valid(ctx, 8, 0, 1, 2)) + goto out; + break; + case DF4p5_NPS1_12CHAN_1K_HASH: + case DF4p5_NPS1_12CHAN_2K_HASH: + case DF4p5_NPS2_6CHAN_1K_HASH: + case DF4p5_NPS2_6CHAN_2K_HASH: + case DF4p5_NPS4_3CHAN_1K_HASH: + case DF4p5_NPS4_3CHAN_2K_HASH: + case DF4p5_NPS1_10CHAN_1K_HASH: + case DF4p5_NPS1_10CHAN_2K_HASH: + case DF4p5_NPS2_5CHAN_1K_HASH: + case DF4p5_NPS2_5CHAN_2K_HASH: + if (ctx->map.num_intlv_sockets !=3D 1 || !map_bits_valid(ctx, 8, 0, 1, 1= )) + goto out; + break; + default: + atl_debug_on_bad_intlv_mode(ctx); + return -EINVAL; + } + + return 0; + +out: + atl_debug(ctx, "Inconsistent address map"); + return -EINVAL; +} + static void dump_address_map(struct dram_addr_map *map) { u8 i; @@ -678,5 +711,9 @@ int get_address_map(struct addr_ctx *ctx) =20 dump_address_map(&ctx->map); =20 + ret =3D validate_address_map(ctx); + if (ret) + return ret; + return ret; } --=20 2.34.1