From nobody Fri Nov 29 23:44:08 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6962343177 for ; Sat, 14 Sep 2024 06:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726294434; cv=none; b=gdVyX0Af439q7+sUxbeR8mYy102LihsDdifpNdjtmp5VjYPYiKs8vKKLCYJA539HiFTqIo4ToJJmTdC854Kt9izf6BEEBgtycZlqOkNx/aKt/scZVWx1IUqRJP9fMiP+OeVriffV8eyJn0Gy9gyOQvEECaWMKK9qkGDZagj3u0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726294434; c=relaxed/simple; bh=4nkPL9h+S80jnhPl5MbfHcBCQhk2JE5FY0doqNnZLTA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Au9HjJhEVKZi7elDYakWeD5IpSQ+tQ5r2JRjKCe7ZPiI2igY9lcYMzyq4Rp5fdN/vC8o2E+NtR37z/JRQDGEnHC5eJG2nFPy7j9kyGl8jiimWejCal5UyHwZoLOn5ngzKpmKrOHj0d4Xh/wYTM7toQo4a70ukQMcjUzqWIRkgds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NpQxbdkU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NpQxbdkU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E64D6C4CECD; Sat, 14 Sep 2024 06:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726294434; bh=4nkPL9h+S80jnhPl5MbfHcBCQhk2JE5FY0doqNnZLTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NpQxbdkUfIAulECCdPSWhku5BWLFEwkbKeyUH8Dyfa0Bgtr6wvBSLR0W1VWWZ1v7O zZxq9GdmCSx3QJdaj/XJvxp9Z7RWplH0Sn+yB0h82rPh+UmiozUgmi3cmUM3W40ewO 27n3W64ZD1Hi5uY8fCofyV6k2UPKUzlemcPx/5E43HDB1vi1WYFgENIg95N5jGh2Zy aOoltq0LvEEjp73bQHCDMG10Sjm+mtwqQ0Pk84RKFoqSgZvpQNOhA9psujT+RM6Hge EScpJiv6T7uesA8gdvwWZd+Ed+Mc/scOjK11hP6AIxgXQl07HesMG06i4TzLIw721F gCHysnv2VOqJA== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1spM2a-00000003V5r-0Uw1; Sat, 14 Sep 2024 08:13:52 +0200 From: Mauro Carvalho Chehab To: Igor Mammedov Cc: Jonathan Cameron , Shiju Jose , Mauro Carvalho Chehab , "Michael S. Tsirkin" , Ani Sinha , Dongjiu Geng , linux-kernel@vger.kernel.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v10 07/21] acpi/ghes: rework the logic to handle HEST source ID Date: Sat, 14 Sep 2024 08:13:28 +0200 Message-ID: <0dd7081717b23b4c1536bc86abfa926388cf2139.1726293808.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab Content-Type: text/plain; charset="utf-8" The current logic is based on a lot of duct tape, with offsets calculated based on one define with the number of source IDs and an enum. Rewrite the logic in a way that it would be more resilient of code changes, by moving the source ID count to an enum and make the offset calculus more explicit. Such change was inspired on a patch from Jonathan Cameron splitting the logic to get the CPER address on a separate function, as this will be needed to support generic error injection. Signed-off-by: Mauro Carvalho Chehab --- Changes from v9: - patch split on multiple patches to avoid multiple changes at the same patch. Changes from v8: - Non-rename/cleanup changes merged altogether; - source ID is now more generic, defined per guest target. That should make easier to add support for 86. Signed-off-by: Mauro Carvalho Chehab --- hw/acpi/ghes.c | 95 ++++++++++++++++++++++++++++++------------ include/hw/acpi/ghes.h | 6 ++- 2 files changed, 73 insertions(+), 28 deletions(-) diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 36fe5f68782f..6e5f0e8cf0c9 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -61,6 +61,23 @@ */ #define ACPI_GHES_GESB_SIZE 20 =20 +/* + * Offsets with regards to the start of the HEST table stored at + * ags->hest_addr_le, according with the memory layout map at + * docs/specs/acpi_hest_ghes.rst. + */ + +/* ACPI 6.2: 18.3.2.8 Generic Hardware Error Source version 2 + * Table 18-382 Generic Hardware Error Source version 2 (GHESv2) Structure + */ +#define HEST_GHES_V2_TABLE_SIZE 92 +#define GHES_ACK_OFFSET (64 + GAS_ADDR_OFFSET) + +/* ACPI 6.2: 18.3.2.7: Generic Hardware Error Source + * Table 18-380: 'Error Status Address' field + */ +#define GHES_ERR_ST_ADDR_OFFSET (20 + GAS_ADDR_OFFSET) + /* * Values for error_severity field */ @@ -401,11 +418,13 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgSt= ate *s, =20 int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address) { - uint64_t error_block_addr, read_ack_register_addr, read_ack_register = =3D 0; - uint64_t start_addr; - bool ret =3D -1; + uint64_t hest_read_ack_start_addr, read_ack_start_addr; + uint64_t hest_addr, cper_addr, err_source_struct; + uint64_t hest_err_block_addr, error_block_addr; + uint32_t i, ret; AcpiGedState *acpi_ged_state; AcpiGhesState *ags; + uint64_t read_ack; =20 assert(source_id < ACPI_GHES_ERROR_SOURCE_COUNT); =20 @@ -414,44 +433,66 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64= _t physical_address) g_assert(acpi_ged_state); ags =3D &acpi_ged_state->ghes_state; =20 - start_addr =3D le64_to_cpu(ags->ghes_addr_le); + hest_addr =3D le64_to_cpu(ags->hest_addr_le); =20 if (!physical_address) { return -1; } =20 - start_addr +=3D source_id * sizeof(uint64_t); + err_source_struct =3D hest_addr + ACPI_GHES_ERROR_SOURCE_COUNT; =20 - cpu_physical_memory_read(start_addr, &error_block_addr, - sizeof(error_block_addr)); + /* + * Currently, HEST Error source navigates only for GHESv2 tables + */ + for (i =3D 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + uint64_t addr =3D err_source_struct; + uint16_t type, src_id; =20 - error_block_addr =3D le64_to_cpu(error_block_addr); + cpu_physical_memory_read(addr, &type, sizeof(type)); =20 - read_ack_register_addr =3D start_addr + - ACPI_GHES_ERROR_SOURCE_COUNT * sizeof(uint64_t); + /* For now, we only know the size of GHESv2 table */ + assert(type =3D=3D ACPI_GHES_SOURCE_GENERIC_ERROR_V2); =20 - cpu_physical_memory_read(read_ack_register_addr, - &read_ack_register, sizeof(read_ack_regist= er)); + /* It is GHES. Compare CPER source address */ + addr +=3D sizeof(type); + cpu_physical_memory_read(addr, &src_id, sizeof(src_id)); =20 - /* zero means OSPM does not acknowledge the error */ - if (!read_ack_register) { - error_report("OSPM does not acknowledge previous error," - " so can not record CPER for current error anymore"); - } else if (error_block_addr) { - read_ack_register =3D cpu_to_le64(0); - /* - * Clear the Read Ack Register, OSPM will write it to 1 when - * it acknowledges this error. - */ - cpu_physical_memory_write(read_ack_register_addr, - &read_ack_register, sizeof(uint64_t)); + if (src_id =3D=3D source_id) { + break; + } =20 - ret =3D acpi_ghes_record_mem_error(error_block_addr, - physical_address); - } else { + err_source_struct +=3D HEST_GHES_V2_TABLE_SIZE; + } + if (i =3D=3D ACPI_GHES_ERROR_SOURCE_COUNT) { error_report("can not find Generic Error Status Block"); + + return -1; } =20 + /* Navigate though table address pointers */ + + hest_err_block_addr =3D err_source_struct + GHES_ERR_ST_ADDR_OFFSET; + hest_read_ack_start_addr =3D err_source_struct + GHES_ACK_OFFSET; + + cpu_physical_memory_read(hest_err_block_addr, &error_block_addr, + sizeof(error_block_addr)); + + cpu_physical_memory_read(error_block_addr, &cper_addr, + sizeof(error_block_addr)); + + cpu_physical_memory_read(hest_read_ack_start_addr, &read_ack_start_add= r, + sizeof(read_ack_start_addr)); + + /* Update ACK offset to notify about a new error */ + + cpu_physical_memory_read(read_ack_start_addr, + &read_ack, sizeof(read_ack)); + + read_ack =3D cpu_to_le64(0); + cpu_physical_memory_write(read_ack_start_addr, + &read_ack, sizeof(read_ack)); + + ret =3D acpi_ghes_record_mem_error(error_block_addr, physical_address); return ret; } =20 diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h index c9bbda4740e2..7485f54c28f2 100644 --- a/include/hw/acpi/ghes.h +++ b/include/hw/acpi/ghes.h @@ -23,6 +23,7 @@ #define ACPI_GHES_H =20 #include "hw/acpi/bios-linker-loader.h" +#include "qapi/error.h" =20 /* * Values for Hardware Error Notification Type field @@ -74,7 +75,10 @@ void acpi_build_hest(GArray *table_data, GArray *hardwar= e_errors, const char *oem_id, const char *oem_table_id); void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s, GArray *hardware_errors); -int acpi_ghes_record_errors(uint8_t source_id, uint64_t error_physical_add= r); +int acpi_ghes_record_errors(uint8_t source_id, + uint64_t error_physical_addr); +void ghes_record_cper_errors(const void *cper, size_t len, + uint16_t source_id, Error **errp); =20 /** * acpi_ghes_present: Report whether ACPI GHES table is present --=20 2.46.0