From nobody Fri Apr 4 09:01:20 2025 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 C134922B5AC for ; Thu, 27 Feb 2025 11:03:58 +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=1740654238; cv=none; b=gaS1casnBvIbRnLH6VgqllPhX+gihsu60oVo+iynEMIwMoYQnRxtzkzr5307mpdsJiyaCsFF89puA++GLveI55QDHpWuPUP67VjeTznm2d9e6DR0IWYv6yUqgZeS1ZQc65fDfiBHskvms+T5HHveHnMMmx2sGKD767CSyKgyJJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740654238; c=relaxed/simple; bh=vZyz76w9mbuLEkV6dVQdbcGEs4hMzqd0w9oBQQyU9u8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aaD7yV3dH+VCvON0/2a9eR6izb+g4iLjhEmKNOekWuAWkdrlLEQs9f3ERY1ELxtR+5HHpheNOTHWpf53hAdcFfhqi547Rq8Xcb81fTgZc0UdWQXAJ9KH2BIT3qzdtUFNtjlFHzUttD1Bk6Jg+TJAnbs3dYKEKVZRhF82a71K+Y0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ds9xIJMQ; 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="ds9xIJMQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DF32C4CEF8; Thu, 27 Feb 2025 11:03:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740654238; bh=vZyz76w9mbuLEkV6dVQdbcGEs4hMzqd0w9oBQQyU9u8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ds9xIJMQFvLMBiTa+Kyssak35WoSBoRhYtu14g6xCkjP0+7ozaqWz1doN+Pzv9q6b 3GdlvU0MT0FDMG6ggkugVLbw0P/SekLRvlAFhN5tdxs/jH3f5Ld59hxMhNbJ218rE4 d+z6MgFWEEkXt7ide6EhKxTVIXMrp28K+Co0fQf6LaB+ysswOFv+3FbNR2fEXHMmMN vTc5vKPMHezi1+tq3W1Q8W6PmKP4mrw7w3BLNJEV1lVQB1x01T17c5p3PwbYiZjNzL wnoZF91ehH+hiwiKwEEEAR/RnnvYSwehmRls2TYP7eyT9AcwVb29fVM4tqorSO5OGl MebN0kXXkgP5Q== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1tnbgK-00000001mRI-1Lws; Thu, 27 Feb 2025 12:03:56 +0100 From: Mauro Carvalho Chehab To: Igor Mammedov , "Michael S . Tsirkin" Cc: Jonathan Cameron , Shiju Jose , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Mauro Carvalho Chehab , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ani Sinha , Eduardo Habkost , Marcel Apfelbaum , Peter Maydell , Shannon Zhao , Yanan Wang , Zhao Liu , linux-kernel@vger.kernel.org Subject: [PATCH v5 12/21] acpi/generic_event_device: add logic to detect if HEST addr is available Date: Thu, 27 Feb 2025 12:03:42 +0100 Message-ID: <73e0b70ed4125dc07a85fb43281a7731f452750e.1740653898.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.48.1 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" Create a new property (x-has-hest-addr) and use it to detect if the GHES table offsets can be calculated from the HEST address (qemu 10.0 and upper) or via the legacy way via an offset obtained from the hardware_errors firmware file. Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jonathan Cameron Reviewed-by: Igor Mammedov --- hw/acpi/generic_event_device.c | 1 + hw/arm/virt-acpi-build.c | 18 ++++++++++++++++-- hw/core/machine.c | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index 5346cae573b7..14d8513a5440 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -318,6 +318,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, Acp= iEventStatusBits ev) =20 static const Property acpi_ged_properties[] =3D { DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap, 0), + DEFINE_PROP_BOOL("x-has-hest-addr", AcpiGedState, ghes_state.use_hest_= addr, false), }; =20 static const VMStateDescription vmstate_memhp_state =3D { diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index af5056201c22..03ee30b3b3f0 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -897,6 +897,10 @@ static const AcpiNotificationSourceId hest_ghes_notify= [] =3D { { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, }; =20 +static const AcpiNotificationSourceId hest_ghes_notify_9_2[] =3D { + { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA }, +}; + static void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) { @@ -951,6 +955,8 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa= bles *tables) =20 if (vms->ras) { AcpiGedState *acpi_ged_state; + static const AcpiNotificationSourceId *notify; + unsigned int notify_sz; AcpiGhesState *ags; =20 acpi_ged_state =3D ACPI_GED(object_resolve_path_type("", TYPE_ACPI= _GED, @@ -958,9 +964,17 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildT= ables *tables) ags =3D &acpi_ged_state->ghes_state; if (ags) { acpi_add_table(table_offsets, tables_blob); + + if (!ags->use_hest_addr) { + notify =3D hest_ghes_notify_9_2; + notify_sz =3D ARRAY_SIZE(hest_ghes_notify_9_2); + } else { + notify =3D hest_ghes_notify; + notify_sz =3D ARRAY_SIZE(hest_ghes_notify); + } + acpi_build_hest(ags, tables_blob, tables->hardware_errors, - tables->linker, hest_ghes_notify, - ARRAY_SIZE(hest_ghes_notify), + tables->linker, notify, notify_sz, vms->oem_id, vms->oem_table_id); } } diff --git a/hw/core/machine.c b/hw/core/machine.c index 02cff735b3fb..7a11e0f87b11 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -34,6 +34,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-iommu.h" +#include "hw/acpi/generic_event_device.h" #include "audio/audio.h" =20 GlobalProperty hw_compat_9_2[] =3D { @@ -43,6 +44,7 @@ GlobalProperty hw_compat_9_2[] =3D { { "virtio-balloon-pci-non-transitional", "vectors", "0" }, { "virtio-mem-pci", "vectors", "0" }, { "migration", "multifd-clean-tls-termination", "false" }, + { TYPE_ACPI_GED, "x-has-hest-addr", "false" }, }; const size_t hw_compat_9_2_len =3D G_N_ELEMENTS(hw_compat_9_2); =20 --=20 2.48.1