From nobody Sat Nov 30 00:59:44 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 E3DDD7D417 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=1726294435; cv=none; b=OKWUeB8th5Gfl5B8gjpz0x3sCL/r3/1988uxMrItGOGjfcTF9st9chWjrqpi4XtVCb9q2v2v83AE7VRm1U3WYUrF035aPajPWd2z4ZrQ1wYXkQaro3h0a8wdnkl9RQGKQQ5GM0Mf/bzzkiQuIle4lZeJAzcTD7+dAKWcsQ1YIEs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726294435; c=relaxed/simple; bh=PMe9CyHoae/jRKMRZBtMlSwi45l1l+ra99k0C2eM4vo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BxwtpOG41rY7JyqXgfVZWCNfcPUihnTirEujxW82lglKt/hDmI0dXj/SgCHf+X1hYCv5i3Zjpe/lhcEZcaz7B3/i/3nFRQx2i2oyetjNnTN5WznJ9dXjWVFY9g85izPLvPmm4dCPcnEhWoC8BQ/d8Bqtlqbaq4OUgIgZfcMSp+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AAojqD2c; 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="AAojqD2c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27CE1C4AF0B; Sat, 14 Sep 2024 06:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726294434; bh=PMe9CyHoae/jRKMRZBtMlSwi45l1l+ra99k0C2eM4vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AAojqD2cpm2rmLL6qAh1bLv3MtEYbzBgPM3IZ7CsK3F1Sbt12P8yqjVTAoww2KTWN ev8dmAi0DLVbSqzT4yCwbkT6BDhwJfvPII9ECNbklvyUwcGx9q8ULKi5qMiZkc7mke D1sDTIDMRjOCRWbl9nOsGnODPU96KmCS+2aWeUXjjcMhDu+Ph/GJccAz+e9/ymKbAm PS2AXGQ6fhNL+Qjajtui8q2XSawAoJh6h9e6mdZ0ZcRcBp72UTDC9a8UkxkPD8KZOU K6nQwSP7gBAr66Ov54zS+sDak6NIRSnk/Zfofe7EgPVIaINdHXt6RYa7Y9fqNc9lGY bjeQfhp2OXJ6Q== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1spM2a-00000003V5z-0iYu; 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 , Peter Maydell , Shannon Zhao , linux-kernel@vger.kernel.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v10 09/21] acpi/ghes: Don't hardcode the number of sources on ghes Date: Sat, 14 Sep 2024 08:13:30 +0200 Message-ID: <08010058cca88a04e6db8303b5c09987c0cc922b.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 number of sources is architecture-dependent. Usually, architectures will implement one synchronous and/or one asynchronous source. Change the logic to better cope with such model. Signed-off-by: Mauro Carvalho Chehab --- hw/acpi/ghes.c | 53 +++++++++++++++++++++++----------------- hw/arm/virt-acpi-build.c | 5 ++++ include/hw/acpi/ghes.h | 21 ++++++++++------ 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 4e34b16a6ca9..c88717fb1bef 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -251,17 +251,18 @@ static int acpi_ghes_record_mem_error(uint64_t error_= block_address, * Initialize "etc/hardware_errors" and "etc/hardware_errors_addr" fw_cfg = blobs. * See docs/specs/acpi_hest_ghes.rst for blobs format. */ -static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *li= nker) +static void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *li= nker, + int num_sources) { int i, error_status_block_offset; =20 /* Build error_block_address */ - for (i =3D 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + for (i =3D 0; i < num_sources; i++) { build_append_int_noprefix(hardware_errors, 0, sizeof(uint64_t)); } =20 /* Build read_ack_register */ - for (i =3D 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + for (i =3D 0; i < num_sources; i++) { /* * Initialize the value of read_ack_register to 1, so GHES can be * writable after (re)boot. @@ -276,13 +277,13 @@ static void build_ghes_error_table(GArray *hardware_e= rrors, BIOSLinker *linker) =20 /* Reserve space for Error Status Data Block */ acpi_data_push(hardware_errors, - ACPI_GHES_MAX_RAW_DATA_LENGTH * ACPI_GHES_ERROR_SOURCE_COUNT); + ACPI_GHES_MAX_RAW_DATA_LENGTH * num_sources); =20 /* Tell guest firmware to place hardware_errors blob into RAM */ bios_linker_loader_alloc(linker, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_errors, sizeof(uint64_t), false); =20 - for (i =3D 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + for (i =3D 0; i < num_sources; i++) { /* * Tell firmware to patch error_block_address entries to point to * corresponding "Generic Error Status Block" @@ -304,10 +305,12 @@ static void build_ghes_error_table(GArray *hardware_e= rrors, BIOSLinker *linker) /* Build Generic Hardware Error Source version 2 (GHESv2) */ static void build_ghes_v2(GArray *table_data, BIOSLinker *linker, - enum AcpiGhesNotifyType notify, - uint16_t source_id) + const AcpiNotificationSourceId *notif_src, + uint16_t index, int num_sources) { uint64_t address_offset; + const uint16_t notify =3D notif_src->notify; + const uint16_t source_id =3D notif_src->source_id; =20 /* * Type: @@ -336,7 +339,7 @@ static void build_ghes_v2(GArray *table_data, 4 /* QWord access */, 0); bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, address_offset + GAS_ADDR_OFFSET, sizeof(uint64_t), - ACPI_GHES_ERRORS_FW_CFG_FILE, source_id * sizeof(uint64_t)); + ACPI_GHES_ERRORS_FW_CFG_FILE, index * sizeof(uint64_t)); =20 /* Notification Structure */ build_ghes_hw_error_notification(table_data, notify); @@ -353,9 +356,10 @@ static void build_ghes_v2(GArray *table_data, build_append_gas(table_data, AML_AS_SYSTEM_MEMORY, 0x40, 0, 4 /* QWord access */, 0); bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, - address_offset + GAS_ADDR_OFFSET, - sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, - (ACPI_GHES_ERROR_SOURCE_COUNT + source_id) * sizeof(uint64_t)); + address_offset + GAS_ADDR_OFFSET, + sizeof(uint64_t), + ACPI_GHES_ERRORS_FW_CFG_FILE, + (num_sources + index) * sizeof(uint64_t= )); =20 /* * Read Ack Preserve field @@ -370,12 +374,15 @@ static void build_ghes_v2(GArray *table_data, /* Build Hardware Error Source Table */ void acpi_build_hest(GArray *table_data, GArray *hardware_errors, BIOSLinker *linker, + const AcpiNotificationSourceId * const notif_source, + int num_sources, const char *oem_id, const char *oem_table_id) { AcpiTable table =3D { .sig =3D "HEST", .rev =3D 1, .oem_id =3D oem_id, .oem_table_id =3D oem_table_id= }; + int i; =20 - build_ghes_error_table(hardware_errors, linker); + build_ghes_error_table(hardware_errors, linker, num_sources); =20 acpi_table_begin(&table, table_data); =20 @@ -383,9 +390,10 @@ void acpi_build_hest(GArray *table_data, GArray *hardw= are_errors, int hest_offset =3D table_data->len; =20 /* Error Source Count */ - build_append_int_noprefix(table_data, ACPI_GHES_ERROR_SOURCE_COUNT, 4); - build_ghes_v2(table_data, linker, - ACPI_GHES_NOTIFY_SEA, ACPI_HEST_SRC_ID_SEA); + build_append_int_noprefix(table_data, num_sources, 4); + for (i =3D 0; i < num_sources; i++) { + build_ghes_v2(table_data, linker, ¬if_source[i], i, num_sources= ); + } =20 acpi_table_end(linker, &table); =20 @@ -421,13 +429,11 @@ int acpi_ghes_record_errors(int source_id, uint64_t p= hysical_address) 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; + uint32_t num_sources, i, ret; AcpiGedState *acpi_ged_state; AcpiGhesState *ags; uint64_t read_ack; =20 - assert(source_id < ACPI_GHES_ERROR_SOURCE_COUNT); - acpi_ged_state =3D ACPI_GED(object_resolve_path_type("", TYPE_ACPI_GED, NULL)); g_assert(acpi_ged_state); @@ -435,16 +441,18 @@ int acpi_ghes_record_errors(int source_id, uint64_t p= hysical_address) =20 hest_addr =3D le64_to_cpu(ags->hest_addr_le); =20 + cpu_physical_memory_read(hest_addr, &num_sources, sizeof(num_sources)); if (!physical_address) { return -1; } =20 - err_source_struct =3D hest_addr + ACPI_GHES_ERROR_SOURCE_COUNT; + err_source_struct =3D hest_addr + sizeof(num_sources); =20 /* * Currently, HEST Error source navigates only for GHESv2 tables */ - for (i =3D 0; i < ACPI_GHES_ERROR_SOURCE_COUNT; i++) { + + for (i =3D 0; i < num_sources; i++) { uint64_t addr =3D err_source_struct; uint16_t type, src_id; =20 @@ -463,9 +471,8 @@ int acpi_ghes_record_errors(int source_id, uint64_t phy= sical_address) =20 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"); - + if (i =3D=3D num_sources) { + error_report("HEST: Source %d not found.", source_id); return -1; } =20 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index bafd9a56c217..476c365851c4 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -890,6 +890,10 @@ static void acpi_align_size(GArray *blob, unsigned ali= gn) g_array_set_size(blob, ROUND_UP(acpi_data_len(blob), align)); } =20 +static const AcpiNotificationSourceId hest_ghes_notify[] =3D { + {ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA}, +}; + static void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) { @@ -945,6 +949,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa= bles *tables) if (vms->ras) { acpi_add_table(table_offsets, tables_blob); acpi_build_hest(tables_blob, tables->hardware_errors, tables->link= er, + hest_ghes_notify, ARRAY_SIZE(hest_ghes_notify), vms->oem_id, vms->oem_table_id); } =20 diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h index 6471934d7775..344919f1f75c 100644 --- a/include/hw/acpi/ghes.h +++ b/include/hw/acpi/ghes.h @@ -57,21 +57,28 @@ enum AcpiGhesNotifyType { ACPI_GHES_NOTIFY_RESERVED =3D 12 }; =20 -enum { - ACPI_HEST_SRC_ID_SEA =3D 0, - /* future ids go here */ - - ACPI_GHES_ERROR_SOURCE_COUNT -}; - typedef struct AcpiGhesState { uint64_t hest_addr_le; uint64_t ghes_addr_le; bool present; /* True if GHES is present at all on this board */ } AcpiGhesState; =20 +/* + * ID numbers used to fill HEST source ID field + */ +enum AcpiGhesSourceID { + ACPI_HEST_SRC_ID_SYNC, +}; + +typedef struct AcpiNotificationSourceId { + enum AcpiGhesSourceID source_id; + enum AcpiGhesNotifyType notify; +} AcpiNotificationSourceId; + void acpi_build_hest(GArray *table_data, GArray *hardware_errors, BIOSLinker *linker, + const AcpiNotificationSourceId * const notif_source, + int num_sources, const char *oem_id, const char *oem_table_id); void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s, GArray *hardware_errors); --=20 2.46.0