acpi/generic_event_device: add logic to detect if HEST addr is available
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> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-ID: <c4eb3cf32a3f158ae62dac29e866ac3f373956c3.1758610789.git.mchehab+huawei@kernel.org> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
d238dedae6
commit
f3f747ddcf
3 changed files with 22 additions and 3 deletions
|
|
@ -349,6 +349,8 @@ static const Property acpi_ged_properties[] = {
|
|||
pcihp_state.use_acpi_hotplug_bridge, 0),
|
||||
DEFINE_PROP_LINK("bus", AcpiGedState, pcihp_state.root,
|
||||
TYPE_PCI_BUS, PCIBus *),
|
||||
DEFINE_PROP_BOOL("x-has-hest-addr", AcpiGedState,
|
||||
ghes_state.use_hest_addr, false),
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_memhp_state = {
|
||||
|
|
|
|||
|
|
@ -1129,6 +1129,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)
|
||||
{
|
||||
|
|
@ -1186,15 +1190,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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,9 +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_1[] = {};
|
||||
GlobalProperty hw_compat_10_1[] = {
|
||||
{ TYPE_ACPI_GED, "x-has-hest-addr", "false" },
|
||||
};
|
||||
const size_t hw_compat_10_1_len = G_N_ELEMENTS(hw_compat_10_1);
|
||||
|
||||
GlobalProperty hw_compat_10_0[] = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue