ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/riscv/virt: Add a switch to disable ACPI 

ACPI will be enabled by default. Add a switch to turn off
for testing and debug purposes.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Message-ID: <20230302091212.999767-3-sunilvl@ventanamicro.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Sunil V L 2023-03-02 14:42:06 +05:30 committed by Palmer Dabbelt
parent 90477a652b
commit 168b8c29ce
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/riscv/virt.c
View File

@ -50,6 +50,7 @@
#include "hw/pci-host/gpex.h" #include "hw/pci-host/gpex.h"
#include "hw/display/ramfb.h" #include "hw/display/ramfb.h"
#include "hw/acpi/aml-build.h" #include "hw/acpi/aml-build.h"
#include "qapi/qapi-visit-common.h"
/* /*
* The virt machine physical address space used by some of the devices * The virt machine physical address space used by some of the devices
@ -1533,6 +1534,7 @@ static void virt_machine_instance_init(Object *obj)
s->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6); s->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6);
s->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8); s->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8);
s->acpi = ON_OFF_AUTO_AUTO;
} }
static char *virt_get_aia_guests(Object *obj, Error **errp) static char *virt_get_aia_guests(Object *obj, Error **errp)
@ -1607,6 +1609,28 @@ static void virt_set_aclint(Object *obj, bool value, Error **errp)
s->have_aclint = value; s->have_aclint = value;
} }
bool virt_is_acpi_enabled(RISCVVirtState *s)
{
return s->acpi != ON_OFF_AUTO_OFF;
}
static void virt_get_acpi(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
OnOffAuto acpi = s->acpi;
visit_type_OnOffAuto(v, name, &acpi, errp);
}
static void virt_set_acpi(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
RISCVVirtState *s = RISCV_VIRT_MACHINE(obj);
visit_type_OnOffAuto(v, name, &s->acpi, errp);
}
static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine,
DeviceState *dev) DeviceState *dev)
{ {
@ -1678,6 +1702,11 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
sprintf(str, "Set number of guest MMIO pages for AIA IMSIC. Valid value " sprintf(str, "Set number of guest MMIO pages for AIA IMSIC. Valid value "
"should be between 0 and %d.", VIRT_IRQCHIP_MAX_GUESTS); "should be between 0 and %d.", VIRT_IRQCHIP_MAX_GUESTS);
object_class_property_set_description(oc, "aia-guests", str); object_class_property_set_description(oc, "aia-guests", str);
object_class_property_add(oc, "acpi", "OnOffAuto",
virt_get_acpi, virt_set_acpi,
NULL, NULL);
object_class_property_set_description(oc, "acpi",
"Enable ACPI");
} }
static const TypeInfo virt_machine_typeinfo = { static const TypeInfo virt_machine_typeinfo = {

2
include/hw/riscv/virt.h
View File

@ -58,6 +58,7 @@ struct RISCVVirtState {
int aia_guests; int aia_guests;
char *oem_id; char *oem_id;
char *oem_table_id; char *oem_table_id;
OnOffAuto acpi;
}; };
enum { enum {
@ -123,4 +124,5 @@ enum {
#define FDT_APLIC_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + \ #define FDT_APLIC_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + \
1 + FDT_APLIC_INT_CELLS) 1 + FDT_APLIC_INT_CELLS)
bool virt_is_acpi_enabled(RISCVVirtState *s);
#endif #endif