From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 DC2642F363F; Wed, 20 May 2026 17:50:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299406; cv=none; b=WQG2EtaRWLDFtsW0xgnQC5eRShL4I1jBMPnn7VwWay9HTJdS3RH3C1tQoeaHsdhb/KCQpZB8EsOquHkJIbGmrSXliSINz2h0KJay0F3Qn7zlkh7AJ6zruG48QJa2qZS2wZqI9xPiIFuCG09mjBA6Jus4c9Gyw5Cp6AJA0voWC5s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779299406; c=relaxed/simple; bh=w6M79GfyH9aahNyyGzMPH50t3XLga4a8AXY95gMB9Ow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rFn0zahXrNjRQL7/hCbw2u75QhfpZfUcxKaAUdatc8GjXxmOXKpi78IPouEdrHA3s4q/Mvbx83fo7sSejlGPTEl/AWMlqHu+lUcjqRuuBX9vtUvc+4kmiPcIV2mVgn5YJ4yURv0PYr6fKJLfkmUvpvFUPVq45inMZ7IIxBNnbOQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QeJjcjJm; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="QeJjcjJm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DAE51F000E9; Wed, 20 May 2026 17:50:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779299405; bh=y8UNG/strGtQAC0lX2tx60VlNOtX67KJKB+pmRLc+gs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QeJjcjJmDe5FAHE8BftcD2jGAjanLtJ+4R26evuZndam/GH0JICwp7U1bU8DWoefq hZkvcUjvAtsK/4S6jdE8GsWswK+PCAnIhHxEL0DFsyaFlxRGoyuf/egkI31VEsFOvH E44+KLLJMl/CGEd2b/iJtgBZyKOt+XrxNkHQkH70= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tony Luck , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.18 761/957] ACPICA: Provide #defines for EINJV2 error types Date: Wed, 20 May 2026 18:20:44 +0200 Message-ID: <20260520162151.067202552@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tony Luck [ Upstream commit 1f6008538384453eb4c13a3d7ff9e37ee8aee6b9 ] EINJV2 defined new error types by moving the severity (correctable, uncorrectable non-fatal, uncorrectable fatal) out of the "type". ACPI 6.5 introduced EINJV2 and defined a vendor defined error type using bit 31. This was dropped in ACPI 6.6. Link: https://github.com/acpica/acpica/commit/e82d2d2fd145 Signed-off-by: Tony Luck Link: https://patch.msgid.link/20260421150216.11666-2-tony.luck@intel.com Signed-off-by: Rafael J. Wysocki Stable-dep-of: 0c00cfbcfcff ("ACPI: APEI: EINJ: Fix EINJV2 memory error injection") Signed-off-by: Sasha Levin --- include/acpi/actbl1.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index 7f35eb0e84586..b074244cbdcbf 100644 --- a/include/acpi/actbl1.h +++ b/include/acpi/actbl1.h @@ -1129,6 +1129,12 @@ enum acpi_einj_command_status { #define ACPI_EINJ_CXL_MEM_FATAL (1<<17) #define ACPI_EINJ_VENDOR_DEFINED (1<<31) +/* EINJV2 error types from EINJV2_GET_ERROR_TYPE (ACPI 6.6) */ + +#define ACPI_EINJV2_PROCESSOR (1) +#define ACPI_EINJV2_MEMORY (1<<1) +#define ACPI_EINJV2_PCIE (1<<2) + /******************************************************************************* * * ERST - Error Record Serialization Table (ACPI 4.0) -- 2.53.0