qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: minyard@acm.org
To: qemu-devel@nongnu.org
Cc: Corey Minyard <cminyard@mvista.com>,
	openipmi-developer@lists.sourceforge.net
Subject: [Qemu-devel] [PATCH 18/20] ipmi: Add ACPI table entries for BMCs
Date: Wed, 29 May 2013 17:08:14 -0500	[thread overview]
Message-ID: <1369865296-19584-19-git-send-email-minyard@acm.org> (raw)
In-Reply-To: <1369865296-19584-1-git-send-email-minyard@acm.org>

From: Corey Minyard <cminyard@mvista.com>

Use the new ACPI table construction tools to create an ACPI
entry for IPMI.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
 hw/ipmi/isa_ipmi.c |  127 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)

diff --git a/hw/ipmi/isa_ipmi.c b/hw/ipmi/isa_ipmi.c
index 7664b66..92afb88 100644
--- a/hw/ipmi/isa_ipmi.c
+++ b/hw/ipmi/isa_ipmi.c
@@ -23,6 +23,8 @@
  */
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
+#include "hw/acpi/acpi-elements.h"
+#include "hw/acpi/acpi.h"
 #include "hw/i386/pc.h"
 #include "qemu/timer.h"
 #include "sysemu/char.h"
@@ -36,16 +38,134 @@
 typedef struct ISAIPMIDevice {
     ISADevice dev;
     char *interface;
+    int intftype;
     uint32_t iobase;
+    uint32_t endaddr;
     uint32_t isairq;
+    uint8_t regspacing;
     uint8_t slave_addr;
+    uint8_t version;
     CharDriverState *chr;
     IPMIInterface *intf;
 } ISAIPMIDevice;
 
+static int
+acpi_ipmi_crs_ops(char **data, int dlen, void *opaque)
+{
+    ISAIPMIDevice *info = opaque;
+    int len, rv;
+    uint8_t regspacing = info->regspacing;
+
+    if (regspacing == 1)
+        regspacing = 0;
+    /* IO(Decode16, x, y, z, c) */
+    len = acpi_add_IO16(data, dlen, info->iobase, info->endaddr,
+                        regspacing, info->endaddr - info->iobase + 1);
+    if (len < 0)
+        return len;
+    if (info->isairq) {
+        /* Interrupt(ResourceConsumer,Level,ActiveHigh,Exclusive) {n} */
+        rv = acpi_add_Interrupt(data, dlen, info->isairq,
+                                ACPI_RESOURCE_CONSUMER,
+                                ACPI_INTERRUPT_MODE_LEVEL,
+                                ACPI_INTERRUPT_POLARITY_ACTIVE_HIGH,
+                                ACPI_INTERRUPT_EXCLUSIVE);
+        if (rv < 0)
+            return rv;
+        len += rv;
+    }
+    rv = acpi_add_EndResource(data, dlen);
+    if (rv < 0)
+        return rv;
+    len += rv;
+    return len;
+}
+
+static int
+acpi_ipmi_crs(char **data, int dlen, void *opaque)
+{
+    ISAIPMIDevice *info = opaque;
+    int len;
+
+    len = acpi_add_BufferOp(NULL, 0, acpi_ipmi_crs_ops, info);
+    if (len < 0)
+        return len;
+    if (len <= dlen) {
+        acpi_add_BufferOp(data, dlen, acpi_ipmi_crs_ops, info);
+    }
+    return len;
+}
+
+static int
+acpi_ipmi_dev(char **data, int dlen, void *opaque)
+{
+    ISAIPMIDevice *info = opaque;
+    int len, rv;
+    char *name;
+    uint64_t val;
+
+    name = g_strdup_printf("ipmi_%s", info->interface);
+
+    /* Name(_HID, EISAID("IPI0001")) */
+    len = acpi_add_Name(data, dlen, "_HID", acpi_add_EISAID,
+                        (void *) "IPI0001");
+    if (len < 0)
+        return len;
+    /* Name(_STR, Unicode("ipmi_xxx")) */
+    rv = acpi_add_Name(data, dlen, "_STR", acpi_add_Unicode, name);
+    if (rv < 0)
+        return rv;
+    len += rv;
+    val = 0;
+    /* Name(_UID, 0) */
+    rv = acpi_add_Name(data, dlen, "_UID", acpi_add_Integer, &val);
+    if (rv < 0)
+        return rv;
+    len += rv;
+    /* Name(_CRS, ResourceTemplate() { */
+    rv = acpi_add_Name(data, dlen, "_CRS", acpi_ipmi_crs, info);
+    if (rv < 0)
+        return rv;
+    len += rv;
+    val = info->intftype;
+    /* Method(_IFT) { Return(i) } */
+    rv = acpi_add_Method(data, dlen, "_IFT", 0, acpi_add_Return, &val);
+    if (rv < 0)
+        return rv;
+    len += rv;
+    val = ((info->version & 0xf0) << 4) | (info->version & 0x0f);
+    /* Method(_SRV) { Return(version) } */
+    rv = acpi_add_Method(data, dlen, "_SRV", 0, acpi_add_Return, &val);
+    if (rv < 0)
+        return rv;
+    len += rv;
+    return len;
+}
+
+static void
+ipmi_encode_acpi(ISAIPMIDevice *info)
+{
+    char ipmitable[200];
+    char *tblptr = ipmitable;
+    int rc;
+    Error *err = NULL;
+
+    /* Device(MI0) { */
+    rc = acpi_add_Device(&tblptr, sizeof(ipmitable), "MI0",
+                         acpi_ipmi_dev, info);
+    /* } */
+    if (rc < 0) {
+        fprintf(stderr, "Unable to format IPMI ACPI table entry\n");
+        return;
+    }
+
+    acpi_append_to_table("DSDT", ipmitable, rc, &err);
+}
+
 static int ipmi_isa_initfn(ISADevice *dev)
 {
     ISAIPMIDevice *isa = ISA_IPMI(dev);
+    IPMIInterfaceClass *intfk;
     char typename[20];
     Object *intfobj;
     IPMIInterface *intf;
@@ -69,6 +189,7 @@ static int ipmi_isa_initfn(ISADevice *dev)
              TYPE_IPMI_INTERFACE_PREFIX "%s", isa->interface);
     intfobj = object_new(typename);
     intf = IPMI_INTERFACE(intfobj);
