SeaBIOS April 2014

seabios@seabios.org

15 participants
35 discussions

[PATCH] ld: don't hardcode "-melf_i386"
by Roger Pau Monne 15 Apr '14

15 Apr '14

On FreeBSD, the name of the emulation is "-melf_i386_fbsd", so allow SeaBIOS to fetch the emulation to use from the environment variables. This allows SeaBIOS to compile on FreeBSD with gcc. Signed-off-by: Roger Pau Monné <roger.pau(a)citrix.com> Cc: Ian Campbell <ian.campbell(a)citrix.com> --- Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 759bbbb..6a51305 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ STRIP=strip PYTHON=python CPP=cpp IASL:=iasl +LD32BIT_FLAG:=-melf_i386 # Default targets -include $(KCONFIG_CONFIG) @@ -143,8 +144,8 @@ $(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(O @echo " Building ld scripts" $(Q)./tools/buildversion.sh $(OUT)version.c $(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o - $(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o - $(Q)$(LD) -melf_i386 -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o + $(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o + $(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o $(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump $(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump -- 1.7.7.5 (Apple Git-26)

3 2

[SeaBIOS: PATCH] SMBIOS: Check for full tables & entry point in fw_cfg
by Gabriel L. Somlo 15 Apr '14

15 Apr '14

