On Tue, May 24, 2016 at 12:37:21PM -0500, miny...@acm.org wrote:
> From: Corey Minyard <cminy...@mvista.com>
>
> Use the new ACPI table construction tools to create an ACPI
> entry for IPMI. This adds a function called from build_dsdt
I think you renamed it since.
> to add an DSDT entry for IPMI if IPMI is compiled in and has
> registered firmware. 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 <cminy...@mvista.com>
> ---
> hw/acpi/Makefile.objs | 2 +
> hw/acpi/ipmi.c | 105
> +++++++++++++++++++++++++++++++++++++++++++++++++
> hw/acpi/noipmi.c | 14 +++++++
> hw/i386/acpi-build.c | 12 ++++++
> include/hw/acpi/ipmi.h | 22 +++++++++++
> 5 files changed, 155 insertions(+)
> create mode 100644 hw/acpi/ipmi.c
> create mode 100644 hw/acpi/noipmi.c
> create mode 100644 include/hw/acpi/ipmi.h
>
> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
> index faee86c..c7c6db6 100644
> --- a/hw/acpi/Makefile.objs
> +++ b/hw/acpi/Makefile.objs
> @@ -6,3 +6,5 @@ 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
> +common-obj-$(call land,$(CONFIG_SMBIOS),$(call lnot,$(CONFIG_IPMI))) +=
> noipmi.o
> diff --git a/hw/acpi/ipmi.c b/hw/acpi/ipmi.c
> new file mode 100644
> index 0000000..7e74ce4
> --- /dev/null
> +++ b/hw/acpi/ipmi.c
> @@ -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));
> + }
> +}
> diff --git a/hw/acpi/noipmi.c b/hw/acpi/noipmi.c
> new file mode 100644
> index 0000000..98b6dce
> --- /dev/null
> +++ b/hw/acpi/noipmi.c
> @@ -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)
> +{
> +}
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 279f0d7..4b05bc2 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -59,6 +59,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
> @@ -1448,8 +1450,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());
> @@ -1461,6 +1465,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);
> }
>
> diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h
> new file mode 100644
> index 0000000..ab2bb29
> --- /dev/null
> +++ b/include/hw/acpi/ipmi.h
> @@ -0,0 +1,22 @@
> +/*
> + * QEMU IPMI ACPI handling
> + *
> + * Copyright (c) 2015,2016 Corey Minyard <cminy...@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 */
> --
> 2.7.4
