[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/20] ipmi: Add SMBIOS table entry
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH 20/20] ipmi: Add SMBIOS table entry |
Date: |
Wed, 29 May 2013 17:08:16 -0500 |
From: Corey Minyard <address@hidden>
Add an IPMI table entry to the SMBIOS.
Signed-off-by: Corey Minyard <address@hidden>
---
hw/ipmi/isa_ipmi.c | 23 +++++++++++++++++++++++
include/hw/i386/smbios.h | 12 ++++++++++++
2 files changed, 35 insertions(+)
diff --git a/hw/ipmi/isa_ipmi.c b/hw/ipmi/isa_ipmi.c
index 92afb88..706cc2c 100644
--- a/hw/ipmi/isa_ipmi.c
+++ b/hw/ipmi/isa_ipmi.c
@@ -29,6 +29,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 */
@@ -162,6 +163,27 @@ ipmi_encode_acpi(ISAIPMIDevice *info)
acpi_append_to_table("DSDT", ipmitable, rc, &err);
}
+static void ipmi_encode_smbios(ISAIPMIDevice *info)
+{
+ 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 = 0x20;
+ 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);
+}
+
static int ipmi_isa_initfn(ISADevice *dev)
{
ISAIPMIDevice *isa = ISA_IPMI(dev);
@@ -233,6 +255,7 @@ static int ipmi_isa_initfn(ISADevice *dev)
isa_register_ioport(dev, &intf->io, intf->io_base);
ipmi_encode_acpi(isa);
+ ipmi_encode_smbios(isa);
return 0;
}
diff --git a/include/hw/i386/smbios.h b/include/hw/i386/smbios.h
index d92fa88..fb79d5a 100644
--- a/include/hw/i386/smbios.h
+++ b/include/hw/i386/smbios.h
@@ -156,6 +156,18 @@ struct smbios_type_32 {
uint8_t boot_status;
} QEMU_PACKED;
+/* 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;
+
/* SMBIOS type 127 -- End-of-table */
struct smbios_type_127 {
struct smbios_structure_header header;
--
1.7.9.5
- [Qemu-devel] [PATCH 00/20] Add an IPMI device to QEMU, minyard, 2013/05/29
- [Qemu-devel] [PATCH 04/20] qemu-char: remove free of chr from win_stdio_close, minyard, 2013/05/29
- [Qemu-devel] [PATCH 03/20] qemu-char: Fix a race reporting opens and closes, minyard, 2013/05/29
- [Qemu-devel] [PATCH 13/20] ipmi: Add documentation, minyard, 2013/05/29
- [Qemu-devel] [PATCH 05/20] qemu-char: Close fd at end of file, minyard, 2013/05/29
- [Qemu-devel] [PATCH 02/20] qemu-char: Allow a chardev to reconnect if disconnected, minyard, 2013/05/29
- [Qemu-devel] [PATCH 15/20] acpi: Add a way to extend tables, minyard, 2013/05/29
- [Qemu-devel] [PATCH 06/20] Add a base IPMI interface, minyard, 2013/05/29
- [Qemu-devel] [PATCH 19/20] smbios: Add a function to directly add an entry, minyard, 2013/05/29
- [Qemu-devel] [PATCH 20/20] ipmi: Add SMBIOS table entry,
minyard <=
- [Qemu-devel] [PATCH 07/20] ipmi: Add a PC ISA type structure, minyard, 2013/05/29
- [Qemu-devel] [PATCH 18/20] ipmi: Add ACPI table entries for BMCs, minyard, 2013/05/29
- [Qemu-devel] [PATCH 09/20] ipmi: Add a BT low-level interface, minyard, 2013/05/29
- [Qemu-devel] [PATCH 08/20] ipmi: Add a KCS low-level interface, minyard, 2013/05/29
- [Qemu-devel] [PATCH 01/20] qemu-char: Allocate CharDriverState in qemu_chr_new_from_opts, minyard, 2013/05/29
- [Qemu-devel] [PATCH 17/20] pc: Postpone adding ACPI and SMBIOS to fw_cfg, minyard, 2013/05/29
- [Qemu-devel] [PATCH 14/20] ipmi: Add migration capability to the IPMI device., minyard, 2013/05/29
- [Qemu-devel] [PATCH 11/20] ipmi: Add an external connection simulation interface, minyard, 2013/05/29
- [Qemu-devel] [PATCH 16/20] acpi: Add table construction tools, minyard, 2013/05/29
- [Qemu-devel] [PATCH 12/20] ipmi: Add tests, minyard, 2013/05/29