+    intfk = IPMI_INTERFACE_GET_CLASS(intf);
     bmc->intf = intf;
     intf->bmc = bmc;
     intf->io_base = isa->iobase;
@@ -85,6 +206,10 @@ static int ipmi_isa_initfn(ISADevice *dev)
     /* These may be set by the interface. */
     isa->iobase = intf->io_base;
     isa->slave_addr = intf->slave_addr;
+    isa->regspacing = 1;
+    isa->endaddr = cpu_to_le64(intf->io_base + intf->io_length - 1);
+    isa->intftype = intfk->smbios_type;
+    isa->version = 0x20; /* Version 2.0 */
 
     if (isa->isairq != 0) {
         isa_init_irq(dev, &intf->irq, isa->isairq);
@@ -107,6 +232,8 @@ static int ipmi_isa_initfn(ISADevice *dev)
 
     isa_register_ioport(dev, &intf->io, intf->io_base);
 
+    ipmi_encode_acpi(isa);
+
     return 0;
 }
 
-- 
1.7.9.5

  parent reply	other threads:[~2013-05-29 22:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-29 22:07 [Qemu-devel] [PATCH 00/20] Add an IPMI device to QEMU minyard
2013-05-29 22:07 ` [Qemu-devel] [PATCH 01/20] qemu-char: Allocate CharDriverState in qemu_chr_new_from_opts minyard
2013-05-29 22:07 ` [Qemu-devel] [PATCH 02/20] qemu-char: Allow a chardev to reconnect if disconnected minyard
2013-05-29 22:07 ` [Qemu-devel] [PATCH 03/20] qemu-char: Fix a race reporting opens and closes minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 04/20] qemu-char: remove free of chr from win_stdio_close minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 05/20] qemu-char: Close fd at end of file minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 06/20] Add a base IPMI interface minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 07/20] ipmi: Add a PC ISA type structure minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 08/20] ipmi: Add a KCS low-level interface minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 09/20] ipmi: Add a BT " minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 10/20] ipmi: Add a local BMC simulation minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 11/20] ipmi: Add an external connection simulation interface minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 12/20] ipmi: Add tests minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 13/20] ipmi: Add documentation minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 14/20] ipmi: Add migration capability to the IPMI device minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 15/20] acpi: Add a way to extend tables minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 16/20] acpi: Add table construction tools minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 17/20] pc: Postpone adding ACPI and SMBIOS to fw_cfg minyard
2013-05-29 22:08 ` minyard [this message]
2013-05-29 22:08 ` [Qemu-devel] [PATCH 19/20] smbios: Add a function to directly add an entry minyard
2013-05-29 22:08 ` [Qemu-devel] [PATCH 20/20] ipmi: Add SMBIOS table entry minyard
2013-11-05 13:56 ` [Qemu-devel] [PATCH 00/20] Add an IPMI device to QEMU Michael S. Tsirkin
2013-11-05 14:05   ` Corey Minyard
2013-11-05 16:09   ` Andreas Färber
2013-11-05 16:48     ` Corey Minyard

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=1369865296-19584-19-git-send-email-minyard@acm.org \
    --to=minyard@acm.org \
    --cc=cminyard@mvista.com \
    --cc=openipmi-developer@lists.sourceforge.net \
    --cc=qemu-devel@nongnu.org \
    /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;
as well as URLs for NNTP newsgroup(s).