OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

acpi: Add IPMI table entries 

Use the ACPI table construction tools to create an ACPI entry
for IPMI.  This adds a function called build_acpi_ipmi_devices
to add an DSDT entry for IPMI if IPMI is compiled in and an
IPMI device exists.  It also adds a dummy function if IPMI
is not compiled in.

This conforms to section "C3-2 Locating IPMI System Interfaces in
ACPI Name Space" in the IPMI 2.0 specification.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Corey Minyard 2016-06-10 04:15:42 -05:00 committed by Michael S. Tsirkin
parent 35658f6e0c
commit 86e91dd713
6 changed files with 155 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/acpi/Makefile.objs
View File

@ -6,3 +6,4 @@ obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI) += acpi_interface.o
common-obj-$(CONFIG_ACPI) += bios-linker-loader.o
common-obj-$(CONFIG_ACPI) += aml-build.o
common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o

105
hw/acpi/ipmi.c Normal file
View File

@ -0,0 +1,105 @@
/*
* IPMI ACPI firmware handling
*
* Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
#include "hw/ipmi/ipmi.h"
#include "hw/acpi/aml-build.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/ipmi.h"
static Aml *aml_ipmi_crs(IPMIFwInfo *info)
{
Aml *crs = aml_resource_template();
/*
* The base address is fixed and cannot change. That may be different
* if someone does PCI, but we aren't there yet.
*/
switch (info->memspace) {
case IPMI_MEMSPACE_IO:
aml_append(crs, aml_io(AML_DECODE16, info->base_address,
info->base_address + info->register_length - 1,
info->register_spacing, info->register_length));
break;
case IPMI_MEMSPACE_MEM32:
aml_append(crs,
aml_dword_memory(AML_POS_DECODE,
AML_MIN_FIXED, AML_MAX_FIXED,
AML_NON_CACHEABLE, AML_READ_WRITE,
0xffffffff,
info->base_address,
info->base_address + info->register_length - 1,
info->register_spacing, info->register_length));
break;
case IPMI_MEMSPACE_MEM64:
aml_append(crs,
aml_qword_memory(AML_POS_DECODE,
AML_MIN_FIXED, AML_MAX_FIXED,
AML_NON_CACHEABLE, AML_READ_WRITE,
0xffffffffffffffffULL,
info->base_address,
info->base_address + info->register_length - 1,
info->register_spacing, info->register_length));
break;
case IPMI_MEMSPACE_SMBUS:
aml_append(crs, aml_return(aml_int(info->base_address)));
break;
default:
abort();
}
if (info->interrupt_number) {
aml_append(crs, aml_irq_no_flags(info->interrupt_number));
}
return crs;
}
static Aml *aml_ipmi_device(IPMIFwInfo *info)
{
Aml *dev;
uint16_t version = ((info->ipmi_spec_major_revision << 8)
| (info->ipmi_spec_minor_revision << 4));
assert(info->ipmi_spec_minor_revision <= 15);
dev = aml_device("MI%d", info->uuid);
aml_append(dev, aml_name_decl("_HID", aml_eisaid("IPI0001")));
aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s",
info->interface_name)));
aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid)));
aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info)));
aml_append(dev, aml_name_decl("_IFT", aml_int(info->interface_type)));
aml_append(dev, aml_name_decl("_SRV", aml_int(version)));
return dev;
}
void build_acpi_ipmi_devices(Aml *scope, BusState *bus)
{
BusChild *kid;
QTAILQ_FOREACH(kid, &bus->children, sibling) {
IPMIInterface *ii;
IPMIInterfaceClass *iic;
IPMIFwInfo info;
Object *obj = object_dynamic_cast(OBJECT(kid->child),
TYPE_IPMI_INTERFACE);
if (!obj) {
continue;
}
ii = IPMI_INTERFACE(obj);
iic = IPMI_INTERFACE_GET_CLASS(obj);
iic->get_fwinfo(ii, &info);
aml_append(scope, aml_ipmi_device(&info));
}
}

12
hw/i386/acpi-build.c
View File

@ -58,6 +58,8 @@
#include "qapi/qmp/qint.h"
#include "qom/qom-qobject.h"
#include "hw/acpi/ipmi.h"
/* These are used to size the ACPI tables for -M pc-i440fx-1.7 and
* -M pc-i440fx-2.0. Even if the actual amount of AML generated grows
* a little bit, there should be plenty of free space since the DSDT
@ -1334,8 +1336,10 @@ static Aml *build_com_device_aml(uint8_t uid)
static void build_isa_devices_aml(Aml *table)
{
ISADevice *fdc = pc_find_fdc0();
bool ambiguous;
Aml *scope = aml_scope("_SB.PCI0.ISA");
Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous);
aml_append(scope, build_rtc_device_aml());
aml_append(scope, build_kbd_device_aml());
@ -1347,6 +1351,14 @@ static void build_isa_devices_aml(Aml *table)
aml_append(scope, build_com_device_aml(1));
aml_append(scope, build_com_device_aml(2));
if (ambiguous) {
error_report("Multiple ISA busses, unable to define IPMI ACPI data");
} else if (!obj) {
error_report("No ISA bus, unable to define IPMI ACPI data");
} else {
build_acpi_ipmi_devices(scope, BUS(obj));
}
aml_append(table, scope);
}

22
include/hw/acpi/ipmi.h Normal file
View File

@ -0,0 +1,22 @@
/*
* QEMU IPMI ACPI handling
*
* Copyright (c) 2015,2016 Corey Minyard <cminyard@mvista.com>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#ifndef HW_ACPI_IPMI_H
#define HW_ACPI_IPMI_H
#include "qemu/osdep.h"
#include "hw/acpi/aml-build.h"
/*
* Add ACPI IPMI entries for all registered IPMI devices whose parent
* bus matches the given bus. The resource is the ACPI resource that
* contains the IPMI device, this is required for the I2C CRS.
*/
void build_acpi_ipmi_devices(Aml *table, BusState *bus);
#endif /* HW_ACPI_IPMI_H */

1
stubs/Makefile.objs
View File

@ -42,3 +42,4 @@ stub-obj-y += target-get-monitor-def.o
stub-obj-y += vhost.o
stub-obj-y += iohandler.o
stub-obj-y += smbios_type_38.o
stub-obj-y += ipmi.o

14
stubs/ipmi.c Normal file
View File

@ -0,0 +1,14 @@
/*
* IPMI ACPI firmware handling
*
* Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "hw/acpi/ipmi.h"
void build_acpi_ipmi_devices(Aml *table, BusState *bus)
{
}