From nobody Wed Dec 17 13:55:41 2025 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2043.outbound.protection.outlook.com [40.107.22.43]) (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 47716185617; Tue, 9 Jul 2024 20:23:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556618; cv=fail; b=OZkS2itexhFoO6ITHYnZg6HsLt0t9B9t8BVZawgMyAhNfkc5WkIk/303puUsZ3IMOLRKSxeq+6lJ/oixjtD43WEDhGf06zAfBhpz9Bgn5+9qo/aJwNmdzJjenU4UUIEXu6TrLtz8dy6BCTU8H1X6jwBLffOch+VAYEkG3OsDvuE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556618; c=relaxed/simple; bh=UpONqte5r5Hx1nNN0JjvCuZqCq5lGesddoh8PgZv3uY=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=UoNDDLdlChrA5RM4hEvzxZ1W2dAkjMB+fHT/pw4nzJcMDKxoePeWATxNFPdDReO7XITxG4xj7Oa9Xk19sWYixYQ3HyP8NxLNHwWgR1kYUY+SmOH8pt/BbIGwtPsRfYBhvWyHQpgxwoiMB7bd9Z6ocYDMrICnLbgV/HJ0iHCOcbo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=eEJgz9pQ; arc=fail smtp.client-ip=40.107.22.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="eEJgz9pQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GFlpWOeg4ThsxuD98daI2fwHnJMuuHMkV23ILR0qJ5zAqmyIevW3CcXPSZlSkixFdntdUvUM5YkrZIjCQSXuGLvoiB6r0R2+VrIFiSIMag/kc0uw+9rPaLllibNQYRCGRhZhXQINWn57tlbBXpVc1HpfDScHpDsF4VL74AhsYLF4NgDPT92oICLPVqqGVms+rVbBaYcNluBOyMJGeztJ1SiClIR6jTRYKonDnUYHARA6NnL47OLysnh0nhgLOso2EjJknLQvxrIQ681YLDnJkOQVWzQlJoksWhUeasx/OiqwAWh0tHuIK4mDc1zENvoKiNt4FWjFBter/m7Iw8uPGg== 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=xtQ3uJl8YmG6bKL+/+LLKJQTXQhg9Sbo8MTtwpVypTo=; b=lTTaP+IylBnxTqK6rSVh4wWgPP4B+CO9+O2+/k0VwHb1mS9GB5BNDyC4XsNLdz0fn2r7hCxYT4PVmvGVNLrEAzjUzr8cFhLbZEVzSsl6BYeke6PLYCBukkEIuL4+vg6EWP6CwrCKFvT9chdYIni20/8fFhqLqU1tHlxhfOcyMXKsy56n151T72lZSoIDPuV0PbAId4uut3HFtQlbd3zmmZGNksRNQHmVg/fDwDNSm25eaBXr6kfV32X1ueivRHHWFVY6UH1eGem4qLVcHIcluAbxwaIhhRziMxmm7cIy5B4k4RJRz0WrkRTvLlvgJ/itmls6qrYt+j+dn+B6dKkmPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xtQ3uJl8YmG6bKL+/+LLKJQTXQhg9Sbo8MTtwpVypTo=; b=eEJgz9pQKLNHpqHfuZPr5gLJU6ks+SABvW2/+UlEz17HLkYhGd5mIAw6O1B5+qnnP2nGltcx6YbhHmSEphS6cUVzDLG5c/1hC3lmIFR/QfXVxsHOBN44DmGb4UVTqRUqHXXPX8MTCtSrDZnj6jwzr4M6ZeAkFSIvVUHMTvAMUro= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DB9PR04MB8267.eurprd04.prod.outlook.com (2603:10a6:10:24b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Tue, 9 Jul 2024 20:23:32 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 20:23:32 +0000 From: Frank Li Date: Tue, 09 Jul 2024 16:23:02 -0400 Subject: [PATCH 1/6] EDAC: fsl_ddr: Pass down fsl_mc_pdata in ddr_in32() and ddr_out32() Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240709-imx95_edac-v1-1-3e9c146c1b01@nxp.com> References: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> In-Reply-To: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> To: York Sun , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter , Krzysztof Kozlowski , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1720556601; l=8040; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=UpONqte5r5Hx1nNN0JjvCuZqCq5lGesddoh8PgZv3uY=; b=V5ZiyLvLjkvpDmrLpJjydLkxqGPR/+inkeTzXlPL4kvbNQvJpz88JEjfpoZ6Ziig67dxwb9LR hsXNOtjKJ4eCYHypgAbk+o+tAv5Jc1JRpN5YVdar8tVwweimd0LbrG0 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR03CA0033.namprd03.prod.outlook.com (2603:10b6:a02:a8::46) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DB9PR04MB8267:EE_ X-MS-Office365-Filtering-Correlation-Id: 61049fa5-fbb5-49d6-5efe-08dca0550099 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|7416014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?eldHUnVQZ0poNThURjgyRnQ4OWF5YjdCWDVoM1pvWE4rM1RTZHFuQkh1d0Jx?= =?utf-8?B?Vys5cjZhT0Zkd0cySTNTR2czcENCMzQxWks5NXgvWHZ1Znh3K0Y5WTVVbCtp?= =?utf-8?B?NEV4aVU4cktIRzVHeWNqR1prNmQvWml3TFNmUnZYOVRYSkU4M1JuUzZUWFA1?= =?utf-8?B?cGhBL0FnYjVKYXovMWNVdTdtZGF3TlNCRXFaVUZ4OWhlcWJ2WVhrL0pLWHFq?= =?utf-8?B?R1lKMjN5L1dMTGg0VnhvWmY3b0Fabk1FNStUSkU0SnJUekFqeW9vNlF6U3FZ?= =?utf-8?B?NldpSmpUaXNqQzNPeDg2UjdONlpmNm9vYTJqSmtNVHFWQWdHME1mbFlEeEZH?= =?utf-8?B?a1h2VzY2R0p6bkpreHVwam5VNzE4VU5EL1dIZE1xSDQ0SnBpazA4RFdiRFJh?= =?utf-8?B?NHJiYlRuNmRxKzhPWk11NXBjS1JlSlFhOG8rNDRYNUJqY2ZkSXpUMVRJbmRo?= =?utf-8?B?YWdQbUUwTi9SY0c1TndMYW1wKzFhTnhveFBRQW5MNDllVDBIc3FEQ3BQZlVr?= =?utf-8?B?c0VpcW8xc1JQOTErekViTjdQakpTRVhSNlJreU1yM3JtQlZCTHFoUHlwc0pU?= =?utf-8?B?bkV6TU9sdXUvYkJuV0pKcFZZQ3Q5TXJqVGFyS2ZxNGRiaGJvQ2ZJY1pnTW9l?= =?utf-8?B?WEYrTWsveXpZaThLQjE2WkN1eUlzMUhDaWFZbmVYUEp5Q1RHdm8rVnA3Q3Rk?= =?utf-8?B?YUxGQityUEtvTzhyejN2dmZtUi9NTUhvZFN0ZTAyai9oSjN1RDZzN3d4VWFt?= =?utf-8?B?Tms5UVFGWlU4OENmZWRvOGRBWUZGdjhhVkFuM0Y1VlQyeGhKUzFpVTlXVzZ2?= =?utf-8?B?VEUyYm5hRzdoRFVzRUMrQmlXSktVd1JOREFtR1lDQStmSjkrWUJZSGJ0Tzh0?= =?utf-8?B?OGUxUi9OUlpZNUo0L0Jxam0zWlBFc0RtL0RUb2JuN3BxY05RNm12YzJrbXJO?= =?utf-8?B?M3R6bEpDaFhYdW5jL3RWUENiNVcwK0xPaXdsMWxqdVliL1JwQWw0a3VNRmtv?= =?utf-8?B?MTVPWU5DNWZXWGJLYnB2SFZHY1NreTNTNGZMc1NTa2pBQXZ0MzJ1Mnp0Z1Bk?= =?utf-8?B?cFJPVUtuV01mbW5xajZRdmlzZERBNXphUnpJbVpJQ2hoSzdaZXg0bnRBZXBs?= =?utf-8?B?b1ZUV2hwU1V1TjBlNGhGeXlEa3ZPWlpwWkIvbThOMGRRaXIvTWZNZnAvTDgx?= =?utf-8?B?Zlg5Q2RMRXFLVGZpaWZJSldySVRuNGFkTlJhQm8yN0x1T2JVcHRkcFV4Zko4?= =?utf-8?B?Z1dPVkNOZHZHTFgycGNqbFlCdjEwbFNac251Qkp0T3o3OVJ6RFVKMkVkeVJq?= =?utf-8?B?QzRIOXpMMzY5Z3pQNmRpMkZFY0sxS0E5ekxEdWZXUHpvY29pdnJkVitHdnVJ?= =?utf-8?B?Q09GSjJWblN3N3ZkQmJkbnN4ZW5vcjl2SkNIS01tM1BnU29WT0dzbmxYR0dk?= =?utf-8?B?ZVdncUQrMktmNVVpWEZWdEZJU3kvZEM2UFFjM2pwNDJGaFkzdzlkRkY0VVNL?= =?utf-8?B?bXVvcVR1YVBOdGN1cDFkV0E0YWM0bTNQYnBBcWVIbThyV0I3SGtJdTdhRExz?= =?utf-8?B?S21CdXBBakR6WXlJaGlYSVNIQmZScTNhRU5JbmU0ZFdlbGo0b2tJUzRGZG1y?= =?utf-8?B?WlZjK2xDdWZsNjQvNlpFcWkzNFR4MXZQU3dHTlpSSEp5aEU0Vmk5aVNYTkRi?= =?utf-8?B?cEFHbytsYnArOWlwdzZkMkVQeTM5cW9CaS95K2EvWWN6U2t4MGRBZWpYS2hq?= =?utf-8?B?MVlCUlA4NU1iOExGbU93cUdqa3hjZmpYV1QxYy9EeGFlL0N3RDByOHRUVFFp?= =?utf-8?B?cERkMzY1SExmNXF0V25OR2hVMndpRTJ4bFpMZ1h6Y0xXSHA5V29ReTBrWlJ1?= =?utf-8?B?UE1QWjRLZ2RpcGE5VXh5SzYvVFdONjB5WVlDV3RhdzdyQWpqcVk5M2t3RmtE?= =?utf-8?Q?yD9iLWWrOg4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(7416014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGFnaTN6SklhOXB3S2NiNVJFQzc4cWk4RGRNUHVGL3dUdmcyMmhsQlNURlNN?= =?utf-8?B?THJ6SjNMN3IxYWdrODVQVVZQdHA2NmlPRjEzdzF2OVhrc3lIVzdPeFZabkNK?= =?utf-8?B?SmZXSFBBenkxczlvdlNLQS82R2YzNjVUR3Mwc0xZVkhsMVovS1EyTjEzK1U2?= =?utf-8?B?S0ZtSDhCb2svWDBnY3psK2xPVWU1UGNCMVpXdEZkMDVxZ3A3QWJ5VHU5N2Fr?= =?utf-8?B?eFVyTVZ6VGxISnVsUWtpNVZGTUF3clZ1TUpnd3hGYlhpNnBueHdRMkhIdjQz?= =?utf-8?B?S0ZDeWhGcWdudGxkWTg2TGxaV083TDZCOStjeklTeStKNFZRakROQ1pYOTJE?= =?utf-8?B?aW1SeitNMG91cHQ1bElvZ2pjYzRqTStPak85d0FDQ1hIR1hUY2NLeEJGaXkx?= =?utf-8?B?UWVRTDNNR2QrcFBRd2JPUEpLQkd1YXZkMlBwS001a01iaGlRYXBIalR4ek1Y?= =?utf-8?B?T3NlRCsxaU16RlZJaXFCaTYvZ3BIanhrLzhrRWhZNDI1WmJ6MEpVUjRHdldi?= =?utf-8?B?aDB4ckpmQ1RXK0lOajZRcW4zeHd6OHRkajczU2JyU043V2xOYmMrVEJYYzRw?= =?utf-8?B?eXdLTzdCM3V5ZE42SllVS1RLOXd3M29rQ1loUEJuc1l0eWYwWSt6VFo5dnFs?= =?utf-8?B?Z2NDTXFLL2VadDdyWFp0NE44UFpHWGdNRld5RjdUbU9SdTY1bEtkbkpkTnBr?= =?utf-8?B?d0QvZDNFem5oV2xRdU1CdU11azU4Q3dxRkFMQjdmZ3NmRk9ITWIycXRqZjdm?= =?utf-8?B?RmEvak9kQWVucnhITVNYTXFXRmZXNXBVSGtEekVtMXkvSVVpaGNicHFoeGh0?= =?utf-8?B?MGNFeklWSE5DK3JQd1hkNUVWYzBPcEVIRE9memRCQU1pRnVjbkw0YWNDOXM2?= =?utf-8?B?YjhMcG5CMkdycG9rdkp3aTJUalliRnZZTXRjekJUQnpmR1did0JqdGJVa29Q?= =?utf-8?B?cHFIakpRSUxLaThTZU80cUpaM2RNdWUvWld3eTBnWG1rNFpuVHR3VDZTODl4?= =?utf-8?B?RlBzY1RUa2c3M2FjS0U5Zlhkc3cwWXdISGoxVVhISENDRk5aSWJzdFYwa1ll?= =?utf-8?B?d2g5TXJjdnI3QkVtQ0pVYVM0ZXU2aERHVGQ0OG5XdHRaRVpDRGNyWXF5cDdK?= =?utf-8?B?UVd3VURSck94eElNSzBqdTJYRlpFeVIwNjZ3OEZFWm1SNWJhcmVmTUFRNmhU?= =?utf-8?B?Z3hDMVZmSytiamp5WERiU1o2WDBKcGZVeDlKM1dvNGxUekdpRXRSRHBHcFlX?= =?utf-8?B?WHhpWURLNEhtYVk4ckZqYURmRkw3MWdLdVhwZzc1bnJPcGd5cFEwdmZrZGx5?= =?utf-8?B?TXdDOUlvZVhMbCtML05Td3diM1RuQ01jbk9IM0xDQVJIUVZFdklTWkNUdEZW?= =?utf-8?B?WVZyelFJcWU2c0lFTHZ4alVNQnEwS2I0STV1OFVWNTZ3SXJ5eVNuTWRxbjhH?= =?utf-8?B?VXovZDRGOFZ2MTFIWVJjbXlBZ3Q5dkpCb0hOM1FBejB0TWxTck5UeWx6UDlr?= =?utf-8?B?SmkvNSswYXBTcC9SNk45ak5GZjZIaFdtVmZMTjBNTHhRYTk5ZTBGN2x6VDJj?= =?utf-8?B?OVJ5R1NCWnllNVRONnVVeVJJMU1Da08rNFF6dlpla1UwTnFGWGJRMkNheUc3?= =?utf-8?B?cUdFYUZBUms5UkF4aWdhbzJTelFqNjQxQ1U1dmczMmN4dTg4K3RRb0J4dEdD?= =?utf-8?B?RE53UENXQUFpR1NBalNvL3ZBOW5ld1FJMXlhM1JDV1B4aFNkbmZNUkRXNmxV?= =?utf-8?B?SjljZXVRYndXd3lJQk1TdllMRW5UU043cmhRTnJ2NnVaVkRFTEUxNzk4TitC?= =?utf-8?B?RnMyY1lzeEtEWWR6NmNab0VqYkx2Y1VuWEVWd3BNQjAvVUpxa2gvVGhaV0FS?= =?utf-8?B?Wnk4TW9ZcWZYMjJyVldWa3c0WTVYZU1XUFFFNHZFeUFLQ1RtUEdsd3BNTlkw?= =?utf-8?B?Z3lVd3pEZGhqcUdmR3B1T1FOVlp6OHZTQVFvTmpBb3Z2bHRibHV0V2dKRHhE?= =?utf-8?B?UEIzeWxzQUtkZ0JsbTRjQ3MxSzNFUnBjd0dUYWdvNU5SYStDRE1IcmdFZlI5?= =?utf-8?B?ZS8xR3ZGZVZOK0VUYk45dVZZVWkrcU1Pb2tIeStyTHRVaDZiN1p3UW1HTi92?= =?utf-8?Q?5rXlnR0S1ya2St9K68dMAIFKs?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61049fa5-fbb5-49d6-5efe-08dca0550099 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 20:23:32.3514 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: daMtabAcM8bGAIdmpzi0j4Oa3s1NVhyCZgo1lbcnMfRfR4KmBm6/x0lz5CbdlU8Qce50m99NaZQre6BOibtfxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8267 Pass down fsl_mc_data in help function ddr_in32() and ddr_out32() to prepare add iMX9 support. iMX9 have a little difference register layout. No functional change. Signed-off-by: Frank Li --- drivers/edac/fsl_ddr_edac.c | 62 ++++++++++++++++++++++++-----------------= ---- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index d148d262d0d4d..a7982370e2381 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -35,13 +35,17 @@ static u32 orig_ddr_err_disable; static u32 orig_ddr_err_sbe; static bool little_endian; =20 -static inline u32 ddr_in32(void __iomem *addr) +static inline u32 ddr_in32(struct fsl_mc_pdata *pdata, unsigned int off) { + void __iomem *addr =3D pdata->mc_vbase + off; + return little_endian ? ioread32(addr) : ioread32be(addr); } =20 -static inline void ddr_out32(void __iomem *addr, u32 value) +static inline void ddr_out32(struct fsl_mc_pdata *pdata, unsigned int off,= u32 value) { + void __iomem *addr =3D pdata->mc_vbase + off; + if (little_endian) iowrite32(value, addr); else @@ -60,7 +64,7 @@ static ssize_t fsl_mc_inject_data_hi_show(struct device *= dev, struct mem_ctl_info *mci =3D to_mci(dev); struct fsl_mc_pdata *pdata =3D mci->pvt_info; return sprintf(data, "0x%08x", - ddr_in32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_HI)); + ddr_in32(pdata, FSL_MC_DATA_ERR_INJECT_HI)); } =20 static ssize_t fsl_mc_inject_data_lo_show(struct device *dev, @@ -70,7 +74,7 @@ static ssize_t fsl_mc_inject_data_lo_show(struct device *= dev, struct mem_ctl_info *mci =3D to_mci(dev); struct fsl_mc_pdata *pdata =3D mci->pvt_info; return sprintf(data, "0x%08x", - ddr_in32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_LO)); + ddr_in32(pdata, FSL_MC_DATA_ERR_INJECT_LO)); } =20 static ssize_t fsl_mc_inject_ctrl_show(struct device *dev, @@ -80,7 +84,7 @@ static ssize_t fsl_mc_inject_ctrl_show(struct device *dev, struct mem_ctl_info *mci =3D to_mci(dev); struct fsl_mc_pdata *pdata =3D mci->pvt_info; return sprintf(data, "0x%08x", - ddr_in32(pdata->mc_vbase + FSL_MC_ECC_ERR_INJECT)); + ddr_in32(pdata, FSL_MC_ECC_ERR_INJECT)); } =20 static ssize_t fsl_mc_inject_data_hi_store(struct device *dev, @@ -97,7 +101,7 @@ static ssize_t fsl_mc_inject_data_hi_store(struct device= *dev, if (rc) return rc; =20 - ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_HI, val); + ddr_out32(pdata, FSL_MC_DATA_ERR_INJECT_HI, val); return count; } return 0; @@ -117,7 +121,7 @@ static ssize_t fsl_mc_inject_data_lo_store(struct devic= e *dev, if (rc) return rc; =20 - ddr_out32(pdata->mc_vbase + FSL_MC_DATA_ERR_INJECT_LO, val); + ddr_out32(pdata, FSL_MC_DATA_ERR_INJECT_LO, val); return count; } return 0; @@ -137,7 +141,7 @@ static ssize_t fsl_mc_inject_ctrl_store(struct device *= dev, if (rc) return rc; =20 - ddr_out32(pdata->mc_vbase + FSL_MC_ECC_ERR_INJECT, val); + ddr_out32(pdata, FSL_MC_ECC_ERR_INJECT, val); return count; } return 0; @@ -286,7 +290,7 @@ static void fsl_mc_check(struct mem_ctl_info *mci) int bad_data_bit; int bad_ecc_bit; =20 - err_detect =3D ddr_in32(pdata->mc_vbase + FSL_MC_ERR_DETECT); + err_detect =3D ddr_in32(pdata, FSL_MC_ERR_DETECT); if (!err_detect) return; =20 @@ -295,14 +299,14 @@ static void fsl_mc_check(struct mem_ctl_info *mci) =20 /* no more processing if not ECC bit errors */ if (!(err_detect & (DDR_EDE_SBE | DDR_EDE_MBE))) { - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_DETECT, err_detect); + ddr_out32(pdata, FSL_MC_ERR_DETECT, err_detect); return; } =20 - syndrome =3D ddr_in32(pdata->mc_vbase + FSL_MC_CAPTURE_ECC); + syndrome =3D ddr_in32(pdata, FSL_MC_CAPTURE_ECC); =20 /* Mask off appropriate bits of syndrome based on bus width */ - bus_width =3D (ddr_in32(pdata->mc_vbase + FSL_MC_DDR_SDRAM_CFG) & + bus_width =3D (ddr_in32(pdata, FSL_MC_DDR_SDRAM_CFG) & DSC_DBW_MASK) ? 32 : 64; if (bus_width =3D=3D 64) syndrome &=3D 0xff; @@ -310,8 +314,8 @@ static void fsl_mc_check(struct mem_ctl_info *mci) syndrome &=3D 0xffff; =20 err_addr =3D make64( - ddr_in32(pdata->mc_vbase + FSL_MC_CAPTURE_EXT_ADDRESS), - ddr_in32(pdata->mc_vbase + FSL_MC_CAPTURE_ADDRESS)); + ddr_in32(pdata, FSL_MC_CAPTURE_EXT_ADDRESS), + ddr_in32(pdata, FSL_MC_CAPTURE_ADDRESS)); pfn =3D err_addr >> PAGE_SHIFT; =20 for (row_index =3D 0; row_index < mci->nr_csrows; row_index++) { @@ -320,8 +324,8 @@ static void fsl_mc_check(struct mem_ctl_info *mci) break; } =20 - cap_high =3D ddr_in32(pdata->mc_vbase + FSL_MC_CAPTURE_DATA_HI); - cap_low =3D ddr_in32(pdata->mc_vbase + FSL_MC_CAPTURE_DATA_LO); + cap_high =3D ddr_in32(pdata, FSL_MC_CAPTURE_DATA_HI); + cap_low =3D ddr_in32(pdata, FSL_MC_CAPTURE_DATA_LO); =20 /* * Analyze single-bit errors on 64-bit wide buses @@ -367,7 +371,7 @@ static void fsl_mc_check(struct mem_ctl_info *mci) row_index, 0, -1, mci->ctl_name, ""); =20 - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_DETECT, err_detect); + ddr_out32(pdata, FSL_MC_ERR_DETECT, err_detect); } =20 static irqreturn_t fsl_mc_isr(int irq, void *dev_id) @@ -376,7 +380,7 @@ static irqreturn_t fsl_mc_isr(int irq, void *dev_id) struct fsl_mc_pdata *pdata =3D mci->pvt_info; u32 err_detect; =20 - err_detect =3D ddr_in32(pdata->mc_vbase + FSL_MC_ERR_DETECT); + err_detect =3D ddr_in32(pdata, FSL_MC_ERR_DETECT); if (!err_detect) return IRQ_NONE; =20 @@ -396,7 +400,7 @@ static void fsl_ddr_init_csrows(struct mem_ctl_info *mc= i) u32 cs_bnds; int index; =20 - sdram_ctl =3D ddr_in32(pdata->mc_vbase + FSL_MC_DDR_SDRAM_CFG); + sdram_ctl =3D ddr_in32(pdata, FSL_MC_DDR_SDRAM_CFG); =20 sdtype =3D sdram_ctl & DSC_SDTYPE_MASK; if (sdram_ctl & DSC_RD_EN) { @@ -444,7 +448,7 @@ static void fsl_ddr_init_csrows(struct mem_ctl_info *mc= i) csrow =3D mci->csrows[index]; dimm =3D csrow->channels[0]->dimm; =20 - cs_bnds =3D ddr_in32(pdata->mc_vbase + FSL_MC_CS_BNDS_0 + + cs_bnds =3D ddr_in32(pdata, FSL_MC_CS_BNDS_0 + (index * FSL_MC_CS_BNDS_OFS)); =20 start =3D (cs_bnds & 0xffff0000) >> 16; @@ -558,11 +562,11 @@ int fsl_mc_err_probe(struct platform_device *op) fsl_ddr_init_csrows(mci); =20 /* store the original error disable bits */ - orig_ddr_err_disable =3D ddr_in32(pdata->mc_vbase + FSL_MC_ERR_DISABLE); - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_DISABLE, 0); + orig_ddr_err_disable =3D ddr_in32(pdata, FSL_MC_ERR_DISABLE); + ddr_out32(pdata, FSL_MC_ERR_DISABLE, 0); =20 /* clear all error bits */ - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_DETECT, ~0); + ddr_out32(pdata, FSL_MC_ERR_DETECT, ~0); =20 res =3D edac_mc_add_mc_with_groups(mci, fsl_ddr_dev_groups); if (res) { @@ -571,15 +575,15 @@ int fsl_mc_err_probe(struct platform_device *op) } =20 if (edac_op_state =3D=3D EDAC_OPSTATE_INT) { - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_INT_EN, + ddr_out32(pdata, FSL_MC_ERR_INT_EN, DDR_EIE_MBEE | DDR_EIE_SBEE); =20 /* store the original error management threshold */ - orig_ddr_err_sbe =3D ddr_in32(pdata->mc_vbase + + orig_ddr_err_sbe =3D ddr_in32(pdata, FSL_MC_ERR_SBE) & 0xff0000; =20 /* set threshold to 1 error per interrupt */ - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_SBE, 0x10000); + ddr_out32(pdata, FSL_MC_ERR_SBE, 0x10000); =20 /* register interrupts */ pdata->irq =3D platform_get_irq(op, 0); @@ -620,12 +624,12 @@ void fsl_mc_err_remove(struct platform_device *op) edac_dbg(0, "\n"); =20 if (edac_op_state =3D=3D EDAC_OPSTATE_INT) { - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_INT_EN, 0); + ddr_out32(pdata, FSL_MC_ERR_INT_EN, 0); } =20 - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_DISABLE, + ddr_out32(pdata, FSL_MC_ERR_DISABLE, orig_ddr_err_disable); - ddr_out32(pdata->mc_vbase + FSL_MC_ERR_SBE, orig_ddr_err_sbe); + ddr_out32(pdata, FSL_MC_ERR_SBE, orig_ddr_err_sbe); =20 edac_mc_del_mc(&op->dev); edac_mc_free(mci); --=20 2.34.1 From nobody Wed Dec 17 13:55:41 2025 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2043.outbound.protection.outlook.com [40.107.22.43]) (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 089B9182A5E; Tue, 9 Jul 2024 20:23:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556620; cv=fail; b=KSQK3syRlUrBJc0DOiZu5Sgf0IYHqi29OXctOB+yDyxNUbVJLFKNyYqImScPU290OwN3lBpt9ks6/CnASYH+zWa6nyy2wPpD0woRWNOuigdSwm8aZ9RoVTGcCulGWJlsI+2wCgDlYfOT070S4eVYbOP+INdxMz5vi7uyy1IsQE8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556620; c=relaxed/simple; bh=QNZOx5eJVCU0W7EZ2hHtejXRuENDwxZu91LDUv0owoM=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=g3AsKt8jaFMel1zTbFUo6yfERWc57wdTKcbhDgfTShSP7CWX6jeDsPy5gVsGgv2DtH75bWwFQ61Ix8MN6GMKlJ/pCjZYXvsZdQxvZUug79EOxSSAEQZsf/XLOtS6sWeLPSSzv7UQYh1IsNg4DeEZmrL6iZPSf+TofqB45zVfXfc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=cqCkJ/OW; arc=fail smtp.client-ip=40.107.22.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="cqCkJ/OW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WlpMYTz1WIhrbqpwQxRNAVXa5LgMyQ05R55zexLA1jXyzUP94FyXubKVxI57k1zGWgwbPUmiEPgqWvOIMwjONISIaMprzi9OR7UgHaUheemnmv1hANcixAlaj434b1rVN9taBskiS/FI+4Kf6vShBMzSpQ80S2m+vUtR+qW+CdSbR6qa2B+qzvWSIjUjWY8foQpFU5OY+FlgPgJVxTaW88NFTn6AbuLqxDAcLKKrbbjEYZookwtHpKW+YBfjoYWFuwPjV6Fo6t/MqlkeDBOAwT7bOfJ0YbOupNWgv65RrUp9KdJYeIHgZysvH7LLROrXR5WOw/SBK80K6IQNf93bUw== 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=JA819jqoPZrn1JnIi72gwTFnZaIouoJzS/nUgbAKfqM=; b=l1GUnb9LKTPfgoHjdg5deb073YOPSHDs7W48H9pNYcbY5fWFYU+3VeCQceKWuv1S5ChB8FC1vOtthmQTjIuWoffDh+2y1yCzHTI3rJv0S7t2eKT2e/XOTp/Kg8OaXhzjeWnEtmFD4w9dwRGDyyxdUCMmzbVvUeGMMtx5WLb94ABPelUDM5beERp6dqcxjZ4WLOQB5Q7/qkbACYdtSgN+lhYt3bGyouZkURKk1TZH+o7JL3d8txMsEpv0Vr2feV3pvAsckIvStnhqeUXfSwN1SOMNDBm/mTymuxjLYqmKAGNIXHct/52L2JhXplqqh2FGZvQZiaYq+4ijBDfdp3gCMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JA819jqoPZrn1JnIi72gwTFnZaIouoJzS/nUgbAKfqM=; b=cqCkJ/OWY1ypIvbQm93oSumEqpAVgH89vtyQLcdDUKejuyZlGKcVmCg3xum9tnfeDDDApNdxq/oTsmjz0+QSG7eHPsyCMLAMR2reCHsJzJ3ptaYITHptOvdTRaS0kh1t2nSAgP0eO/QWQoFrVmtC9kDodG1JocxvbNXn9S63a5I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DB9PR04MB8267.eurprd04.prod.outlook.com (2603:10a6:10:24b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Tue, 9 Jul 2024 20:23:37 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 20:23:37 +0000 From: Frank Li Date: Tue, 09 Jul 2024 16:23:03 -0400 Subject: [PATCH 2/6] EDAC, fsl_ddr: Move global variable into struct fsl_mc_pdata Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240709-imx95_edac-v1-2-3e9c146c1b01@nxp.com> References: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> In-Reply-To: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> To: York Sun , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter , Krzysztof Kozlowski , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1720556601; l=3448; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=QNZOx5eJVCU0W7EZ2hHtejXRuENDwxZu91LDUv0owoM=; b=02ZNyms3Nt0w9tn9oyTolLLBuW7enItXsYUKkZGHONgeXNOpVfgJiBo2QYpuUpDj3Y+FDVvt4 Zv3n/DEGv7UB+aiJNfULpRb6a73izM3leYPYmDM6FUVCtpvMb5msd5a X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR03CA0033.namprd03.prod.outlook.com (2603:10b6:a02:a8::46) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DB9PR04MB8267:EE_ X-MS-Office365-Filtering-Correlation-Id: 6874fe9f-9f85-4ee9-21dd-08dca055037f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|7416014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?alZFamEyNVpDcjBIZzhYUXNIMVB3UW44YkJRRVJVcGhNTG9pREE2aExmTU8y?= =?utf-8?B?NGpiRUpWZ0RHTkNKODJ1ekJjQnNrZ0FnRDZNUEljdnRjWU84OU9SQ0tmUmNC?= =?utf-8?B?Q2J2K0xyaXpJY2FwVzF6S2hXY2g0Y0V0Y2NJRGdqRkFuU0grdm1Ya2xURGUw?= =?utf-8?B?d1BjVnkzSHEyQUp3L05zb2FiZ0E0dmFBR0NhekJoZ3VzcHE4UGFFdTJaaHVG?= =?utf-8?B?SjBCNDdTK2tTVDU3SnVrTWRXVkZhN25INzZmWE53cFRBSUJnd0tYTUorWUtL?= =?utf-8?B?VUEvTVZKNGk2a2NIbzJlNDJvVEtxejVBTjlldkdNQ1dyWk4vd0laQWtEWnVu?= =?utf-8?B?YVBJUXZjRmhic2hKektlWklMQ3hka05rS0VrZE9RZWNaOFVaa21Cb0lJOUh0?= =?utf-8?B?KzUydDF0QXhncHBmWXBYUFIzRDlad3VvWFJXUU90UERFWlhhYUNWU3FNR3kw?= =?utf-8?B?REVCeHdqZ1YxdVorblFhQVpHMEQzdFdPeFNGRTR6VG1rYmtnRGp3TUp4blAz?= =?utf-8?B?R0h5VDduK0ZGTUIreEhwOUdDWUl3V2owZmFlbEJ0dHdQeGwzSzFTQXFXOWM3?= =?utf-8?B?ajFEWXQvdGVxd0NzcjByQ1NqMWdPaTg4UG9zQkszZVpVbytQcE9rNStWTEdu?= =?utf-8?B?bFdVNjRRVDFjZGVJSlo2bWpZcGlJaExXbjJIckRvUk5UaFlVUzA4MlZlc3ZO?= =?utf-8?B?NUtlb3NiWVJoa0NmVi9tOTVMMEgyQ1JpcGJDZmhyWCt5cUpjUUNaTlhORHNR?= =?utf-8?B?dHcrSnhzbUVtT09XMFJlOHBrVzFSdW51TnhVZEF5MXk4eW5JdFhDSDlFbHJK?= =?utf-8?B?U0xnSWJtNFpuYWpaR0VTZU50bEdDU2YvcEc2TGlZM1Y0ZXQrYyt3NG03NHpr?= =?utf-8?B?QUp2TEY3UCt1bGd3RWt5NVlTaUtwbkF4akpQZGtBMHpuTGhreExGd1dKRnFq?= =?utf-8?B?VTM4MGN1TVhnc3VnM0FiOEdQY1pWc3l6TzVLQ2srUHptbHJIZVkrNUJWUThj?= =?utf-8?B?TkY3U0thKzVnZmpwMCtiN1F1MnZTanlYVlI3TkQ3N0pCSllCa0pQemlsMUZR?= =?utf-8?B?aW9kRjNLUnhLL0Q1bnpnRFMvUklReVU1dmJLSlR2YjZGMVZkQW0yMU0raTZt?= =?utf-8?B?VnRyT0JYK0MzRU1QSjNSNTJoTk9XTDJSQmh6NE9temJzREdCWStBYjVrN3hr?= =?utf-8?B?NGlLakl1dy95aVlCV21NR1lTWFAvWURDS3B6QVlUS0JrcTBLNzhyYlRyME16?= =?utf-8?B?K2NMVmw1RWk1TlFaVXNaQjNiT3BFNjFEYmtKRnhRb2FZMmxNRzg4bzd3K1RT?= =?utf-8?B?NjdpZFRYYk5MRlJ3TEVCbjVLU2l5RnRJZHBiazB4T1pzZVlSMW42TlMzb0xU?= =?utf-8?B?blpOSGo5RW9mY0h4MGtmcWxyN3hOVHdsRktPWk83MEVvb3NPMnk1TWVpTzFM?= =?utf-8?B?S0hsZk9OQkJQZFJhZ2ZhdFhxM0pLM3ZrZi9NTnc5MDJYRzFqSnBZNmk0V1F2?= =?utf-8?B?Kyt5ZXdOcVZXdVZaOFdpQ3V5c2prOGZPdy9LcDJzbDU2MXF4QzZSU3d6S1ln?= =?utf-8?B?OVZQN0k3YmFQRDFKbzRKeit5MldyRzhEU1NEOEJQUnJBQk1BdTNDRmMrUE8y?= =?utf-8?B?ODM0SVIyZHREajZqMzU2bStIUTFsck93V2crelJBSWJYdmZaMjc2WXNka3V4?= =?utf-8?B?SWlScTkzMXVJOVJGZC9oa0ZkSGl1OHQ1clNNU3JPRW9pYWdQaFdYUmxUcHZo?= =?utf-8?B?RjlROFRkM0VkNlN6YnBZQjU4NEtkQzYvNEJhMmhwWVNRaWVIdWExb3ZtNWsx?= =?utf-8?B?VTZ3clhkbVkxdTRrTjllUVArSnFPMWlObE9zbHIreUd2bWN6Q09KYXQxejcy?= =?utf-8?B?K3M4c1UxSjM0TS8vNWpPVGtDSjd0VFVZdFd4Q0habGNYM3UxVE55OUN2THln?= =?utf-8?Q?P9u0LIeQh5A=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(7416014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RURZN3dxZ0d4cU1kZC9HRUVZd29Ub0RxUnNOejhMVG1xS1JqK1ZxSXZmR0g5?= =?utf-8?B?QTNheGV2dlVzR1l4WDBzTWErQnFtbkltOTJjZnFOeWJ1ZUNUK052MjRWSTZz?= =?utf-8?B?eWxQS1NZV2ZZRTg5QmN4ZU80Y1BmQlo1RVFYeVNJbS96T1lBZEYwcXpEejlv?= =?utf-8?B?SU1xOHRYcWsxajVaVnIxZFhUS2ppMnFnWU1ReWFqakZ3VU5oS3diTFJqQm9E?= =?utf-8?B?c1JGQVA4U2dOb2dQMjBIVW9oazNLS0VJRzlDbFgrQ1cxVGZtRjhkckh3Y3d4?= =?utf-8?B?Qnllc1FoM1Qwc04zSkRKUU1UTFpudHFzUU4yK2VDRkVjUFJKZWpkYlQ2RHNp?= =?utf-8?B?RGpSVUpmMytJb2V0R0Qrd0Y1TS92MDR0bXk2S1FNY2NPeTF6a1JYb3NUT1k2?= =?utf-8?B?VjVSZDlNQ09IcWYwTFNQSkVFb0lMVDZubkt6SkhZQnBxdzJQYmg3L0taT0RO?= =?utf-8?B?WXk5ZzFRdXV2OGl2dWRhWGowYTBVN2JxaUk5Y3F2Z0IxZ1Nsd0xoMGJLL1NS?= =?utf-8?B?MTJBU1doK1pUQ0dTUElnUlVHVllpbnlwU21hVUFhSVRZZWJ1R01jaDBxSCs1?= =?utf-8?B?N0ptUWlmN1E4Y0dCTnJneVNKMlJjU2JpNndaWWVONFpIcWNRUGQwb3VwVVYw?= =?utf-8?B?WXF3NHVWVEFIbDh0YTlUd2gyTVM5d1hER3NnMXNxRmpRankyS1hyM3Axai9Y?= =?utf-8?B?V21GZkUrN2xqeTFNRWlaS2Fwejlya0ZuOUYrQUx1Y05ocTJiSmZERllGR1Ft?= =?utf-8?B?NVRCcFVLMlJnQklhOEd0Q09TU2tkYjRnUlR1QUl4WDF2T25oQzB1ekdIZUl2?= =?utf-8?B?MlpLdVJnSkV5NTJiRUZQVys0dmt0N2Mzc0MwQ2I5UWQ5VmdzWlgxdWlFL0VJ?= =?utf-8?B?a09lK3Exajd2bXdXOUUrMUU2em4yRXlUTU9WazJxTGRFRHJEMHRhWmQ3c0JG?= =?utf-8?B?VWhma0xuUklBYzQ2clNQUTQyL2pFb28xcHoyQ054OXcwMFBhTWhodlJrU3NI?= =?utf-8?B?YzRmK1pOYlRyWUxYTFdDbHNqKzlBYnNCbmJLOWpmU3UwMUE5SkZRR2ZSWjE2?= =?utf-8?B?SzZwN0xFbzJUbndreU1GM1g3SHNHZ2s3V0xHWXFuY3VnTHNRUkc3RVRzZFQ5?= =?utf-8?B?aWFrR0tUV3UwQ3R4MVJMVXpRQURWYllxQ1JMZlpHZXo4bDlrUW1wbjFkN0lt?= =?utf-8?B?VTNOQWlOenZLM1FEUEg4TE1rRURTNDZsQWxsYnZqNnl1UFFDQmNDMmc2WitC?= =?utf-8?B?VG8va1hibkY4Tjk5Ty9ZbU85N2didXhTMStoSWNtVnJYQVk2RlhIQTNPTFd1?= =?utf-8?B?NTV2N1Z6OWxOQ2FnM3FNU3BUeGNaSERHaFZmeXdLYTJpY3R1c0hsVUhLK1Vh?= =?utf-8?B?NWozTGxIMUhqeHduTTZ0c3c2bUUxOWlEbENlRU9HdmV0K3N5dkpTd0tBdEtO?= =?utf-8?B?c0lpb2VYL1lNUVNyUUN3YTM0K2wxdGxIcEs4YmEvR25GZ0hzcTV1ODZ2WGZh?= =?utf-8?B?ZDJFYWJIdFpKZzllMC9JSkdwQjc1Yi80K3g4UU5XQjBmNU9CSmhiaEhFd3pF?= =?utf-8?B?Y0RRbWp6MTNuSjlHNEtQb01Yajh3cGdodXorTmRYa05qeHByZ3k1MkkyckVM?= =?utf-8?B?ZVFtQnVjMDZGR1AxNjZTa3MxRWNwUlpNQ2dKUk15MVFyWllEdzVyNEl0b2lk?= =?utf-8?B?b1pWWHBPR3BPS3ZRV1FOUVhYaGlaUGoybWJFZHkrVmJJUGxZYlJmUzk5NlJD?= =?utf-8?B?a2VvZG5mODFHYUdVSU5HTUZnRDhsREZNU3dvSTFYcWkybWVHOGM5amxHTkx3?= =?utf-8?B?ZmJBT0hBbWJERFl4UGJHQ1EvajZ0d3MvZzJyRmRsMFZ0aEVtV1pnVkFQbit1?= =?utf-8?B?K2w0cHVYcGFOUmNWaHlsbkZUaEdmbVkwYmZ6MWNrbXEwOXcwcjNNa2YwZDR5?= =?utf-8?B?a29EOFlZRTMzRGJjUktqQ1czVUFQVzZQaUNTYVlkU0RxT3RMUUw2TWVHN2hZ?= =?utf-8?B?blM2cGNVN2F5UklFbFlIZFFVVzYrcTd0WHNIQzlWK25OemZqRE4vRHRPUFRP?= =?utf-8?B?TFgyVzl0YURpZjI1TnpQM1hyN2ZKajU5SVVCZWhqdlM2R05WelJ5dkQrSDcw?= =?utf-8?Q?DIL/+7wshT/3D9vjCRU39Qofa?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6874fe9f-9f85-4ee9-21dd-08dca055037f X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 20:23:37.1945 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ujC/chjcQ0TViU10DIsngJX9IwhCxlfZYTfoWiEfMW19bLPSArC1JQBuPDvmNyaRjMeIJUfAU2RCKHSBtyikoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8267 Move global variable into struct fsl_mc_data in case there are more than one ddr controller in system. No function change. Signed-off-by: Frank Li --- drivers/edac/fsl_ddr_edac.c | 21 +++++++++------------ drivers/edac/fsl_ddr_edac.h | 3 +++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index a7982370e2381..10b0a46669f3d 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -31,22 +31,18 @@ =20 static int edac_mc_idx; =20 -static u32 orig_ddr_err_disable; -static u32 orig_ddr_err_sbe; -static bool little_endian; - static inline u32 ddr_in32(struct fsl_mc_pdata *pdata, unsigned int off) { void __iomem *addr =3D pdata->mc_vbase + off; =20 - return little_endian ? ioread32(addr) : ioread32be(addr); + return pdata->little_endian ? ioread32(addr) : ioread32be(addr); } =20 static inline void ddr_out32(struct fsl_mc_pdata *pdata, unsigned int off,= u32 value) { void __iomem *addr =3D pdata->mc_vbase + off; =20 - if (little_endian) + if (pdata->little_endian) iowrite32(value, addr); else iowrite32be(value, addr); @@ -511,7 +507,7 @@ int fsl_mc_err_probe(struct platform_device *op) * Get the endianness of DDR controller registers. * Default is big endian. */ - little_endian =3D of_property_read_bool(op->dev.of_node, "little-endian"); + pdata->little_endian =3D of_property_read_bool(op->dev.of_node, "little-e= ndian"); =20 res =3D of_address_to_resource(op->dev.of_node, 0, &r); if (res) { @@ -535,7 +531,7 @@ int fsl_mc_err_probe(struct platform_device *op) goto err; } =20 - sdram_ctl =3D ddr_in32(pdata->mc_vbase + FSL_MC_DDR_SDRAM_CFG); + sdram_ctl =3D ddr_in32(pdata, FSL_MC_DDR_SDRAM_CFG); if (!(sdram_ctl & DSC_ECC_EN)) { /* no ECC */ pr_warn("%s: No ECC DIMMs discovered\n", __func__); @@ -562,7 +558,7 @@ int fsl_mc_err_probe(struct platform_device *op) fsl_ddr_init_csrows(mci); =20 /* store the original error disable bits */ - orig_ddr_err_disable =3D ddr_in32(pdata, FSL_MC_ERR_DISABLE); + pdata->orig_ddr_err_disable =3D ddr_in32(pdata, FSL_MC_ERR_DISABLE); ddr_out32(pdata, FSL_MC_ERR_DISABLE, 0); =20 /* clear all error bits */ @@ -579,7 +575,7 @@ int fsl_mc_err_probe(struct platform_device *op) DDR_EIE_MBEE | DDR_EIE_SBEE); =20 /* store the original error management threshold */ - orig_ddr_err_sbe =3D ddr_in32(pdata, + pdata->orig_ddr_err_sbe =3D ddr_in32(pdata, FSL_MC_ERR_SBE) & 0xff0000; =20 /* set threshold to 1 error per interrupt */ @@ -628,8 +624,9 @@ void fsl_mc_err_remove(struct platform_device *op) } =20 ddr_out32(pdata, FSL_MC_ERR_DISABLE, - orig_ddr_err_disable); - ddr_out32(pdata, FSL_MC_ERR_SBE, orig_ddr_err_sbe); + pdata->orig_ddr_err_disable); + ddr_out32(pdata, FSL_MC_ERR_SBE, pdata->orig_ddr_err_sbe); + =20 edac_mc_del_mc(&op->dev); edac_mc_free(mci); diff --git a/drivers/edac/fsl_ddr_edac.h b/drivers/edac/fsl_ddr_edac.h index c0994a2a003c2..de66f9822fba1 100644 --- a/drivers/edac/fsl_ddr_edac.h +++ b/drivers/edac/fsl_ddr_edac.h @@ -70,6 +70,9 @@ struct fsl_mc_pdata { int edac_idx; void __iomem *mc_vbase; int irq; + u32 orig_ddr_err_disable; + u32 orig_ddr_err_sbe; + bool little_endian; }; int fsl_mc_err_probe(struct platform_device *op); void fsl_mc_err_remove(struct platform_device *op); --=20 2.34.1 From nobody Wed Dec 17 13:55:41 2025 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2041.outbound.protection.outlook.com [40.107.22.41]) (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 6D3F5187856; Tue, 9 Jul 2024 20:23:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556627; cv=fail; b=CCCrF6hrgupzHZNCexQQ+Q7tvcD/3NRD3Ptxh18tHtB3FhG4GF+CzcHzU9dq5dUyPZTY5NrkZkiYRnJq7SIWWWj4LVUWEGtc5MQtVKCETt7bL96V42qg8IuAo3GNHKag1GiyqeDUEpF26QjnFF3DAMU1/R2bZRGTLqYi1E9XI3U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556627; c=relaxed/simple; bh=w0nRzozlUKzyaSgoCBfno/orQTAg8Z8csRiuGUzusmA=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=HsIcY6SBYdSOMc90J4657q9AEFijViA2ab2h8q0s8+pPkaxi3ZbcsVMbwY2NF7Oxmn+X7JMMRSexcLkswHcGLF9zE6yuyL7XDD/l7GlEdXKFP0ku2eJpYRCbWWiguQrEbkJwAYUVg63ShW+W7QKbPVN4vkh4QEKwlMSFhuWn4uo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=GxngbnE2; arc=fail smtp.client-ip=40.107.22.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="GxngbnE2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CRfFcRjES5+NCMe2aNsL1z+KPE9k2BsDOo+1VbA8xLDSeB4yoIeboO971wkmvt8b+fm/zHMvy6I+wmJtBOnQ2Q6TJ1S0CH7QCOwxkJCqlEDx+rfziPJPAh0/LcLeJY9DWyymYZ2Hn/mRpjg1uENxP3tqvx0zciU10itsEQcnPxOgGDF0jFK1v/EvSLRUDvDiSE9HsE+IdC+z/8+iN7VerKY+NMrK4Y6ZwYuIWlfSD31HUc5SVvLwFVmqD2FbZ/xe/XX0vQ0zMXM4o//amfLJgXtaPIZOXmO1OSVWi9YXxSjkS0Rhib9lS41B+el0saPZuU1ia5PwfaunOGU2JmbZ+A== 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=UuCZ+qtZuHwlK6whSWPf8p+h6hNNgJzBMctNbfek56A=; b=LpGL42Q2woBPdiAx8Jh54mvgJ8NjCWS8Mxw1HQu2T8fWnkAfdkTlyzj6DJW4omyjBWUA7fco9q7+Lfk0aXseiobvNE8gLKgVJxn1VYjYqzR+ZlrwfFmjBSTiDZBG/bZaf4Kx3T1KwgIkpraEtFy1yH8bN8krnHHCdUV18TL79TDEIxdnX+NgSmXijyBqtxgIZIo6guCzzK5MIVeHzI/BnFeOx/VICX+Mbp0sIfsBqj3fruy5asedfqLSNN8VKVRl0WlBZiIJY6hOs5JgnvYUIWzYnv3trMV+Q3oHR8yjuMnpc/xpMiULNqmL9E/4K2PMgYfJJXRhuFNcmQrpwVLvcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UuCZ+qtZuHwlK6whSWPf8p+h6hNNgJzBMctNbfek56A=; b=GxngbnE2yRRyl0jdZZGSxkcGHuGqLUtKte4r5PoDh6MLXhTPjW6xoJWxOsjxi9vIGfeufJcXNjGVtR606JQr/Cqidq7EksP9JV/JmCoixq3Np+f1PTFzjuV/80Xrmu3T1nwtZ7xcSTmsVmA/KOGHmZ24GP1f8KAQpe/8S6PTVkA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DB9PR04MB8267.eurprd04.prod.outlook.com (2603:10a6:10:24b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Tue, 9 Jul 2024 20:23:42 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 20:23:42 +0000 From: Frank Li Date: Tue, 09 Jul 2024 16:23:04 -0400 Subject: [PATCH 3/6] EDAC: fsl: Fix bad bit shift operations Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240709-imx95_edac-v1-3-3e9c146c1b01@nxp.com> References: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> In-Reply-To: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> To: York Sun , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter , Krzysztof Kozlowski , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Frank Li , Priyanka Singh , Sherry Sun , Li Yang X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1720556601; l=1758; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=yIBDEMa1tOArl3nH5oE1mzsXvIC+50RpgJfJD2pCSww=; b=puMEO4pwlHPQzAg1IqC+fRj92Cu/EFmnqVMekfg3xaM+mcKdL7bovGBGfwQZKOWQSEJjcHrgM c9UPnlILtDwDBxTuLn+efAGFo38VutXUjDvmdyv8jCf6ck8PKxMiVPz X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR03CA0033.namprd03.prod.outlook.com (2603:10b6:a02:a8::46) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DB9PR04MB8267:EE_ X-MS-Office365-Filtering-Correlation-Id: f71cb98d-c8ac-48ad-6511-08dca05506bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|7416014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?RlBjYnJxblFTRDBYYk9qbEFLTDZWT3NhWG5yVnQvM2lic2V0V2hNZGx3NExK?= =?utf-8?B?YVFxT2RZbGlxMDhtUmYvcFQ1TjczU1NGTnJyMVJjcEpCcXhzd0tKeSszWndN?= =?utf-8?B?a016SVZQcFpBMFZqMklPbWRzSjJ3Z2xwbHdMa2tGbzgxdzl6VFZXNkcwYmFK?= =?utf-8?B?bElXaC9Td1JUc3lqN3ZzQzVkbFY0VDU4VTRCMnlJN0FMZ1MyeVZnRy9QbFRu?= =?utf-8?B?WTVaVnhCamFGSFZJWjJ1Y1htL20zQUF6c014VFpDemdRWi8zT3JwVVJqTGRm?= =?utf-8?B?bHpwbE5PTFk0QnBiWmR0UEV0OUdsNCtJZEVadDExNmZBdmJLYmtGVjRBRVVo?= =?utf-8?B?d3gyK2o5VUczajU2RDVBOWhUeDhyZHJ2ZUwyMXNGSnY3WmFzTXY4bVJwVVlo?= =?utf-8?B?aVR6MkZZajBiTmgwUUpnWklBODZ2M0U2c3JIT29SOURSQUdrOTRqaWJDTm1X?= =?utf-8?B?blNMcXJ1a0tlSytzKzA2eDZyVDlWSnl0Q3AxY2VxTjFEUCtBa2szL2hSdTZj?= =?utf-8?B?bXdiQThGK1lhZ0tlcW1icG5hUW5IR05DRjJWelhCcjQxUEdubE5iZFd6RkUz?= =?utf-8?B?OFYraS9NYThKdXpWbTVEU0F4UGlWK0pkZUp3YjV0SmViVW5PSjFINEpNeXZJ?= =?utf-8?B?SmtFYmZmbTUrb282Uk9DbC9veEZ2MUh5dlkxZFlJMm4yZHR3OFN2RTkwVjVy?= =?utf-8?B?bVdoeExJVklIZlVCaTdnZkxaQmduamVzM2RRS1FSSm9rVDZSNkJHdnJ6bEoz?= =?utf-8?B?OFVKM0pGcm1JU3o0ek8rWmZpM0VuYjlkb29OTVRYNm4rMDA0aUpPamdOUUhY?= =?utf-8?B?QU5lYmlOWlVoRCtWLzBRaVlpUTMyUmdlNWtRTDlxT1dLWGRYY3ltamczd0xC?= =?utf-8?B?K3Y1WHRvNHBKWENUV3UxMk5jL0Q3eHhaRFF5ZFcwTVFRbmRjQTdyK3VBaWRO?= =?utf-8?B?M3NIMytaSUp6Vi9VOGFCa2doMXMwWkdZcGdpcitkb2JwMjdWK3VlenBrdHZx?= =?utf-8?B?emgvbDVJQTRtRHRuRXpIVXlVQVQ5UlROd3NqOEp2WElueW9JQXo0ZDhPTWlF?= =?utf-8?B?S2hWbG5iU21MOGtQb09ObE1KT3VUWnZhUTNlTDlNQy9aVEh6dzZFR25uZFQx?= =?utf-8?B?N0xLSGo5aW12VHVYMVc3S2YwakQ3di9FR0Z4VnBRbjZPVmRvaFk5VzhkRHlw?= =?utf-8?B?SzI3aTMyVGRMVE9ESU5NT3BkbEtjWVl3VDBsVEoxVjk5QjdFYXVVckhpckpY?= =?utf-8?B?UW10L3BDbWJ0a0NiYTdjNWRING93a0d5cHlJZWxtMGc1N2FROFFNVmNMc1ZR?= =?utf-8?B?Z3E3UFlqN29zT2hTcitCWk9BNUVnTTc3QWpxUGh1L3RHa1dNdUZyWGYxNHRz?= =?utf-8?B?TVF3Q3dCOU1jRHBmRGFRZ2I3U3h0M1FhUjQ3c2tZdUhWMjJ3dFRNNEZGQmt5?= =?utf-8?B?eThjbE4yT3hEdkxycW5lNGhyYTI4NUxhNmJzYzM5ekNuL1JaTGhVUWw5Uk9n?= =?utf-8?B?czY3WEltY0xQSk1UZU9JUkpENkRaaE1SdDg3TzNKVG9uMThVRzNhYVVoS0hO?= =?utf-8?B?bkJxU25aNGJZOXdDcE1Wclh1ZzNzU0ZYbGJBa1BkWFdUVW9yMG13QnhiVXl3?= =?utf-8?B?YjFiVC9FSjlPMnVuazJTaHdSWjI5ZWZPbEdGd29sUmR4MHNjbjJVQjJ0cG4y?= =?utf-8?B?TzA3dXN2Vzg1OExFdmR6SGNxMmt4MlcxVW1qWHRjdklyeHJ0eWlTVE10NG1i?= =?utf-8?B?dm1WbXM3VkNlRjlMczJhUkxxaXMzQ3orN1RoMDlDbStBWG5wenhUalJYRVcy?= =?utf-8?B?dlNqR0prLzF0UGVqWFY4dW9tZFJkeVIxdXhhWkNhMFdFZ3lRaW5ScWM0R1pH?= =?utf-8?B?UmkzbnBRV0E4NGZaUk1DQkwyTElWdE40MlphVmZIRUtHU1YraTNaTStCL29O?= =?utf-8?Q?Y2oDkBgtCcE=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(7416014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?blRjU3p5VjRNWFNRbXdaSm00WW03V0FhWUFTajA2MWFnV0xscFhSeTBxMHdG?= =?utf-8?B?dWhIa2ZiS0s3Q3c2NkEvQ2puZktzaUhtMlZIZk9ZYjUxdWF1RkxJSjY0dTFl?= =?utf-8?B?N0FpdFJxRzNxWnRGUTJiVy9rUXpvOENOK29mZHNRaUFQeGJtR1o1VlVnTGpL?= =?utf-8?B?T1RGZEZoMUJpVkppRjM0UjkwTi9mQjc0dDVhZVk5ZHNqbCtya3ZtTnNGNGZJ?= =?utf-8?B?TytJTnl3c3pEdXB6MFlhMmx0WWNaTGxzdHh1dUYwbmg0YVdCVmloSG9udURv?= =?utf-8?B?UUJPOTZqOVFPWDhXR0RQMUd5WGxyVGJRUUN6SUJOSC9GSVNhTU9UMnZGdjlF?= =?utf-8?B?MzZQL3lCWWU2dU5YZ2lZaTdmT3JPdERRQmt4elBiamFnZ1BtV2xVOEVEajJ1?= =?utf-8?B?Q25xZUMzekhEbmhWUHU4N3k0TFdiQjZiTUdrY3JydXlKbUl4aDlJSGJQUVhU?= =?utf-8?B?MEJUNk1KNkYwQmJWeTVUZnFXc0FQZzFGQ2ozeTlwTFJ0aDBLbVVrSXhJVmFX?= =?utf-8?B?WDdyamh3bCtWQmRpOEJOdGlncGJERldVckIydUQvQU51SU1CSkNjSHBYV2l1?= =?utf-8?B?Y0RUKysrWTFZRUdJSnJpMjcvUUFiQU10SUJVeGJXczh6aDA2NU04Tm1lUyty?= =?utf-8?B?ODBQMzhlZG5XWTRMVTE0KzhtU0JzcnBNeEt0UmVhUm1SK1ppbzI0bVkvWUxY?= =?utf-8?B?amoybkltejR3dThjRkUrMGEzNmZnUTlvRkdoWThLeFRMd3hHSjM3Rjh4aHp4?= =?utf-8?B?QU92QWUvQk9jMzZsQW5rdG53d0UzS1g0bjJkWUJkUjFDT1p0UnhRd0NHYk9q?= =?utf-8?B?d0dudy90dGNtekVWOHVXRzdCVUVTMkRXSjFJUHhmOWxjMDlxKytwcXI3Z0Rp?= =?utf-8?B?N1FTREFMK0lTSk45WXR3Y2FRUE5mcHF4dXZUUmJtcDRvSnZvZHZsc0pyclBl?= =?utf-8?B?TThzOGFrSHhhd0loRnJTL2JEQXUyWnJtRm5yMm1xZVRSNXRLcE1LTEI2NytQ?= =?utf-8?B?NXNYSXJZVHpZZDJrdzZocitZeVZ5SDRQelFVeWdBQzIvTXNxdlZuUWNaNSs4?= =?utf-8?B?Zzk0b3FzOW9ZRXk5Z1NzdUJLTWMycFhtdnZqclo4SzRPVmk3b2xmSzBwdE5H?= =?utf-8?B?akhnVFRmUGJ0TU1sZ0Z3OUhmZ3NnVlJXNFJCRDhrOFovVTdlZ1h4VGdrdzlT?= =?utf-8?B?ckJZUTFwdC9CTDRob21xOWZPUklJUWdTQy9Nb08rclVsQ3NBU1BDNTFnSlpN?= =?utf-8?B?VkpsOStJbUFuOUpCOXVrVy93RXBHbVZqNmtldmxzQTAvcFc1bEZkUWNqSFp2?= =?utf-8?B?MW5vaEVMdHV1MTZyMU9PaGRaUzhjSDBha2FWU2VmeldPZGRlNEdLL0MxRkI0?= =?utf-8?B?dzZCNVJFQzFxaGFrZjcwR3F0RXlyNFJuWTV6NnU2aXBGTHZjRmI4WEZxbFlE?= =?utf-8?B?cWVmWjdyZERONkpGTzlzMkZteEdnbWpCbHdkNENKWDhmMUwvT2hXODM3Sk9F?= =?utf-8?B?TkdnZXhZMDZ2RXY4K2ZHcHJMRTdqUEQ2NXZucXBZd2g5bUorNmc1UXNOU0hi?= =?utf-8?B?NHBreW1RdEdtNU8yUUNCL2IvTElSamxmdEd5bUw5V1ExZk5Bd0RQY3d1TjNM?= =?utf-8?B?TzRqcThhWWw2bzFCUi9HcWUxWTBFTlcxSFVXSml6Tk9kcENQUWhvUmo3Witm?= =?utf-8?B?YW1xamJhdERxZk53ZGp6SGV5MXFnSDBPanRLY2VzN005VUNGQnVxVzYxUmZ4?= =?utf-8?B?Z2xZblgvaFlnODU4SlcvOHFQNHdmQTRmSGNuWi9xMmp0TFFEMUMxSVg1RGs2?= =?utf-8?B?Sms5Q2N2QTJrNTg4a3NoTDMweW9PeVdWQmFoVytrdXI0ZjBLZFhnNWtzQlZ5?= =?utf-8?B?cUNuVDJoOUpDR3RVRmQ4RUVGNmttT0hEcnR3d0FNZXF4WkhXNVJWSEpnb2Rm?= =?utf-8?B?Q3dTbDAzS0xlRGM4NjVXdFhoMEoyK3loQm14Sng3bVhHcGxIbEhveElLK0pN?= =?utf-8?B?aGtkQktVTmc5TmNlMWJKUmVqSmZpVlg2UkZOM3pyc09EVHJ2V1daMGNQcjlp?= =?utf-8?B?TFFIYTM3TlQ5MStOaGxhemVMZEtNVStsSlFsK0ZtclRUZk9iZW9iTUhuOTJT?= =?utf-8?Q?eNHkdMmQQ3AeO2Dh/FfjlsxUv?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f71cb98d-c8ac-48ad-6511-08dca05506bb X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 20:23:42.6521 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XstainIzzxSB29QtlC7RI/USSLnwdc7EIL3+j9luyi7GaoP6YxGWrHQN76kEE4f4KYSEAkc5NjO+KbyThfUW/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8267 From: Priyanka Singh The original code: cap_high ^ (1 << (bad_data_bit - 32)) The variable bad_data_bit ranges from 0 to 63. If bad_data_bit is below 32, bad_data_bit - 32 will be a negative value. Left shifting a negative value in C is undefined behavior. Fix this by checking the range of bad_data_bit. Fixes: ea2eb9a8b620 ("EDAC, fsl-ddr: Separate FSL DDR driver from MPC85xx") Signed-off-by: Priyanka Singh Reviewed-by: Sherry Sun Signed-off-by: Li Yang Signed-off-by: Frank Li --- drivers/edac/fsl_ddr_edac.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index 10b0a46669f3d..da743cf8a95e9 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -338,11 +338,18 @@ static void fsl_mc_check(struct mem_ctl_info *mci) fsl_mc_printk(mci, KERN_ERR, "Faulty ECC bit: %d\n", bad_ecc_bit); =20 - fsl_mc_printk(mci, KERN_ERR, - "Expected Data / ECC:\t%#8.8x_%08x / %#2.2x\n", - cap_high ^ (1 << (bad_data_bit - 32)), - cap_low ^ (1 << bad_data_bit), - syndrome ^ (1 << bad_ecc_bit)); + if ((bad_data_bit > 0 && bad_data_bit < 32) && bad_ecc_bit > 0) { + fsl_mc_printk(mci, KERN_ERR, + "Expected Data / ECC:\t%#8.8x_%08x / %#2.2x\n", + cap_high, cap_low ^ (1 << bad_data_bit), + syndrome ^ (1 << bad_ecc_bit)); + } + if (bad_data_bit >=3D 32 && bad_ecc_bit > 0) { + fsl_mc_printk(mci, KERN_ERR, + "Expected Data / ECC:\t%#8.8x_%08x / %#2.2x\n", + cap_high ^ (1 << (bad_data_bit - 32)), + cap_low, syndrome ^ (1 << bad_ecc_bit)); + } } =20 fsl_mc_printk(mci, KERN_ERR, --=20 2.34.1 From nobody Wed Dec 17 13:55:41 2025 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 D925D18786D; Tue, 9 Jul 2024 20:23:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556632; cv=fail; b=NAvG3oe7eXgYzsHPImYEMKl01oRdEiPfweof4NoIDrYo+ZLvdG9OTcBCIFs8ZoUQFVFh/TAHkjAgf7xd6nC2FucmXQIz6Z9NJhLPdj0XKXZ3ZaLpp7qyTNPBoa+zz3mCcz3AskmeiN6gdF0XvuOJLl4itotmI5E02WfKDCg4Z9E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556632; c=relaxed/simple; bh=sEQ2s5DOaJpFElpdRGOeANeI0KjitaYMW7pvhbkIm/o=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=psCKSrvvTs1knuQpFmXh+8hrj/z5tuicpZ0TW6DaxwiTZ7tS6ffGtAkdNXHAogRwsjue3/mMMvO97H+NDsEW+ksD9vnVdh57axV5+1LzvI6xRtwJMfhiIG9xiKjDXZExrkXdFtNMWFMPfU2LOGnI4dTCNjk2DwDmsT1tL1hILcI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=kowJTigb; arc=fail smtp.client-ip=40.107.22.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="kowJTigb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DyyLR0hypnLLAMg5sF/rZdjgcc+IlRVs7caqIItBgKrOu5Vg/CCYa+I9zGpvfLeIOj6u5BGZA6Yq22VAbhl9SErQkJFlxJoSXR/fg2Lj0u9yXWrEe2RngXQxjsRV/8tT5q7TnzeavaA2nJoy9qe8S5bsShW/jXLw+n9vT2HIZ8M8nF5DfXKKGBUt2bu9My1i2LWi9PfH/mzt3uV06VRgf7o7WJLp+ihh6n6ElHVZ+iQEaJDseFjFoCG5IOuDzXDnixR6PgHq6dAnjf3K1F8A5KgZaA9H/xEUdYyjoNSVqhj23r52gPsApRJ2Lbd+d+DBLmS+ab9N3asfJhdq0pG10A== 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=M18oDrIm0n7SzSLcID9y8NvUus7H0YWm2DEQVvXaTa4=; b=g5HBjqeNMdhMdvOoYaWBCYLzeqhIXwq2aSWV0d2S1fZMQVCPkQ+rKNIypTc5a2sPQU/C2WHYEjG+8F+9/DqThL/2iSsPuRdJpI+IBrDiIqdVz92PlWS2OD6O7cr1n7V/9IKqK+6A0SW0EVrUe2k5tYvVSiBp2tAlbjC+pu+Zaym6M7Y913Pec4Q9qVCL/GK+6plLUVKtb1T39MmJ5qAWxOymD5SrG5DMIYj/Wn0Vm5u+hUMaDx6BAe3o1EKYsi2b25u4TVFNQPx98SK0JVl5ZWowsJZN/uI+axxXgKwBdAHja9GRblOHv26TClnLTHGTK5TA3CRpLbPeRSwoAUQ6NA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M18oDrIm0n7SzSLcID9y8NvUus7H0YWm2DEQVvXaTa4=; b=kowJTigb5+Yy8KmG6MgyhdmlcUxrDJN7b99FqrhtMKhQYofMhtfigg9wMOh580JYa/XhFu+vNqf9L+eLd08mhOxyYUyT+d2ZBQKcYTBn1Auf8EMFCKPhkdRaModdcC6GG9PvTvURKuDektqhSYkxrb9qf91cRCvrdec9jQPOpYU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DB9PR04MB8267.eurprd04.prod.outlook.com (2603:10a6:10:24b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Tue, 9 Jul 2024 20:23:47 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 20:23:47 +0000 From: Frank Li Date: Tue, 09 Jul 2024 16:23:05 -0400 Subject: [PATCH 4/6] dt-bindings: memory: fsl: Add compatible string nxp,imx9-memory-controller Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240709-imx95_edac-v1-4-3e9c146c1b01@nxp.com> References: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> In-Reply-To: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> To: York Sun , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter , Krzysztof Kozlowski , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1720556601; l=1903; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=sEQ2s5DOaJpFElpdRGOeANeI0KjitaYMW7pvhbkIm/o=; b=Vn4XK7e4+72Pi4m92N5oOm/JDIRynHBP8bwx2ivq6Qq5Aq+1ByMcJxulB0TemTYYyw79FST35 MR90BpuRCgwC/GukSWTTSdmCUIs1G8hfDgKGMUAZTUuKcCN6oq/Lge8 X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR03CA0033.namprd03.prod.outlook.com (2603:10b6:a02:a8::46) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DB9PR04MB8267:EE_ X-MS-Office365-Filtering-Correlation-Id: 2032ff1e-d238-4907-dc00-08dca05509a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|7416014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?MkF1RzNKTTgrTXJCQUIzWEFPRVE4cW1WaGlhckQ2Mk04clFTSXdxM1JKN0NX?= =?utf-8?B?N3ZzNHN4Z3dpa05aYU5yYXdMRU9EU0FXK1RpVkxXckhWQjIzNmFVbjErSE5W?= =?utf-8?B?c1o2TXhMSXNubDVqZW1heFh2ajNvbEZ2elpRZExyOXJEZERpVXRPSVpFQTBO?= =?utf-8?B?VzhLZXZiWm9wODR6TnBPMHNheXZIbmphbStvWHlnUEZjYURmR1p5RFBzRFUr?= =?utf-8?B?VlNsUnpGWmY2SWxqSDZnYkZJbkxwN1VKbjJnT28zWlJ6OUY3TFpEaTlQMkE3?= =?utf-8?B?MnBYMEdwVDdvSnhsWHlsYnBET3F3VTdtdDZjb1VEcGh0TGo5TGVHREZIVE9z?= =?utf-8?B?VlFEeDJSY2hoUjhoSmJ4R0M3Qk13cWVLdDUwQ2FMcTl3aVQ2SkZkaURBOVdn?= =?utf-8?B?VTJUN29RWldvS0tKS2FsVnRIT2Z1NWJjbzlFK25mK3UwOHp1NkU3RndDVi9R?= =?utf-8?B?OXdiSWw5Rlo0MFUxaVpHMDRiS2tObVlpbldsWWJWM0FFRUxtZFlzNWJQdExB?= =?utf-8?B?V0IxTjhOd0orMEpaR2c2NmlMK29jd0M1QXZ1dWZwTmk2MEJwbFk4Q0R0WjBZ?= =?utf-8?B?UG93dEFRZWgvdWltVjR0VVBDVVlpNzAzaXdYYzFOeXk4ZVNkc29MZmQvSnhS?= =?utf-8?B?MVBnS1ZIZE9jemViNW9rZ0h3MXRTMXlVQ2NERitsTWYwY3pNTE9IMzVGVnEv?= =?utf-8?B?UUViUU54cDJLZVFiNWp6VU5GZzRoRHFEYVkxZlNqVGt1TXJyTlhrV1NvTkJL?= =?utf-8?B?R1dSaitOVDFkamFHQ2FaNFlvWFdTaFhFWDZnZXNVOEowY0xCRnJOQmxvd2JD?= =?utf-8?B?ZFBPSlRvbTJROEV6aDhXSjdFSG1DREFQdm53Y2daNzVLN01SQi9Vemd1Skpl?= =?utf-8?B?RHRtem4wYVRtVXhCREhuRkt2Q0VDMUpWYlV3eVpHTkFRVG05K0x4VGpJa0JH?= =?utf-8?B?czJ6NnJYd3FIMnliVjVmWFRiYVZqTGtEK1RQNHc4NHhjemVKOXFTc05NM1No?= =?utf-8?B?T3pYakx1eW90M0RWL3NwRnBNbVdUTXhwTldQVkdNUUpZUUxVVDBmczlWZzZR?= =?utf-8?B?TXNyU3VwNEdKTHZPL0ZDVFUrWVNhR29UdXIyNnZnd3FsWWFmaGp4bXJtcGlo?= =?utf-8?B?UjF0N09URlZnc0xUeE1DblYzYWlmMjlxYm1ZdGkrVUswbzdVaWg5ZWV5THpy?= =?utf-8?B?YUZTcVMwVU1VTGdoQkt0cTc4b25CRDl2d0NVT09wdmd4VDJyVlY3ZGNzbkRF?= =?utf-8?B?NnBpd3Y1ckpWM3VvTDJJVVFlV0YvcEZSZm5xdHdFY0VWRGlJQTYvNzh2SHhr?= =?utf-8?B?VDF6V3pOV1V5UFRDZllYUEIxVG5WMGE3UUpzK2tEK2xIRUtZN2JTMFFWNTBP?= =?utf-8?B?bHZRaFFObWFCNDRxdG9BcE8rOFpWbmRZU1lZN1JtVCtuelpaUUhUMGlVTG0x?= =?utf-8?B?UEZ3dWVQanlQdTJ0SENVYUwycTd6NjU3Zm4zdG1sdW5pTTF0VW1QRWFpSkxk?= =?utf-8?B?VDVkY1drK3VCR3ZlRi95aFh3ZnJmYkthOS9RWjNrR1RkVUdRWE9ad0xxK2Fz?= =?utf-8?B?OHcvWUVILzIzNHQ3djJWSDUrejRNWEdzRERGNnJxM3Zsb2hVcnBIZEZIVVZC?= =?utf-8?B?MEtIaFFjcjNjN2VHYm1ybjRaT1RWbjZaa0FSY2R5RlNjTkllVDhwb0FBd2RR?= =?utf-8?B?amlhaXVRVTFDd1dVTzJydGN0WlMxb21JaDA2N2MyYnV6MHlJQjVqWXhycFdH?= =?utf-8?B?SXh6MkVxRmN2NGljbElCT0M2Wk1KNmVTMWNPNUlETGYzcjFTMWZ6bnZsS3Iv?= =?utf-8?B?b2VGd3pFcHhDeitPVGtXdXJHTFJoR0R1NTN3aUJlMUZpVXpyb2cyOVI4T1Rl?= =?utf-8?B?MURuK21vOFdPa1JWVVFzclNTM0gxYnNoekJXaGkwYVFyTUgwR2JCa1RjK0pG?= =?utf-8?Q?vUI2EqKi+/4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(7416014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V0VKNnVHNU9mRTh2WFJJQjVJT0dTdWxmN0dNbWFYZ25QeUZObytBcnNTd3du?= =?utf-8?B?Mm9QNk9XRTR3YnJMTVJXb0tGWEtTQjdhd2hPMnh3WjZ1RW1pQS8zT0x4NzV6?= =?utf-8?B?cDRWYm1mQ3BTZUtDQ0I1NjZWYzJJZFNDbVVIQzVIZlIrbXhvcjJEVm0vOHpi?= =?utf-8?B?eERVWlJTRmpMLyt4NkRNaWdMTzhxWndOQzI2c1VSZ2FQUjZHa3EwWGptRWNs?= =?utf-8?B?cGxCRlh6SlJtSTI1SS9MRVlWRFJpZmNraW1NOGJIV1NQWjZFNEhucEhVRC9m?= =?utf-8?B?Mmw5TTk1Z0IzTmJGeDFOcFp4ZUVVNmtzQ1g2ck9ETjRla1piMDZqekdkWmkz?= =?utf-8?B?ZE9QVW8wMUhyOGRIR1gyenR6VGx4UVZ0Y2F5WjJvb0FDM0gvK0ZVUzRpSTBG?= =?utf-8?B?NkkxVHdpS1NzL0k2YmlpbDhtRnplZXpqVW8vNWNjTjhrTEl3MTBNaWErVGZY?= =?utf-8?B?TUVQYVR0Rk5hY0hVTkVSZ3JZNElYUHd5YWdCb2pYRlB2STJ2YTZOTko4emhX?= =?utf-8?B?WU1Ibmo0M2dkMzdaTDM2Yk16a0U3Nk40M0U5MFR0RWRkWkxxQjZXT2pFeUF0?= =?utf-8?B?ZnZKVEwwUjAxejVYZ1VDRjhCbUtqWW13SDVxaXlZUVdmbmFqdGVhM0pYRnBZ?= =?utf-8?B?dFdWcG43MXJqbzUrYkJGUTExaVJrdkw3M2pZWVpDVkFnVnJCNWF1enkvay9v?= =?utf-8?B?ek1kd2Z1UWdGUUVUd2hLeEhoUUZwWStEUjVkSXpjaWFnOWtlSUd2cjYramth?= =?utf-8?B?a1RLMDh4YktRM096YWgvdkVPUTNlNXRrcmVLVkhCQURPOXltKzdwdWRVWWdY?= =?utf-8?B?NFd4Nko2ZS9IMWdjRTJxbGF6c0Z3VENqR0E1K1FmVFpZS2dLaHpaOUZpWkhx?= =?utf-8?B?N1VFK1RRU0RRclVEc0hEL0crQVlQV1JXWThKSTVzeUJtMERhMUhQZUR5b3pQ?= =?utf-8?B?TVJMWXJuK3VySFVPeDdPWlMzNjExWE96dWZLeXpFZWYvcitFTmVNdi9wbzU3?= =?utf-8?B?N1pSVzZBMWxJcCtla0h6KzRvYng2ak9JYmFYNE1oL29MRHhTRGU4MnRvYmNk?= =?utf-8?B?eHJvZ20xajNHbUNVNTIzbGtFaVZ3bWdYTm5GZE5QM1B6RXFlenFXeWtVcHJl?= =?utf-8?B?aVVpMmdxMm41aFZ2Q1lGekJMTjVpQlNUV2w3L0pONHdvWCs1TGRlRUluK2Rr?= =?utf-8?B?M1Y4Q1IyVkpEdmRWdXlZd0M4Wkh6T05GK0UvMUEwc2MrKzB0a2F2T1dISEp3?= =?utf-8?B?WjhWaEd6UE5ZMGtuSkRGYjZpdWNwQU54Sm94RW1OWkwzc0JXMy94OEN3QWFB?= =?utf-8?B?a0dyL01ZVEl4aDlhbWR4dzJkdGtadjNNbGVpUndLWHNGSS9PM29HeEdQQloz?= =?utf-8?B?OFI4M05YcmJCd2tOaVpOeElnSE51NzZYOEVEOU9NWXhNU1Fub1Rvanp4Mkk5?= =?utf-8?B?dHhPQzMzT0d3ZFRJZlZraDF0Y0F0UzlwWC9aSEUzc2hEeDVHUXprQ3ZNMExw?= =?utf-8?B?eThSS1ZmRmpYZzB2dk5FT254eDdUU3FkSHZBR1BjdlRGV00zbmtjSE5vMU9H?= =?utf-8?B?dTJvWXp3OFZSdlR6cG1ObjlZblpuZWVLSXozSHlJMXgyS1g4ZkJCQlVUcU92?= =?utf-8?B?ZThoZ0FoV3ZLT29maUozUXJzLzlrV1NuOWYwRTlEZkR1OEhvRndJb3N1V1FH?= =?utf-8?B?dk03U0pSTFFmeGNORzE4TVBzOFZrNll6MnBrM2NDMTluNW42b056VUE3M2Rk?= =?utf-8?B?aVpWRHpPMHZMVjhSQUZTQ2ZNd004N0E0V0s2YUlYbzdvRWRaTFNDOGY0d3dZ?= =?utf-8?B?cVdtWTFBZHNIaDVaM29lME8zbnRQY2VQWEE4NVhQanhFaGJob1o1N2JoZDZv?= =?utf-8?B?eGxFek91WlhWb3BablJDaHhrMEVqbjhjVEJMajVPdUlKQXFZekRjQWNxcEJu?= =?utf-8?B?TmJ1cU5RNDVHUUR0d1QrSDVuTDdiQVAyQ2t1QUFxMGwxYzJLVFAzMHc3R0Nv?= =?utf-8?B?dWQ3SmZBT2RZaU12OCtnOVd1U0FKQlVJcGIxbW5vL2tqRm9aNGovNUN4ZGs2?= =?utf-8?B?UGduTUdiSnc5RWY0bmN1K0lmRUNXeW1oNDJHeTdNaUhFRFRhK2QyNm8yVWd1?= =?utf-8?Q?lXMzHEN8BsEP80VXW4BeFMk5Q?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2032ff1e-d238-4907-dc00-08dca05509a4 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 20:23:47.5064 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bGgxXaA2c//yA9Cu3x7GhhR15yBLvrBjbkCm3uD1ZKQwXiJDre2sFToU026xQ6xouC+OEMuNxgzwT8QsZZJlBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8267 iMX9 memory controller is similar with other layerscape chips. But some register layout has a little bit difference, so add new compatible string 'nxp,imx9-memory-controller' for it. imx9 need two 'reg', one for DDR controller and the other is ECC inject engine register space. Keep the same restriction for other compatible string. Signed-off-by: Frank Li Reviewed-by: Krzysztof Kozlowski --- .../bindings/memory-controllers/fsl/fsl,ddr.yaml | 31 ++++++++++++++++++= +++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,d= dr.yaml b/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.= yaml index 84f778a99546b..e0786153eec73 100644 --- a/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml +++ b/Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ddr.yaml @@ -40,6 +40,7 @@ properties: - fsl,p1021-memory-controller - fsl,p2020-memory-controller - fsl,qoriq-memory-controller + - nxp,imx9-memory-controller =20 interrupts: maxItems: 1 @@ -51,13 +52,41 @@ properties: type: boolean =20 reg: - maxItems: 1 + items: + - description: Controller register space + - description: Inject register space + minItems: 1 + + reg-names: + items: + - const: ctrl + - const: inject + minItems: 1 =20 required: - compatible - interrupts - reg =20 +allOf: + - if: + properties: + compatible: + contains: + enum: + - nxp,imx9-memory-controller + then: + properties: + reg: + minItems: 2 + reg-names: + minItems: 2 + else: + properties: + reg: + maxItems: 1 + reg-names: false + additionalProperties: false =20 examples: --=20 2.34.1 From nobody Wed Dec 17 13:55:41 2025 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2043.outbound.protection.outlook.com [40.107.104.43]) (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 95DFC182A63; Tue, 9 Jul 2024 20:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.104.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556637; cv=fail; b=QOT6gpRjXSKX54DYfzSpUrlIIiER6yyB/+Sc1QZ+6juxyj1ztb4g2WFMP0MuQAf9iAPkHbdumd2PnQwb3FYMobluYyrOFrRBV+mGTYhWUXUE+KtwqPYwPd1ZGSXWjnof8WS6g+njRnxi8MHPb4A0/UVaDhxt7R+p5nBydb42Qpc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556637; c=relaxed/simple; bh=f6OXDb6eLZXmBH224OLnsfJkq1Rey5aQ1bBhSuWJ1I0=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=DbEcyTPi9qbiugTZWKBf0XS4hcNFcwsQQ1hMTuMJW7xhEfKu5u8allRPtdHjdO4A7EwaSEmloUSrfRQmgpFyjoWt2T2fskt59w/eVQWgxp8222uAaG+Gk5U2ZlVa1Fg3BnVw05E8ohHPX2+t0vDS66DDKf0+FWn+l6DKB96oZk4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=EBcm16ac; arc=fail smtp.client-ip=40.107.104.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="EBcm16ac" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cGlgL9MiPPt95cwOQvk+r35JyW3+4+vVGBeZFn5G8UWiJhuCtkGGghbcOLe1phQo5Ve43hbmCVQsKSsCdrk93leFYA1KG3UOhz8v2L/CMQnVEteKqV7epc48IBzRBU+cTJ9ILurUc1tqKVEsMghqYaggbHXsCcNtJZ9dYMLpcQ8WTd5rZFwPs272V8PcdeEkl9DJf8k2YmXj3HE6GKGIM8XlitIDycNLgvXm+rl8OMUM5yeHbnUSh3s9y7FMYC6YNph9yXhyHGUfCCenrHK1tnFaHawM4ec2VDwu7abAtV2ULRiXklx0CdeeUwo8REdSsvlWwKhAxqk/3fbeNTIWIw== 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=+llaZGd3ThH3xZSiE12Yp5AZPrupVBjPLiolbmqn1fQ=; b=kds9oSw+zuuodEBQZBRP/sQwN36059gXLKQQVmX0Fva5yvOdjBh5nTcF1dWPJBIq/1OKaIZv25l785TXgoRIMAVAl0+kXwei1fGvjI+tppZUUhOF+3BqChDL5KYKtN7jdIIcUWncJUdfmi0jXbUJqbY7fvovOTIqw+9Os4pwjTFLmfisq/i6MG6DPPN/gVVXqx4YvoWY4+fRvBDCMpvX+jh6LfuJiJCtickXk2XPieZUkpch1ZixE6qu16qt5od6AMLc82t/DYzQZ+xmhJbqw3SUut0BwWBwArHaUHCOdxw23LX/Y9HP+YtN4jYJ7g5dst8WRhFwB4sz4E/9MXdjiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+llaZGd3ThH3xZSiE12Yp5AZPrupVBjPLiolbmqn1fQ=; b=EBcm16acfCydMBRxh/00Scer1tPv33liamNlzQZg0ScOkUFMdsnDCCzLy67jSORJMDdx6/gXaBd6BHiWk+cvRj9di7p86lBOB2QqApQzeIGk40j+9ohMIrGaGIk8uyM/kDURMkjJufs27qddX5b27mLq/EJL+4gJBHOAkovbEBE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DB9PR04MB8267.eurprd04.prod.outlook.com (2603:10a6:10:24b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Tue, 9 Jul 2024 20:23:52 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 20:23:52 +0000 From: Frank Li Date: Tue, 09 Jul 2024 16:23:06 -0400 Subject: [PATCH 5/6] EDAC: fsl_ddr: Add support for i.MX9 DDR controller Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240709-imx95_edac-v1-5-3e9c146c1b01@nxp.com> References: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> In-Reply-To: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> To: York Sun , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter , Krzysztof Kozlowski , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Frank Li , Ye Li , Peng Fan X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1720556601; l=5882; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=CpSB72KuM9NooGj6fUi66TJ5cUJ4AKdkHQLj07U+ubU=; b=L0yyp80JaWeD0GEbKGknTPd4CW06DeRi37o5TJXaY2KIWlxwHNbkGFGntW35phVgM7t7X+yn6 sKnBbBqTuwRDqYTXkl/qPuJQddcEKzTlee7X0wB3DrZkRq8JIG7/4xR X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR03CA0033.namprd03.prod.outlook.com (2603:10b6:a02:a8::46) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DB9PR04MB8267:EE_ X-MS-Office365-Filtering-Correlation-Id: eaa65157-5fb5-4466-8a5c-08dca0550cc2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|7416014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?UzdSRnJlYURJa0ladVM5MjVTTWp2cGRuNEwraVY1RXNkYmQrZ2FlQyt6R1ht?= =?utf-8?B?T0Q4UHJ0N09wU2NBenNKV296Qy9hVVRUWG9qMzVuSURRK2F1RlNPbVJodURn?= =?utf-8?B?UnlLSCtNdEl6STRHQ2xkMjgzeDhvQllaRjhwR0xGdGxxWG5SekloU3NpZTJn?= =?utf-8?B?S1ZLWElRZThWcnVrL1lKejhnVWR6a092NDB2L2o5c0N0aEp2ZmJyZmY1QmdR?= =?utf-8?B?UFNudmFOdkNyOTNXYmdqdkhUSWhaTForZzJFd2V0bko4UVp2Z0ZrYXRad0RQ?= =?utf-8?B?Zk1tTlg4Ly9Vam8vazNXNUVWdXRzWWZjVXlDdjVHUzZBOVF2VDBlanRiVENp?= =?utf-8?B?ZyttdGdBRGN2ZWpNdVlzRzc4UlVDN3UwTWYxdEJ3WEM1Q25UR2s2L3EzWGdz?= =?utf-8?B?Z0laTk5EOGtZOWtRazNFV1FzSEpUQUpnc2JPaTJSenN0Syt2d3VMUXJ1SEFu?= =?utf-8?B?blVON2VEODRoVjJGdmgxUmxsdk5TUnd5VmRjdVNnR3RVVjArcWdxSHJSczFw?= =?utf-8?B?NE9sUnh3Mlc5Z295aFhGaG0vMjFZUVZlZzRwNlVubWp1NEw2dUQ3WnpWZnBF?= =?utf-8?B?b0NmcDZIazZZUXRoa3ZKaTZvK2V5MkdlNHNRdkRxWHRmUk9xRFN6QTZnZTVw?= =?utf-8?B?bk01dVJ6Z0ZJQXlkbzV2NnI0L0xzcituMTB3OTJVaHcwSGUzem9BNU5pRTh5?= =?utf-8?B?WmV4Q2M3VHVwNDM0VEgvSlI0MjFGMHhSdDZVckVFWXFEeGNEMzhPUVVKWVdD?= =?utf-8?B?ajhSdlIyL2VnbVY3YStjVkZYbXE3VklISnEwTlFhWTJ4ZGpxemFJem5vZGRK?= =?utf-8?B?T0lqYVZ3YjNKYzA5cUJXU1RualR5YlZ4S0Irc1ZqZjVIdXFhbSsyU0NpT3RN?= =?utf-8?B?NEw3aWZaTnhna2MzWGlaektCUlRVdFhXTWMvK0VzdW14Sm1oa2F0R245aDg1?= =?utf-8?B?QzhOMFE3WmJreDJteDZPL1VuRFRpNDIvZlZWVU9DcWxTNWFra1ZvU1ZNQU01?= =?utf-8?B?RWhDSlAvOWVqa1pDUGdaZmNMQ1JQSExvSUc4Sk16TWlOeGkzVmxtb1pxelRR?= =?utf-8?B?SXp5Ym5aRU10RXplY2t6YmpYeThMUEM5U1ZKZXpkY1NhUUJpV0N0TUFXYS9P?= =?utf-8?B?bGVhVmVnR2E4cmoyYVUxL0kwbVBLYkdJMDJ6bjhGSHpONTVnU0FJc1hzSm9l?= =?utf-8?B?MWpsNDR3cGJBNzlJRkJISVRFVHFSUmwrVzVoSzJiRkRsRHJxS0NiUEEyN3FF?= =?utf-8?B?SkRFR2dyZzZXd21Rak82WFBOcUVYdUxxUkU1UTAwbjg5ZUJESTRVUVFtN3FM?= =?utf-8?B?ak9uYnFWOUlsTWhjelBWdFNxWjZpaGxraWQ4eW1ib0RaZ3crZ1R5WkFVOVpy?= =?utf-8?B?MWtVdmFrMVAxTFllelR3enFadmtKMzFFckxlZFhFNW9aa3grZ1ZmVmk4VjZR?= =?utf-8?B?S21HYnpRVXViWkhicXR3NnNsaHorS2dmblN2ZE5JcUtSZGVJbFhtZHZNUTBT?= =?utf-8?B?VFZISkhMVXAwdEFYdVIxZmp3K0FXbFkzUnhoWWpVek92bFBPSTBSMGdXYS9N?= =?utf-8?B?dThIb29aWWtFY3JuUHFFd2VOOFBFbmdZN1I2dlJ5MnhSb2w0TkdMWHdFcEYw?= =?utf-8?B?aCs1RjM0RUtzVGtVU2RVc1BRS1htL3R3Z2RFODZnMlNtUkNwdW1pMjV6ZVlU?= =?utf-8?B?ZUh2TGNrenNEUlI1Y0ZDN1ZBVkZ6SFRoVEVzaXhPNktMRTRqR09XWkptS1RK?= =?utf-8?B?WkZGVW9LZ09ZUE05ODQrWXo1bU4zaWxEcDRMYzFIVkRUUjZUTnRSek1uTUxa?= =?utf-8?B?bzhoZW13ZlBHalVnK253WXJuVEtYQ3FyZkNZWFZLMDhTL0NiMi91UWgzaWpO?= =?utf-8?B?MGI2KzZNRlRzRUJVb3ZLQ3JJS2R2aFlSSmFNVTM2ME0zb2ExY0NkWWF4b3d1?= =?utf-8?Q?1h/S3SV69dI=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(7416014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Rm02TWMrWGN3MlM4NVNSdWMvRmxnUkdaTkxjWG50MEVEby9KalorS3FjYUNN?= =?utf-8?B?R2tXdVJ6UzNYd0U3U25xNSt2VEl1QTdVVFU0TytnWGFEMDVDaHcwdnZwL25t?= =?utf-8?B?aDFlUVRGZE9xenFkdVdNWGIzSXdpRzB1SlJaMjNjdTJtajdBZC9FQWNYU2RI?= =?utf-8?B?VUVDeEpLclFrNEMxR0ZPS1FuRVlUSlRzdE5vODFjOXJ2eDdkcnFHMjlhcnZL?= =?utf-8?B?NExNbzFSTjRIRld1cStVVUhyU1c4RCtKeTFDdzVQRXNocnJUa2RpaXZYZGFs?= =?utf-8?B?OWFuWjZXMjNVeGxoSnRnQW04VE13T1Q0SUdYUzRGblgrQ01lem9sWW80TjNO?= =?utf-8?B?dG9hcm1KQ3BNWDRDN0VONlhISkVGNWV4K0lTblZ5K1RVL000SndyTXpsRjM2?= =?utf-8?B?bUlZSEtlOVFibGY2NFBkclNVbnBGNVAvSmFxK2QwNGdvUzJtd00yWFhad1F0?= =?utf-8?B?bWdVVW9xV1REc08wVG55S3QyaGt1djVubjhRZ0I5b24rWm9iNGJtQlpZOHRk?= =?utf-8?B?dzVPMC8xcm9DVi9PcXgzakVWdU4xNlYwYnVFRnB6Wkt2RWFZMVdjN3V6UWUy?= =?utf-8?B?M2ZpOXNBYUt2RWdTcFplQ2NqUFhid2VFcEZVNEsySlRIbG44dkJtRXlCdTl0?= =?utf-8?B?UVNOdGdzS2ZQSFBnUFJxckxmQWp3a2hBd2laNCtHQjQwOWN0NDNJOXpVUnBY?= =?utf-8?B?SFVza1hnajByR3V1OWpEaDExSjc4Z2lkU2Mzbjd6L09FL3cxT29IOVNNMzhX?= =?utf-8?B?dWF5THNHSlFrZjRkVTkxNHNPS0M5UmFoZkpaZEpJd3FiYmg4Zmd0c05JZng2?= =?utf-8?B?STZ5aFV1bEI3ZVBWR1BYaXhJTTJJNTFZTmc5Vzc0SW5Ocm5KMWlWWTIzaWpp?= =?utf-8?B?MCtiYWVtK1cyRG1vaUdQMjFtSWVCcUdXOGxTajJoelkrdU84b0dsNVJqRytu?= =?utf-8?B?cEw5VFVaajlmdmJwdnBxMkI5enh6SFNXNXlGQW9uT2hLNTBSTUdpS3N6akVJ?= =?utf-8?B?K0R6NHVURjhtWlo4OWhvOWF0TStDWi92OFRrVGVndzM1YkE3TVpHMkZiTU1o?= =?utf-8?B?d2RjZlVBWGYvT1VGWnBBZ3RVK0twQ05PcTh4aVNWOGtZRnZMbHJ2TjE1eVFs?= =?utf-8?B?L0tMZnp5R01Wd3BsNFVvWkRDQWxTak5GOWRGSGlFMmlma3kxY1lsb3NiYjJw?= =?utf-8?B?dUp3cDF1SDAxZnR2bmlZZkdLcExqWWttMEYzRnFoQkJ5NjljazNHL2t1dDRQ?= =?utf-8?B?andmNGRpK1hyY2dETmYvdGQ3UGg5VzRjRzZJYWZ1TmxFa3NCYzl5VHdvZEFZ?= =?utf-8?B?ZEoyL0xnU09wMGVYY1dGVXVxQ1JnSzZhWnowM0dEbnZrTitmU0pVaFRYYlJ1?= =?utf-8?B?alBKNDJrYnBlWUFHakJRNlZaL0s0dHpGbkJ0cnZkU0JPamlVWFhUaUI4THl6?= =?utf-8?B?WGJmTk5GYk1MamxKM2Rjd2JjZVlnRCtQTWJsZlpZNFkrcjFIN3VNYUgyek56?= =?utf-8?B?U0FISjBpR3VCOVFYUis0RGtZRTV6NVBDaUtHc1d0VnJxdmMxOXkxcjI3bUtU?= =?utf-8?B?K21MOW1TQi9jM1JhK0lYZU9zZnZFQnpwRWptYUNHbmhpS21veHZOWnM4NUZx?= =?utf-8?B?R3JxbU5LSTljLy9HREp4UDhoallWWTNJK2ROd2FUaktyWTErTnkrSVdtcmZC?= =?utf-8?B?MGxPL2RtL3dQdThnclZ1VytHeTNVUkNDM3lkV2FkT2VSU05KZXJFNGNtN1Bx?= =?utf-8?B?c05EeHhiTVBja1FIYkVIQ0FCOHpaam1GNXJjeEkxYU03dVlwM01IbXQ2MGQz?= =?utf-8?B?QkR5STQvanFIbnppZkNRbEsxcGsxSTNBV01oYklOUE4reEZBZ1Z3QkR4RFNE?= =?utf-8?B?ZWxLc2h4MzVVUUdRYTJKVmR5SXp1OGdQV2hVb2FsUmlLd0VWbXJjdE5OVFZo?= =?utf-8?B?SWM4MGRkY0Y0OHZ2VllpamhUNXVZYzB6NXNnOTk5eVhNbWZHdTMzL0xmRG45?= =?utf-8?B?SmdieTFCbTFreXlrZHRhM21LcVI4ODV2SmdYaFp0TjliMzk5cTd1YkFBNVQ0?= =?utf-8?B?dzMwK0ZXWUx6SVA0RGlvNFRTMGNTMmtKeVg3NHdNeE1MYlcvRDJEV3Z6UDhX?= =?utf-8?Q?yGHdcbIs6P5DjbgKXh3tHXFYH?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaa65157-5fb5-4466-8a5c-08dca0550cc2 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 20:23:52.7567 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TUZ37exuyuQbl9uFcGG/cvbjh7VEIw0iyg1QGMlmELG5HIlcQ/gBnLjIwGOeTBX3KWoOu1XUgAs7oUdrdM0D3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8267 From: Ye Li i.MX9 uses an DDR controller that has registers offset and some function changed, but the ECC and Error inject functions are almost same with fsl_ddr controller. So update and re-use the driver for i.MX9. A special type is added for i.MX9 controller only to distinguish the difference. Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Frank Li --- drivers/edac/fsl_ddr_edac.c | 48 ++++++++++++++++++++++++++++++++++++--= ---- drivers/edac/fsl_ddr_edac.h | 10 +++++++++ drivers/edac/layerscape_edac.c | 1 + 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index da743cf8a95e9..438b995066f2a 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -31,16 +31,28 @@ =20 static int edac_mc_idx; =20 +static inline void __iomem *ddr_reg_addr(struct fsl_mc_pdata *pdata, unsig= ned int off) +{ + if (pdata->flag =3D=3D TYPE_IMX9 && off >=3D FSL_MC_DATA_ERR_INJECT_HI &&= off <=3D FSL_MC_ERR_SBE) + return pdata->inject_vbase + off - FSL_MC_DATA_ERR_INJECT_HI + + IMX9_MC_DATA_ERR_INJECT_OFF; + + if (pdata->flag =3D=3D TYPE_IMX9 && off >=3D IMX9_MC_ERR_EN) + return pdata->inject_vbase + off - IMX9_MC_ERR_EN; + + return pdata->mc_vbase + off; +} + static inline u32 ddr_in32(struct fsl_mc_pdata *pdata, unsigned int off) { - void __iomem *addr =3D pdata->mc_vbase + off; + void __iomem *addr =3D ddr_reg_addr(pdata, off); =20 return pdata->little_endian ? ioread32(addr) : ioread32be(addr); } =20 static inline void ddr_out32(struct fsl_mc_pdata *pdata, unsigned int off,= u32 value) { - void __iomem *addr =3D pdata->mc_vbase + off; + void __iomem *addr =3D ddr_reg_addr(pdata, off); =20 if (pdata->little_endian) iowrite32(value, addr); @@ -438,6 +450,9 @@ static void fsl_ddr_init_csrows(struct mem_ctl_info *mc= i) case 0x05000000: mtype =3D MEM_DDR4; break; + case 0x04000000: + mtype =3D MEM_LPDDR4; + break; default: mtype =3D MEM_UNKNOWN; break; @@ -471,7 +486,9 @@ static void fsl_ddr_init_csrows(struct mem_ctl_info *mc= i) dimm->grain =3D 8; dimm->mtype =3D mtype; dimm->dtype =3D DEV_UNKNOWN; - if (sdram_ctl & DSC_X32_EN) + if (pdata->flag =3D=3D TYPE_IMX9) + dimm->dtype =3D DEV_X16; + else if (sdram_ctl & DSC_X32_EN) dimm->dtype =3D DEV_X32; dimm->edac_mode =3D EDAC_SECDED; } @@ -483,6 +500,7 @@ int fsl_mc_err_probe(struct platform_device *op) struct edac_mc_layer layers[2]; struct fsl_mc_pdata *pdata; struct resource r; + u32 ecc_en_mask; u32 sdram_ctl; int res; =20 @@ -510,6 +528,8 @@ int fsl_mc_err_probe(struct platform_device *op) mci->ctl_name =3D pdata->name; mci->dev_name =3D pdata->name; =20 + pdata->flag =3D (unsigned long)device_get_match_data(&op->dev); + /* * Get the endianness of DDR controller registers. * Default is big endian. @@ -538,8 +558,23 @@ int fsl_mc_err_probe(struct platform_device *op) goto err; } =20 - sdram_ctl =3D ddr_in32(pdata, FSL_MC_DDR_SDRAM_CFG); - if (!(sdram_ctl & DSC_ECC_EN)) { + if (pdata->flag =3D=3D TYPE_IMX9) { + pdata->inject_vbase =3D devm_platform_ioremap_resource_byname(op, "injec= t"); + if (IS_ERR(pdata->inject_vbase)) { + res =3D -ENOMEM; + goto err; + } + } + + if (pdata->flag =3D=3D TYPE_IMX9) { + sdram_ctl =3D ddr_in32(pdata, IMX9_MC_ERR_EN); + ecc_en_mask =3D ERR_ECC_EN | ERR_INLINE_ECC; + } else { + sdram_ctl =3D ddr_in32(pdata, FSL_MC_DDR_SDRAM_CFG); + ecc_en_mask =3D DSC_ECC_EN; + } + + if ((sdram_ctl & ecc_en_mask) !=3D ecc_en_mask) { /* no ECC */ pr_warn("%s: No ECC DIMMs discovered\n", __func__); res =3D -ENODEV; @@ -550,7 +585,8 @@ int fsl_mc_err_probe(struct platform_device *op) mci->mtype_cap =3D MEM_FLAG_DDR | MEM_FLAG_RDDR | MEM_FLAG_DDR2 | MEM_FLAG_RDDR2 | MEM_FLAG_DDR3 | MEM_FLAG_RDDR3 | - MEM_FLAG_DDR4 | MEM_FLAG_RDDR4; + MEM_FLAG_DDR4 | MEM_FLAG_RDDR4 | + MEM_FLAG_LPDDR4; mci->edac_ctl_cap =3D EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap =3D EDAC_FLAG_SECDED; mci->mod_name =3D EDAC_MOD_STR; diff --git a/drivers/edac/fsl_ddr_edac.h b/drivers/edac/fsl_ddr_edac.h index de66f9822fba1..73618f79e587f 100644 --- a/drivers/edac/fsl_ddr_edac.h +++ b/drivers/edac/fsl_ddr_edac.h @@ -39,6 +39,9 @@ #define FSL_MC_CAPTURE_EXT_ADDRESS 0x0e54 #define FSL_MC_ERR_SBE 0x0e58 =20 +#define IMX9_MC_ERR_EN 0x1000 +#define IMX9_MC_DATA_ERR_INJECT_OFF 0x100 + #define DSC_MEM_EN 0x80000000 #define DSC_ECC_EN 0x20000000 #define DSC_RD_EN 0x10000000 @@ -46,6 +49,9 @@ #define DSC_DBW_32 0x00080000 #define DSC_DBW_64 0x00000000 =20 +#define ERR_ECC_EN 0x80000000 +#define ERR_INLINE_ECC 0x40000000 + #define DSC_SDTYPE_MASK 0x07000000 #define DSC_X32_EN 0x00000020 =20 @@ -65,14 +71,18 @@ #define DDR_EDI_SBED 0x4 /* single-bit ECC error disable */ #define DDR_EDI_MBED 0x8 /* multi-bit ECC error disable */ =20 +#define TYPE_IMX9 0x1 /* MC used by iMX9 having registers changed */ + struct fsl_mc_pdata { char *name; int edac_idx; void __iomem *mc_vbase; + void __iomem *inject_vbase; int irq; u32 orig_ddr_err_disable; u32 orig_ddr_err_sbe; bool little_endian; + unsigned long flag; }; int fsl_mc_err_probe(struct platform_device *op); void fsl_mc_err_remove(struct platform_device *op); diff --git a/drivers/edac/layerscape_edac.c b/drivers/edac/layerscape_edac.c index 0d42c1238908b..9a0c92ebbc3c4 100644 --- a/drivers/edac/layerscape_edac.c +++ b/drivers/edac/layerscape_edac.c @@ -21,6 +21,7 @@ =20 static const struct of_device_id fsl_ddr_mc_err_of_match[] =3D { { .compatible =3D "fsl,qoriq-memory-controller", }, + { .compatible =3D "nxp,imx9-memory-controller", .data =3D (void *)TYPE_IM= X9, }, {}, }; MODULE_DEVICE_TABLE(of, fsl_ddr_mc_err_of_match); --=20 2.34.1 From nobody Wed Dec 17 13:55:41 2025 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2071.outbound.protection.outlook.com [40.107.22.71]) (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 2257A189F39; Tue, 9 Jul 2024 20:23:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556641; cv=fail; b=X2NhRcu6C3carLMasGXgtJXvlUD+VFZ+Unl+asi6C51ZpQ2xrSS7VyhshL32SrR28t0U/2UPrcfYBYXo/yNC34ajaZYzTkfJ4nw7aC81Egg0vCBEWS3Y92fDs/MDZ3E5ESEFg+oLuuANQfyDQGejPMra93A+dzW/Ok2yUY2QwzI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720556641; c=relaxed/simple; bh=s8pNnrdq56Ppj8eEPtENwxRkzkEKcLwgHNFgBUHLUgg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=HK98liiZUU/rYD7ShyXcNusaki/Ihndw0OH/sg4gcuowNgp8zWJqhPE/MkAqym2pIzI9qMlEIvw+TVQ5x+5NN3LFcjpF4vkuu1v/oJ/1oDs5vUFVHBHAlPkBbZeJ0KBH2YaZiH4UJJoM234f4uv9+TnXG1D0vMKzQJnF7cQvZKw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=BVvG2akz; arc=fail smtp.client-ip=40.107.22.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="BVvG2akz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SR8qnkzscrWlPVJDR/g6CEu8oZqAruVjoT94dDBrUzDiZJANQxxRMuBwBgpFXTO1k3trQ/kubNZPKduIyUCRpu/cipYripFzhtAi8oOmLCKC0KsHhI6SMCilzRSnDRF5hm18duTLLtdF/ijlrGbwMp9ro0YL88aXrDzkxptvfOSI+4SNnjv4fVlBgGFlpqtRC+v2yrK5xzn+Iw5kLxnZ5P9zaxHrh4wZrXJx1ViPwlvlwOwi24K4Up0alGtXKmlwGDAbKGd6hWRpehClbi77VuykBM2h/zu/bM09Ph9LZWI24ESCmpVTHouONvg1yL2xQ6xktAVJ67MOzTt3DCLvvA== 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=tcyyOpXR/elxOWjMLNQTI1/X+neU4CKgNbG534icVsg=; b=ZJRnD8yxBDwlVHM1Mz6rZMa7Q+edvvKJfRofdznhVMt6z08WGA5dcIeu2eOqjE/v9O8T6efYrGk112HMfJn1uHQ33YI8RSaPKR5CbbC044LgZNenxMAPG99dRAg1zxApln/G9fs6BDu8gTZtNTy04LBKLbp4Ih5YCf2azv3SGoAOVQokNXXWVBior0IskvcwXiLheIHCb50ydybunyMCrO83Anu1X/8i0FMf/LHK3OBeZ4g5O7PNwwBJgd65dJMRlOfmNmhKD6m4eOZeE2kQfn6w4z5boPmUQksaGB9VopsaekLb658Z9L3+06b3LADA1e1spdch1oEZ90oPHwirwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tcyyOpXR/elxOWjMLNQTI1/X+neU4CKgNbG534icVsg=; b=BVvG2akzLDSCVCWhNcPW7uLqXwlY2y+VXFbe4Ayirod2iScDiyUlnterDlvcy6Bd0vV7f0/F5gI2uGa6I983q5CSZ+0G04emiP1q/KJoVy8mXlj8h+Jo4I1rdJmL0/+9EmB0EBBOgCSLZhFogNUfX5ULeRkpj9KEORP8iIQND7A= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DB9PR04MB8267.eurprd04.prod.outlook.com (2603:10a6:10:24b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Tue, 9 Jul 2024 20:23:57 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 20:23:57 +0000 From: Frank Li Date: Tue, 09 Jul 2024 16:23:07 -0400 Subject: [PATCH 6/6] arm64: dts: imx93: add ddr edac support Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240709-imx95_edac-v1-6-3e9c146c1b01@nxp.com> References: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> In-Reply-To: <20240709-imx95_edac-v1-0-3e9c146c1b01@nxp.com> To: York Sun , Borislav Petkov , Tony Luck , James Morse , Mauro Carvalho Chehab , Robert Richter , Krzysztof Kozlowski , Rob Herring , Conor Dooley , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1720556601; l=859; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=s8pNnrdq56Ppj8eEPtENwxRkzkEKcLwgHNFgBUHLUgg=; b=AwHYQq0Qcdnoz25sGb152A0P9wfUumjviii1fP58m1xcjkJv5OuEUCOxuWuyKAwnM3sXhYyDH y+rERn1bs2xCQ/2h5MQW40E6KA4RolfzBrPvGIIlvDP5Ad8nFMSDUqu X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR03CA0033.namprd03.prod.outlook.com (2603:10b6:a02:a8::46) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DB9PR04MB8267:EE_ X-MS-Office365-Filtering-Correlation-Id: d8358489-1b22-49b1-6d95-08dca0550fb9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|7416014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SjdLamNlMWpSRjRMQ0ZGSkRLRWdmM1R1R0F4dUNzakUvSXFGUkpnMEl6V1l3?= =?utf-8?B?a2dQV3R2K2Rub3liNUpudTFYZjJscHhKSVl1YlN5cDFucTdjMjZnaE9yWk9D?= =?utf-8?B?ckgybDVVZXhQRThGNDZVcm8vVlRkWHJoU2h5VDZQMDBoN09sOEROVzNqaytk?= =?utf-8?B?M0svb1NCVDRKMHgvUGNVdUZCSE9CYU9LYmVqQWZSVzd0RDJSY0ZFbXpXb21B?= =?utf-8?B?THg0Qm1BT0xmbXdUci9RSEpyZjZobE12RU5VMUM3Vm5VY0xPeTJJS2YyUTFU?= =?utf-8?B?eU9rdFFKeVF5TWpkaTltN1NRY0JpanNDQmxGT3FKOU9aVno0VjdLeGx0eHd3?= =?utf-8?B?bTJyZVNPZUs2NFlrTVpwd0p3REYxemJLSkpaTmNaVG9wU1h0Ym1TRkxHRkl4?= =?utf-8?B?UEZxVk1sbytoVER6eU9QRDhyMUtCTitheFJXZ0dIRlR4dXhhUVRnVXVISEhk?= =?utf-8?B?YTdxQ3RnVXVmd3ZlWDErV045MHQ1cUVIL2xpdmpSbzcyRjhtYTNxcUVFV0o5?= =?utf-8?B?SDdBRzhrcWo0c1lETFIwSXkzODE1V05paVMreitDS21hNEVaakVwMEdqaWMw?= =?utf-8?B?UHpFLy9QUEZ6eW5xYU5ES2RoL2Q1eTJHaUZXUEZ5TWlXMy9Qb1RJdGxnRHZy?= =?utf-8?B?bnI4TTNIQnliVmdLZ3pLaUFZbWNhWDhPWlhUb012YXFwL1VMa3RVanlnLzRz?= =?utf-8?B?YzUrOS9YTDF6YUhQOUkveEFMaldTQjEwaXdBYlBERWlkeXVzYW5kZVVFYkJ5?= =?utf-8?B?YksxUmt2Y2prSjdyZ0xVd21tV3M2clA1MzVpZFJjL1YvZHNxRWI1bFVGQnNx?= =?utf-8?B?d09rZVNQNmttOGhEWXNKKy95NHNGdFg3Y0V4Y1F1WUthdzdEdmFHOE5LQU9y?= =?utf-8?B?VzRCT3IvazlLREVodGVUVGo4MHFVWFRtL3czOUowWnVWSTBpNjQ1empZeXhR?= =?utf-8?B?eWsybXJsekU1ellzY1hYcWFsbHhpTHMrdUR6NWp4RDVRdW1RRnVSWGIyQlV3?= =?utf-8?B?dGZlQStrQWdRVDhNcnpvY3hTNGdNYVE3NlAxeVVQTVRJSWhFY3V3dzlUajRs?= =?utf-8?B?YVFYd2hOdHJHVzZLa1JWVlVFY3Y3eXJCaC9FcnFSMUE1UkVnOUZpb01qbVdJ?= =?utf-8?B?MFFndkV5aHNPbFE1QU4xODU4b1VGZTdibzZobS8yeGY2RWxDMTdGWnE2dHVv?= =?utf-8?B?Q0U2VlkwMUlaQThzSXhNV256RWtISkROeGw0U0s1akkzVFlicW9ZOFh6M0hI?= =?utf-8?B?eGJBYm5oMlhWOVliaTZPM0IvZnA0NWFqVXRUSDJHYUltUjRKaHduUU85amR6?= =?utf-8?B?STVxYXNQQzZ5UC9pSi9rMUxjd1Y5M3hkVkFPY1Q4MWJIODdUZnVLS0dDQUNF?= =?utf-8?B?cEtzTHArSkRLNElQU091L1NzSWR0bEtHc1ZuM1R4N1FnNHg0MS9oc1lFZkkw?= =?utf-8?B?anJJVnhlUExIWVF0U2pvc1daRFZPV0JVKzlLK01aRThjekdpdzlQMEd1STdN?= =?utf-8?B?WTA1aDJTeVlSUEtXamhwL1VZRU9zenZNekNObVFxckc0WTdhTll4ZnV0cEds?= =?utf-8?B?MVZSSEc2cFoxQUJpNlBmYU1EZUJndUdxLysrdHJnSk1tSVJkMHh0dkErRXRL?= =?utf-8?B?eDhFSGM0Kzc2UzkzYk1nSjdVL3hsZFNJUmNwNjlOVURQMmZzaFJKejhsWnJT?= =?utf-8?B?WU95eXdRZ2wwaWZzWi9mU09HMTRpRVV0a2VlOUdEc1V5eEp2aU1aN085Mm9W?= =?utf-8?B?emR3OVRiYTJjc2VhV2RtWU1xbTZOcWw0OS9BVXdOY09RQ0ZSdFV1cmF2MlB3?= =?utf-8?B?clZGZEcycWQvZ1NNZWFFVU4ydmZjY0xuZ0ttV2ZBajhnbkFHbmVGSHFsbGhm?= =?utf-8?B?amJUVDc4Rkw5NmJ1ajFiUXBQd0VMM003SG01K0hsRFkzbys4Uld0Tm9XMUdX?= =?utf-8?Q?P4TL9CudueM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(7416014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R2hQT2k5cC9LZ0lma1dRU0xaWmxKbzlhRG9hbU1MZ1JMNUo5bytOTkpIYUY1?= =?utf-8?B?SWM5UUFVeWNDVDE2ZVBFWHRlQUFaOXFVOVNFQkFTTElGc2swRDVuSjk4K1pm?= =?utf-8?B?ZVgzRm5UMzZ3bERwWEx3UmRuZk41UWFIVEd2cXkrdUoxdWlTRjV3Vm9FMldC?= =?utf-8?B?dDNnVXNwaDFCVyt5L0NtR1lhVEFxajFvSnh3K1ZiVVVOM2ZybFFUc3JXd1Rv?= =?utf-8?B?a3FmbnVQbDRDb2kwZE5hUXZabklxcDRjQUJDTW5pdkRGMlUxOEh5ODBhUjAw?= =?utf-8?B?d21aVHNHSzNoakg5eTNTZUc0a3dCWFlxVk04aHlZMDI1YUROOE5KejNyS0Rs?= =?utf-8?B?ZlNYM3NXZDk1c1FUbTV0T3JDNXpzdnZwcFdiWVgyRmszdXVxMjR6U3Myd1h3?= =?utf-8?B?M0RLQnRvalZoV2VKSkZmSjgrYzJSWUhTUmlYdmRYeG1zK3UyNW9PaHlLWFNu?= =?utf-8?B?RGhXc21EZytURkRnQXpBaSswTHVNSHpPY2s3QjlOS2d5aHpjaUd6b2t3bDFh?= =?utf-8?B?cWJUTkNqZnhadEtuekd0MUJ0bys3WUN2a0ZGbC9LNk1oNDVQZGRLaEtkWi9w?= =?utf-8?B?OUdCV2FMRERqVCtJT1lVTlZlUlJOQXNjQ21OVXQ0bUp2MHY1Q1NwSmhUMW9N?= =?utf-8?B?dGkrZkFEbU9RcU94UHNudm1vMVQ5Z2Mvd0pKM3JKck5QOEp1UG5HaExNSTQz?= =?utf-8?B?TDVXSVpISnYyeGIzbXhSM21BQi9MNWhTcTA3anFoZktxcDY3Z05PcnYzOTFX?= =?utf-8?B?M0JDNmtsVkdReThGU1lINjgyS240Q3Q5aTRKSmZFVy9CcnZjaXJVdE1aTGZ5?= =?utf-8?B?TG96Wkk5MUlNRXFBTEkvQ3JUWjg5QWpydkxIWUI0VVNiRnB2dWVWUVpQQzQw?= =?utf-8?B?RFh3bCtzQ3hjaFAvcERybWZNK3d5alNibnlmZFJJRWRWeU9sVUdoUFRPSkNE?= =?utf-8?B?VXpUdHF6YXlZekJHTGRHcFRZc0RwTzhmUUlJUnBNRE41YUJ3NU9vdnVGa3ZK?= =?utf-8?B?Q1g5RktyYmk1TTJKRG81blZkTjd3SnhGT1k3azJiSlB1S09sZHdPaDVjUlVt?= =?utf-8?B?dnBmYlZ2bGdOUlFKS3RNVS9FRE8wMEEvb2MvL1JkdEZEVXZ2WGdlUlpyRTE0?= =?utf-8?B?ak50MUxBU0xBbkNrQ0JhdWYzT0t2aFpOYzY1cjQ2NHVEWDhnd2xyUzRXcFd4?= =?utf-8?B?K0J4WWVMdXVtbUlMRXlnRVczdG5VRkFwV2pzc203WEFVQUtwbW4wMVFQcG9E?= =?utf-8?B?dWZyUEd4aFhScHl5UXNpYysxUHF4dlRKcC9kNWNNZzdZdERHWmRmdlh0VkZl?= =?utf-8?B?NDJwQ01aRG9KQjdIT1ZYYUs1V0UyalBmQ3IvK0FBSkl1RzZCejM3T2NCUWpy?= =?utf-8?B?NTYxNlZMbDRqN2FOTi9VTnBaTThBOVNDTkJQMkdiT0hRdjRpMFkyNWNHajNL?= =?utf-8?B?aDdBNVNCbmJkSVAwcG93VER3L2g1bHJrdTdYTWtrQkhXb24rYU1TT3g1a09P?= =?utf-8?B?cVg1MVVUNHBaZm9GWDE4NUpxSTlXSWJTblFJU0hza2JuNmxoWjRGczRLMkF2?= =?utf-8?B?eTBDSHN3dVF4K0ZYVUhGb3pPWWJ6aUJPaklsSE51UlN2NHJMRjdEZDQzS3NO?= =?utf-8?B?M2t0WkRzRUNlOXArNmJJMGNZN3hGeWIvb1dsaUZ1czl1Z3ZwWjZGY0UyVnpm?= =?utf-8?B?RFliWmRhb0tsYzFoUGlEOCsyT2hYZjViL01lZ0JSL0JrbW5sSGdqYXNRRjlI?= =?utf-8?B?Wk9BME1lM1JyWDlxaDRtdWUweW5TWDBVWUtlNThYeEM0R3VqVEsxcDA3TTgw?= =?utf-8?B?RTA2emZ3V1d3TVBBZVBuRTl1dm1nVlZ6dHE2bi9Ea3Z3c2VYbDcwb28rL1Ix?= =?utf-8?B?NVlxc2RiUm5KWXVuZGJ6azE0Nmh0aEE0WkpPZTdpVzJLZ3ZUVzAyMmRHM2xT?= =?utf-8?B?c09nN0h4K2Mwb2E3SVBGY2NQSDRORlFvKzFPS0JWQWVLYnpwTFJ4YmVONk5a?= =?utf-8?B?bUhSL1Y0VDZZTTZBNnI0Rm9SRmRUaytndnZaRmJJY1VGYUZFT0ZFaFhvbHNj?= =?utf-8?B?VnFpQUJta0NDc0JKRkxwb3hZcVBXcEU0MUh3TG12ZVBvSnZVRlVoTjlrQlZl?= =?utf-8?Q?ImqAerI0oybYJKjI+HFHNsuUP?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8358489-1b22-49b1-6d95-08dca0550fb9 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 20:23:57.6982 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /59MVkA05iGzu5pp0egeyKki2ltqHT3DkA8rxiT+1xCe9zDAZqV4dKMh7ek8TblbFT6zbemvjVNFo5/PHH3zcw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8267 Add ddr edac support for imx93. Signed-off-by: Frank Li --- arch/arm64/boot/dts/freescale/imx93.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts= /freescale/imx93.dtsi index 4a3f42355cb8f..6faba848fe286 100644 --- a/arch/arm64/boot/dts/freescale/imx93.dtsi +++ b/arch/arm64/boot/dts/freescale/imx93.dtsi @@ -1279,6 +1279,14 @@ usbmisc2: usbmisc@4c200200 { #index-cells =3D <1>; }; =20 + memory-controller@4e300000 { + compatible =3D "nxp,imx9-memory-controller"; + reg =3D <0x4e300000 0x800>, <0x4e301000 0x1000>; + reg-names =3D "ctrl", "inject"; + interrupts =3D ; + little-endian; + }; + ddr-pmu@4e300dc0 { compatible =3D "fsl,imx93-ddr-pmu"; reg =3D <0x4e300dc0 0x200>; --=20 2.34.1