From: Igor Mammedov <imammedo@redhat.com>
To: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Shiju Jose" <shiju.jose@huawei.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Ani Sinha" <anisinha@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Shannon Zhao" <shannon.zhaosl@gmail.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Zhao Liu" <zhao1.liu@intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v9 12/20] acpi/generic_event_device: add logic to detect if HEST addr is available
Date: Mon, 2 Jun 2025 12:22:44 +0200 [thread overview]
Message-ID: <20250602122244.081a1960@imammedo.users.ipa.redhat.com> (raw)
In-Reply-To: <20250530221810.694ce02e@foz.lan>
On Fri, 30 May 2025 22:18:10 +0200
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote:
> Em Fri, 30 May 2025 16:49:03 +0200
> Igor Mammedov <imammedo@redhat.com> escreveu:
>
> > On Fri, 30 May 2025 08:01:28 -0400
> > "Michael S. Tsirkin" <mst@redhat.com> wrote:
> >
> > > On Wed, May 28, 2025 at 05:42:12PM +0200, Igor Mammedov wrote:
> > > > On Tue, 20 May 2025 08:41:31 +0200
> > > > Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote:
> > > >
> > > > > 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.
> > > >
> > > >
> > > > it doesn't apply to current master anymore
> > >
> > > indeed. Mauro?
> >
> > Michael,
> > it's trivial conflict in machine compat,
> > could you fix it up while applying?
>
> IMHO, that's the best. The thing is, as code gets merged upstream with
> backports, conflicts happen.
>
> I can re-send the series, if you prefer, as I'm keeping it rebasing it
> from time to time at:
> https://gitlab.com/mchehab_kernel/qemu/-/tree/qemu_submitted?ref_type=heads
>
> (it is on the top of upstream/master)
>
> But even that might have conflicts on your test tree if you pick
> other patches touching this backport table:
>
> > -GlobalProperty hw_compat_10_0[] = {};
> > +GlobalProperty hw_compat_10_0[] = {
> > + { TYPE_ACPI_GED, "x-has-hest-addr", "false" },
> > +};
>
> (this was the code when I sent the PR. When applying upstream,
> such hunk is now(*):
>
> GlobalProperty hw_compat_10_0[] = {
> { "scsi-hd", "dpofua", "off" },
> + { TYPE_ACPI_GED, "x-has-hest-addr", "false" },
> };
>
>
> (*) https://gitlab.com/mchehab_kernel/qemu/-/commit/08c4859f8c6f36d7dccf2b773be88847e5d1fe0c
>
> If you still prefer that I resubmit the entire PR, let me know.
If it's the only patch that needs rebase and doesn't affect the rest,
I'd say there is no need to spam the list with whole series respin,
just post rebased v10 12/20 as reply here
If it's more than that, respin series.
>
> Regards,
> Mauro
>
WARNING: multiple messages have this Message-ID
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Igor Mammedov <imammedo@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Cc: "Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Shiju Jose" <shiju.jose@huawei.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org,
"Mauro Carvalho Chehab" <mchehab+huawei@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Ani Sinha" <anisinha@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Shannon Zhao" <shannon.zhaosl@gmail.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Zhao Liu" <zhao1.liu@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v10 12/26] acpi/generic_event_device: add logic to detect if HEST addr is available
Date: Mon, 2 Jun 2025 14:52:30 +0200 [thread overview]
Message-ID: <20250602122244.081a1960@imammedo.users.ipa.redhat.com> (raw), Mauro Carvalho Chehab <mchehab+huawei@kernel.org> (raw)
In-Reply-To: <20250530221810.694ce02e@foz.lan>
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 <mchehab+huawei@kernel.org>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
v10:
- rebased on the top of upstream
hw/acpi/generic_event_device.c | 2 ++
hw/arm/virt-acpi-build.c | 18 ++++++++++++++++--
hw/core/machine.c | 2 ++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index d292f61b4e41..3cf9dab0d01a 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -318,6 +318,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
static const Property acpi_ged_properties[] = {
DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap, 0),
+ DEFINE_PROP_BOOL("x-has-hest-addr", AcpiGedState,
+ ghes_state.use_hest_addr, false),
};
static const VMStateDescription vmstate_memhp_state = {
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index da3ebf403ef9..3126234e657d 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -893,6 +893,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = {
{ ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA },
};
+static const AcpiNotificationSourceId hest_ghes_notify_10_0[] = {
+ { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA },
+};
+
static
void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
{
@@ -947,15 +951,25 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
if (vms->ras) {
AcpiGedState *acpi_ged_state;
+ static const AcpiNotificationSourceId *notify;
+ unsigned int notify_sz;
AcpiGhesState *ags;
acpi_ged_state = ACPI_GED(vms->acpi_dev);
ags = &acpi_ged_state->ghes_state;
if (ags) {
acpi_add_table(table_offsets, tables_blob);
+
+ if (!ags->use_hest_addr) {
+ notify = hest_ghes_notify_10_0;
+ notify_sz = ARRAY_SIZE(hest_ghes_notify_10_0);
+ } else {
+ notify = hest_ghes_notify;
+ notify_sz = 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 c3f3a5020d0b..aa90a83d8c23 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -35,10 +35,12 @@
#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"
GlobalProperty hw_compat_10_0[] = {
{ "scsi-hd", "dpofua", "off" },
+ { TYPE_ACPI_GED, "x-has-hest-addr", "false" },
};
const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
--
2.49.0
WARNING: multiple messages have this Message-ID
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Igor Mammedov <imammedo@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Cc: "Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Shiju Jose" <shiju.jose@huawei.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org,
"Mauro Carvalho Chehab" <mchehab+huawei@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Ani Sinha" <anisinha@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Shannon Zhao" <shannon.zhaosl@gmail.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Zhao Liu" <zhao1.liu@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v10 12/20 RESEND] acpi/generic_event_device: add logic to detect if HEST addr is available
Date: Mon, 2 Jun 2025 14:57:12 +0200 [thread overview]
Message-ID: <20250602122244.081a1960@imammedo.users.ipa.redhat.com> (raw), Mauro Carvalho Chehab <mchehab+huawei@kernel.org> (raw)
Message-ID: <20250602125712.zRS3rDnUwpgBqaN6Cxy87fcfw2wsfLpc_wcW4oZ1UMI@z> (raw)
In-Reply-To: <20250530221810.694ce02e@foz.lan>
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 <mchehab+huawei@kernel.org>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
PS.: patch resent as the previous version was "12/26" instead
of "12/20"
v10:
- rebased on the top of upstream
hw/acpi/generic_event_device.c | 2 ++
hw/arm/virt-acpi-build.c | 18 ++++++++++++++++--
hw/core/machine.c | 2 ++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index d292f61b4e41..3cf9dab0d01a 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -318,6 +318,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
static const Property acpi_ged_properties[] = {
DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap, 0),
+ DEFINE_PROP_BOOL("x-has-hest-addr", AcpiGedState,
+ ghes_state.use_hest_addr, false),
};
static const VMStateDescription vmstate_memhp_state = {
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index da3ebf403ef9..3126234e657d 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -893,6 +893,10 @@ static const AcpiNotificationSourceId hest_ghes_notify[] = {
{ ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA },
};
+static const AcpiNotificationSourceId hest_ghes_notify_10_0[] = {
+ { ACPI_HEST_SRC_ID_SYNC, ACPI_GHES_NOTIFY_SEA },
+};
+
static
void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
{
@@ -947,15 +951,25 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
if (vms->ras) {
AcpiGedState *acpi_ged_state;
+ static const AcpiNotificationSourceId *notify;
+ unsigned int notify_sz;
AcpiGhesState *ags;
acpi_ged_state = ACPI_GED(vms->acpi_dev);
ags = &acpi_ged_state->ghes_state;
if (ags) {
acpi_add_table(table_offsets, tables_blob);
+
+ if (!ags->use_hest_addr) {
+ notify = hest_ghes_notify_10_0;
+ notify_sz = ARRAY_SIZE(hest_ghes_notify_10_0);
+ } else {
+ notify = hest_ghes_notify;
+ notify_sz = 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 c3f3a5020d0b..aa90a83d8c23 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -35,10 +35,12 @@
#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"
GlobalProperty hw_compat_10_0[] = {
{ "scsi-hd", "dpofua", "off" },
+ { TYPE_ACPI_GED, "x-has-hest-addr", "false" },
};
const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
--
2.49.0
next prev parent reply other threads:[~2025-06-02 10:22 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1747722973.git.mchehab+huawei@kernel.org>
2025-05-20 6:41 ` [PATCH v9 01/20] tests/acpi: virt: add an empty HEST file Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 02/20] tests/qtest/bios-tables-test: extend to also check HEST table Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 03/20] tests/acpi: virt: update HEST file with its current data Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 04/20] Revert "hw/acpi/ghes: Make ghes_record_cper_errors() static" Mauro Carvalho Chehab
2025-05-20 8:34 ` Jonathan Cameron
2025-05-20 6:41 ` [PATCH v9 05/20] acpi/ghes: Cleanup the code which gets ghes ged state Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 06/20] acpi/ghes: prepare to change the way HEST offsets are calculated Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 07/20] acpi/ghes: add a firmware file with HEST address Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 08/20] acpi/ghes: Use HEST table offsets when preparing GHES records Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 09/20] acpi/ghes: don't hard-code the number of sources for HEST table Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 10/20] acpi/ghes: add a notifier to notify when error data is ready Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 11/20] acpi/generic_event_device: Update GHES migration to cover hest addr Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 12/20] acpi/generic_event_device: add logic to detect if HEST addr is available Mauro Carvalho Chehab
2025-05-28 15:42 ` Igor Mammedov
2025-05-30 12:01 ` Michael S. Tsirkin
2025-05-30 14:49 ` Igor Mammedov
2025-05-30 20:18 ` Mauro Carvalho Chehab
2025-06-02 10:22 ` Igor Mammedov [this message]
2025-06-02 11:28 ` Mauro Carvalho Chehab
2025-06-02 12:52 ` [PATCH v10 12/26] " Mauro Carvalho Chehab
2025-06-02 12:57 ` [PATCH v10 12/20 RESEND] " Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 13/20] acpi/generic_event_device: add an APEI error device Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 14/20] tests/acpi: virt: allow acpi table changes at DSDT and HEST tables Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 15/20] arm/virt: Wire up a GED error device for ACPI / GHES Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 16/20] qapi/acpi-hest: add an interface to do generic CPER error injection Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 17/20] acpi/generic_event_device.c: enable use_hest_addr for QEMU 10.x Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 18/20] tests/acpi: virt: update HEST and DSDT tables Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 19/20] docs: hest: add new "etc/acpi_table_hest_addr" and update workflow Mauro Carvalho Chehab
2025-05-20 6:41 ` [PATCH v9 20/20] scripts/ghes_inject: add a script to generate GHES error inject Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250602122244.081a1960@imammedo.users.ipa.redhat.com \
--to=imammedo@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=anisinha@redhat.com \
--cc=eduardo@habkost.net \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mchehab+huawei@kernel.org \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.com \
--cc=shiju.jose@huawei.com \
--cc=wangyanan55@huawei.com \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®