From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOHFj-0004M5-6j for qemu-devel@nongnu.org; Wed, 18 Feb 2015 21:54:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOHFe-0007dF-Qz for qemu-devel@nongnu.org; Wed, 18 Feb 2015 21:54:11 -0500 Received: from gate.crashing.org ([63.228.1.57]:45895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOHFd-0007bu-Ch for qemu-devel@nongnu.org; Wed, 18 Feb 2015 21:54:06 -0500 Message-ID: <1424314416.26254.25.camel@kernel.crashing.org> From: Benjamin Herrenschmidt Date: Thu, 19 Feb 2015 13:53:36 +1100 In-Reply-To: <1418411751-3614-13-git-send-email-minyard@acm.org> References: <1418411751-3614-1-git-send-email-minyard@acm.org> <1418411751-3614-13-git-send-email-minyard@acm.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 12/16] ipmi: Add SMBIOS table entry List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: minyard@acm.org Cc: Corey Minyard , qemu-devel@nongnu.org On Fri, 2014-12-12 at 13:15 -0600, minyard@acm.org wrote: > From: Corey Minyard > > Add an IPMI table entry to the SMBIOS. Can this be made optional ? I'd like to use the BMC on an OpenPower model I'm working on but that has no smbios.. Cheers, Ben. > Signed-off-by: Corey Minyard > --- > hw/ipmi/isa_ipmi.c | 43 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/hw/ipmi/isa_ipmi.c b/hw/ipmi/isa_ipmi.c > index e62f744..83ea706 100644 > --- a/hw/ipmi/isa_ipmi.c > +++ b/hw/ipmi/isa_ipmi.c > @@ -27,6 +27,7 @@ > #include "qemu/timer.h" > #include "sysemu/char.h" > #include "sysemu/sysemu.h" > +#include "hw/i386/smbios.h" > #include "ipmi.h" > > /* This is the type the user specifies on the -device command line */ > @@ -36,13 +37,50 @@ > typedef struct ISAIPMIDevice { > ISADevice dev; > char *interface; > + int intftype; > uint32_t iobase; > int32 isairq; > uint8_t slave_addr; > + uint8_t version; > CharDriverState *chr; > IPMIInterface *intf; > } ISAIPMIDevice; > > +/* SMBIOS type 38 - IPMI */ > +struct smbios_type_38 { > + struct smbios_structure_header header; > + uint8_t interface_type; > + uint8_t ipmi_spec_revision; > + uint8_t i2c_slave_address; > + uint8_t nv_storage_device_address; > + uint64_t base_address; > + uint8_t base_address_modifier; > + uint8_t interrupt_number; > +} QEMU_PACKED; > + > +static void ipmi_encode_smbios(void *opaque) > +{ > + ISAIPMIDevice *info = opaque; > + struct smbios_type_38 smb38; > + > + smb38.header.type = 38; > + smb38.header.length = sizeof(smb38); > + smb38.header.handle = cpu_to_le16(0x3000); > + smb38.interface_type = info->intftype; > + smb38.ipmi_spec_revision = info->version; > + smb38.i2c_slave_address = info->slave_addr; > + smb38.nv_storage_device_address = 0; > + > + /* or 1 to set it to I/O space */ > + smb38.base_address = cpu_to_le64(info->iobase | 1); > + > + /* 1-byte boundaries, addr bit0=0, level triggered irq */ > + smb38.base_address_modifier = 1; > + smb38.interrupt_number = info->isairq; > + smbios_table_entry_add((struct smbios_structure_header *) &smb38, > + sizeof(smb38), true); > +} > + > static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) > { > ISADevice *isadev = ISA_DEVICE(dev); > @@ -50,6 +88,7 @@ static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) > char typename[20]; > Object *intfobj; > IPMIInterface *intf; > + IPMIInterfaceClass *intfk; > Object *bmcobj; > IPMIBmc *bmc; > > @@ -68,10 +107,13 @@ static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) > TYPE_IPMI_INTERFACE_PREFIX "%s", ipmi->interface); > intfobj = object_new(typename); > intf = IPMI_INTERFACE(intfobj); > + intfk = IPMI_INTERFACE_GET_CLASS(intf); > bmc->intf = intf; > intf->bmc = bmc; > intf->io_base = ipmi->iobase; > intf->slave_addr = ipmi->slave_addr; > + ipmi->intftype = intfk->smbios_type; > + ipmi->version = 0x20; /* Version 2.0 */ > ipmi_interface_init(intf, errp); > if (*errp) { > return; > @@ -103,6 +145,7 @@ static void ipmi_isa_realizefn(DeviceState *dev, Error **errp) > qdev_set_legacy_instance_id(dev, intf->io_base, intf->io_length); > > isa_register_ioport(isadev, &intf->io, intf->io_base); > + smbios_register_device_table_handler(ipmi_encode_smbios, ipmi); > } > > static void ipmi_isa_reset(DeviceState *qdev)