From patchwork Fri Jul 29 15:35:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Lu X-Patchwork-Id: 594378 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF25C00144 for ; Fri, 29 Jul 2022 15:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237599AbiG2PgR (ORCPT ); Fri, 29 Jul 2022 11:36:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237540AbiG2PgP (ORCPT ); Fri, 29 Jul 2022 11:36:15 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e88::61c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35D92863CC; Fri, 29 Jul 2022 08:36:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YqgS7qmuCp3pql9sg34kVVRa3Xb890pHjIjmcHXOCzxpeoj8luTtZyNcXnciMK+FVVyz/tiKhR97RPhroe7J+W32HNZln0z+bSTXOXjbB/knFmqVvXJDJdgGk/Ef4PWDU9vBIJcR527hdXxVOCADYlrns5mX7f1zQb4OKb5PUiMcwRWmQpfitN++/G5pbL6VcEQUARqtdOlvX5Ocws7d6F0oOGAtSFYWH0nRbVuXy5F1SaubXmhF60n3/aLI6NC4amG5Fh8dpBCzAh4cvVXaGYYnvTQsE75BR1IKRqh8uUVlKE1wtL1FjJZIJlKj95mj3CHh+gqOrsO0grxScVOqAg== 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=SLKrwHaj1uEqs5MWTrqI2l62IQ85QckPXxEivlWPa24=; b=lp/t5q3PP2DrHYlEF78Tl0Ym6Af6FYoS7bH5UVGKAeNsZUoWfz7H5sziuVJSqMzeDP2dXJIEgQaxmXSjBD/v1KYc3Qa4eqLyTQGIosIw/Xp80FLrvNa1afwg29M4RpEYgqwfzkC3cYOiIOfspsoiZhlaUwzB3lVtq4KHXStJkDoOSYOm6JSNIBTp9A33C631YDK4dfwLGL/t8rDO5EDzkSQNDoiyxvHLJyAT49/2zkAXTodAPFfUZwCzLiZAvzPSZ96HbtNVz9DgRSIJqEt0SBK5sDyUxNG9VDREvcqjYdJp8EEZ4nJQPtvfGFEX6wy/Tep3yfm4fzdxsNVlibEbzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SLKrwHaj1uEqs5MWTrqI2l62IQ85QckPXxEivlWPa24=; b=imb5hjiLO9iMA1/YlhshknTaGe8ZYgDraIdug83zi9zyiGx7kMXQO09YvjUxMcLLi3y8z4C4rdhl/c85fy9l+LHqE93LbgyN7BjnxRYNnP4zXVFZJ1Fshswj6r54ibT0zl0m5VT+542LQVXMkdycfeFxdQMiplPEHLmwuFq/TlM= Received: from DM6PR08CA0024.namprd08.prod.outlook.com (2603:10b6:5:80::37) by CY4PR12MB1912.namprd12.prod.outlook.com (2603:10b6:903:11c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Fri, 29 Jul 2022 15:36:09 +0000 Received: from DM6NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:5:80:cafe::f2) by DM6PR08CA0024.outlook.office365.com (2603:10b6:5:80::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.7 via Frontend Transport; Fri, 29 Jul 2022 15:36:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT008.mail.protection.outlook.com (10.13.172.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5482.10 via Frontend Transport; Fri, 29 Jul 2022 15:36:08 +0000 Received: from ethanolx5619host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Fri, 29 Jul 2022 10:36:07 -0500 From: Jay Lu To: , , , , , , , , , CC: , , , , , Subject: [PATCH 1/3] ACPI, APEI, EINJ: Fix Formatting Errors Date: Fri, 29 Jul 2022 10:35:48 -0500 Message-ID: <20220729153550.181209-2-jaylu102@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220729153550.181209-1-jaylu102@amd.com> References: <20220729153550.181209-1-jaylu102@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d870129f-c47f-46c9-921e-08da71780f29 X-MS-TrafficTypeDiagnostic: CY4PR12MB1912:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3yumRXH1Z7ajd3jS9szUhd2ylSyW+1f0/KhJx1bDEEOrIRNPmGC/C6mKfphYT8WSi/iOkUqOss0+/wlAL8T97sUhKfxCeOt2zg7q4169/mIbCueRkJs+8sqNw0duNqYLdzuBGz5tgxJc9j1CdaydffLSF9Ar3OEaCQwpARS0Br2bQ1qpQ83gPogqTuKePkbqA7hYXcVZ7TIty/xWViwPs8q+yaijL/bPG8UbQe29u2GR6MwPP268/if/eLLFxNt+GLD0EsWqMOufo7yRRxog5253w7EDYSY5lNuNcGthx+onqGu7S0SpLiX9eInL3rAsuGbJ150QBSjNHYdLCD1X4NDgp7GATobZUgGDmNvV5EP2oMR8V7N58xZwLx21g6RqUneQaJsh7M6Mf6tigRG5+INUVHz+JRPSEoqPzVyEoM2KvYEqujaQLFGui/XPFRMlll3t0qaNVnsgDZW3BSvUiu0xAP/UGgq+Gn04E4bLu1BHijHbV3tFWi9kcUid2Y64EBrGwANk1pZbr2qbUi7J1ufE+a/3sUNSCYKiZrbixjniHjK+4Cv79B0daaVLx/MfsodbRW+jtdLvi62q6XY4scYJUjZkKvbxte7sT3S81ZoXBwGcXgTw5h9RWOHewFbSirL71p6yLHfGDA3vkofyQLQq/277pjnROlHTpEQr90LBWgHwoYGxsTy65UZkgD7mWzU90h14js+ynNnV75pJ3WvIh3tp1IgFVv5ONMxM9NupAlQ2PhTnS2n1utN6cZOfq9DoSP/lkwOV8X3Af0nfL4OP/YxvFVWOQoLf628ey7xDEAJLJI0rvIIfdr1Iv+CUz3q4pakwnyiEAmMoIfh/ZzwdYYi9bgW1tWVgGFyhZrk= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(376002)(346002)(136003)(396003)(39860400002)(40470700004)(36840700001)(46966006)(40460700003)(41300700001)(6666004)(8936002)(2906002)(316002)(7416002)(83380400001)(478600001)(7696005)(426003)(82310400005)(2616005)(47076005)(336012)(36860700001)(1076003)(186003)(82740400003)(16526019)(70206006)(921005)(5660300002)(356005)(8676002)(40480700001)(70586007)(36756003)(110136005)(54906003)(81166007)(26005)(4326008)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2022 15:36:08.9805 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d870129f-c47f-46c9-921e-08da71780f29 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1912 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Checkpatch reveals warnings and an error due to missing lines and incorrect indentations. Add the missing lines after declarations and fix the suspect indentations. Signed-off-by: Jay Lu --- drivers/acpi/apei/einj.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index d4326ec12d29..da039c630fd0 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -358,6 +358,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, */ if ((param_extension || acpi5) && (type & MEM_ERROR_MASK) && param2) { struct apei_resources addr_resources; + apei_resources_init(&addr_resources); trigger_param_region = einj_get_trigger_parameter_region( trigger_tab, param1, param2); @@ -432,11 +433,11 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, } v5param->flags = vendor_flags; } else if (flags) { - v5param->flags = flags; - v5param->memory_address = param1; - v5param->memory_address_range = param2; - v5param->apicid = param3; - v5param->pcie_sbdf = param4; + v5param->flags = flags; + v5param->memory_address = param1; + v5param->memory_address_range = param2; + v5param->apicid = param3; + v5param->pcie_sbdf = param4; } else { switch (type) { case ACPI_EINJ_PROCESSOR_CORRECTABLE: @@ -466,6 +467,7 @@ static int __einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, return rc; if (einj_param) { struct einj_parameter *v4param = einj_param; + v4param->param1 = param1; v4param->param2 = param2; } @@ -687,8 +689,7 @@ static int __init einj_init(void) if (status == AE_NOT_FOUND) { pr_warn("EINJ table not found.\n"); return -ENODEV; - } - else if (ACPI_FAILURE(status)) { + } else if (ACPI_FAILURE(status)) { pr_err("Failed to get EINJ table: %s\n", acpi_format_exception(status)); return -EINVAL; From patchwork Fri Jul 29 15:35:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Lu X-Patchwork-Id: 594377 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 554A4C00144 for ; Fri, 29 Jul 2022 15:37:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237755AbiG2PhR (ORCPT ); Fri, 29 Jul 2022 11:37:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237797AbiG2Pg6 (ORCPT ); Fri, 29 Jul 2022 11:36:58 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::60d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D51F487236; Fri, 29 Jul 2022 08:36:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Je/PiDbTJg0oOe1MPwO9bJK2y8V3r4VFnX7sDtSFAOFfQY9TuAy+ZpPDdd+C1zQ9c1M0dB/l8lt5dluyfRS+HNTXTc+wCehTRyIngp4tS6RQomIKbHl6Y1ssWCiGSNcRKbErCQox+x487YFNtUHDSYTWFNv1rhpMXC1I89e3ylHvKPll/Vrp1nMUtXq79Ju5VGb9cNh8vVK97Im3B2BmqVUrkBjIT4vw+FnBDYivrGJjVQh3J52rIvA8pjP8yuRf0VUkeUxFJKA2JO2MogJJZKDzHW5n46+2V+g2KlVyU84DqhpBZzOpTtrJE/ua/NaJ9cesfr205qoBvY4rzUpxIw== 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=1N/7/XvPykj/YHjS0eRexhoibRmT1bwQEg8OR9IPb5E=; b=iYXtxMSPeD8gM5DG2graJuH2LDXS4JMe2SFPJs37zZOEZ4L0K4qmWjqab0RWbsRcCBMaSi3TnwmNYtMNTPkYVueWULn7XuIk9gWV7YlG1WtSdGvY0xB2z6ox2bE5uLSipXheDhrq0FKvOA/O22m+APSAKZdaZ02/wqVracPIDhWq6VS3VILEHZ+91/sdBNmpSwiw3LOJf9x51dZ3Wys6OH06c/oEkIXVWSxw2mBcounhxTDQLuiM6u2OnqzD017EXEit/6v/8KNjVbK89/4Tz5ZY69kuUrf7mz37CqCeNrODuQVJUWQOh5gXP5h06CLIFUn043O8YXnEUVfuTyluMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1N/7/XvPykj/YHjS0eRexhoibRmT1bwQEg8OR9IPb5E=; b=HH1F1H1CkzT4nWV/ftdMK+9yovbYfV+MWC869ix+uoI8Z5wTNGtYtYwo0JENTrAsb07+Gif8Nm9AZVkXcpTkZE1FSHxJk8C2TiQp+o0r5TkHBSXM8rgJIc3w3CIre0Z5XS+ZxG1Ok2XOhBf7W6nDuJPclqBWm1iCxLM0V3+ylW0= Received: from DS7PR05CA0013.namprd05.prod.outlook.com (2603:10b6:5:3b9::18) by DM6PR12MB3211.namprd12.prod.outlook.com (2603:10b6:5:15c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.19; Fri, 29 Jul 2022 15:36:49 +0000 Received: from DM6NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::c2) by DS7PR05CA0013.outlook.office365.com (2603:10b6:5:3b9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.1 via Frontend Transport; Fri, 29 Jul 2022 15:36:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT030.mail.protection.outlook.com (10.13.172.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5482.10 via Frontend Transport; Fri, 29 Jul 2022 15:36:33 +0000 Received: from ethanolx5619host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Fri, 29 Jul 2022 10:36:18 -0500 From: Jay Lu To: , , , , , , , , , CC: , , , , , Subject: [PATCH 2/3] ACPI, APEI, EINJ: Refactor available_error_type_show Date: Fri, 29 Jul 2022 10:35:49 -0500 Message-ID: <20220729153550.181209-3-jaylu102@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220729153550.181209-1-jaylu102@amd.com> References: <20220729153550.181209-1-jaylu102@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f15713a-ac99-4c24-d770-08da71781e1f X-MS-TrafficTypeDiagnostic: DM6PR12MB3211:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GDruPMef7Kd40odrEdxGUcpOOFIUCprUeqLkn2o6qPDcfnhRIATFalwNqY29WUZg2SWiahODsqAkcSOECuyUin+yu8uzmpAOKp0wlyYCQ01R6E77vs8d0cxZBQQfEga+IYXKudIe1lxnh4F3YWxm6aagki8GfVDPJ7VX1G31JDEO4eEI81/XXm/zGmqw9w1tqXmFITpEv5J07E/oynmzu1+y+OCrvx+BsF5bB9knJplBdzu0R6MtV8RlItlDS8mDCHtvRBqQrGfBaueQoVHXvXp08c8Il+oC2fAn2FlILKgFUvaxoWipWDA8DSeuDTolxzJILiXlkOaD80CnvCTLVAwYeHBY3MNXJ9M1JnBuuMK88pUo0Lh2xjz4xkH15aSHe/xmIBnwNAE/SBu0oM8rleuz+RPwwf4ZMwNYoe9PRuInj/r5Vr2hlre9ffsozQZop6D/1aVhT6EuT42kudLjSxRW5wcRM+Vlz8HFsfYeMFWbed3m1ZoUhwVkQ4xjeHmdaZYJLy46KGb2oPT6eG2Egcm/ifkptFZFiqLbK467/q0EBUeWs7euwz0BevHhc9c94s5Wxr+1TYCGjO37LMngCpaQo1DAPW+5ToARaAs/nIJSVKDxAJdUHt2ky7msXlEP+uMlSLEv9A132grl2AvkxtmgUmAu2Dd8nPMSsru593CSjJxKpT3r2frm18gdKtRl6UcpQuml1fCMI74sNLUix688Fc9y+m19UCbNF79ESrn660iyW3zHv5qg9cFAAjGcF0WT+6T0Z0zl7idnLwxIpPn7JV3let6eSC6fxlBp1JLk/Nwq1ONfjHByRS9844zLIQd5X5Iqve0y9BnjCF81BC+n0VDVrM7+UcwleX/IcKM= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(376002)(136003)(396003)(346002)(46966006)(36840700001)(40470700004)(356005)(2616005)(336012)(47076005)(921005)(1076003)(81166007)(186003)(82740400003)(16526019)(316002)(54906003)(110136005)(83380400001)(426003)(70586007)(26005)(2906002)(478600001)(40460700003)(7696005)(36756003)(8936002)(8676002)(4326008)(70206006)(7416002)(82310400005)(36860700001)(41300700001)(40480700001)(5660300002)(6666004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2022 15:36:33.8639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f15713a-ac99-4c24-d770-08da71781e1f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3211 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Move error type descriptions into an array and loop over error types to improve readability and maintainability. Replace seq_printf() with seq_puts() as recommended by checkpatch.pl. Signed-off-by: Jay Lu --- drivers/acpi/apei/einj.c | 41 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index da039c630fd0..a68103280f74 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -569,6 +569,20 @@ static u64 error_param2; static u64 error_param3; static u64 error_param4; static struct dentry *einj_debug_dir; +static const char * const einj_error_type_string[] = { + "0x00000001\tProcessor Correctable\n", /* bit 0 */ + "0x00000002\tProcessor Uncorrectable non-fatal\n", /* bit 1 */ + "0x00000004\tProcessor Uncorrectable fatal\n", /* bit 2 */ + "0x00000008\tMemory Correctable\n", /* bit 3 */ + "0x00000010\tMemory Uncorrectable non-fatal\n", /* bit 4 */ + "0x00000020\tMemory Uncorrectable fatal\n", /* bit 5 */ + "0x00000040\tPCI Express Correctable\n", /* bit 6 */ + "0x00000080\tPCI Express Uncorrectable non-fatal\n", /* bit 7 */ + "0x00000100\tPCI Express Uncorrectable fatal\n", /* bit 8 */ + "0x00000200\tPlatform Correctable\n", /* bit 9 */ + "0x00000400\tPlatform Uncorrectable non-fatal\n", /* bit 10 */ + "0x00000800\tPlatform Uncorrectable fatal\n", /* bit 11 */ +}; static int available_error_type_show(struct seq_file *m, void *v) { @@ -578,30 +592,9 @@ static int available_error_type_show(struct seq_file *m, void *v) rc = einj_get_available_error_type(&available_error_type); if (rc) return rc; - if (available_error_type & 0x0001) - seq_printf(m, "0x00000001\tProcessor Correctable\n"); - if (available_error_type & 0x0002) - seq_printf(m, "0x00000002\tProcessor Uncorrectable non-fatal\n"); - if (available_error_type & 0x0004) - seq_printf(m, "0x00000004\tProcessor Uncorrectable fatal\n"); - if (available_error_type & 0x0008) - seq_printf(m, "0x00000008\tMemory Correctable\n"); - if (available_error_type & 0x0010) - seq_printf(m, "0x00000010\tMemory Uncorrectable non-fatal\n"); - if (available_error_type & 0x0020) - seq_printf(m, "0x00000020\tMemory Uncorrectable fatal\n"); - if (available_error_type & 0x0040) - seq_printf(m, "0x00000040\tPCI Express Correctable\n"); - if (available_error_type & 0x0080) - seq_printf(m, "0x00000080\tPCI Express Uncorrectable non-fatal\n"); - if (available_error_type & 0x0100) - seq_printf(m, "0x00000100\tPCI Express Uncorrectable fatal\n"); - if (available_error_type & 0x0200) - seq_printf(m, "0x00000200\tPlatform Correctable\n"); - if (available_error_type & 0x0400) - seq_printf(m, "0x00000400\tPlatform Uncorrectable non-fatal\n"); - if (available_error_type & 0x0800) - seq_printf(m, "0x00000800\tPlatform Uncorrectable fatal\n"); + for (int pos = 0; pos < ARRAY_SIZE(einj_error_type_string); pos++) + if (available_error_type & (BIT(0) << pos)) + seq_puts(m, einj_error_type_string[pos]); return 0; } From patchwork Fri Jul 29 15:35:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Lu X-Patchwork-Id: 594627 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0284C00144 for ; Fri, 29 Jul 2022 15:36:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236704AbiG2Pgt (ORCPT ); Fri, 29 Jul 2022 11:36:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237071AbiG2Pgo (ORCPT ); Fri, 29 Jul 2022 11:36:44 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2061.outbound.protection.outlook.com [40.107.244.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29A018688A; Fri, 29 Jul 2022 08:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gvwVkDxShns79GLs6f+LTJi6flKMLCocgeWAiFtfgjBWGkUCuCtxJzuxj2oRl/vRNkHTFtxvv0FF0zfkQkJdV4Ng4Q/DVtSF9vF9cRjOGvQ+VEU4znefmEqvjtPezmWGfNyMnHqqechFTMjqYhw/GCoEMYzz9CT6W1oBT8abb95QGenwFLU3dv1wd47MuDSKhct0v+1id3GFh/fJh8HNoONizawHujFcijmGaD4LTE5we4lWVuiSmDZUxrmsAA4dk4HoZYr7dJ+x7S2vYtDnDbZJ90yR7qyOxpA1/8T0szI9ON307JNZEpHnudU+U7NiQdUUSm3dbgcSMIi9LzF6jw== 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=S2FIhRaBuRAB0tkV6ZfOQqI0+Vk9NZvzVPc10iqR/Hs=; b=jONGWdMHbBx5QQ+RlhfLcnvg/2jA8moC05uJ0m0/e7ictxcmRC1IlEJb1xbtonUUBSeZyG0Qqs89gybv3fDXqTw+HtPNzMd5flKSrSu8zaDMMYrabxdw+c/rMk3XjXWbal+WyMV2LSZkbmu8B2a07PiIt8RobXWkDSQgjHWLLFN+/CO1wO4nDb0+hlcFEIrh0BQ0dIqt793uaDuMGn4sg0A1wrO7BDbHAOBBkaPuMDKb35vTNUYbY2ywvXKkZ09pLtCVoWLBJkjFWJKIDAcIhdTBAHZbgzAcSgq/9JZgF1TUR/sazlf5VLBinhKKpZTLV4T9eJlf1atpk4YElNuO5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S2FIhRaBuRAB0tkV6ZfOQqI0+Vk9NZvzVPc10iqR/Hs=; b=kPi3OxIAECY2chzmX+jckBXXt9IH776XBCrGsPi847YFtRY4NUcw4bo6ZWcq+K/+qrXlh5mbbd5YckjokovpPIToYWIDi/siEYAT9DKbJuf22XFRnm34jA6FY2C6oOvXtmPE+CBZKb7g3cDr1kEOO+gLwrozQ528txHJZYijUvU= Received: from DM6PR06CA0037.namprd06.prod.outlook.com (2603:10b6:5:54::14) by SA1PR12MB6728.namprd12.prod.outlook.com (2603:10b6:806:257::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.6; Fri, 29 Jul 2022 15:36:42 +0000 Received: from DM6NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::92) by DM6PR06CA0037.outlook.office365.com (2603:10b6:5:54::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.24 via Frontend Transport; Fri, 29 Jul 2022 15:36:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT010.mail.protection.outlook.com (10.13.172.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5482.10 via Frontend Transport; Fri, 29 Jul 2022 15:36:42 +0000 Received: from ethanolx5619host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Fri, 29 Jul 2022 10:36:30 -0500 From: Jay Lu To: , , , , , , , , , CC: , , , , , Subject: [PATCH 3/3] ACPI, APEI, EINJ: Add support for new CXL error types Date: Fri, 29 Jul 2022 10:35:50 -0500 Message-ID: <20220729153550.181209-4-jaylu102@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220729153550.181209-1-jaylu102@amd.com> References: <20220729153550.181209-1-jaylu102@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d00e37b-4d3b-44a6-2ec2-08da717822ed X-MS-TrafficTypeDiagnostic: SA1PR12MB6728:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +QYS3gv9qkY3EwJP5Ja2N1GjXwvq+68dj+7SD+nnE4CYV0xHlbAd6qUXlmJSrblHc2qs/OVg2dd4NClh316FWJDYjBb/P1Lx52uYOkR/Iz5q76tyxaZxXLGA7i2XPfKcwALdYJuKkNS9IBjX7PFffrigAVHeaaUqAVtgNiNXFGOAn4eInhiAepSNKM2aYrzp9IZDeZhzfmmM8O0sfx+gzhwjPrZQ/DWz4RswcSCau8VM4GCoOMBP6Nha+zDRsuG26qjAUA/qhIMPrYF3wHj81Gpv6xg5/5U9KVfJ5Pzc3ENz+pCtoaxb8alY0j6b4DBhS1ecE3IwvykaZL5PpiteS9OVm7RdAH0mfhk5EtDCUXoSCLpBSSBFmNj0gPwvKGL5ibma1hOTk9K7INYPAR9ppP2vH+OnJ24UtmJ8JT4CoFQbWXpO9YBYX6RGLiceqv1DFWOCUdUFuoDuFQLMJk09Ek+yNfIZynSvUMiXQ/0U8CnMRlyTF++AqYp7caxEOuCHxJKbcEAw+c6b7wZMsFtJ0X54g9/KLx4kosQc1nG48zi52vYdWTAsaODRRKTN81bJCK3P0y9zQeBRV605vzHoJYL6j9Y70KF9R0ba8ad2FpwO/dAX+gCQdFtyyTuch9kMAUaK5ZRLGnvrwTBd8ban69lpm8Mqe7IIr9UyxjPEKLpNLkdW4Ss/OtKBwm00UG5EGAkFirCR/9XhoqA4UnUZ5iAX6udCNGsXXtfsNx7zpjI3NlxZQk8WkVvFy8ntszIdLB6kW4hHLcvbv+lZ2xRzPMU9Z7uz2MdiWdjUgxgK3VLjymzmcGeyi+ZwLD25o3jg7MhHlaIZDSuMivvVt0TnN0L8AM1E2MWbHB2yWFZRGpE= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(136003)(39860400002)(346002)(396003)(376002)(40470700004)(36840700001)(46966006)(478600001)(70206006)(70586007)(4326008)(36860700001)(8936002)(82740400003)(83380400001)(16526019)(8676002)(36756003)(7416002)(54906003)(110136005)(316002)(2906002)(6666004)(5660300002)(7696005)(2616005)(426003)(41300700001)(1076003)(336012)(356005)(921005)(40480700001)(40460700003)(26005)(81166007)(82310400005)(186003)(47076005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2022 15:36:42.0767 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d00e37b-4d3b-44a6-2ec2-08da717822ed X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6728 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org EINJ module allows new CXL error types to be passed through sysfs interface, but it doesn't advertise new CXL error types in sysfs. Update EINJ so that it displays new CXL errors. Signed-off-by: Jay Lu --- drivers/acpi/apei/einj.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index a68103280f74..4aed0eab329e 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -582,6 +582,12 @@ static const char * const einj_error_type_string[] = { "0x00000200\tPlatform Correctable\n", /* bit 9 */ "0x00000400\tPlatform Uncorrectable non-fatal\n", /* bit 10 */ "0x00000800\tPlatform Uncorrectable fatal\n", /* bit 11 */ + "0x00001000\tCXL.cache Protocol Correctable\n", /* bit 12 */ + "0x00002000\tCXL.cache Protocol Uncorrectable non-fatal\n", /* bit 13 */ + "0x00004000\tCXL.cache Protocol Uncorrectable fatal\n", /* bit 14 */ + "0x00008000\tCXL.mem Protocol Correctable\n", /* bit 15 */ + "0x00010000\tCXL.mem Protocol Uncorrectable non-fatal\n", /* bit 16 */ + "0x00020000\tCXL.mem Protocol Uncorrectable fatal\n", /* bit 17 */ }; static int available_error_type_show(struct seq_file *m, void *v)