qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org, Anthony Liguori <anthony@codemonkey.ws>
Cc: peter.maydell@linaro.org, imammedo@redhat.com, mst@redhat.com,
	kraxel@redhat.com, marcel.a@redhat.com
Subject: [Qemu-devel] [PULL v2 27/39] i386: add bios linker/loader
Date: Tue, 15 Oct 2013 09:31:56 +0300	[thread overview]
Message-ID: <1381818560-18367-28-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1381818560-18367-1-git-send-email-mst@redhat.com>

This adds a dynamic bios linker/loader.
This will be used by acpi table generation
code to:
    - load each table in the appropriate memory segment
    - link tables to each other
    - fix up checksums after said linking

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/bios-linker-loader.h |  27 ++++++++
 hw/i386/bios-linker-loader.c | 158 +++++++++++++++++++++++++++++++++++++++++++
 hw/i386/Makefile.objs        |   1 +
 3 files changed, 186 insertions(+)
 create mode 100644 hw/i386/bios-linker-loader.h
 create mode 100644 hw/i386/bios-linker-loader.c

diff --git a/hw/i386/bios-linker-loader.h b/hw/i386/bios-linker-loader.h
new file mode 100644
index 0000000..498c0af
--- /dev/null
+++ b/hw/i386/bios-linker-loader.h
@@ -0,0 +1,27 @@
+#ifndef BIOS_LINKER_LOADER_H
+#define BIOS_LINKER_LOADER_H
+
+#include <glib.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
+GArray *bios_linker_loader_init(void);
+
+void bios_linker_loader_alloc(GArray *linker,
+                              const char *file,
+                              uint32_t alloc_align,
+                              bool alloc_fseg);
+
+void bios_linker_loader_add_checksum(GArray *linker, const char *file,
+                                     void *table,
+                                     void *start, unsigned size,
+                                     uint8_t *checksum);
+
+void bios_linker_loader_add_pointer(GArray *linker,
+                                    const char *dest_file,
+                                    const char *src_file,
+                                    GArray *table, void *pointer,
+                                    uint8_t pointer_size);
+
+void *bios_linker_loader_cleanup(GArray *linker);
+#endif
diff --git a/hw/i386/bios-linker-loader.c b/hw/i386/bios-linker-loader.c
new file mode 100644
index 0000000..0833853
--- /dev/null
+++ b/hw/i386/bios-linker-loader.c
@@ -0,0 +1,158 @@
+/* Dynamic linker/loader of ACPI tables
+ *
+ * Copyright (C) 2013 Red Hat Inc
+ *
+ * Author: Michael S. Tsirkin <mst@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bios-linker-loader.h"
+#include "hw/nvram/fw_cfg.h"
+
+#include <string.h>
+#include <assert.h>
+#include "qemu/bswap.h"
+
+#define BIOS_LINKER_LOADER_FILESZ FW_CFG_MAX_FILE_PATH
+
+struct BiosLinkerLoaderEntry {
+    uint32_t command;
+    union {
+        /*
+         * COMMAND_ALLOCATE - allocate a table from @alloc.file
+         * subject to @alloc.align alignment (must be power of 2)
+         * and @alloc.zone (can be HIGH or FSEG) requirements.
+         *
+         * Must appear exactly once for each file, and before
+         * this file is referenced by any other command.
+         */
+        struct {
+            char file[BIOS_LINKER_LOADER_FILESZ];
+            uint32_t align;
+            uint8_t zone;
+        } alloc;
+
+        /*
+         * COMMAND_ADD_POINTER - patch the table (originating from
+         * @dest_file) at @pointer.offset, by adding a pointer to the table
+         * originating from @src_file. 1,2,4 or 8 byte unsigned
+         * addition is used depending on @pointer.size.
+         */
+        struct {
+            char dest_file[BIOS_LINKER_LOADER_FILESZ];
+            char src_file[BIOS_LINKER_LOADER_FILESZ];
+            uint32_t offset;
+            uint8_t size;
+        } pointer;
+
+        /*
+         * COMMAND_ADD_CHECKSUM - calculate checksum of the range specified by
+         * @cksum_start and @cksum_length fields,
+         * and then add the value at @cksum.offset.
+         * Checksum simply sums -X for each byte X in the range
+         * using 8-bit math.
+         */
+        struct {
+            char file[BIOS_LINKER_LOADER_FILESZ];
+            uint32_t offset;
+            uint32_t start;
+            uint32_t length;
+        } cksum;
+
+        /* padding */
+        char pad[124];
+    };
+} QEMU_PACKED;
+typedef struct BiosLinkerLoaderEntry BiosLinkerLoaderEntry;
+
+enum {
+    BIOS_LINKER_LOADER_COMMAND_ALLOCATE     = 0x1,
+    BIOS_LINKER_LOADER_COMMAND_ADD_POINTER  = 0x2,
+    BIOS_LINKER_LOADER_COMMAND_ADD_CHECKSUM = 0x3,
+};
+
+enum {
+    BIOS_LINKER_LOADER_ALLOC_ZONE_HIGH = 0x1,
+    BIOS_LINKER_LOADER_ALLOC_ZONE_FSEG = 0x2,
+};
+
+GArray *bios_linker_loader_init(void)
+{
+    return g_array_new(false, true /* clear */, sizeof(BiosLinkerLoaderEntry));
+}
+
+/* Free linker wrapper and return the linker array. */
+void *bios_linker_loader_cleanup(GArray *linker)
+{
+    return g_array_free(linker, false);
+}
+
+void bios_linker_loader_alloc(GArray *linker,
+                              const char *file,
+                              uint32_t alloc_align,
+                              bool alloc_fseg)
+{
+    BiosLinkerLoaderEntry entry;
+
+    memset(&entry, 0, sizeof entry);
+    strncpy(entry.alloc.file, file, sizeof entry.alloc.file - 1);
+    entry.command = cpu_to_le32(BIOS_LINKER_LOADER_COMMAND_ALLOCATE);
+    entry.alloc.align = cpu_to_le32(alloc_align);
+    entry.alloc.zone = cpu_to_le32(alloc_fseg ?
+                                    BIOS_LINKER_LOADER_ALLOC_ZONE_FSEG :
+                                    BIOS_LINKER_LOADER_ALLOC_ZONE_HIGH);
+
+    /* Alloc entries must come first, so prepend them */
+    g_array_prepend_val(linker, entry);
+}
+
+void bios_linker_loader_add_checksum(GArray *linker, const char *file,
+                                     void *table,
+                                     void *start, unsigned size,
+                                     uint8_t *checksum)
+{
+    BiosLinkerLoaderEntry entry;
+
+    memset(&entry, 0, sizeof entry);
+    strncpy(entry.cksum.file, file, sizeof entry.cksum.file - 1);
+    entry.command = cpu_to_le32(BIOS_LINKER_LOADER_COMMAND_ADD_CHECKSUM);
+    entry.cksum.offset = cpu_to_le32(checksum - (uint8_t *)table);
+    entry.cksum.start = cpu_to_le32((uint8_t *)start - (uint8_t *)table);
+    entry.cksum.length = cpu_to_le32(size);
+
+    g_array_append_val(linker, entry);
+}
+
+void bios_linker_loader_add_pointer(GArray *linker,
+                                    const char *dest_file,
+                                    const char *src_file,
+                                    GArray *table, void *pointer,
+                                    uint8_t pointer_size)
+{
+    BiosLinkerLoaderEntry entry;
+
+    memset(&entry, 0, sizeof entry);
+    strncpy(entry.pointer.dest_file, dest_file,
+            sizeof entry.pointer.dest_file - 1);
+    strncpy(entry.pointer.src_file, src_file,
+            sizeof entry.pointer.src_file - 1);
+    entry.command = cpu_to_le32(BIOS_LINKER_LOADER_COMMAND_ADD_POINTER);
+    entry.pointer.offset = cpu_to_le32((gchar *)pointer - table->data);
+    entry.pointer.size = pointer_size;
+    assert(pointer_size == 1 || pointer_size == 2 ||
+           pointer_size == 4 || pointer_size == 8);
+
+    g_array_append_val(linker, entry);
+}
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index f950707..b9ca380 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -5,6 +5,7 @@ obj-y += pc_sysfw.o
 obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
 
 obj-y += kvmvapic.o