Check fw_cfg for the presence of a complete set of smbios tables (etc/smbios/smbios-tables), and an entry point structure (etc/smbios/smbios-anchor). If found, no longer build smbios tables locally; instead, replace only the type 0 table with a default of our own, and (re)calculate only the minimum set of necessary fields from the provided entry point. Signed-off-by: Gabriel L. Somlo <somlo(a)cmu.edu> --- This patch leaves the behavior of SeaBIOS completely unchanged, unless full tables are provided via fw_cfg by QEMU (e.g. by my QEMU SMBIOS patch set v5, which I'll email out shortly). Thanks, Gabriel src/fw/smbios.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/src/fw/smbios.c b/src/fw/smbios.c index 0c6a5b2..00faef0 100644 --- a/src/fw/smbios.c +++ b/src/fw/smbios.c @@ -166,6 +166,60 @@ get_external(int type, char **p, unsigned *nr_structs, } \ } while (0) +#define set_str_field_or_skip(type, field, value) \ + do { \ + int size = (value != NULL) ? strlen(value) + 1 : 0; \ + if (size > 1) { \ + memcpy(end, value, size); \ + end += size; \ + p->field = ++str_index; \ + } else { \ + p->field = 0; \ + } \ + } while (0) + +static void * +smbios_new_type_0(void *start, + const char *vendor, const char *version, const char *rel_date) +{ + struct smbios_type_0 *p = (struct smbios_type_0 *)start; + char *end = (char *)start + sizeof(struct smbios_type_0); + int str_index = 0; + + p->header.type = 0; + p->header.length = sizeof(struct smbios_type_0); + p->header.handle = 0; + + set_str_field_or_skip(0, vendor_str, vendor); + set_str_field_or_skip(0, bios_version_str, version); + p->bios_starting_address_segment = 0xe800; + set_str_field_or_skip(0, bios_release_date_str, rel_date); + + p->bios_rom_size = 0; /* FIXME */ + + /* BIOS characteristics not supported */ + memset(p->bios_characteristics, 0, 8); + p->bios_characteristics[0] = 0x08; + + /* Enable targeted content distribution (needed for SVVP, per SeaBIOS) */ + p->bios_characteristics_extension_bytes[0] = 0; + p->bios_characteristics_extension_bytes[1] = 4; + + p->system_bios_major_release = 0; + p->system_bios_minor_release = 0; + p->embedded_controller_major_release = 0xFF; + p->embedded_controller_minor_release = 0xFF; + + *end = 0; + end++; + if (!str_index) { + *end = 0; + end++; + } + + return end; +} + /* Type 0 -- BIOS Information */ #define RELEASE_DATE_STR "01/01/2011" static void * @@ -507,6 +561,91 @@ smbios_init_type_127(void *start) return start + 2; } +static int +smbios_try_fw_cfg_setup(void) +{ + struct romfile_s *f_anchor = romfile_find("etc/smbios/smbios-anchor"); + struct romfile_s *f_tables = romfile_find("etc/smbios/smbios-tables"); + struct smbios_entry_point *ep; + u8 *tables, *t; + u16 t_len; + + if (!f_anchor || !f_tables || f_anchor->size != sizeof(*ep)) + return 0; + + ep = malloc_fseg(sizeof(*ep)); + if (!ep) { + warn_noalloc(); + return 0; + } + f_anchor->copy(f_anchor, ep, f_anchor->size); + + if (f_tables->size != ep->structure_table_length) { + free(ep); + return 0; + } + + tables = malloc_tmphigh(f_tables->size); + if (!tables) { + warn_noalloc(); + free(ep); + return 0; + } + f_tables->copy(f_tables, tables, f_tables->size); + + /* rip out any type 0 tables we may have received */ + t = tables; + t_len = ep->structure_table_length; + while (t < tables + t_len) { + struct smbios_structure_header *h = (struct smbios_structure_header *)t; + u8 *next; + + /* find start of next structure (past the double-'\0' terminator) */ + for (next = t + h->length; *next || *(next+1); next++); + next += 2; + + if (h->type == 0) { + /* move remaining tables down over t */ + memmove(t, next, t_len - (next - tables)); + /* shorten total blob length */ + t_len -= (next - t); + } else { + t = next; + } + } + + /* final blob length adds our own type 0 with 3 strings and 4 '\0's */ + ep->structure_table_length = t_len + sizeof(struct smbios_type_0) + + strlen("SeaBIOS") + strlen(VERSION) + + strlen(RELEASE_DATE_STR) + 4; + + /* allocate final blob */ + if (ep->structure_table_length > BUILD_MAX_SMBIOS_FSEG) + t = malloc_high(ep->structure_table_length); + else + t = malloc_fseg(ep->structure_table_length); + if (!t) { + warn_noalloc(); + free(ep); + free(tables); + return 0; + } + + /* finalize entry point */ + ep->structure_table_address = (u32)t; + ep->checksum = -checksum(ep, 0x10); + ep->intermediate_checksum = -checksum((void *)ep + 0x10, ep->length - 0x10); + + /* populate final blob */ + t = smbios_new_type_0(t, "SeaBIOS", VERSION, RELEASE_DATE_STR); + memcpy(t, tables, t_len); + free(tables); + + /* success */ + SMBiosAddr = ep; + return 1; +} + #define TEMPSMBIOSSIZE (32 * 1024) void @@ -517,6 +656,9 @@ smbios_setup(void) dprintf(3, "init SMBIOS tables\n"); + if (smbios_try_fw_cfg_setup()) + return; /* got full tables via fw_cfg, we're done */ + char *start = malloc_tmphigh(TEMPSMBIOSSIZE); if (! start) { warn_noalloc(); -- 1.9.0

4 7

[QEMU v5 PATCH 00/18] SMBIOS: build full tables in QEMU
by Gabriel L. Somlo 14 Apr '14

14 Apr '14

Quick highlights: - after 10/18, we're generating tables 100% consistent with SeaBiOS - after 14/18, we use e820 to generate type 19 (memory area) tables - after 18/18, we expect SeaBIOS to check fw_cfg for a full set of tables and an entry point (e.g., we need a version of SeaBIOS which has applied this patch: http://www.seabios.org/pipermail/seabios/2014-April/007823.html Please let me know what you all think. Thanks, Gabriel Gabriel L. Somlo (18): SMBIOS: Rename smbios_set_type1_defaults() for more general use SMBIOS: Use macro to set smbios defaults SMBIOS: Use bitmaps to check for smbios table collisions SMBIOS: Add code to build full smbios tables; build type 2 table SMBIOS: Build full tables for types 0 and 1 SMBIOS: Remove unused code for passing individual fields to bios SMBIOS: Build full type 3 table SMBIOS: Build full type 4 tables SMBIOS: Build full smbios memory tables (type 16, 17, 19, and 20) SMBIOS: Build full tables for type 32 and 127 SMBIOS: Update all table definitions to smbios spec v2.3 SMBIOS: Remove SeaBIOS compatibility quirks SMBIOS: Stop including type 20 tables SMBIOS: Use e820 memory map to generate type 19 tables SMBIOS: Update type 3 definition to smbios spec v2.7 SMBIOS: Update type 4 definition to smbios spec v2.6 SMBIOS: Update memory table types (16, 17, and 19) to smbios spec v2.8 SMBIOS: Generate complete smbios tables, including entry point hw/i386/pc.c | 35 ++- hw/i386/pc_piix.c | 14 +- hw/i386/pc_q35.c | 10 +- hw/i386/smbios.c | 762 +++++++++++++++++++++++++++++++++++++++-------- include/hw/i386/pc.h | 2 + include/hw/i386/smbios.h | 98 ++++-- 6 files changed, 745 insertions(+), 176 deletions(-) -- 1.9.0

5 24

[PATCH] Factor out smbios table walking from display_uuid to smbios_next().
by Kevin O'Connor 12 Apr '14

12 Apr '14

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/fw/biostables.c | 108 ++++++++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 62 deletions(-) diff --git a/src/fw/biostables.c b/src/fw/biostables.c index a90199b..818a8fe 100644 --- a/src/fw/biostables.c +++ b/src/fw/biostables.c @@ -236,6 +236,31 @@ find_acpi_features(void) * SMBIOS ****************************************************************/ +// Iterator for each sub-table in the smbios blob. +void * +smbios_next(struct smbios_entry_point *smbios, void *prev) +{ + if (!smbios) + return NULL; + void *start = (void*)smbios->structure_table_address; + void *end = start + smbios->structure_table_length; + + if (!prev) { + prev = start; + } else { + struct smbios_structure_header *hdr = prev; + if (prev + sizeof(*hdr) > end) + return NULL; + prev += hdr->length + 2; + while (prev < end && (*(u8*)(prev-1) != '\0' || *(u8*)(prev-2) != '\0')) + prev++; + } + struct smbios_structure_header *hdr = prev; + if (prev >= end || prev + sizeof(*hdr) >= end || prev + hdr->length >= end) + return NULL; + return prev; +} + struct smbios_entry_point *SMBiosAddr; void @@ -265,69 +290,28 @@ copy_smbios(void *pos) void display_uuid(void) { - u32 addr, end; - u8 *uuid; - u8 empty_uuid[16] = { 0 }; - - if (SMBiosAddr == NULL) - return; - - addr = SMBiosAddr->structure_table_address; - end = addr + SMBiosAddr->structure_table_length; - - /* the following takes care of any initial wraparound too */ - while (addr < end) { - const struct smbios_structure_header *hdr; - - /* partial structure header */ - if (end - addr < sizeof(struct smbios_structure_header)) - return; - - hdr = (struct smbios_structure_header *)addr; - - /* partial structure */ - if (end - addr < hdr->length) + struct smbios_type_1 *tbl = smbios_next(SMBiosAddr, NULL); + int minlen = offsetof(struct smbios_type_1, uuid) + sizeof(tbl->uuid); + for (; tbl; tbl = smbios_next(SMBiosAddr, tbl)) + if (tbl->header.type == 1 && tbl->header.length >= minlen) { + u8 *uuid = tbl->uuid; + u8 empty_uuid[sizeof(tbl->uuid)] = { 0 }; + if (memcmp(uuid, empty_uuid, sizeof(empty_uuid)) == 0) + return; + + printf("Machine UUID" + " %02x%02x%02x%02x" + "-%02x%02x" + "-%02x%02x" + "-%02x%02x" + "-%02x%02x%02x%02x%02x%02x\n" + , uuid[ 0], uuid[ 1], uuid[ 2], uuid[ 3] + , uuid[ 4], uuid[ 5] + , uuid[ 6], uuid[ 7] + , uuid[ 8], uuid[ 9] + , uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]); return; - - /* any Type 1 structure version will do that has the UUID */ - if (hdr->type == 1 && - hdr->length >= offsetof(struct smbios_type_1, uuid) + 16) - break; - - /* done with formatted area, skip string-set */ - addr += hdr->length; - - while (end - addr >= 2 && - (*(u8 *)addr != '\0' || - *(u8 *)(addr+1) != '\0')) - ++addr; - - /* structure terminator not found */ - if (end - addr < 2) - return; - - addr += 2; - } - - /* parsing finished or skipped entirely, UUID not found */ - if (addr >= end) - return; - - uuid = (u8 *)(addr + offsetof(struct smbios_type_1, uuid)); - if (memcmp(uuid, empty_uuid, sizeof empty_uuid) == 0) - return; - - printf("Machine UUID" - " %02x%02x%02x%02x" - "-%02x%02x" - "-%02x%02x" - "-%02x%02x" - "-%02x%02x%02x%02x%02x%02x\n" - , uuid[ 0], uuid[ 1], uuid[ 2], uuid[ 3] - , uuid[ 4], uuid[ 5] - , uuid[ 6], uuid[ 7] - , uuid[ 8], uuid[ 9] - , uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]); + } } -- 1.9.0

1 0

[PATCH 0/5] Separate legacy bios table generation and deprecate.
by Kevin O'Connor 11 Apr '14

11 Apr '14

This patch series isolates acpi.c to the code that generates acpi tables and isolates smbios.c to the code that generates smbios tables. The code not specific to table generation (eg, parsing logic) is moved to biostables.c. Finally the bios table generation code is marked so that developers are warned against trying to add enhancements. I've also added a patch here to refactor the way the bios tables are copied to their final locations when seabios does generate them. The code will now use the same mechanism that coreboot/csm would use when copying tables. -Kevin Kevin O'Connor (5): acpi: Move acpi parsing logic from acpi.c to biostables.c / paravirt.c. smbios: Move smbios parsing logic from smbios.c to biostables.c. Move PirAddr definition from pirtable.c to biostables.c. Use biostables.c for copying bios tables even when generating them. Document no new changes to pirtable.c, mptable.c, acpi.c, and smbios.c. src/fw/acpi.c | 149 +++------------------------------- src/fw/biostables.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++---- src/fw/mptable.c | 34 +++----- src/fw/paravirt.c | 22 +++++ src/fw/pirtable.c | 11 +-- src/fw/smbios.c | 108 ++++--------------------- src/util.h | 21 ++--- 7 files changed, 284 insertions(+), 289 deletions(-) -- 1.9.0

1 6

[PATCH V4 0/2] hw/pci: reserve IO and mem for pci-2-pci bridges with no devices attached
by Marcel Apfelbaum 10 Apr '14

10 Apr '14

v3 -> v4: - Addressed Kevin O'Connor's comments: - Refactored a for loop in patch 1/2. - Addressed Michael S. Tsirkin's comments (patch 2/2): - Removed not needed method - Test only base registers (dropped limits tests) - Renamed a helper method - Used 0xFF to test if the memory is reserved - Simplified code in pci_bridge_has_region - I did keep the code that restores base's address as I don't want to modify the registers in a 'query' method. (as replied on the mail thread) v2 -> v3: - Addressed Michael S. Tsirkin's comments: - I/O and Prefetchable Memory are optional. Do not allocate ranges if they are not implemented (2/2). - Note that 2/2 patch can be seen as a separate fix. However, it is related to ranges reservation. v1 -> v2: - Thanks Gerd Hoffmann for the review. - Addressed Michael S. Tsirkin's comments: - Limit capabilities query to 256 iterations, to make sure we don't get into an infinite loop with a broken device. If a pci-2-pci bridge supports hot-plug functionality but there are no devices connected to it, reserve IO/mem in order to be able to attach devices later. Do not waste space, use minimum allowed. Marcel Apfelbaum (2): hw/pci: reserve IO and mem for pci-2-pci bridges with no devices attached hw/pci: check if pci2pci bridges implement optional limit registers src/fw/pciinit.c | 12 +++++------- src/hw/pci.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/hw/pci.h | 10 ++++++++++ 3 files changed, 68 insertions(+), 7 deletions(-) -- 1.8.3.1

2 4

[PATCH V3 0/2] hw/pci: reserve IO and mem for pci-2-pci bridges with no devices attached
by Marcel Apfelbaum 10 Apr '14

10 Apr '14

v2 -> v3: - Addressed Michael S. Tsirkin's comments: - I/O and Prefetchable Memory are optional. Do not allocate ranges if they are not implemented (2/2). - Note that 2/2 patch can be seen as a separate fix. However, it is related to ranges reservation. v1 -> v2: - Thanks Gerd Hoffmann for the review. - Addressed Michael S. Tsirkin's comments: - Limit capabilities query to 256 iterations, to make sure we don't get into an infinite loop with a broken device. If a pci-2-pci bridge supports hot-plug functionality but there are no devices connected to it, reserve IO/mem in order to be able to attach devices later. Do not waste space, use minimum allowed. Marcel Apfelbaum (2): hw/pci: reserve IO and mem for pci-2-pci bridges with no devices attached hw/pci: check if pci2pci bridges implement optional limit registers src/fw/pciinit.c | 12 +++++----- src/hw/pci.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/hw/pci.h | 10 +++++++++ 3 files changed, 82 insertions(+), 7 deletions(-) -- 1.8.3.1

3 8

E820 (Re: [v4 PATCH 00/12] SMBIOS: build full tables in QEMU)
by Gabriel L. Somlo 08 Apr '14

08 Apr '14

On Tue, Mar 18, 2014 at 07:23:17PM -0400, Gabriel L. Somlo wrote: > At this point, can anyone with access to a real, physical, NUMA > system dump the smbios tables with dmidecode and post them here? > I think that would be very informative. So I thrashed around a bit trying to find a real NUMA box, and found a Dell R410 whose BIOS claims to support NUMA by disabling the "Node Interleaving" option (haven't actually configured it to run NUMA, but based on what else I found, I no longer think I need to -- keep reading :) So, to my surprise, I noticed this machine did NOT have any Type 20 tables in SMBIOS at all !!! Then, after a more careful reading of the SMBIOS manual, I noticed that Type 20 was made OPTIONAL as v2.5 of the spec, cca. 2006 !!! In conclusion, we *could* simply scan e820 for E820_RAM type regions and generate Type 19 tables for each one we find, and we no longer have to care at all about generating Type 20 nodes to link 19s to 17s, which basically makes the problem go away, as far as I am concerned. I tested this (omitting Type 20) on OS X (10.6 through 10.9), XPsp3 and Win7, successfully, without either of them noticing any changes from previous executions where smbios tables were "different" (i.e., when they used to include T20). At this point, though, I'd like some feedback before I shoot out another version (v5) of this patch set: - Should I pretend we're generating v2.5 tables ? - this means Type 4 now has extra fields (i.e. the number of cores, etc), which should be relatively easy to add, so I'd be OK doing that, if we agree on everything else. Heck, how about going all out and implementing v2.8 ? That would get us past the 2T limit in Types 16, 17, and 19 ! - SeaBIOS is still in charge of providing the smbios_entry_point structure, and it's unlikely we can reasonably expect it to bump the version to 2.5 (not that it seems to matter, if my tests are to be believed) - on that note, SeaBIOS will still cheerfully generate Type 20 tables if nothing is supplied to it via fw_cfg from QEMU, and, again, I'm not sure how likely it is we can get it to stop doing that :) - Does anyone still care ? ;) Let me know what you all think! Thanks, --Gabriel

4 36

[PATCH] hw/pci: reserve IO and mem for pci-2-pci bridges with no devices attached
by Marcel Apfelbaum 08 Apr '14

08 Apr '14

If a pci-2-pci bridge supports hot-plug functionality but there are no devices connected to it, reserve IO/mem in order to be able to attach devices later. Do not waste space, use minimum allowed. Signed-off-by: Marcel Apfelbaum <marcel.a(a)redhat.com> --- src/fw/pciinit.c | 3 +++ src/hw/pci.c | 17 +++++++++++++++++ src/hw/pci.h | 1 + 3 files changed, 21 insertions(+) diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c index 64f1d41..9b5d7ad 100644 --- a/src/fw/pciinit.c +++ b/src/fw/pciinit.c @@ -677,12 +677,15 @@ static int pci_bios_check_devices(struct pci_bus *busses) continue; struct pci_bus *parent = &busses[pci_bdf_to_bus(s->bus_dev->bdf)]; int type; + u8 shpc_cap = pci_find_capability(s->bus_dev, PCI_CAP_ID_SHPC); for (type = 0; type < PCI_REGION_TYPE_COUNT; type++) { u64 align = (type == PCI_REGION_TYPE_IO) ? PCI_BRIDGE_IO_MIN : PCI_BRIDGE_MEM_MIN; if (pci_region_align(&s->r[type]) > align) align = pci_region_align(&s->r[type]); u64 sum = pci_region_sum(&s->r[type]); + if (!sum && shpc_cap) + sum = align; /* reserve min size for hot-plug */ u64 size = ALIGN(sum, align); int is64 = pci_bios_bridge_region_is64(&s->r[type], s->bus_dev, type); diff --git a/src/hw/pci.c b/src/hw/pci.c index caf9265..ee8a7f1 100644 --- a/src/hw/pci.c +++ b/src/hw/pci.c @@ -225,6 +225,23 @@ pci_find_init_device(const struct pci_device_id *ids, void *arg) return NULL; } +u8 pci_find_capability(struct pci_device *pci, u8 cap_id) +{ + u8 cap; + u16 status = pci_config_readw(pci->bdf, PCI_STATUS); + + if (!(status & PCI_STATUS_CAP_LIST)) + return 0; + + for (cap = pci_config_readb(pci->bdf, PCI_CAPABILITY_LIST); cap; + cap = pci_config_readb(pci->bdf, cap + PCI_CAP_LIST_NEXT)) + if (pci_config_readb(pci->bdf, cap + PCI_CAP_LIST_ID) == cap_id) + return cap; + + return 0; +} + + void pci_reboot(void) { diff --git a/src/hw/pci.h b/src/hw/pci.h index 167a027..e828225 100644 --- a/src/hw/pci.h +++ b/src/hw/pci.h @@ -116,6 +116,7 @@ int pci_init_device(const struct pci_device_id *ids , struct pci_device *pci, void *arg); struct pci_device *pci_find_init_device(const struct pci_device_id *ids , void *arg); +u8 pci_find_capability(struct pci_device *pci, u8 cap_id); void pci_reboot(void); #endif -- 1.8.3.1

4 14

[PATCH] apm: Remove old Bochs mechanism for shutdown/suspend/standby.
by Kevin O'Connor 07 Apr '14

07 Apr '14

Remove the old mechanism that used port 0x8900 to send apm signals. Recent versions of QEMU no longer support this port. Bochs and QEMU only ever supported shutdown anyway, and shutdown is already available via an ACPI mechanism. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/apm.c | 34 ++++++---------------------------- src/fw/paravirt.h | 1 - 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/apm.c b/src/apm.c index fd71a01..f7c2306 100644 --- a/src/apm.c +++ b/src/apm.c @@ -9,30 +9,11 @@ #include "biosvar.h" // GET_GLOBAL #include "bregs.h" // struct bregs #include "config.h" // CONFIG_* -#include "fw/paravirt.h" // runningOnQEMU #include "output.h" // dprintf #include "stacks.h" // yield_toirq #include "util.h" // apm_shutdown #include "x86.h" // outb -static void -out_str(const char *str_cs) -{ - if (!runningOnQEMU()) { - dprintf(1, "APM request '%s'\n", str_cs); - return; - } - - u8 *s = (u8*)str_cs; - for (;;) { - u8 c = GET_GLOBAL(*s); - if (!c) - break; - outb(c, PORT_BIOS_APM); - s++; - } -} - // APM installation check static void handle_155300(struct bregs *regs) @@ -54,14 +35,11 @@ handle_155301(struct bregs *regs) set_success(regs); } -// Assembler entry points defined in romlayout.S -extern void entry_apm16(void); -extern void entry_apm32(void); - // APM 16 bit protected mode interface connect static void handle_155302(struct bregs *regs) { + extern void entry_apm16(void); regs->bx = (u32)entry_apm16; regs->ax = SEG_BIOS; // 16 bit code segment base regs->si = 0xfff0; // 16 bit code segment size @@ -74,6 +52,7 @@ handle_155302(struct bregs *regs) static void handle_155303(struct bregs *regs) { + extern void entry_apm32(void); regs->ax = SEG_BIOS; // 32 bit code segment base regs->ebx = (u32)entry_apm32; regs->cx = SEG_BIOS; // 16 bit code segment base @@ -111,11 +90,10 @@ void apm_shutdown(void) { u16 pm1a_cnt = GET_GLOBAL(acpi_pm1a_cnt); - - irq_disable(); if (pm1a_cnt) outw(0x2000, pm1a_cnt); - out_str("Shutdown"); + + irq_disable(); for (;;) hlt(); } @@ -130,10 +108,10 @@ handle_155307(struct bregs *regs) } switch (regs->cx) { case 1: - out_str("Standby"); + dprintf(1, "APM standby request\n"); break; case 2: - out_str("Suspend"); + dprintf(1, "APM suspend request\n"); break; case 3: apm_shutdown(); diff --git a/src/fw/paravirt.h b/src/fw/paravirt.h index 69d7248..04fb4b9 100644 --- a/src/fw/paravirt.h +++ b/src/fw/paravirt.h @@ -31,7 +31,6 @@ static inline int runningOnKVM(void) { #define PORT_QEMU_CFG_DATA 0x0511 #define PORT_ACPI_PM_BASE 0xb000 #define PORT_SMB_BASE 0xb100 -#define PORT_BIOS_APM 0x8900 void qemu_preinit(void); void qemu_platform_setup(void); -- 1.9.0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS April 2014