From patchwork Thu Apr 17 22:00:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zaid Alali X-Patchwork-Id: 881883 Received: from SJ2PR03CU002.outbound.protection.outlook.com (mail-westusazon11023137.outbound.protection.outlook.com [52.101.44.137]) (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 E546E1FBEB1; Thu, 17 Apr 2025 22:00:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.44.137 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927236; cv=fail; b=m/8WjOS3epnrcuv38R0JGps+9SSwD3IgkSmvpX29ewiUPKhNbfFK3ba+gTcKKqHm5AgiVzIujcvtRA1FH/+KCXVJCr4rMUAKwxT8RsOcqKM4YwZa2Pts8e9856RarO49afK0JauKApTY+v6mVM/2v/aOOdQ8G2MfLewLZ1X1cLE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927236; c=relaxed/simple; bh=N82lQgw0OOtW3DNeHdfoRKpC2j5SqL3vrku7Px3ILqg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=hDDHaERDjJsjUu3vzslB/pDAkmQrDmXj9y0Ld7pl/59nO4We1kYmjZ64440MK0yR1ErDNTqWglLPpK0riI1AAqRI5OlRiOPPqWZXmRdzcqOoG4IU/Q4JimHup6iU93GKXuZGaJZ7yMddkWWWb97ri7+YxUUt58cDos5RPrkmGxU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com; spf=pass smtp.mailfrom=os.amperecomputing.com; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b=feLPAK6A; arc=fail smtp.client-ip=52.101.44.137 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b="feLPAK6A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=STesipW0BfH2HXfbthXquNzMtVNHNDVigU2inmokaUTOOoGscb6gSSIujBNHSH/xIGuk4FwotPJAH/d3oMEgPlaU+pbhLwOspqdZkPGeLdXr2J21E3qunZ6t3ZD7A+1mOYEbjagWP/sVC+QL++g80DYojbwn9hzVEorFIltWiOppd/vsnI7ooRsn6fwLtlIyW8wEZ+0Z2GczELo19z1otUMx9HY+efOZcYQopGZdmXAthH7CqgPzI3A+gMF7Dm7GlCc+DBhz3g9mACeIcdEA1ZC6cbhTK5VTEinn9ZYr8DlzmL/W4Br/CxxOAlE1orCd0es9OcmqeByg96xwv+BKKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7I6WwV15YtJvLaqmzSPZuA7F+ZEjQ4z8qExpNmVFSgQ=; b=fOsRzgEzgSFnzG91kD0f9cZzSrbG2zEYjg1wJUarOqRUjCY/yQWrtqv6yymdSig5ALZ/bOYYnC6rPUfyTidxs1aRuzCsKq4WJFHm15pWs/412CKhqnZRzDqsJHVvRQcBiHxb2MdO4zV0Jvs/44JBKYla5Kgt4zRviQgYpDvRe69hkDAdC5vjs4Y+xRhJWZtuNiagZyrf0SPT8ppbgYRSMbKvKvO7qh1obfgkCrj9Y9L7UzgLSS+YnIH1E/zM4+O2vzJMTILiIxaTR1GTV4pWJFGvY2uzqQLjnvZJrAiBLZdvAcVfXpeHMtw3YaoaKOImUH2EoqehnSQ2zfsIMLCTYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7I6WwV15YtJvLaqmzSPZuA7F+ZEjQ4z8qExpNmVFSgQ=; b=feLPAK6AQWWURnnwI7i04quO3O9bqn5Xdyw2OSAPU9OmSfVUeBZpOfaNT+OiY/K6uXn97iOuV8Vg6nuOSgXwVQRU2q8A+ITdZz12/C8twJLuJJP9VC6WQsaOzWZZw/yqFjQPX6q4D7OIkTN6VtcWnMmDm79jutHwGwvR1BCeRHA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) by LV2PR01MB7597.prod.exchangelabs.com (2603:10b6:408:17e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.36; Thu, 17 Apr 2025 22:00:31 +0000 Received: from SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f]) by SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f%6]) with mapi id 15.20.8655.025; Thu, 17 Apr 2025 22:00:31 +0000 From: Zaid Alali To: rafael@kernel.org, lenb@kernel.org, james.morse@arm.com, tony.luck@intel.com, bp@alien8.de, robert.moore@intel.com, Jonathan.Cameron@huawei.com, ira.weiny@intel.com, Benjamin.Cheatham@amd.com, dan.j.williams@intel.com, arnd@arndb.de, Avadhut.Naik@amd.com, u.kleine-koenig@pengutronix.de, john.allen@amd.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v6 1/9] ACPICA: Update values to hex to follow ACPI specs Date: Thu, 17 Apr 2025 15:00:11 -0700 Message-ID: <20250417220019.27898-2-zaidal@os.amperecomputing.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417220019.27898-1-zaidal@os.amperecomputing.com> References: <20250417220019.27898-1-zaidal@os.amperecomputing.com> X-ClientProxiedBy: MW4P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::23) To SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN7PR01MB7903:EE_|LV2PR01MB7597:EE_ X-MS-Office365-Filtering-Correlation-Id: e0578967-d5d4-4405-d1a9-08dd7dfb4586 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: 3LjVwtXqK4I+OzFZNx9gL9NHvtLAo55v6dbWWJrB4r1RzRuiRlXcuPqzro8H4eiTG06kfTBJCv7Wi7Q1f4r9ZkxhrrPeGemHuynSqJO/Zvbt+zbw8vZ69+W9bgqw77wftptdDSXlQ9j6ngw6NFQpCwoGYb5zvmzdWLirIuOdZqlzs5fkLZPBUibAHhgei7mmAgc1iHGkKG2g2busR/hJ1gr1GxaFldajaRZ9ec03OUrx+5vkAPQ/8g6c4S5gHSLys8FSIazw0hjevcXwspnjF3/+dug5pv7r0pmWxucKZPdS4mfPNjsYADR3m0E/viMzemKdXz8lvKfjyDDlbj8PWINYTTWLPi4TWaRJqQNLn7DWiwcJYPN5ihCRCNFdTAgipAo823I5nwZMqJ2+Mc7G+U7iGmyNL9YTZOTy87camLYfwwCQe1n9E8uoTsW7gFI5TCuX4P1iLPbXyN5W+Ymvq08Emuj2j1kEZik2AWOG4Brv4qvrtLzWK2g9viqL9ZFr1qa8qd9UT9zNLl1ycHgTmH13dsVv9cosnaJh9hBfuew7kuA8Ypjc5ZSm3dJbqPp2zZ7j6gRSkQ5BtGtxRVYJWAN5w9gL7/rePJ1pskawOZiOseaDQhQGgegbwONvyK0Y+4rxVUOqT5C+7Q7cP6XYSF7BRmjGu7qzd4uVl5BfccZDGv18VCNG9uEwW45ro2jjWJyGPdeSMMxSznR+xtNRNrJqVJOMxORqi/4C4OvoXW0GP8D1mw1VX+Z91KABUtD1dXHy+0Vx9Wqq2cwO9eMxTPXZwujsPXhdK9e6skTtcrocAvfFG6mpCpdHmFU0s1EFH3FdnYnnhQgBgFvaCQlPWNIQ1ybwByQeUNCzyl76aU0vgMfD3F9/oSYlDU4uiQFHsPF8CmEZhZC/s0PxUgWrUlnae3FqAq2+pwBfKavWJAIDtHKcUzDZ91EvvjSshy75ah17HpKf1Cpfld+taZhzkrazmQ/sG6VegvKowT9ZpGH7D2w8eExvfOUbYPI13b7Mre7AhO7sCQ6+6ggpg/SUck6VePnOMSCgp5DpNqxauBL0ceHOFul7Bc57AmbQVwz6oE4fyjdDs0kuyxnSAqLxh/QbrWv+35FRj07eGW/OVPlT9qkplmenHEIWsh1SMfQXojFPzgzsKPxwTy93lkWHz24skRFFEuziypnJygvNtZ2UtuKhj4HS6wfNigh4FEuLRLXc37T7gPwJL62hE57c/SDMnBI3kS3JVziCX/2yEuSHKSpUwsBI9oiCAjzEdeh2ovzQHllZxZF3zJiouqhrNy3NgM9+8jFu30e039SD7s4DU6kol8UIM+6ygxo08oqZxDMsWMJ8JZ9oqTbK4B3RDnkx1QVK2Pj9u7pTpXP0rZwuaJInjlhBZ4qihgr8HvKtjUg46V4dmD6v8zKiXawOYyZPP77QmG3boQCnxWFLVXdzlR9C7oF/GlwnUcab/dCOWM1MkYFwgPHXgRt+v1GA1nsDxhWYf+STOx+h54CYT1w4bMnmwh4ERNPW4E7GxwuL X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN7PR01MB7903.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JIEc1ldEPDsXTPm6ERRdY5B4T7ODsIzG+E0WVtMzgyeMVcKjJ2vk5ynlg1TmnYbep/cndEj/ky4k6dcp2BUIGnYVryC3fB6FQ8E2rMUDCSw5gGTI7gK9tvi6Pp2BKX4A5TZCt6Hkkx3r5ks46UpvIPDmvf7ihGl2crrjh+PUZJ0pawXAB9IuGajBvIupbhDmRPz+h0GoZy7vkcgmprqQxRgir/ytOSdfmJXCkcXQ538votnIrTeIPSTgu+aV0VECA0kREaoDBw2lNHodMY7d4amgNY6yW85GLMzLaYcvJ8eg0rBITcOBTJctPECwLdXvGto99Owdt2MS1Nll1lHP0XyKe8VyWitTMV1AhCn438bskQOfwtmPn57ego20k7SvPHS8DQE+3aRdlqXQ8lw3GbiYI4UU2Z56sSi2pObXPLsQrx+sk6W6CNyFMeo9MJo7JRjXMZ/DcydVTBYZZRe3jNVm4zbDm4H3jzInWBSCGNxt6Cset5I6cm7AvOjVwiiDds5bvNZJ8RjX2ZRBKdjoPv7JDb4zZ1R7Bq82WkhYhTEZ7MRqI3ueq2KNMntvNRKLa+MENt5/yJMyZw7o7yIFk9k6N0YXcysmeXOOC1rrOU+ZfOxP7OwfIct808ZLpbF6vXgogDnCZdYUqD47x+mWAgWUINjmx8+Df3rCnlzn0USIMI4nKqLKzgJUWoxlMIXxNAKxJHayzlIax10sbx58j20eojzOSI6NyYTtObn3D6yKHcE/CdiMoPiUUlyDynWxvTdJz+LjEqKeC/r4fcwcxdHsggU6MQW61q7wZtLmHg7OKFnpAUpRlb+VmknaiQuuJm7JFsSVCJfJRKJZ+TSNF3OsYk0tyzWMh0v8FOFe3Hk/DDjFsv5U6fcNje0DORT6P7ldWU7gbLxzBhWw3eBAAcrtGgdAc3f9sVfMwg/Y4GJ7R1Aaei4dioBQzhtwBvedGl4TCXzw3Vz3fuR+K50H8QpOp8O4wDuoSaYihoNrQWjMU5Wj88eOkXt4zYe5CrYExGtqjD+m1StN+Z9J7BWed6op1kBiTimQ1c2SGzO8K5I383nuTntWifN+bNBuV9+KYH2EwxgpQVHNSwnr9z5X/HuB783208p4rHwstABb5OftloD5xEEPrygYDz9o6em4lJLR69k9KaTiXZgvikBfeK1kmYbvgjA0N44Jv73c8BnlHD2JpB53Rjj8q4XFVr1s8yuGMWUAQqMJBLLNZioJ7JRndRrr9HWKjpl2pj0XyiZFuF4gGyMshEWJCvzuqhx8BLZxKlEnf0Men/SAN0+eLbIqdt8u1mj0miDfVG2J85Ok7rQhQPP5CUf6iCvpa+nkf1hIV7JmHgl+xToFKGfApKO4GPUhxrIqS0Dmcf/D9aFAcEy5Qe7RXrW502sa2nKpc1aaAAV/SpPZ/HvoBpCxOkkBMgvrYFgOnAKk9TRTIhv74npRwfzq6eUpoCcGy5UoVF7xraCmDRe2hSq84YLC3JYEM3XnT4VrYaONGnoQRGJVCHSNZdD+HLVeAA04pP48LZkXxbTPRLtfoKKmtoZ1Amu5FGS7oe4kCMXH7utDd7WjSy+CS8LuOidCmzpoCJnEbP6sg2J8bJacYFXXRFQZyIXPB280z3gbp5rQB97xKwc= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0578967-d5d4-4405-d1a9-08dd7dfb4586 X-MS-Exchange-CrossTenant-AuthSource: SN7PR01MB7903.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 22:00:31.5152 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +YydhuWhGISuZ815yikD9KK5cX6N2cPLUsesU9PII8ILdJHhhxRkWldAf4+Gx/V33qHpphZe3j3xo0ycy1I77uf9Nng4IREI4y0bUNYDIDtfeQEzk+xVoAXVE/TA12NE X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR01MB7597 ACPI specs[1] define Error Injection Actions in hex values. This commit intends to update values from decimal to hex to be consistent with ACPI specs. This commit and the following one are not to be merged and will come form ACPICA project see pull request[2]. Link: https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html [1] Link: https://github.com/acpica/acpica/pull/977 [2] Signed-off-by: Zaid Alali --- include/acpi/actbl1.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 387fc821703a..c701c434976c 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -1024,18 +1024,18 @@ struct acpi_einj_entry { /* Values for Action field above */ enum acpi_einj_actions { - ACPI_EINJ_BEGIN_OPERATION = 0, - ACPI_EINJ_GET_TRIGGER_TABLE = 1, - ACPI_EINJ_SET_ERROR_TYPE = 2, - ACPI_EINJ_GET_ERROR_TYPE = 3, - ACPI_EINJ_END_OPERATION = 4, - ACPI_EINJ_EXECUTE_OPERATION = 5, - ACPI_EINJ_CHECK_BUSY_STATUS = 6, - ACPI_EINJ_GET_COMMAND_STATUS = 7, - ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 8, - ACPI_EINJ_GET_EXECUTE_TIMINGS = 9, - ACPI_EINJ_ACTION_RESERVED = 10, /* 10 and greater are reserved */ - ACPI_EINJ_TRIGGER_ERROR = 0xFF /* Except for this value */ + ACPI_EINJ_BEGIN_OPERATION = 0x0, + ACPI_EINJ_GET_TRIGGER_TABLE = 0x1, + ACPI_EINJ_SET_ERROR_TYPE = 0x2, + ACPI_EINJ_GET_ERROR_TYPE = 0x3, + ACPI_EINJ_END_OPERATION = 0x4, + ACPI_EINJ_EXECUTE_OPERATION = 0x5, + ACPI_EINJ_CHECK_BUSY_STATUS = 0x6, + ACPI_EINJ_GET_COMMAND_STATUS = 0x7, + ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 0x8, + ACPI_EINJ_GET_EXECUTE_TIMINGS = 0x9, + ACPI_EINJ_ACTION_RESERVED = 0xA, /* 0xA and greater are reserved */ + ACPI_EINJ_TRIGGER_ERROR = 0xFF /* Except for this value */ }; /* Values for Instruction field above */ From patchwork Thu Apr 17 22:00:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zaid Alali X-Patchwork-Id: 881882 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11023122.outbound.protection.outlook.com [40.107.201.122]) (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 53A2C21ADAE; Thu, 17 Apr 2025 22:00:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.122 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927242; cv=fail; b=OJxYqdY2vn4ztvwbfNB+dzdNkFH6+7dHfWEqCVro1GjF2Nkv1oggkU8bqG7p9WB8LbVojsvfTn2zaMvGs8zyEEuNoRAS00EDY4QBPXtYDF2ncdt4lFev/ffKxEfrlfhkUIe1RM/esZUTiC/0mHOCWPjByX3IHGVeZppERzLtvFQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927242; c=relaxed/simple; bh=+FeQw4Ql1K764YHCLl27B6uJPctl4rabWjWohYjgoqo=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=OvMgvgVql7ZUnnNHGIsQoDWJdUv58hABOSGMubnI9g3XLJED4N3GUjxJ+Lo5g2s+7Qbuw6qEIFx6ukXa/YDNZcU91eTFIIhaWO8XbtzKbsYvseFv5OGwkZTLt5IKsjRdYnRGUM0x8mUgS2F8rj1LPwROCr1jBR0Ubo+AhENR+KA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com; spf=pass smtp.mailfrom=os.amperecomputing.com; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b=X5jwVCGp; arc=fail smtp.client-ip=40.107.201.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b="X5jwVCGp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XRg5dWrYsLrLAqcwNSEVTtP2BYSUVZIqwFT0LpE8hq6Kz9DOOaxLsQIpMYg5OM7qslX6zIEFJLj7W6c/9U2hyWeLwV2rybnwkZv9xtFD3nyga62UNAjvtUh4uigKSFKro/aoGdpWvGUWU4cnUsMhtYjITsXD2DHnf/OVvzndG9Va/CQ+t3bp1lth+ZyO5LkvTBnREmRLTQNvgPyA7+5jARV6VcC8eOzUzdGXb/YelI3zY0rieh2mkS/dQLN+i2Oo7ccGZ9/G8VfRDPnxVe6acMFzLblGzaIzjiysU7fur7CFtCp355oBH8HSQ0HNkhLrKjcHrD9gwup2oZkUPgCnCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Z4s9zAKLfpA5cMBdhr7Ndjv1wq90/iZNU52xRnv0I4M=; b=MyHxLJ6jE+dJFGaIvOfhOOhBTQeRWZIsyVO58iuyyxHx2M/9cXxdQaKD7HXY3mmhSyzDbM/c+hEPD9CO/aAa3ljMw7LYFEO4f1T9icUO8Ibas6tbGJoxNUwDYDExmLgzuBAbZUdKUaiL3Yk5s9E/RlM5qBixpDbKaGCKPbuWZqcuLiMu+a2awTfebttQ/kCa0Rcpkj5WkXE9XavNcl2owBntXPBGjjVPkXRnNli1LSdHYUymvG21rUC5ECOCNMOXeJ3qLsM8P00u9mK3s5htivu5fS4fQEavAzIuOZ4cCKMoWgsduCytNElI3azRHrZVBiy5t3pRVYK4gP5FoVXb2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z4s9zAKLfpA5cMBdhr7Ndjv1wq90/iZNU52xRnv0I4M=; b=X5jwVCGpg/xpxskOaiQgnpA4/53vE6y8lcMPrnRJD3JFmPktWA8gfmdB/Og/p2F8hrkHEtL1KBuPpov2IuGS43VE3cr/XJ5npY8z92WLlHrFlmk7Ur1xk54gs8UrC/p/HqTDckgsnbEfyLMT1Og6FUHSAMTooaIXZ8nxGBa+bso= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) by SA1PR01MB7327.prod.exchangelabs.com (2603:10b6:806:1f6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.21; Thu, 17 Apr 2025 22:00:36 +0000 Received: from SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f]) by SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f%6]) with mapi id 15.20.8655.025; Thu, 17 Apr 2025 22:00:36 +0000 From: Zaid Alali To: rafael@kernel.org, lenb@kernel.org, james.morse@arm.com, tony.luck@intel.com, bp@alien8.de, robert.moore@intel.com, Jonathan.Cameron@huawei.com, ira.weiny@intel.com, Benjamin.Cheatham@amd.com, dan.j.williams@intel.com, arnd@arndb.de, Avadhut.Naik@amd.com, u.kleine-koenig@pengutronix.de, john.allen@amd.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v6 4/9] ACPI: APEI: EINJ: Remove redundant calls to einj_get_available_error_type Date: Thu, 17 Apr 2025 15:00:14 -0700 Message-ID: <20250417220019.27898-5-zaidal@os.amperecomputing.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417220019.27898-1-zaidal@os.amperecomputing.com> References: <20250417220019.27898-1-zaidal@os.amperecomputing.com> X-ClientProxiedBy: MW4P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::23) To SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN7PR01MB7903:EE_|SA1PR01MB7327:EE_ X-MS-Office365-Filtering-Correlation-Id: 1700a51f-8c91-47a6-6d00-08dd7dfb48a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: bOcJ7ij2vuJWF62f+yxfuCHVukF8jauCY1G/5udnuCXAeLlxqKLwjiV+eV4rubs2CU04VYXdvEiRWXQkBT/vgE4zle9e2T4OsCTlTbw5wfNuVz5SyxOiECC8lKefZgHKd4FaNBo1BkL2BdQ9xmlpnr202Hcj7E4wwKRtzWhdMmjvAfT3hE4YNQJEGcoLdV6vXP/aBDgtK1uOiqIHPNkmGAdBDfgldoKudWi4ZrtbufbLFqrCmfd5tqz085Wa56IKYK7xVgD2DEoeUCl5BFZngeBJ3zF8gGPXjI+njAcHZ7zdYFBLiCLV8a7EVSenewOi7Nzp/yQ4O87hko6932vj1CR2HDlRSYgHhUqoVA2k3G/9KnNVXyA6BMSn6PZW9TDPOT352Og/ILhlXiIMiumoj7/E0VpiZN3dWHw5I1VNGcVyIJMDFtky5wn5SnwWQlkKHDsK0jIV2hByuvIq+qiwitbTu6KdiG8p8A5ZwQzpADE8pawrfMB0jFjuKOhk3/fTHrp53GcM4cvmCYJf+Q4/32UcT0wRTcDuLQjZtfLI+Z3lf1XG8f22wLtjF0cC85C8TzhlYIG9LBwQC96Hw/lf4tjT1pH3h9nDbxwwGV8z40seaNZZQUWdeUy/GMzyPC0wj3/C6Kiw/8ZROY6NYHFEmwxDuC++W2bmuIHQXXK6z++d7NwByMqiqDrFyPE5FVGhHCgBwpl9GsWi29lJCe7ngXSN0SG+Ho5aUm6BWBTz6jbmAhTTU4QARmGJN4OPFy5R7CObPEtStWz5BGNG9KDju8ycNWkJ6Lmcf0b2txmKaa6+OuVKI77rTVTlH3sMj+CZ0w7xAP/VQQmTMgr30uzTO3KQDX8mIvQ9VBHjrz+jmIKiYmdpVH/6Hlak1e5XrsMLyVJlY0h5P1IWT5xuIgQxMHLDze/poPsDkCHDn//BIy2CPbo3nnE5U9yKgvGzknEXu8+G7qvhQ/Rp/2TfpX5yejVF9XNRZraa4oXahHh1v8NQZvE67IQl7WV4wNxlgjL18CTsp/YIaojhvVBMm1lf6Yxs4PtAed8/8VR0Edek0Lf3XS69ls2RF5XKL4pR0abvsTmyozRXS2p4TpZ2TkbA9uYOflH781IYNbUL5fDC8e+hkkdOcY9KrAp87xqNvFtmLcW8FVqjyUnKgTKCITVWaeepm/1yEzroQfceb5qVYyVGKI7cnvHxyHpHe6Aha6jzdVGrzFp0WQKW9615IkbmV4qSaRcsSlxMvPXCfaMQTJ94+b749q9L18Q0Cka3nx5RyiHSMfoHEc2RYfLrJjXKWdY2yu2aDoACgy3SybYYrvSEVzM4C2P+C8jrnuIT09KLzz6tzd/nuNE3Smh/OKv5lEWtYx1DT50AlN3Kf5anUFPk2StAgsIFgn+aMyephgTApKPbpgXZYBrjeC+jj3CETlkQ7Q726f/3UL1ok0FFfLj8HZWIPJktjQ6foJVMcPBsZPKtx04jAaUqwv5VQ5Ks2rS7vc9AZ7RnQskn2puCL3I= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN7PR01MB7903.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hSezOW90DHxJyCtX9XOaBOq21M/L7Fjsq9lldFcRsSKDnhwr31KpWWUbFWL0n3+nUYKwlLQsCidKACqipiEq0Ug0TZp0cN/4EBt5KlSfSM76Xb6Gq6yST3BpsNfOBMxDWRhoi2qiZlDKelLfsprd3MZmg1ASGdRpklG7o/wEB0JVJbFrmWpF+qZGpte2Be9RLFweOiYrPWIcVOfEsRWfgpGEOlaU2n3B534CvjHne6Tc+GUR7NPzHwFFWGfKlZQpN6lCgGLuL8DHV53FsxicQ+h1YPkKl3NlVq4gGvSDXTFPPW/qN5/RztUt2NBi3cO94Vv6G/R8/BMPqhQdyZ87uHkZqhqMMaDoWPLrTL/y9tciA9nSba/fFlPPKABZdeyIFVTfF/pTgCowD2qS5Unlw8z7t5JzvwrhDfzgMmL5HuPE0m/KEarbUHQ/B5FA13sr10AzZc7+1YzL02Atxc+ug0Az/J5gODoX21LHT5SUGdgchSuMqdXSCv2x0o0deNceYcGIuGHJNDpP2Gq6HF4vy7+pmco/wvKblEuCLzJIjjUDXeSj/64C5JwzDFvacmdVv+CXnlG9RvpH6cBx8f7OAZ1PsVfnpzVbGIqAlWwWNsAxKBvYJ8FEUuA5dCY+3pImcFcZJ+jDebzR0tUIgxI8GTe7whU7MiF/hP963mDoei7J86SOdFwSbNU3BU6vAxMwBAqQy2jb5aVxiiWkGpJBpTmZihSgje1iD78hB36hC2BAYYHAAyA2ybC9/87xH8E8njFEsISTVg7hrUsTvUUCB1Lf0vhEPT2QHo4H/J+ZBTNELIA1c01dhg6ZhhzkWQfFftjvhdIKwMx+gxqgtttXM1vaysbG8U5crh9zgpOthb0PumLp7E0rlaEyqiogCKUjceO+DdsF0MTEVo+QFo398Y/pBu7d42ci8cvgi50dhVFlFlmBRP/8+ZRvoTYji53llM8dJWjWW/OKEqwcXvDZ1+5IGsi662HcoTi++5JkzS3LYhKUtoi7N+r9cTB6/uiH/FGQaXFmIjx38sJABmYcWhPmc414S77lM6nM4jF6JnygwLRhDv7GpBYAKEAD36pY/B99CxDLzOS9xoDaZK9z/u85I6t1JpufAgXdX6Gqe72WOunO8VMG6NoI1y3+U0omLu8CbAORDhqgYxFkpiKy9Y6BytiW3nLOVfWQ0taKLoSwzdjWJFv44b6UHvoUnfikkFVfBPeLrSL7RVxtyxRD/UkrHmSgtZchCmHcmQEgwZL4HiCnGAo5kuF+i9Tv5n4M6AV89n50K5w6nxxyKqwjp+4wFoBgecWoTuflB1cDykFg5L5Lc8RRmXLbljByGMQlkN5L6ezbazoCKkUgnCCz6sCiZVaojnlGtYI5LoZOZEIQwbvCI4bmKwQEtQ91xv8vtjW+6SwYRy090uj2BUdR+BlC6sgya4H69hQyLf/uU79hmOaQcy4/HQTFyv7twcV3Z7KO+BRErmxQit25DGG7Gy7hI+UY887k99F7g9qgZB/ZLepu8EJf5e/ZvAhZgcE3mNo6amrAQW0NuQScBwbsxrSNhQthCB31MayMF8GNUTjds4LAmEJ1V79+EfTCnxdXQpML1Z+OlGY7qRUJz1M4hzAcgZNU43+65bl8yIilgsg= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1700a51f-8c91-47a6-6d00-08dd7dfb48a9 X-MS-Exchange-CrossTenant-AuthSource: SN7PR01MB7903.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 22:00:36.7774 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pmXPOBKF8vVvWuLufil+6O+W4a3PYSDVwfsRjzTgVjo/Q9B7OgiyMku1YzsbiL82kkX85U4HBzu60gaoImLjOaQKTbtU9i10ZB2lIh++TmvuHnidD8HEiqXbg1cj88DC X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR01MB7327 A single call to einj_get_available_error_type in init function is sufficient to save the return value in a global variable to be used later in various places in the code. This commit does not introduce any functional changes, but only removing unnecessary redundant function calls. Reviewed-by: Jonathan Cameron Reviewed-by: Ira Weiny Signed-off-by: Zaid Alali --- drivers/acpi/apei/einj-core.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c index 47abd9317fef..ada1d7026af5 100644 --- a/drivers/acpi/apei/einj-core.c +++ b/drivers/acpi/apei/einj-core.c @@ -83,6 +83,8 @@ static struct debugfs_blob_wrapper vendor_blob; static struct debugfs_blob_wrapper vendor_errors; static char vendor_dev[64]; +static u32 available_error_type; + /* * Some BIOSes allow parameters to the SET_ERROR_TYPE entries in the * EINJ table through an unpublished extension. Use with caution as @@ -662,14 +664,9 @@ static struct { u32 mask; const char *str; } const einj_error_type_string[] = { static int available_error_type_show(struct seq_file *m, void *v) { - int rc; - u32 error_type = 0; - rc = einj_get_available_error_type(&error_type); - if (rc) - return rc; for (int pos = 0; pos < ARRAY_SIZE(einj_error_type_string); pos++) - if (error_type & einj_error_type_string[pos].mask) + if (available_error_type & einj_error_type_string[pos].mask) seq_printf(m, "0x%08x\t%s\n", einj_error_type_string[pos].mask, einj_error_type_string[pos].str); @@ -692,8 +689,7 @@ bool einj_is_cxl_error_type(u64 type) int einj_validate_error_type(u64 type) { - u32 tval, vendor, available_error_type = 0; - int rc; + u32 tval, vendor; /* Only low 32 bits for error type are valid */ if (type & GENMASK_ULL(63, 32)) @@ -709,13 +705,9 @@ int einj_validate_error_type(u64 type) /* Only one error type can be specified */ if (tval & (tval - 1)) return -EINVAL; - if (!vendor) { - rc = einj_get_available_error_type(&available_error_type); - if (rc) - return rc; + if (!vendor) if (!(type & available_error_type)) return -EINVAL; - } return 0; } @@ -791,6 +783,10 @@ static int __init einj_probe(struct platform_device *pdev) goto err_put_table; } + rc = einj_get_available_error_type(&available_error_type); + if (rc) + return rc; + rc = -ENOMEM; einj_debug_dir = debugfs_create_dir("einj", apei_get_debugfs_dir()); From patchwork Thu Apr 17 22:00:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zaid Alali X-Patchwork-Id: 881881 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11023122.outbound.protection.outlook.com [40.107.201.122]) (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 1EB0321CFEA; Thu, 17 Apr 2025 22:00:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.122 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927246; cv=fail; b=WlOOQd3LTa/S8SqFeJiz3cLXhzzO1jfPuNZ6j/j2GGYf2nC4IE16Yot/IGPGgqfYmH9TNd/A0OQTUp7K0UGYRpf2rKaIisw7ssHCKrZ+0vw45e91FQ8qTIV53mm37Y73GvybULdPKJjMTUkNEWKs1V4H3bEeNio60FRfyn1UOnI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927246; c=relaxed/simple; bh=lY+RHFhlgBCOVWT4R/5hi/RN1INSM5BGBuzlNK0Qx1c=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=bGkjLqesTTg20fOmxySjJ4hFRtbfXYgUJhT4pr7F32AqxLjX7uII5qkMgpzBL8aQuccVg0lEvAMrthUzVkI/GUXBo8GhI4CcngPKGIuB12RIkys0pfezREm9MnF3MfLUCc707tUz/QGf65OFf5Qxgl6Yi3rURTOun+BumxTpomc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com; spf=pass smtp.mailfrom=os.amperecomputing.com; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b=RoLJ3XWw; arc=fail smtp.client-ip=40.107.201.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b="RoLJ3XWw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NV6SsH0/SRFaxySVSdRuvkNXTDDy5oRmNa4Er54YZDA7xoMYi3Pst9U4XZjdvDTjq+qHMNN2+JWbURPo/Fq8fo+soQKAAhte4Yfx36BFu7Nyc49fSacjJBX1Y2xeWTo9VXWiOMukKkwayIe4qMbJ6JUq58qAOkMP3szKwvFMqaD6QqyYbM/LcvzrJri5C1gTuZC+W3nJUV+UEHU5+g8/qGYq92dXA0xC3ZtNqi7q6Jef309zgIRstoxBU4Syefcs4ZKLnwVr4+1ZRcam1ibJNnCQjdvftojAodXmsTl2xdMNZmSJ2sLTfi10Ozbmpbm9syonm68kBaR323M/DFz6kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BquAVzk5n+UIKpX4MWOPjCBYEX9yuzjuEmrEWYq9jzA=; b=gZZraDVHh2SqJxvcanmPkt2zVZ67MI3Su2LlxLyyYtMbwyy1o2flNSJmozqBBR1460Kdaqxg2e+kgWc+NU22z1purBZwFibxYZM+8yIMMrD6Vemyo4ktiROP8vlnCEUso+Adhdxwsh82WvhHvXg0IDUR6nrIYlFkIYY5EwBhfG4zuRWS+J3XkfAp3F9mAYq9Q8rQ5/tnD1NHKkhB3ikZrrKP85Hus44nvXOjv3CG7ea/YIwvEVtFbnyfNzPOqUJaeI4T+KZ/ImovYMEB12V7Ug3dJe97XknjLABPIehMYqZ3jFmSpgA9KMl7uzF9Fc8M0RTy+GyI6z78NsZlLagDlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BquAVzk5n+UIKpX4MWOPjCBYEX9yuzjuEmrEWYq9jzA=; b=RoLJ3XWwXYU39ppQOiZJYcUdtFO8ATLvyMDl1fJhwF6C9PQ/04MUv/VwNIAQG8QQRQ3eQYbb+kmuvMj9yGKzjGGFSRvzSIVLQ/9rS86cPeOyWM37RWSIKXkTFlQtK84ovE0YUsMlBH1ecRbWWaTn1KS2sQFmgk0r/Ek0KcqbZCE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) by SA1PR01MB7327.prod.exchangelabs.com (2603:10b6:806:1f6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.21; Thu, 17 Apr 2025 22:00:38 +0000 Received: from SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f]) by SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f%6]) with mapi id 15.20.8655.025; Thu, 17 Apr 2025 22:00:38 +0000 From: Zaid Alali To: rafael@kernel.org, lenb@kernel.org, james.morse@arm.com, tony.luck@intel.com, bp@alien8.de, robert.moore@intel.com, Jonathan.Cameron@huawei.com, ira.weiny@intel.com, Benjamin.Cheatham@amd.com, dan.j.williams@intel.com, arnd@arndb.de, Avadhut.Naik@amd.com, u.kleine-koenig@pengutronix.de, john.allen@amd.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v6 5/9] ACPI: APEI: EINJ: Enable the discovery of EINJv2 capabilities Date: Thu, 17 Apr 2025 15:00:15 -0700 Message-ID: <20250417220019.27898-6-zaidal@os.amperecomputing.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417220019.27898-1-zaidal@os.amperecomputing.com> References: <20250417220019.27898-1-zaidal@os.amperecomputing.com> X-ClientProxiedBy: MW4P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::23) To SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN7PR01MB7903:EE_|SA1PR01MB7327:EE_ X-MS-Office365-Filtering-Correlation-Id: 2eabac2f-9f24-49c4-0335-08dd7dfb499d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: JoiMOEpC/EGWpK0YV306J1YHjvql2ja9loyrDzKYUW3EL2UCwwQ6HNT+7c2BXZAYWAXZxBGRFXrAvK9FPp66RZiG96Km3lWO/KGgIlsul6IV8CI9e0V2oyekrweQ3naxUbytQI0b0Qlcd1/OlYFpEU2luhJ4Wml6Rd0siWorjm5V/Pd8xmF/lazFFfJKlEYT3DWMsKVIS+gHITnmcIQaDwk9/BhBBBeZVwOhTzSuIugXNBPZVk+pclrVAvILWLYUGtKSpzA3nJxSSYH0gGNJ03kP1fuRnPNStaDfqv7FQe5UAdj6+q/pjz/D8FUXMCjCPmuRGhlaHZ9WjU0NWAlIoBHw/pOhSKUHcU1A4bDIsrSeItEvL4uEJ2lNHStjCb9JBHnLLDQpI2W0yv1c4dykuEICWDsrO1KW1rau6v4zbxe6ATEubRFKLm95aP6Pelp/t0RdSS7GOvJrF11D/TuM0BKhYJiVOg8XW2QDsUxCtNyRDB+w/93giv1sjGWNhNry3iNsPmiHI9AVAemJU4HjXy2GEx/ffMffok8Gc6frE4g4hYZfqY/ivNz0gyowrBZPht94j/q/VXguSywubsKRrhqVmfyXbz3RmBSXK7KqXLPeNAc8EECycevUrRoEyrnFTtxTHXwrnu7mtPHCNUx1/jRLOkaCg9DPPrmCrmMbAtaIWjQ52IXIVlmGRZNzFXIIdtEVYG8vIjrUQM77pTdarVyRClNamq23zOYAaSd7fezbrE12ytEo1qI+rHNVre3y6GjWShGI6R6z9iB9Jjdbc38ZuoR1OZYYaOIsLKkDvPfh91DyUZZWtlm0o5KdEWauDqr0+HcYmV4vS12uLxdEK1/1uH6+OlrvKFpR6Y9CsNy9gGrur9K5m6paSTA3MrHJ7RW16ibkwRjWIOkeGbQBUQqs2fhJ3PKF0KQUaaWAJf4YzC/hTEYtwe9Wq3oGatb3S6wzCJyybbd53IidgTj0Vix4CR7mrfaOnRdfvO8iOH7zLIV1f/Jn8oZwIJtusDaBjQLRDDZsTLkOCD6+jbSwbUFlDAe+8YsoRGkIBkaUy8GytrrjjbkPueUP6p4E6YsvA6QMqPZmKstr45DWNIrYuV4VHAUsYXCQpDQM/o8OglsFTkDuF88axYvxnngQuQuv2a0zpE+ciIT0UbgsJeqmstwxDg6uhReIm9DUZroq4ERsgzdCv44iwBuH6FzaRD975l0me01e+qZQyIBBaKFcVH6dIVaTRVV/p9JURtypdvveQjOcslRk6hdc+gVylJG55VGzfaqixwc/VhwSbhhJyiN8MBxn9YPzV+4tocRrVfVhX7gImQnsNI2HQiPr/vqTvFCERAbTTpAhkBzO0oHpPaV4A9hQTDUmJOMWdallRWKU89nnIrC4JrZlHlCZ+10jfP4Y+hynigBD5+b/hGhqiQnpH4tQF85TXkZ4c+IvthH2yC7rn47izbMBk4fDvI/lYey5TuDqBVb1Gv5XKLudMI9v/4ezVW4Z0xN69quhg+s= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN7PR01MB7903.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0770pJ3U/bcP3mgkiQ89Z4VxxAhRg95hllRoHMcAgSagFxygGuNnlbQA/93SRG+hKKG2Q+XJyghfb/ezk21R8Xmz6cxg0TDA9O5zvZ1qEEDYBlvu1j0fzGyr4EY3wYpcGxGuRX6z5Tc1SqX/vT83g1VHdtjsBMw54MYWu5SLJLqb2BNzJCcmAE+8JWFagg8c+orfvBXkSwyAdgFvxWJBqOWtuycI1B8jw1QrvFJzs/wGUlJAX4YPDrThyiUvbYNidT9/eOC1u0rPOHNzxF2vez1SZ11kmkqCvktDSW8K36QnE+PIP3QmByrhOyEAUAsnBaLvcFHut1cWVuP7T6gNRyuBZX2or8YAZbqd0hefgftDWGPHyuLyy1Ut8GnbWmdbKAf8iCN1iK7nwsY266Ms1BuT3R0qLFWf09bLwpD1kyZzicgcdHudh6EEILu4CAWyHZPUp0wNiVr0eN4KxxIPWxc393MedUQ6mH727z3gH75UURSYbFv+ulaeaFbNg0Y5qMLg+HopMBBxMhAF2kS2U4Epl0d7UpNebYFaa8J1T/tL/7H8M9sGW/8gO5Yb4GgQBLFQHvAxdM4D/Flq4Iq5og7OMxZXf99v/QHHMepBiXzS9ncLD7zWGBw91AkwCtmzW2UcDmghxqqLUZzeUsrGbiP+RFVPneo25senkZxD6mTY86+JH6AWOedNQpWfxsKbAFkDYIGIrFANwwUbEtaBsEY/P82KiZD0JCqdcCylMppkzz9dnaSOOn1eF3r/6/U+K2U4I4rtNzKrDnDa3Nc9dUdQRXiCrMNc09iFa1r6fe3uA5vSeQmXng2sUD3yluEJMrXKC5aGXAtBudOnOKdGm2iKHUx4iNPG/uYXraX0VjFC89u3rDoIMuvEZxgWAXNXJXjjWbeyOL2Lqld/yOPRcsZYJxj7exyYZ914EB3tH1MI5jhiHZf1aK07fYfZA60bl96Q0pDmSc5mnuoqt3AyV4PETPqvGrXXgF9EKWycx5jlB7FEVzKV/NC/ZWMLL06kkFLQXN/yOJ6DvJobskcbCXQG3mF9dYuLC6PWqEbJABTc6pmBB9FLXfj+5RUVGMnuT4jpgqmFLgAvSnX3UNq4L6a8aggGIkW0kTTRHEMxfM53jpCVx3Q/dnlFzpR0rjHpfVhOebo6YVQiRFqMwqwSoTy4hG+58BTB6wdXz55rJMQVp/gdJYtB8+SR/5soHtSoNhHTnu9KJA+jZD+K7onWcOA0+doCtw41vgsiNCLg8uVXEZmDUvFH7HXtj7+HZQe9lSH4YKTtrt0VjcrE89f+2Wsvx1+/HHgSHsQSxWXEU1uFYDkfjUhDdR8p3Zz3Z+mrC3R/T8gFVjsOZQudiQg73QwcVovEsPCQrNBRa+r8kvHJxbwxwtiHvtIhs87wAmZXWKw1ydwAWYqxdpZvo1k+Dy7wlUMoOZKeLMZAd1I8xHVRu4KpDkzahWgcUQCkFYO83UJFs0AVmbcVys709HuhHDJRVpRzr/X4amspVwUwCL9XoT7M29hS/FTbG+7c1/dfPORKem2bz4YgQAOs8SGJ8oJd0DsiIUbxqX/F97c0FB77/6zkqRl5e6O03MUF8hsomjUkoGD6sVFAtMUXTmAmLpURg2KtvpeWW4TfNTVJkOQ= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2eabac2f-9f24-49c4-0335-08dd7dfb499d X-MS-Exchange-CrossTenant-AuthSource: SN7PR01MB7903.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 22:00:38.2888 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EHce/GmWmX+Q9nqtl41fOW69jLlCsKINQXylXkPJ80+oE6yiTLpA1YXmhnXLkWTK4vgPv4YIlB1pruKAFrGyd5eGvXmGY/91YyyMUdHHg6qNJQHIvTykffJjEl9/w2XB X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR01MB7327 Enable the driver to show all supported error injections for EINJ and EINJv2 at the same time. EINJv2 capabilities can be discovered by checking the return value of get_error_type, where bit 30 set indicates EINJv2 support. Reviewed-by: Jonathan Cameron Signed-off-by: Zaid Alali --- drivers/acpi/apei/apei-internal.h | 2 +- drivers/acpi/apei/einj-core.c | 75 +++++++++++++++++++++++++------ drivers/acpi/apei/einj-cxl.c | 2 +- 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h index cd2766c69d78..77c10a7a7a9f 100644 --- a/drivers/acpi/apei/apei-internal.h +++ b/drivers/acpi/apei/apei-internal.h @@ -131,7 +131,7 @@ static inline u32 cper_estatus_len(struct acpi_hest_generic_status *estatus) int apei_osc_setup(void); -int einj_get_available_error_type(u32 *type); +int einj_get_available_error_type(u32 *type, int einj_action); int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, u64 param3, u64 param4); int einj_cxl_rch_error_inject(u32 type, u32 flags, u64 param1, u64 param2, diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c index ada1d7026af5..ee26df0398fc 100644 --- a/drivers/acpi/apei/einj-core.c +++ b/drivers/acpi/apei/einj-core.c @@ -33,6 +33,7 @@ #define SLEEP_UNIT_MAX 5000 /* 5ms */ /* Firmware should respond within 1 seconds */ #define FIRMWARE_TIMEOUT (1 * USEC_PER_SEC) +#define ACPI65_EINJV2_SUPP BIT(30) #define ACPI5_VENDOR_BIT BIT(31) #define MEM_ERROR_MASK (ACPI_EINJ_MEMORY_CORRECTABLE | \ ACPI_EINJ_MEMORY_UNCORRECTABLE | \ @@ -84,6 +85,7 @@ static struct debugfs_blob_wrapper vendor_errors; static char vendor_dev[64]; static u32 available_error_type; +static u32 available_error_type_v2; /* * Some BIOSes allow parameters to the SET_ERROR_TYPE entries in the @@ -159,13 +161,13 @@ static void einj_exec_ctx_init(struct apei_exec_context *ctx) EINJ_TAB_ENTRY(einj_tab), einj_tab->entries); } -static int __einj_get_available_error_type(u32 *type) +static int __einj_get_available_error_type(u32 *type, int einj_action) { struct apei_exec_context ctx; int rc; einj_exec_ctx_init(&ctx); - rc = apei_exec_run(&ctx, ACPI_EINJ_GET_ERROR_TYPE); + rc = apei_exec_run(&ctx, einj_action); if (rc) return rc; *type = apei_exec_ctx_get_output(&ctx); @@ -174,17 +176,34 @@ static int __einj_get_available_error_type(u32 *type) } /* Get error injection capabilities of the platform */ -int einj_get_available_error_type(u32 *type) +int einj_get_available_error_type(u32 *type, int einj_action) { int rc; mutex_lock(&einj_mutex); - rc = __einj_get_available_error_type(type); + rc = __einj_get_available_error_type(type, einj_action); mutex_unlock(&einj_mutex); return rc; } +static int einj_get_available_error_types(u32 *type1, u32 *type2) +{ + int rc; + + rc = einj_get_available_error_type(type1, ACPI_EINJ_GET_ERROR_TYPE); + if (rc) + return rc; + if (*type1 & ACPI65_EINJV2_SUPP) { + rc = einj_get_available_error_type(type2, + ACPI_EINJV2_GET_ERROR_TYPE); + if (rc) + return rc; + } + + return 0; +} + static int einj_timedout(u64 *t) { if ((s64)*t < SLEEP_UNIT_MIN) { @@ -646,6 +665,7 @@ static u64 error_param2; static u64 error_param3; static u64 error_param4; static struct dentry *einj_debug_dir; +static char einj_buf[32]; static struct { u32 mask; const char *str; } const einj_error_type_string[] = { { BIT(0), "Processor Correctable" }, { BIT(1), "Processor Uncorrectable non-fatal" }, @@ -662,6 +682,12 @@ static struct { u32 mask; const char *str; } const einj_error_type_string[] = { { BIT(31), "Vendor Defined Error Types" }, }; +static struct { u32 mask; const char *str; } const einjv2_error_type_string[] = { + { BIT(0), "EINJV2 Processor Error" }, + { BIT(1), "EINJV2 Memory Error" }, + { BIT(2), "EINJV2 PCI Express Error" }, +}; + static int available_error_type_show(struct seq_file *m, void *v) { @@ -669,17 +695,22 @@ static int available_error_type_show(struct seq_file *m, void *v) if (available_error_type & einj_error_type_string[pos].mask) seq_printf(m, "0x%08x\t%s\n", einj_error_type_string[pos].mask, einj_error_type_string[pos].str); - + if (available_error_type & ACPI65_EINJV2_SUPP) { + for (int pos = 0; pos < ARRAY_SIZE(einjv2_error_type_string); pos++) { + if (available_error_type_v2 & einjv2_error_type_string[pos].mask) + seq_printf(m, "V2_0x%08x\t%s\n", einjv2_error_type_string[pos].mask, + einjv2_error_type_string[pos].str); + } + } return 0; } DEFINE_SHOW_ATTRIBUTE(available_error_type); -static int error_type_get(void *data, u64 *val) +static ssize_t error_type_get(struct file *file, char __user *buf, + size_t count, loff_t *ppos) { - *val = error_type; - - return 0; + return simple_read_from_buffer(buf, count, ppos, einj_buf, strlen(einj_buf)); } bool einj_is_cxl_error_type(u64 type) @@ -712,9 +743,23 @@ int einj_validate_error_type(u64 type) return 0; } -static int error_type_set(void *data, u64 val) +static ssize_t error_type_set(struct file *file, const char __user *buf, + size_t count, loff_t *ppos) { int rc; + u64 val; + + memset(einj_buf, 0, sizeof(einj_buf)); + if (copy_from_user(einj_buf, buf, count)) + return -EFAULT; + + if (strncmp(einj_buf, "V2_", 3) == 0) { + if (!sscanf(einj_buf, "V2_%llx", &val)) + return -EINVAL; + } else { + if (!sscanf(einj_buf, "%llx", &val)) + return -EINVAL; + } rc = einj_validate_error_type(val); if (rc) @@ -722,11 +767,13 @@ static int error_type_set(void *data, u64 val) error_type = val; - return 0; + return count; } -DEFINE_DEBUGFS_ATTRIBUTE(error_type_fops, error_type_get, error_type_set, - "0x%llx\n"); +static const struct file_operations error_type_fops = { + .read = error_type_get, + .write = error_type_set, +}; static int error_inject_set(void *data, u64 val) { @@ -783,7 +830,7 @@ static int __init einj_probe(struct platform_device *pdev) goto err_put_table; } - rc = einj_get_available_error_type(&available_error_type); + rc = einj_get_available_error_types(&available_error_type, &available_error_type_v2); if (rc) return rc; diff --git a/drivers/acpi/apei/einj-cxl.c b/drivers/acpi/apei/einj-cxl.c index 78da9ae543a2..e70a416ec925 100644 --- a/drivers/acpi/apei/einj-cxl.c +++ b/drivers/acpi/apei/einj-cxl.c @@ -30,7 +30,7 @@ int einj_cxl_available_error_type_show(struct seq_file *m, void *v) int cxl_err, rc; u32 available_error_type = 0; - rc = einj_get_available_error_type(&available_error_type); + rc = einj_get_available_error_type(&available_error_type, ACPI_EINJ_GET_ERROR_TYPE); if (rc) return rc; From patchwork Thu Apr 17 22:00:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zaid Alali X-Patchwork-Id: 881880 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11023122.outbound.protection.outlook.com [40.107.201.122]) (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 F0D62221577; Thu, 17 Apr 2025 22:00:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.122 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927250; cv=fail; b=qO7MLgRin6QEXWhp6iS3TO54/5aDjxZvqjsCisArLqM9SxVgxnPVILcIOACZcUANRsUVBmG+rX3B7phFnT5+M6kd2sdURoWM9IgpKUVjWb2/qqAkdHJQiyu8OSPLuDC5E7ysTGZc1kAQROfpZKvuXZLFGjgj3v9XEJP3XvzQW3w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927250; c=relaxed/simple; bh=HESRGjfbYVVJKi+eLvJZkbNDnJS2bwpLvNLcvMU/aA0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=OTAoIrfr3q0P8mPaFwbFA1BbA7VeRPXcbt43NiPzAKI7Sk9WKjuUWGsjaCGypv/1otXovCjAL+4zHJhKc74D2OzOzeTQxVtu/kLKVJpBdbObJrvGB1DZyIsqZRPiSR6eTdKN1sPTa3sZls//0Q33EmVVWvba+Zjm1w/1UFPxl3A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com; spf=pass smtp.mailfrom=os.amperecomputing.com; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b=f/7K1vdz; arc=fail smtp.client-ip=40.107.201.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b="f/7K1vdz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bI6slOqAu+uDBkAANZlP56eOyr7MmGyx9KmXKICNELGbeHUv6GqI35JZNrFnvF/trpNXDwaF0D0B7MG87LQnSvShd+SpunCy+Ku558nt/wB9LoPTnUvEvZirzGLn0L0xWett08aEMNbrPdiGQaT7Nmap7DnsxIwgKl0Q64O8W7mp/6ArTIGGhzLGshUQw+jvyj79/B8P5CiaS1p6IAa/L6/hsmPtewKEVT/Abhdhn/lzJBHciAYtNIwgkM32mdszX+v740wmJlzNl1LGA8EdFp9Xnk1siKheixe2+Vu3M6JW0Zl9EDH2P4S6t/uRFY+N9/ctPYGyXfyry7fMcFRhbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v+s2chpCcfgm454VHOiaifyeDxInp+Kp+bsxGCxZVo0=; b=lYdQM3hLHq4KqokbdKuezg3ySfI9HZcheAEn8uHkVKixPwkkciWAXlo9GsDy32tqq6eYt3S6SXhFJxzQprRKp7ByA0ANAXhDqdPH6rcsE8PoUUWGUGopa4CV8ilHWuPZpBbq7lmhjT9YsSfSoY5a4T6WqmmFxSCkub/Jts1J/BFt4jw+gyAFoZF2lyQKsZup9SPuhS09DIqH5Jyfg8CZGsAkyuj/hi4p6DI1AmAXcT30odEzjI8TFUt2JO+MBSFTtizEmWOR6Vy29c74NviDCSPVELZpkDFL4xVmOyavcCjWM9q7sDxMaE7lwSbAGsroCufO/Z8AtBA1pEzu6K4UuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v+s2chpCcfgm454VHOiaifyeDxInp+Kp+bsxGCxZVo0=; b=f/7K1vdzWmljp2dbxDkQIhTfWgQ7QslgDU4w4QCcQSuils4tPENZZPPuPqAWkJllu67pa3TlwzCeYkihtNED1YgPHHWnZSIC06Q6fWLmL9kIRs75wmlgb3qqx5mvAzy3gYIF5DBfy3bOrJrp9ewIDPpL4oTRDxv+RojT1l/D8DY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) by SA1PR01MB7327.prod.exchangelabs.com (2603:10b6:806:1f6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.21; Thu, 17 Apr 2025 22:00:41 +0000 Received: from SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f]) by SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f%6]) with mapi id 15.20.8655.025; Thu, 17 Apr 2025 22:00:41 +0000 From: Zaid Alali To: rafael@kernel.org, lenb@kernel.org, james.morse@arm.com, tony.luck@intel.com, bp@alien8.de, robert.moore@intel.com, Jonathan.Cameron@huawei.com, ira.weiny@intel.com, Benjamin.Cheatham@amd.com, dan.j.williams@intel.com, arnd@arndb.de, Avadhut.Naik@amd.com, u.kleine-koenig@pengutronix.de, john.allen@amd.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v6 7/9] ACPI: APEI: EINJ: Add debugfs files for EINJv2 support Date: Thu, 17 Apr 2025 15:00:17 -0700 Message-ID: <20250417220019.27898-8-zaidal@os.amperecomputing.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417220019.27898-1-zaidal@os.amperecomputing.com> References: <20250417220019.27898-1-zaidal@os.amperecomputing.com> X-ClientProxiedBy: MW4P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::23) To SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN7PR01MB7903:EE_|SA1PR01MB7327:EE_ X-MS-Office365-Filtering-Correlation-Id: fa6781f5-16e6-429b-285d-08dd7dfb4b4b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: dY5waXHTybDUdcBoT4vrMvLpPVyk6IzdOxQWbyINnrmsYx48nuZvz6jnOKO97AonNYouBU2qxHGCrhb5YJJ65D1CDHhzbA/o1Or8t/xLPUWz3o6uZBblNdGzuWurbWw4GIp53lYYDQii3BOkdvUGe87HtFcUFUA0uKJSs2R9uJ2/mfXlVmTjYpJgZXDyi5I9qCP9P28bGUEfm15X8tCtOFMBh3XuOznD6NgDZXkVdaNuPf+UOEcJEVYOMfZI7NrsWhlIKcCcuXAelFW4Dz5fnkgfg+OLWhihIX7CVVws/TXnvpWdBuBVgHmkF4UJQctSZAhNgily4sJtszlvB89ci8AtQKCaO8Y4XVyH6xkJDwbqGGAbg9Xt9lMHk+I5xm8OYr5PoYlVrhclaSYxd0eW5HRzR39lJ1uOSXEaZBiPyU6apG4g421xSFp6MKM7FupHvVyb8Sw45lSzLf6928eVqqb+cBVj7vKzissdiNJc2hDpi6aFiRsJPRxzfw5rdekIXVgOAtAC+g7bg38Z8++vuImrU6hXJRsXYcntyG+9I6pFJl3TNCMq1gAgW+Dea3WKPFYg9S2FhVRDfBpJ1H+gTUy4Kct6deQKKovBpGLU5R0FhdzwhVWo6wLApQgLMIOLcBksr+2Ltx/4TeSj/3YpsufjnPcJMt+35Z69SuYOtsN5vh/s7eZV3BbZXGyFsAXvsPhwbQHdKvU5U7fEvkpTQmwzyLyzcFfRg4wa9L1y2OkMQYkhSY1EuUUaCYZixM1KRXBkX4VeEZrLFlgB9yflw7TwqrjczqepNHSHBV3xFBByaMjBd1x7Y2zYA1Yz/TBiWdQyuSOfL9kCGEaDb2SWrMLC67DPNplbPfxFOf9YA11Y539wXzCTOXE59L6dSPx4+3p532BQ0N5TqW5dLVUj8LiNORmmbalSsDvHHyt4GJUEP30kZIDrAz1f2Y3p0kT08E5RfI6CLmmodkkSVw5RIDp+ndxHi0FNDOApQBnaHRtg5booTDgpsW0RreZWpANtw9/HicWENdn34/OoBXjcPmOjufpnPvlbriLsx8CCZmHf7DqEFJjRI/1yn0LPDXNThfnQaYIgil6mDRQiIjxuNSIEIR+k/OvASkC4atIoeK+TR1wvg5Pdn085y61RX9Nw03j7XFaL5cNOCVBJ1j8MZaLPRcHxeo1Hi/YcRzXemBTCtyMwN0uZRyW6dpdLTMWVdUzji8elyrsbj+q66QdlHeT1l0M10dW1OyUy8D+5QXP+pfzqhNTiGve+XYqqG37iyDGUGt+OYQee7OvTyeG9Ax8urb96C6EJ4u40ntqxhIz51IbQ88C6Xbep5O/8mFiW4q5fAccer5QvKg+hrZd2XHo2esIc2cEjZiM99/oKt/14xgg7JSrAqUljguZ2fZ2s0qW04dfJZaPoASm0aLOp6nNgu9xThijyG98MPmP1dwi2zhc7r+1SK47kAXasNPdDSGs+3A47zljdjkrDhGLXF2AxQ0Xx295PMuUDwuvQnzQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN7PR01MB7903.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vTk2DoiJB6XrpiMDC3JZNAAA+wYU0uHvQ3rL/+/cUnFl+RlmJfhAiqyjoh/UrkGcYmUgIRg5D7WzOx2SQvbkpnZ5EP5R9fsvgj5oNwGa4tAp/dr2gkcBAIsXvD+weV2lUYpQBirfoHkzfS0uzmqC2+kwzcEPq234kTr/MiBaqALNGDAXqaSpKYUPxlFEyBrmVFmVomDRuK4E/9jctK/wo5eO2bjsdfvNU9Y7lAVhRuttKcT2ArfLRAswi3evGooSfFsPRNlMorm3Aw8Rfwmv6jQwMkOII6Hw6v3sFk4Ls57osKB4QUxCJk9K5tknQXSvCzE3wOtj4ZJu29FEe1znIP30pRtL94EpQLBpNUR9EjMGbxnormivm+YXYf7sd3C+Me1eGxQu1XJtVI+HCFgkKgGWeSaTC9sKLMAsjcrvIFcW50rc0aaUDgtrJwIfprmOKnbRgIPP2FST2UblXBKMY1iPL/J9pb+A8OZT5+aV0XL4g/y2f+keULCJWVxoblk+hn53ZGqUajBULFHijOUxr5Slfv/tvOCo0yqJ8Wa0u0CY1oc35mQtlMUrvvqmjnt/2j1MEW8fcCLq/KZmAy+HQSDU/DVH813Je+V9ulQ6NwyEbMFzikgvru1Dyw/AobZRY5sL4Denu18nzmkVPYejn01ZEuIqv+JPhYkf61epaS8p627gU+KxCeDEzy7X4RoAKIuhuQGUYuKhYZPmHvLFFB/wOxugMXcGlQ2nwn9HdXnEKM5WCXNJ75Px31XEW+7ub/UiMSwYCg+9+U7SCW6Bi7vwuT9vdXMStCYTQBQo90g4fWKDpPkm0GW3l1jQnlfgTrnDo3XZdQ40yDaXCODF/zXDORfLlEG8FFFuT9ztK5ILw+OVad952ujh0RdJugUCJAeDO3j1fUB83QdGTrtZ/dH2P0AHBNQ0yQKTdE9EDa4skysmeypBEQjDWi+2V1Z747VCaS2LXC0V033bAgxxkketsBnHRYSN3Y+TckAzmVxs0RsKrn7WBgQGKJq+yiRJDfOohIVifTN7I1fYJKtDCHAQLsQZtMVHjWIczVcQyA+k+ltCn9HDWwoaK4JYp20ZVBkb+r0kUP1LICBiwTub5+KUaLLPR/iEipODwAmtZQ8I5KEKaw0sXru/Qd+ObZXz28/qsSQjBAqax7EJzLIhxZPBGQ7pGkqGBh1mOvZ1hscvIqwhf4EviygRB5KKM3wrJRddzTHcaTdBuiAIkn6+0xrPhbUNKwKeUt/xF0vuZGtP6Myjch16i1mKTLjxBU+J2R/nSmwS8ps+VuLDy4BXsyWP7UiWhIICqZsrrucdvLAGK0U4WSs87ZOcwrTtTEkU3QBeAEkGv/kTdeghg5ImSDtnrxsTWzehfYNzqLa+hGOrt9yB07ZcE3QdOY04ilSDa1hRMlX09lORS5XzrkUNe56EoIwX/eCOgUpCzsEHIxHbm79pOxsDeHRzg6HHq7Weh+0H+TbKk0jKF0FIsAmMwE9UwA3twYM/xUNYLhlxRQgpcIqIzd5buB42/Xm0cSWoJb9Ge58Pb4/vDb8ydC1ONeDGftTGoRvYghDyrQs/rjBBw5bpRVuxAKaGGXUMylqhUVR67IPnkCbJzl5uKSvE+wD5x07iVuUK1/rnKPHjCo4= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa6781f5-16e6-429b-285d-08dd7dfb4b4b X-MS-Exchange-CrossTenant-AuthSource: SN7PR01MB7903.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 22:00:41.1474 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Dc900x8kHshDrHrQa/Q3KZlW5V+q9rt95QBn3YD/r+51mOQVACbsp9esb7FCuAdQLp9LbB7jVUuJuJol5OQ/XdBgymvjGEcw2ZC/V86aYdnkUSfMp1GKgBimFVEj8pYG X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR01MB7327 Create a debugfs blob file to be used for reading the user input for the component array. EINJv2 enables users to inject errors to multiple components/devices at the same time using component array. Reviewed-by: Jonathan Cameron Signed-off-by: Zaid Alali --- drivers/acpi/apei/einj-core.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c index fde6e01f66eb..2c22615ac72c 100644 --- a/drivers/acpi/apei/einj-core.c +++ b/drivers/acpi/apei/einj-core.c @@ -33,6 +33,7 @@ #define SLEEP_UNIT_MAX 5000 /* 5ms */ /* Firmware should respond within 1 seconds */ #define FIRMWARE_TIMEOUT (1 * USEC_PER_SEC) +#define COMP_ARR_SIZE 1024 #define ACPI65_EINJV2_SUPP BIT(30) #define ACPI5_VENDOR_BIT BIT(31) #define MEM_ERROR_MASK (ACPI_EINJ_MEMORY_CORRECTABLE | \ @@ -107,6 +108,8 @@ static struct debugfs_blob_wrapper vendor_blob; static struct debugfs_blob_wrapper vendor_errors; static char vendor_dev[64]; +static struct debugfs_blob_wrapper einjv2_component_arr; +static void *user_input; static u32 available_error_type; static u32 available_error_type_v2; @@ -689,6 +692,7 @@ static u64 error_param3; static u64 error_param4; static struct dentry *einj_debug_dir; static char einj_buf[32]; +static bool EINJv2_enabled; static struct { u32 mask; const char *str; } const einj_error_type_string[] = { { BIT(0), "Processor Correctable" }, { BIT(1), "Processor Uncorrectable non-fatal" }, @@ -718,7 +722,7 @@ static int available_error_type_show(struct seq_file *m, void *v) if (available_error_type & einj_error_type_string[pos].mask) seq_printf(m, "0x%08x\t%s\n", einj_error_type_string[pos].mask, einj_error_type_string[pos].str); - if (available_error_type & ACPI65_EINJV2_SUPP) { + if ((available_error_type & ACPI65_EINJV2_SUPP) && EINJv2_enabled) { for (int pos = 0; pos < ARRAY_SIZE(einjv2_error_type_string); pos++) { if (available_error_type_v2 & einjv2_error_type_string[pos].mask) seq_printf(m, "V2_0x%08x\t%s\n", einjv2_error_type_string[pos].mask, @@ -901,8 +905,22 @@ static int __init einj_probe(struct platform_device *pdev) &error_param4); debugfs_create_x32("notrigger", S_IRUSR | S_IWUSR, einj_debug_dir, ¬rigger); + if (available_error_type & ACPI65_EINJV2_SUPP) { + user_input = kzalloc(COMP_ARR_SIZE, GFP_KERNEL); + if (!user_input) { + EINJv2_enabled = false; + pr_info("EINJv2 is disabled: not enough memory\n"); + goto skip_EINJv2; + } + EINJv2_enabled = true; + einjv2_component_arr.data = user_input; + einjv2_component_arr.size = COMP_ARR_SIZE; + debugfs_create_blob("einjv2_component_array", S_IRUSR | S_IWUSR, + einj_debug_dir, &einjv2_component_arr); + } } +skip_EINJv2: if (vendor_dev[0]) { vendor_blob.data = vendor_dev; vendor_blob.size = strlen(vendor_dev); @@ -944,6 +962,7 @@ static void __exit einj_remove(struct platform_device *pdev) if (vendor_errors.size) acpi_os_unmap_memory(vendor_errors.data, vendor_errors.size); } + kfree(user_input); einj_exec_ctx_init(&ctx); apei_exec_post_unmap_gars(&ctx); apei_resources_release(&einj_resources); From patchwork Thu Apr 17 22:00:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zaid Alali X-Patchwork-Id: 881879 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11023122.outbound.protection.outlook.com [40.107.201.122]) (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 C11A92222A9; Thu, 17 Apr 2025 22:00:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.122 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927254; cv=fail; b=ZGwIbW2QxOHENFjwXi97rJJlGdzIaXY5et6l5FKl2YBg5mtXp5EZHbnpoH/EcYCzGt7FIC9tQedtLr/DfUezsQSaaudwCE/QQHJVco/RG9YlzD2v+lQZxI+35+408jWdXsyNqU6a9wEO7I/oSSFpZJHQVra1ji5UyVxwtqK1I9s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744927254; c=relaxed/simple; bh=PNEcV5WXaTl89tmntZbZ26Jmw3XvbC5UpGilY1EoAuE=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=le+TTvsvQ7Y1fr1ZCXGm9PshInEAYIegy0qUDd/Oj350NJpqb4QCIpPn4ltwctbWGIKckQo7k/SMQJ13XXEQCzoDAIvI0GGVy6Y0HalsGMj3zX917Rv3uu5pkcOD5lb9+4AJzzO9l2WhpTefUM+6jAFdNYfWo1S9N6tbcVZti6M= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com; spf=pass smtp.mailfrom=os.amperecomputing.com; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b=Wg/TxSKm; arc=fail smtp.client-ip=40.107.201.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=os.amperecomputing.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=os.amperecomputing.com header.i=@os.amperecomputing.com header.b="Wg/TxSKm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JKucfasMLYTGVnxZz8qJs3PYUhXhBFp8voUXXWyKLU6pwVuTl8W7NZLQdTAWhBpIrmXH2KNE13XEZTh/eQf9/Husctr1SahJPtsFYsZ1w8nlbQXOiGeSRJnsQfCTX/Q0dnn3par5bsMkMGkYyj1u5IB+fWl7WsOYVzmsEkwc8XoT8fxM3Z1QCduK0gvnY/7ZVii7VrlBae7C8LLA7Nq0CdofHT+ypOLGQekLt4LT7dAxObHAohFxvbjAyoDgf9n0yRawrNsu8ruqYSdyTjD1Gv/mnPQI+FT66HxF/IAeZmosFNmQkxtPjKCa+crQOeLEszXbOdj9V6WeiNurAn3zpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0cP6oVO+3xZZqXf12B0fYcRcH/7BiO2oARAWntCa2is=; b=FtcvDOxrAoweb1kBonZHP0W7tsqvnliNwimEYwNjH0aPwac+HlkA2bepwl171XPrQG0qPOfLYdyU728yl8ZLHMOJXS7vukMHBlF8Q887f5r+MGj2azruN12egtZfMpvCtrCDWxaofJjTaq8JDkH64KKZA2WtYWcYkrQQUM8KJBhKzDMYXtvOIdz5QnA+ZRAF1z8omuyWWjdBYN7oBJtbaBscMxt+fCKv9WxrOgdoaDKkoyIyiAItBXAL808i8voDq4hVxwvIx54f3y8YLjWigIh7n0wULnwWf/1CpLaKSKZ+0yaoqUhGTfZTTUUid8WbnLG2FIKv4rhLI3VpTiIYVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0cP6oVO+3xZZqXf12B0fYcRcH/7BiO2oARAWntCa2is=; b=Wg/TxSKmtWi2m7HI+6mPtUfzK410/qZ/ymDUDb+iwVSPsrpwQicFgRBS3B5kyrZ+qQ8BdgGKww7+2hi0oUvNq1rSJkJtRSXipSgwRckfKUVJ2y4fGdQDqYwG871Pbb2Xm3RsJZ17J5B6J5wPDnQt8LVpV12qQBSrlIeAgMUV0B8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) by SA1PR01MB7327.prod.exchangelabs.com (2603:10b6:806:1f6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.21; Thu, 17 Apr 2025 22:00:44 +0000 Received: from SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f]) by SN7PR01MB7903.prod.exchangelabs.com ([fe80::cf45:9855:a64e:382f%6]) with mapi id 15.20.8655.025; Thu, 17 Apr 2025 22:00:44 +0000 From: Zaid Alali To: rafael@kernel.org, lenb@kernel.org, james.morse@arm.com, tony.luck@intel.com, bp@alien8.de, robert.moore@intel.com, Jonathan.Cameron@huawei.com, ira.weiny@intel.com, Benjamin.Cheatham@amd.com, dan.j.williams@intel.com, arnd@arndb.de, Avadhut.Naik@amd.com, u.kleine-koenig@pengutronix.de, john.allen@amd.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v6 9/9] ACPI: APEI: EINJ: Update the documentation for EINJv2 support Date: Thu, 17 Apr 2025 15:00:19 -0700 Message-ID: <20250417220019.27898-10-zaidal@os.amperecomputing.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250417220019.27898-1-zaidal@os.amperecomputing.com> References: <20250417220019.27898-1-zaidal@os.amperecomputing.com> X-ClientProxiedBy: MW4P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::23) To SN7PR01MB7903.prod.exchangelabs.com (2603:10b6:806:34f::17) Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN7PR01MB7903:EE_|SA1PR01MB7327:EE_ X-MS-Office365-Filtering-Correlation-Id: df13f759-c2ed-454f-22e2-08dd7dfb4d20 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|7416014|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: IgPWr8M8OM3bURzr8Ulb70ALTZZsc55oca/6QUAW1NFf4wNWPs9tmJLx92zjxepiKGK5t4Dj3FjjhmkDSoOHlxIYqIqJyqVeuPXD3VLgGSw9VFpD6BvHA6ev+ARSjvmVPnyCSHtLpzHHWf4su0qdg/7kYICZYfTyGJu6hGvcwtHD2ykn5Rk6l8YnkYtHYEt1rajdgDByM0aPm+5NjFsycLcd07BLGTa0Bpo31ShQ4jDoymz7e0J0yPWaMcUNYU6tYYfEjc4fwlbjaW5RnixSXQwnUSNFZ0Fbz1ML4LlwPVTESUHQqR50qidVE7BiYHDiEfJ5JqMXv6HR9FSkr3SGn1dO+U0a8JPw2InnvePCixetkX86SX/ZD/KQNLfFljoser1gxqbpOYM7oTjbG0owM/7+h56c9NCakuTZXX9AECxs/pyPvYBuWrrwtFqlI7sEj6FKZ8GYjXlK0Ol4YYEUxk2nno6XF5PscAbIcHH7+Z8F76lvsVjYzdPdDHXlBeaJLBtjUzX/JACZfF1i8S5HFAMuc4VhOIu9T90ftSffQvdI/o82XBsF01Dbtl0yanrhFnW2pnwfWbcOcDgyH9VoLedSuevV0wW67a8r6ELPbX9GE1ClsVkgJKpMQ3RiM4PPqB96YEjNWdgwsawzTtDQP3p0sWBwQvpIvqPTa45BBfGvdabvjmtR54bQV59CHGpjJ8EjZLVlIYaqaDtjMHVZp5EbX9CzHWRWFX6cf8Vi5QcZ+n2WGYKsto+NKSBwfSFJEeqBFJbo/nlATq/YYJ0Saa6CFWHXEgwIzD5S13bYdaP1dALfTVgVDSeZO42+ncg2fNKZcWh5Wjq3AKkxMZ+NYedZx5xLpF8kNgtMR3OVeCKqMbCJZTRXqsqVOqR0fMnhJGc74MB4ZSTW/QX0zIf1f4DyrCp+t7MZ0z32C0HlcMJ+yE5br4cwtAnZoDLea15K1QjevK1XF6WHi+4NYaq4LPNfAzENUvMA0/dRdhVv450Jdw6O4XoH/ibd1Whnf5gTtL7ZFM9UNaGWE4b47F/SRRIKQFdCIwhtQmkghR8KmFdfq5d5KKi5nKiQytttTR5F0tDJWsDpNhNJOOU616E9sr9wH91OGyCUoUWAFNj73dDTFRfTxEh56W8qE7WEOtdIgwJdBRaQv6Ftqc5bIqE+FwozRW1XHPeMUcBW6shYOV8eG+mPIBsxS7JXlSs5OXFfET57lONbf0RkwhxfVXMNDsAE+RR7WkwjmctSCENqGiV3JS/+PX/rectuZ7yeMwe1Ul7m5ttkypR2YLsdY+31mWKMR1hYYqyj3i5mCaeU32Nq3butAbYCwV+w+qL13gXRCM0FlyhBW+sUUEfQ/1QSJ3IPIzKeDbVvdpWCKkf8GJuYGZIndP+MFgyKCkDuYAmYUmieQ4OZRVU3MD0U4VX7TfGK0Sl7ZpDICIuZpDbKuWNPOic6d8bCClQeju4KZHwcBzZNaD7o64/S1tXb4/1q541VZ+bbEGpXggNCIdr+wus= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN7PR01MB7903.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(52116014)(7416014)(376014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iZReYtMhjspJ4Ds9GhOcypMNEN4dBrmZ9tvrH/PdHkFTNNz9kVpvxbiJyQwcwKKf8uPRdkGY8jnCxFTekFaq0somhnHlU83vDkokrp6lgV0X9Qa1DHyAg8IvmiKmpmlAHBz7xRw1ClbuaK4K+cPyCX+CUOGcKRww4ZymenevQH53AGLitqf8lMOoAIfM3VfSbG3Snnw/AcSA1wITfY9YynJ1jWjGIbJ4tptb0Z1SvMSCB6PHNE5QSV0o3juBG3Ngyo6PFXwCCkjCNwpezbplLXXzaYq93NpDl8jRV36FdZ6log8L8yuenAT5lJPcDQkpHvcfGoob+Gws9G/A4FljdU54Ta/3VZFBfvIHFsAg4zafsyIiGISIjs6atu61ht9g1oy12kuV7Gk+kzzeQesWSbROcdvU8Zwfz2Y/l9gIESxbJD/RvKyusYBKYn0LcBJksSc1qs80wuBfxBXpk9iXMJN0mfc6EhxZ/OfrAsKn8QUi8h04B8DnPI4XJJpWsUAf8u0s03A+2LuTl002eRilxkhxssZIJQJd+eb3VrXw94VP//HJ6uVeWr/UMM54qaPFdXmiQP5tHAUvl+ZbDhWNqtiw5VVUShy0LZmjF1cJ9HcMSNGpTpnpMR1vTgPlb/oERcHJ2cI/+s1os+5TSl3B2E+dsZPFFiEn+o2KiOO4PQrD4VWeSCZyg2VLxcLj6bpwroWXtk6DSFwrBwTOdMkWM6akIFAh6bfVH4OwFhRzi6BdGyVPJOzAXGqTq+8Om0PL6arATIKGOkVWdeoMxNz2aZ0HY/2DjV1WqO6EJKsg9g4dPADZ3ZrwYjgzQCOlc4JZlmioR5bavxC7gTG/FN6j7sugXKISJh/MDZriDDe5WYAwZ8vkg/1o519OugP9rK9u8ORZmwtPReT4OeqA9QuvnwR7ENsDZQxokDMNpSNeQDDE2eLjQQHoubdz2xnHrsJFCPzAITySblvrjiBHiIJqsMmb+aX8GjCXx4LYBCD7/ZPB6lVmGmtm35iVf/1H7k1O/6MjJ1Yh++CkFfZuINXLgVZOsXheTmy5fuPCYQxRbQiJCQNbBXQjMbeHY2Xl8RArq8tKWSY44Y7IF8mM1kGNw4dXER9wZ+TZjSLqdsCbubv8zNNEmwtwmw6CFTIQUwpJAP9oOWyTy4CThmP4T3ihfdcwUUatQfUHajopAzdVOF0eBYLOt2292OLfdhX2fLMYb9ae+v9gfw7JD0NLLie8mLqNH+WHBT5rkedGNVBXQYmzEnNrCQlQM+tX/jm5+cp12AiKnT/CDyfODNu4CTH4kYO2MFxReL++/7eXwCLyMUcK6LKgWIRZphcGwSKefQeqF+ZHjtKJUDWCKWZ5gEywQ6eK6Alpl8cqngaWJrc8en5QP0z9fOj9Jm7XIUgbm+9UEj/pv023KyPP6bvp7VmW6d8lVHZGfIZXE/wOkJbi7hUNfxdtU/OiSQuaeoA4uFI3OYnIfvbKkHeUyFdbj9cMe0rOi4U/V3IS476XnVQLChSnmX8eJCeTtdRdy4lR5kpSmDmHMNHHAJshaPQ25IRHm/f6DX+6VQzDh7XLffNGfJbYi1dBoVgaikLNuL9fAmCjZoFW5KWTppDglqsDh8su2lkggQCe39wdc0yi7FZTz/E= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: df13f759-c2ed-454f-22e2-08dd7dfb4d20 X-MS-Exchange-CrossTenant-AuthSource: SN7PR01MB7903.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 22:00:44.2860 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: I27XIyI3Cfj0fGuV3aaNYlnAsJTuObcAVEt3w1Sty7sZfI8ph74wVKm2d2ORKEjdEBv3/I4g4qdiC7k1vUXmAtZ+XzM6T+kQi5CCANHbtoIy/JMe0JPiFIWyG508oAdY X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR01MB7327 Add documentation for the updated ACPI specs for EINJv2[1][2] Link: https://github.com/tianocore/edk2/issues/9449 [1] Link: https://github.com/tianocore/edk2/issues/9017 [2] Reviewed-by: Jonathan Cameron Signed-off-by: Zaid Alali --- .../firmware-guide/acpi/apei/einj.rst | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Documentation/firmware-guide/acpi/apei/einj.rst b/Documentation/firmware-guide/acpi/apei/einj.rst index c52b9da08fa9..edf3a2165e75 100644 --- a/Documentation/firmware-guide/acpi/apei/einj.rst +++ b/Documentation/firmware-guide/acpi/apei/einj.rst @@ -59,6 +59,9 @@ The following files belong to it: 0x00000200 Platform Correctable 0x00000400 Platform Uncorrectable non-fatal 0x00000800 Platform Uncorrectable fatal + V2_0x00000001 EINJV2 Processor Error + V2_0x00000002 EINJV2 Memory Error + V2_0x00000004 EINJV2 PCI Express Error ================ =================================== The format of the file contents are as above, except present are only @@ -88,6 +91,8 @@ The following files belong to it: Memory address and mask valid (param1 and param2). Bit 2 PCIe (seg,bus,dev,fn) valid (see param4 below). + Bit 3 + EINJv2 extension structure is valid If set to zero, legacy behavior is mimicked where the type of injection specifies just one bit set, and param1 is multiplexed. @@ -122,6 +127,13 @@ The following files belong to it: this actually works depends on what operations the BIOS actually includes in the trigger phase. +- einjv2_component_array + + The contents of this file are used to set the "Component Array" field + of the EINJv2 Extension Structure. The expected format is hex values + for component id and syndrome separated by space, and multiple + components are separated by new line. + CXL error types are supported from ACPI 6.5 onwards (given a CXL port is present). The EINJ user interface for CXL error types is at /cxl. The following files belong to it: @@ -194,6 +206,26 @@ An error injection example:: # echo 0x8 > error_type # Choose correctable memory error # echo 1 > error_inject # Inject now +An EINJv2 error injection example:: + + # cd /sys/kernel/debug/apei/einj + # cat available_error_type # See which errors can be injected + 0x00000002 Processor Uncorrectable non-fatal + 0x00000008 Memory Correctable + 0x00000010 Memory Uncorrectable non-fatal + V2_0x00000001 EINJV2 Processor Error + V2_0x00000002 EINJV2 Memory Error + + # echo 0x12345000 > param1 # Set memory address for injection + # echo 0xfffffffffffff000 > param2 # Range - anywhere in this page + # comp_arr="0x1 0x2 # Fill in the component array + >0x1 0x4 + >0x2 0x4" + # echo "$comp_arr" > einjv2_component_array + # echo V2_0x2 > error_type # Choose EINJv2 memory error + # echo 0xa > flags # set flags to indicate EINJv2 + # echo 1 > error_inject # Inject now + You should see something like this in dmesg:: [22715.830801] EDAC sbridge MC3: HANDLING MCE MEMORY ERROR