+obj-y += bios-linker-loader.o
 
 iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \
     ; then echo "$(2)"; else echo "$(3)"; fi ;)
-- 
MST

  parent reply	other threads:[~2013-10-15  6:29 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-15  6:29 [Qemu-devel] [PULL v2 00/39] pci, pc, acpi fixes, enhancements Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 01/39] memory: Change MemoryRegion priorities from unsigned to signed Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 02/39] docs/memory: Explictly state that MemoryRegion priority is signed Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 03/39] hw/pci: partially handle pci master abort Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 04/39] hw/core: Add interface to allocate and free a single IRQ Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 05/39] hw/pci: add pci wrappers for allocating and asserting irqs Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 06/39] hw/pci-bridge: set PCI_INTERRUPT_PIN register before shpc init Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 07/39] hw/vmxnet3: set interrupts using pci irq wrappers Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 08/39] hw/vfio: " Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 09/39] hw: " Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 10/39] hw/pcie: AER and hot-plug events must use device's interrupt Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 11/39] hw/pci: removed irq field from PCIDevice Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 12/39] cleanup object.h: include error.h directly Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 13/39] qom: cleanup struct Error references Michael S. Tsirkin
2013-10-15  6:30 ` [Qemu-devel] [PULL v2 14/39] qom: add pointer to int property helpers Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 15/39] pci: fix up w64 size calculation helper Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 16/39] fw_cfg: interface to trigger callback on read Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 17/39] loader: support for unmapped ROM blobs Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 18/39] pcie_host: expose UNMAPPED macro Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 19/39] pcie_host: expose address format Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 20/39] q35: use macro for MCFG property name Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 21/39] q35: expose mmcfg size as a property Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 22/39] i386: add ACPI table files from seabios Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 23/39] acpi: add rules to compile ASL source Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 24/39] acpi: pre-compiled ASL files Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 25/39] acpi: ssdt pcihp: updat generated file Michael S. Tsirkin
2013-10-15  6:31 ` [Qemu-devel] [PULL v2 26/39] loader: use file path size from fw_cfg.h Michael S. Tsirkin
2013-10-15  6:31 ` Michael S. Tsirkin [this message]
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 28/39] loader: allow adding ROMs in done callbacks Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 29/39] i386: define pc guest info Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 30/39] acpi/piix: add macros for acpi property names Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 31/39] piix: APIs for pc guest info Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 32/39] ich9: " Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 33/39] pvpanic: add API to access io port Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 34/39] hpet: add API to find it Michael S. Tsirkin
2013-10-15  6:32 ` [Qemu-devel] [PULL v2 35/39] acpi: add interface to access user-installed tables Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 36/39] pc: use new api to add builtin tables Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 37/39] i386: ACPI table generation code from seabios Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 38/39] ssdt: fix PBLK length Michael S. Tsirkin
2013-10-15  6:33 ` [Qemu-devel] [PULL v2 39/39] ssdt-proc: update generated file Michael S. Tsirkin

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=1381818560-18367-28-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=imammedo@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=marcel.a@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).