SeaBIOS February 2013

seabios@seabios.org

24 participants
63 discussions

[PATCH] Report on f-segment UMB ram also.

by Kevin O'Connor

Some old DOS programs can also use f-segment space as Upper Memory Blocks (UMB), so also report on what space is available in debug messages. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/pmm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pmm.c b/src/pmm.c index b003dd1..d1986c2 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -324,11 +324,12 @@ malloc_prepboot(void) int size = (BUILD_BIOS_ADDR - base) / 512; dummyrom->size = (size > 255) ? 255 : size; memset((void*)RomEnd, 0, base-RomEnd); - dprintf(1, "Space available for UMB: %08x-%08x\n", RomEnd, base); // Clear unused f-seg ram. struct allocinfo_s *info = findLast(&ZoneFSeg); memset(info->dataend, 0, info->allocend - info->dataend); + dprintf(1, "Space available for UMB: %x-%x, %x-%x\n" + , RomEnd, base, (u32)info->dataend, (u32)info->allocend); // Give back unused high ram. info = findLast(&ZoneHigh); -- 1.7.11.7

7 years, 5 months

[PATCH] Eliminate separate BiosTableSpace[] space for f-segment allocations.

by Kevin O'Connor

The BiosTableSpace variable was used to ensure there was sufficient space in the f-segment for malloc_fseg() calls. However, it added 2K to the final image size to reserve that space. Update the build to determine where to put the f-segment allocations. In most cases (when code relocation is enabled) allocations can be done in the space free'd from the "init" sections and no additional space needs to be reserved in the final image. This also has the benefit of not fragmenting the f-segment allocation space. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- This patch, along with the other pending patches from my local tree, is available for testing at: https://github.com/KevinOConnor/seabios/tree/test-20130218 --- src/config.h | 2 -- src/pmm.c | 12 +++--------- tools/layoutrom.py | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/config.h b/src/config.h index 71c0b7e..f391877 100644 --- a/src/config.h +++ b/src/config.h @@ -16,8 +16,6 @@ // Maximum number of map entries in the e820 map #define CONFIG_MAX_E820 32 -// Space to reserve in f-segment for dynamic allocations -#define CONFIG_MAX_BIOSTABLE 2048 // Space to reserve in high-memory for tables #define CONFIG_MAX_HIGHTABLE (64*1024) // Largest supported externaly facing drive id diff --git a/src/pmm.c b/src/pmm.c index 9fca8dc..dbe34a1 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -216,9 +216,6 @@ rom_confirm(u32 size) * Setup ****************************************************************/ -// Space for bios tables built an run-time. -char BiosTableSpace[CONFIG_MAX_BIOSTABLE] __aligned(MALLOC_MIN_ALIGN) VARFSEG; - void malloc_preinit(void) { @@ -320,12 +317,9 @@ malloc_init(void) RomBase = findLast(&ZoneLow); // Add space available in f-segment to ZoneFSeg - addSpace(&ZoneFSeg, BiosTableSpace, &BiosTableSpace[CONFIG_MAX_BIOSTABLE]); - extern u8 code32init_end[]; - if ((u32)code32init_end > BUILD_BIOS_ADDR) { - memset((void*)BUILD_BIOS_ADDR, 0, (u32)code32init_end - BUILD_BIOS_ADDR); - addSpace(&ZoneFSeg, (void*)BUILD_BIOS_ADDR, code32init_end); - } + extern u8 zonefseg_start[], zonefseg_end[]; + memset(zonefseg_start, 0, zonefseg_end - zonefseg_start); + addSpace(&ZoneFSeg, zonefseg_start, zonefseg_end); calcRamSize(); } diff --git a/tools/layoutrom.py b/tools/layoutrom.py index 2d45317..d90f326 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -59,6 +59,8 @@ def setSectionsStart(sections, endaddr, minalign=1, segoffset=0): BUILD_BIOS_ADDR = 0xf0000 BUILD_BIOS_SIZE = 0x10000 BUILD_ROM_START = 0xc0000 +# Space to reserve in f-segment for dynamic allocations +BUILD_MIN_BIOSTABLE = 2048 # Layout the 16bit code. This ensures sections with fixed offset # requirements are placed in the correct location. It also places the @@ -159,6 +161,7 @@ class LayoutInfo: sections32init = sec32init_start = sec32init_align = None sections32low = sec32low_start = sec32low_align = None sections32fseg = sec32fseg_start = sec32fseg_align = None + zonefseg_start = zonefseg_end = None zonelow_base = final_sec32low_start = None exportsyms = varlowsyms = None @@ -211,6 +214,15 @@ def doLayout(sections): li.sec32flat_start, li.sec32flat_align = setSectionsStart( textsections + rodatasections + datasections + bsssections , li.sec32fseg_start, 16) + li.zonefseg_end = li.sec32flat_start + li.zonefseg_start = BUILD_BIOS_ADDR + if li.zonefseg_start + BUILD_MIN_BIOSTABLE > li.zonefseg_end: + # Not enough ZoneFSeg space - force a minimum space. + li.zonefseg_end = li.sec32fseg_start + li.zonefseg_start = li.zonefseg_end - BUILD_MIN_BIOSTABLE + li.sec32flat_start, li.sec32flat_align = setSectionsStart( + textsections + rodatasections + datasections + bsssections + , li.zonefseg_start, 16) # Determine 32flat init positions li.sections32init = getSectionsCategory(sections, '32init') @@ -369,6 +381,8 @@ def writeLinkerScripts(li, out16, out32seg, out32flat): , forcedelta=li.final_sec32low_start-li.sec32low_start) out += outXRefs(sections32all, exportsyms=li.exportsyms) + """ _reloc_min_align = 0x%x ; + zonefseg_start = 0x%x ; + zonefseg_end = 0x%x ; zonelow_base = 0x%x ; final_varlow_start = 0x%x ; @@ -390,6 +404,8 @@ def writeLinkerScripts(li, out16, out32seg, out32flat): code32flat_end = ABSOLUTE(.) ; } :text """ % (li.sec32init_align, + li.zonefseg_start, + li.zonefseg_end, li.zonelow_base, li.final_sec32low_start, sec32all_start, -- 1.7.11.7

7 years, 5 months

[PATCH] Don't relocate "varlow" variable references at runtime.

by Kevin O'Connor

Since the final location of the "varlow" variables are known at build time, link the final locations into the binary during the build. The 16bit code was already done at link time - update the build so the 32bit code is also done at link time. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- v2 - When relocations are disables make sure the "init" sections are empty. Thus "init32flat_end" always points to the beginning of the "fixed" code regardless of CONFIG_RELOCATE_INIT and there is no reason to introduce a final_code32flat_start reference. --- src/pmm.c | 25 +++++++++++---------- src/post.c | 8 +------ src/types.h | 2 +- src/util.h | 2 +- tools/checkrom.py | 4 +--- tools/layoutrom.py | 66 +++++++++++++++++++++++++++++------------------------- 6 files changed, 53 insertions(+), 54 deletions(-) diff --git a/src/pmm.c b/src/pmm.c index 8944bae..02fa328 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -223,7 +223,7 @@ void malloc_preinit(void) { ASSERT32FLAT(); - dprintf(3, "malloc setup\n"); + dprintf(3, "malloc preinit\n"); dprintf(1, "Ram Size=0x%08x (0x%016llx high)\n", RamSize, RamSizeOver4G); @@ -288,25 +288,26 @@ csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size) // Update pointers after code relocation. void -malloc_fixupreloc_init(void) +malloc_init(void) { ASSERT32FLAT(); - if (!CONFIG_RELOCATE_INIT) - return; - dprintf(3, "malloc fixup reloc\n"); - - int i; - for (i=0; i<ARRAY_SIZE(Zones); i++) { - struct zone_s *zone = Zones[i]; - if (zone->info) - zone->info->pprev = &zone->info; + dprintf(3, "malloc init\n"); + + if (CONFIG_RELOCATE_INIT) { + // Fixup malloc pointers after relocation + int i; + for (i=0; i<ARRAY_SIZE(Zones); i++) { + struct zone_s *zone = Zones[i]; + if (zone->info) + zone->info->pprev = &zone->info; + } } // Move low-memory initial variable content to new location. extern u8 varlow_start[], varlow_end[], final_varlow_start[]; memmove(final_varlow_start, varlow_start, varlow_end - varlow_start); - // Add space free'd during relocation in f-segment to ZoneFSeg + // Add space available in f-segment to ZoneFSeg extern u8 code32init_end[]; if ((u32)code32init_end > BUILD_BIOS_ADDR) { memset((void*)BUILD_BIOS_ADDR, 0, (u32)code32init_end - BUILD_BIOS_ADDR); diff --git a/src/post.c b/src/post.c index 7f096de..44bb0b0 100644 --- a/src/post.c +++ b/src/post.c @@ -105,7 +105,7 @@ void interface_init(void) { // Running at new code address - do code relocation fixups - malloc_fixupreloc_init(); + malloc_init(); // Setup romfile items. qemu_cfg_init(); @@ -264,8 +264,6 @@ reloc_preinit(void *f, void *arg) extern u32 _reloc_rel_start[], _reloc_rel_end[]; extern u32 _reloc_init_start[], _reloc_init_end[]; extern u8 code32init_start[], code32init_end[]; - extern u32 _reloc_varlow_start[], _reloc_varlow_end[]; - extern u8 varlow_start[], varlow_end[], final_varlow_start[]; // Allocate space for init code. u32 initsize = code32init_end - code32init_start; @@ -275,10 +273,6 @@ reloc_preinit(void *f, void *arg) panic("No space for init relocation.\n"); // Copy code and update relocs (init absolute, init relative, and runtime) - dprintf(1, "Relocating low data from %p to %p (size %d)\n" - , varlow_start, final_varlow_start, varlow_end - varlow_start); - updateRelocs(code32flat_start, _reloc_varlow_start, _reloc_varlow_end - , final_varlow_start - varlow_start); dprintf(1, "Relocating init from %p to %p (size %d)\n" , code32init_start, codedest, initsize); s32 delta = codedest - (void*)code32init_start; diff --git a/src/types.h b/src/types.h index 4df1476..03104a2 100644 --- a/src/types.h +++ b/src/types.h @@ -90,7 +90,7 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VAR16 __section(".discard.var16." UNIQSEC) # define VAR16FIXED(addr) VAR16 __VISIBLE __weak # define VAR32SEG __section(".discard.var32seg." UNIQSEC) -# define VARLOW __section(".data.varlow." UNIQSEC) __VISIBLE +# define VARLOW __section(".data.varlow." UNIQSEC) __VISIBLE __weak # define VARFSEG __section(".data.varfseg." UNIQSEC) __VISIBLE # define ASM16(code) # define ASM32FLAT(code) __ASM(code) diff --git a/src/util.h b/src/util.h index 5729a2f..9303b5a 100644 --- a/src/util.h +++ b/src/util.h @@ -371,7 +371,7 @@ int rom_confirm(u32 size); void csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size); void malloc_preinit(void); -void malloc_fixupreloc_init(void); +void malloc_init(void); void malloc_prepboot(void); void *pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align); int pmm_free(void *data); diff --git a/tools/checkrom.py b/tools/checkrom.py index f141f8b..6f07ac8 100755 --- a/tools/checkrom.py +++ b/tools/checkrom.py @@ -73,9 +73,7 @@ def main(): rawdata = checksum(rawdata, tableofs, tablesize, CSUM_FIELD_OFS) # Print statistics - runtimesize = datasize - if '_reloc_abs_start' in symbols: - runtimesize = end - symbols['code32init_end'].offset + runtimesize = end - symbols['code32init_end'].offset print "Total size: %d Fixed: %d Free: %d (used %.1f%% of %dKiB rom)" % ( datasize, runtimesize, finalsize - datasize , (datasize / float(finalsize)) * 100.0 diff --git a/tools/layoutrom.py b/tools/layoutrom.py index 2543c58..2d45317 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -152,6 +152,7 @@ def getSectionsPrefix(sections, prefix): # The sections (and associated information) to be placed in output rom class LayoutInfo: + genreloc = None sections16 = sec16_start = sec16_align = None sections32seg = sec32seg_start = sec32seg_align = None sections32flat = sec32flat_start = sec32flat_align = None @@ -159,9 +160,10 @@ class LayoutInfo: sections32low = sec32low_start = sec32low_align = None sections32fseg = sec32fseg_start = sec32fseg_align = None zonelow_base = final_sec32low_start = None + exportsyms = varlowsyms = None # Determine final memory addresses for sections -def doLayout(sections, genreloc): +def doLayout(sections): li = LayoutInfo() # Determine 16bit positions li.sections16 = getSectionsCategory(sections, '16') @@ -223,17 +225,13 @@ def doLayout(sections, genreloc): # Determine "low memory" data positions li.sections32low = getSectionsCategory(sections, '32low') - if genreloc: - sec32low_top = li.sec32init_start - final_sec32low_top = min(BUILD_BIOS_ADDR, li.sec32flat_start) - else: - sec32low_top = min(BUILD_BIOS_ADDR, li.sec32init_start) - final_sec32low_top = sec32low_top - relocdelta = final_sec32low_top - sec32low_top - zonelow_base = final_sec32low_top - 64*1024 + sec32low_end = li.sec32init_start + final_sec32low_start = min(BUILD_BIOS_ADDR, li.sec32flat_start) + relocdelta = final_sec32low_start - sec32low_end + zonelow_base = final_sec32low_start - 64*1024 li.zonelow_base = max(BUILD_ROM_START, alignpos(zonelow_base, 2*1024)) li.sec32low_start, li.sec32low_align = setSectionsStart( - li.sections32low, sec32low_top, 16 + li.sections32low, sec32low_end, 16 , segoffset=li.zonelow_base - relocdelta) li.final_sec32low_start = li.sec32low_start + relocdelta @@ -243,7 +241,7 @@ def doLayout(sections, genreloc): size32fseg = li.sec32seg_start - li.sec32fseg_start size32flat = li.sec32fseg_start - li.sec32flat_start size32init = li.sec32flat_start - li.sec32init_start - sizelow = sec32low_top - li.sec32low_start + sizelow = sec32low_end - li.sec32low_start print "16bit size: %d" % size16 print "32bit segmented size: %d" % size32seg print "32bit flat size: %d" % size32flat @@ -258,7 +256,7 @@ def doLayout(sections, genreloc): ###################################################################### # Write LD script includes for the given cross references -def outXRefs(sections, useseg=0, exportsyms=[]): +def outXRefs(sections, useseg=0, exportsyms=[], forcedelta=0): xrefs = dict([(symbol.name, symbol) for symbol in exportsyms]) out = "" for section in sections: @@ -272,7 +270,7 @@ def outXRefs(sections, useseg=0, exportsyms=[]): loc = symbol.section.finalloc if useseg: loc = symbol.section.finalsegloc - out += "%s = 0x%x ;\n" % (symbolname, loc + symbol.offset) + out += "%s = 0x%x ;\n" % (symbolname, loc + forcedelta + symbol.offset) return out # Write LD script includes for the given sections using relative offsets @@ -319,7 +317,7 @@ def getSectionsStart(sections, defaddr=0): if section.finalloc is not None] or [defaddr]) # Output the linker scripts for all required sections. -def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): +def writeLinkerScripts(li, out16, out32seg, out32flat): # Write 16bit linker script out = outXRefs(li.sections16, useseg=1) + """ zonelow_base = 0x%x ; @@ -350,11 +348,10 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): outfile.close() # Write 32flat linker script - sections32all = (li.sections32flat + li.sections32init + li.sections32low - + li.sections32fseg) + sections32all = (li.sections32flat + li.sections32init + li.sections32fseg) sec32all_start = li.sec32low_start relocstr = "" - if genreloc: + if li.genreloc: # Generate relocations absrelocs = getRelocs( li.sections32init, type='R_386_32', category='32init') @@ -363,14 +360,14 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): initrelocs = getRelocs( li.sections32flat + li.sections32low + li.sections16 + li.sections32seg + li.sections32fseg, category='32init') - lowrelocs = getRelocs(sections32all, category='32low') relocstr = (strRelocs("_reloc_abs", "code32init_start", absrelocs) + strRelocs("_reloc_rel", "code32init_start", relrelocs) - + strRelocs("_reloc_init", "code32flat_start", initrelocs) - + strRelocs("_reloc_varlow", "code32flat_start", lowrelocs)) - numrelocs = len(absrelocs + relrelocs + initrelocs + lowrelocs) + + strRelocs("_reloc_init", "code32flat_start", initrelocs)) + numrelocs = len(absrelocs + relrelocs + initrelocs) sec32all_start -= numrelocs * 4 - out = outXRefs(sections32all, exportsyms=exportsyms) + """ + out = outXRefs(li.sections32low, exportsyms=li.varlowsyms + , forcedelta=li.final_sec32low_start-li.sec32low_start) + out += outXRefs(sections32all, exportsyms=li.exportsyms) + """ _reloc_min_align = 0x%x ; zonelow_base = 0x%x ; final_varlow_start = 0x%x ; @@ -621,7 +618,12 @@ def main(): sections = gc(info16, info32seg, info32flat) # Separate 32bit flat into runtime and init parts - findInit(sections) + genreloc = '_reloc_abs_start' in info32flat[1] + if genreloc: + findInit(sections) + else: + for section in sections: + section.category = section.fileid # Note "low memory" and "fseg memory" parts for section in getSectionsPrefix(sections, '.data.varlow.'): @@ -630,17 +632,21 @@ def main(): section.category = '32fseg' # Determine the final memory locations of each kept section. - genreloc = '_reloc_abs_start' in info32flat[1] - li = doLayout(sections, genreloc) + li = doLayout(sections) + li.genreloc = genreloc # Exported symbols - exportsyms = [symbol for symbol in info16[1].values() - if (symbol.section is not None - and '.export.' in symbol.section.name - and symbol.name != symbol.section.name)] + li.exportsyms = [symbol for symbol in info16[1].values() + if (symbol.section is not None + and '.export.' in symbol.section.name + and symbol.name != symbol.section.name)] + li.varlowsyms = [symbol for symbol in info32flat[1].values() + if (symbol.section is not None + and '.data.varlow.' in symbol.section.name + and symbol.name != symbol.section.name)] # Write out linker script files. - writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat) + writeLinkerScripts(li, out16, out32seg, out32flat) if __name__ == '__main__': main() -- 1.7.11.7

7 years, 5 months

[PATCHv2] Calculate "RamSize" needed by 16bit interface dynamically.

by Kevin O'Connor

Calculate a LegacyRamSize directly from the e820 map for use by handle_1588() and handle_15e801() (the only two external interfaces that require "RamSize"). All other users of the existing RamSize (and RamSizeOver4G) variables are specific to QEMU, so move the declarations to paravirt.c. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- It's not ideal to calculate the ram size in 16bit mode, so do the scan in 32bit mode and cache the results. In order to handle the various cases of CSM/not-csm, and pre/post optionrom, perform the calculation twice - once at the start of POST and again as the end of POST. --- src/acpi.c | 1 + src/coreboot.c | 17 +---------------- src/misc.c | 5 ----- src/mtrr.c | 1 + src/paravirt.c | 6 ++++++ src/paravirt.h | 2 ++ src/pciinit.c | 1 + src/pmm.c | 26 ++++++++++++++++++++++++-- src/smbios.c | 1 + src/system.c | 4 ++-- src/util.h | 3 +-- src/xen.c | 13 ------------- 12 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index f7a2e55..7575fc6 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -13,6 +13,7 @@ #include "pci_regs.h" // PCI_INTERRUPT_LINE #include "ioport.h" // inl #include "config.h" // CONFIG_* +#include "paravirt.h" // RamSize #include "dev-q35.h" /****************************************************/ diff --git a/src/coreboot.c b/src/coreboot.c index 0d44834..f0484e1 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -148,28 +148,15 @@ coreboot_preinit(void) if (!cbm) goto fail; - u64 maxram = 0, maxram_over4G = 0; int i, count = MEM_RANGE_COUNT(cbm); for (i=0; i<count; i++) { struct cb_memory_range *m = &cbm->map[i]; u32 type = m->type; - if (type == CB_MEM_TABLE) { + if (type == CB_MEM_TABLE) type = E820_RESERVED; - } else if (type == E820_ACPI || type == E820_RAM) { - u64 end = m->start + m->size; - if (end > 0x100000000ull) { - end -= 0x100000000ull; - if (end > maxram_over4G) - maxram_over4G = end; - } else if (end > maxram) - maxram = end; - } add_e820(m->start, m->size, type); } - RamSize = maxram; - RamSizeOver4G = maxram_over4G; - // Ughh - coreboot likes to set a map at 0x0000-0x1000, but this // confuses grub. So, override it. add_e820(0, 16*1024, E820_RAM); @@ -186,8 +173,6 @@ coreboot_preinit(void) fail: // No table found.. Use 16Megs as a dummy value. dprintf(1, "Unable to find coreboot table!\n"); - RamSize = 16*1024*1024; - RamSizeOver4G = 0; add_e820(0, 16*1024*1024, E820_RAM); return; } diff --git a/src/misc.c b/src/misc.c index fb7aad4..a34405c 100644 --- a/src/misc.c +++ b/src/misc.c @@ -10,11 +10,6 @@ #include "util.h" // debug_enter #include "pic.h" // enable_hwirq -// Amount of continuous ram under 4Gig -u32 RamSize VARFSEG; -// Amount of continuous ram >4Gig -u64 RamSizeOver4G; - /**************************************************************** * Misc 16bit ISRs diff --git a/src/mtrr.c b/src/mtrr.c index 56f85f9..0f94c2c 100644 --- a/src/mtrr.c +++ b/src/mtrr.c @@ -7,6 +7,7 @@ #include "util.h" // dprintf #include "config.h" // CONFIG_* #include "pci.h" // pcimem_start +#include "paravirt.h" // RamSize #define MSR_MTRRcap 0x000000fe #define MSR_MTRRfix64K_00000 0x00000250 diff --git a/src/paravirt.c b/src/paravirt.c index 9ea3dd5..f061039 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -21,6 +21,10 @@ #include "pci.h" // create_pirtable #include "xen.h" // xen_biostable_setup +// Amount of continuous ram under 4Gig +u32 RamSize; +// Amount of continuous ram >4Gig +u64 RamSizeOver4G; // Type of emulator platform. int PlatformRunningOn VARFSEG; @@ -83,6 +87,8 @@ qemu_preinit(void) /* reserve 256KB BIOS area at the end of 4 GB */ add_e820(0xfffc0000, 256*1024, E820_RESERVED); + + dprintf(1, "Ram Size=0x%08x (0x%016llx high)\n", RamSize, RamSizeOver4G); } void diff --git a/src/paravirt.h b/src/paravirt.h index 7237731..fce5af9 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -9,6 +9,8 @@ #define PF_XEN (1<<1) #define PF_KVM (1<<2) +extern u32 RamSize; +extern u64 RamSizeOver4G; extern int PlatformRunningOn; static inline int runningOnQEMU(void) { diff --git a/src/pciinit.c b/src/pciinit.c index 306b125..77cac0a 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -12,6 +12,7 @@ #include "ioport.h" // PORT_ATA1_CMD_BASE #include "config.h" // CONFIG_* #include "memmap.h" // add_e820 +#include "paravirt.h" // RamSize #include "dev-q35.h" /* PM Timer ticks per second (HZ) */ diff --git a/src/pmm.c b/src/pmm.c index c717884..42484cd 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -225,8 +225,6 @@ malloc_preinit(void) ASSERT32FLAT(); dprintf(3, "malloc preinit\n"); - dprintf(1, "Ram Size=0x%08x (0x%016llx high)\n", RamSize, RamSizeOver4G); - // Don't declare any memory between 0xa0000 and 0x100000 add_e820(BUILD_LOWRAM_END, BUILD_BIOS_ADDR-BUILD_LOWRAM_END, E820_HOLE); @@ -278,6 +276,26 @@ csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size) addSpace(&ZoneTmpLow, (void *)low_pmm, (void *)low_pmm + low_pmm_size); } +u32 LegacyRamSize VARFSEG; + +// Calculate the maximum ramsize (less than 4gig) from e820 map. +static void +calcRamSize(void) +{ + u32 rs = 0; + int i; + for (i=e820_count-1; i>=0; i--) { + struct e820entry *en = &e820_list[i]; + u64 end = en->start + en->size; + u32 type = en->type; + if (end <= 0xffffffff && (type == E820_ACPI || type == E820_RAM)) { + rs = end; + break; + } + } + LegacyRamSize = rs >= 1024*1024 ? rs : 1024*1024; +} + // Update pointers after code relocation. void malloc_init(void) @@ -309,6 +327,8 @@ malloc_init(void) , (u32)final_code32flat_start - BUILD_BIOS_ADDR); addSpace(&ZoneFSeg, (void*)BUILD_BIOS_ADDR, final_code32flat_start); } + + calcRamSize(); } void @@ -338,6 +358,8 @@ malloc_prepboot(void) add_e820((u32)info->dataend, giveback, E820_RAM); dprintf(1, "Returned %d bytes of ZoneHigh\n", giveback); } + + calcRamSize(); } diff --git a/src/smbios.c b/src/smbios.c index a9d76f0..f0b83b3 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -7,6 +7,7 @@ #include "util.h" // dprintf #include "config.h" // CONFIG_* +#include "paravirt.h" // RamSize #include "smbios.h" // struct smbios_entry_point struct smbios_entry_point *SMBiosAddr; diff --git a/src/system.c b/src/system.c index dc1dd7d..7b481a8 100644 --- a/src/system.c +++ b/src/system.c @@ -174,7 +174,7 @@ handle_1587(struct bregs *regs) static void handle_1588(struct bregs *regs) { - u32 rs = GET_GLOBAL(RamSize); + u32 rs = GET_GLOBAL(LegacyRamSize); // According to Ralf Brown's interrupt the limit should be 15M, // but real machines mostly return max. 63M. @@ -270,7 +270,7 @@ handle_15e801(struct bregs *regs) // regs.u.r16.ax = 0; // regs.u.r16.bx = 0; - u32 rs = GET_GLOBAL(RamSize); + u32 rs = GET_GLOBAL(LegacyRamSize); // Get the amount of extended memory (above 1M) if (rs > 16*1024*1024) { diff --git a/src/util.h b/src/util.h index 9303b5a..306a8bf 100644 --- a/src/util.h +++ b/src/util.h @@ -371,6 +371,7 @@ int rom_confirm(u32 size); void csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size); void malloc_preinit(void); +extern u32 LegacyRamSize; void malloc_init(void); void malloc_prepboot(void); void *pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align); @@ -450,8 +451,6 @@ void reset_vector(void) __noreturn; // misc.c void mathcp_setup(void); -extern u32 RamSize; -extern u64 RamSizeOver4G; extern u8 BiosChecksum; // version (auto generated file out/version.c) diff --git a/src/xen.c b/src/xen.c index 569fcc0..db542c3 100644 --- a/src/xen.c +++ b/src/xen.c @@ -130,7 +130,6 @@ void xen_biostable_setup(void) void xen_ramsize_preinit(void) { - u64 maxram = 0, maxram_over4G = 0; int i; struct xen_seabios_info *info = (void *)INFO_PHYSICAL_ADDRESS; struct e820entry *e820 = (struct e820entry *)info->e820; @@ -140,18 +139,6 @@ void xen_ramsize_preinit(void) for (i = 0; i < info->e820_nr; i++) { struct e820entry *e = &e820[i]; - if (e->type == E820_ACPI || e->type == E820_RAM) { - u64 end = e->start + e->size; - if (end > 0x100000000ull) { - end -= 0x100000000ull; - if (end > maxram_over4G) - maxram_over4G = end; - } else if (end > maxram) - maxram = end; - } add_e820(e->start, e->size, e->type); } - - RamSize = maxram; - RamSizeOver4G = maxram_over4G; } -- 1.7.11.7

7 years, 5 months

(PAM stuff) reset doesn't work on OVMF + SeaBIOS CSM

by Laszlo Ersek

Hi, I noticed that under OVMF + SeaBIOS CSM + your related patches for both, reset requested by the guest doesn't work as expected. The behavior is an infinite loop, with the following debug fragment repeated by the CSM-ized SeaBIOS: In resume (status=0) In 32bit resume Attempting a hard reboot i8042_wait_write The corresponding call chain seems to be: reset_vector() [src/romlayout.S] entry_post() entry_resume() handle_resume() [src/resume.c] prints "In resume" handle_resume32() prints "In 32bit resume" tryReboot() prints "Attempting a hard reboot" i8042_reboot() [src/ps2port.c] i8042_wait_write() prints "i8042_wait_write" outb(0xfe, PORT_PS2_STATUS) (The entry_post -> entry_resume jump occurs because HaveRunPost has been set to 1 by csm_maininit() --> interface_init() --> ivt_init().) At this point kbd_write_command() in qemu-kvm's "hw/pckbd.c", case KBD_CCMD_RESET, requests a system reset. Soon the reset handlers run, among them cpu_reset() (which was registered by pc_init1() [hw/pc.c] pc_new_cpu() ). cpu_reset() [target-i386/helper.c] sets CS:IP to f000:fff0, which is the exact address of... reset_vector() in SeaBIOS. Of course OVMF should be re-run instead of SeaBIOS. When qemu-kvm starts, "OVMF.fd" is installed as ROM, such that the last address it occupies is "all-bits-one", independently of its size (below a limit of course): pc_init1() [hw/pc.c] rom_add_file_fixed() [] open() / read() /close() rom_insert() some calls to inform KVM I think when OVMF runs SeaBIOS as CSM, OVMF shadows the original ROM (containing the OVMF binary itself) with the SeaBIOS code + static data (I'm peeking at <http://en.wikipedia.org/wiki/Shadow_RAM#Shadow_RAM>...). This should render SeaBIOS visible / executable / writeable in the top 16-bit segment, and leave OVMF in a permanently unusable state (in RAM at least). My guess at the relevant edk2 function is ShadowAndStartLegacy16() [IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBios.c]. The LegacyRegion->UnLock() call should be instrumental (implemented in "OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c" with PAM (Programmable Attribute Map) registers?) Hence I *presume* qemu-kvm should un-shadow the ROM at reset time (ie. make OVMF visible again as ROM) not later than allowing the VCPU to continue at f000:fff0 again. Normally that address should be occupied by OVMF code from (I guess) "UefiCpuPkg/ResetVector/Vtf0". Does this make any sense? Is qemu-kvm forgetting to reset the PAMs? Or would that be the responsibility of tryReboot() in SeaBIOS? ... Aah! qemu_prep_reset() in SeaBIOS [src/shadow.c] goes like: void qemu_prep_reset(void) { if (!CONFIG_QEMU) return; // QEMU doesn't map 0xc0000-0xfffff back to the original rom on a // reset, so do that manually before invoking a hard reset. make_bios_writable(); extern u8 code32flat_start[], code32flat_end[]; memcpy(code32flat_start, code32flat_start + BIOS_SRC_OFFSET , code32flat_end - code32flat_start); if (HaveRunPost) // Memory copy failed to work - try to halt the machine. apm_shutdown(); } and this function is actually called inside the infinite loop (I ignored it before): tryReboot() prints "Attempting a hard reboot" qemu_prep_reset() [src/shadow.c] <-------------- here i8042_reboot() [src/ps2port.c] i8042_wait_write() prints "i8042_wait_write" outb(0xfe, PORT_PS2_STATUS) but of course it doesn't do anything with CONFIG_CSM (since that implies !CONFIG_QEMU). What's more, qemu_prep_reset() and make_bios_writable_intel() seem to exploit SeaBIOS characteristics (code32flat_*, HaveRunPost etc.) that probably make no sense when the data being restored is a different (= OVMF) image. Can we dumb down ^W^W generalize this code? :) Or maybe should qemu introduce a reset handler for PAMs? (I realize I've been reading all the time about PAMs, in the "Writeable files in fw_cfg" thread, in the discussion about unlocking the 0xE0000 segment for stack purposes... Didn't understand a single word before, sorry. Downloaded my copy of the i440FX spec just today; I finally have a remote idea how shadowing / write-protecting works.) Thanks! Laszlo

7 years, 5 months

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 00/30] ACPI memory hotplug

by Erlon Cruz

On Tue, Dec 18, 2012 at 10:41 AM, Vasilis Liaskovitis < vasilis.liaskovitis(a)profitbricks.com> wrote: > This is v4 of the ACPI memory hotplug functionality. Only x86_64 target is > supported (both i440fx and q35). There are still several issues, but it's > been a while since v3 and I wanted to get some more feedback on the current > state of the patchseries. > > We are working in memory hotplug functionality on pSeries machine. I'm wondering whether and how we can better integrate things. Do you think the DIMM abstraction is generic enough to be used in other machine types? > Overview: > > Dimm device layout is modeled with a normal qemu device: > > "-device dimm,id=name,size=sz,node=pxm,populated=on|off,bus=membus.0" > > How does this will handle the no-hotplugable memory for example the memory passed in '-m' parameter? > The starting physical address for all dimms is calculated from top of > memory, > during memory controller init, skipping the pci hole at [PCI_HOLE_START, > 4G). > e.g. > "-device dimm,id=dimm0,size=512M,node=0,populated=off,bus=membus.0" > will define a 512M memory dimm belonging to numa node 0, on bus membus.0. > > Because dimm layout needs to be configured on machine-boot, all dimm > devices > need to be specified on startup command line (either with populated=on or > with > populated=off). The dimm information is stored in dimm configuration > structures. > > After machine startup, dimms are hot-added or removed with normal > device_add > and device_del operations e.g.: > Hot-add syntax: "device_add dimm,id=mydimm0,bus=membus.0" > Hot-remove syntax: "device_del dimm,id=mydimm0" > > Changes v3->v4 > > - Dimms added with normal -device argument (extra -dimm arg dropped). > - multiple memory buses can be registered. Memory buses of the real > hw/chipset > or a paravirtual memory bus can be added. > - acpi implementation uses memory API instead of old ioports. > - Support for q35/ich9 added (still buggy, see patch 12/31). > - piix4/i440fx initialization code has been refactored to resemble q35. > This > will allow memory map initialization at chipset qdev init time for both > machines, as well as more similar code. > - Hot-remove functionality has been moved to separate patches. Hot-remove > no > longer frees memory but unmaps the dimm/qdev device from the guest's view. > Freeing the memory should happen when the last user unrefs/unmaps the > memory, > see also (work in progress): > https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg00728.html > https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg02697.html > - new qmp/hmp command for the state of each dimm (on/off) > > Changes v2->v3 > > - qdev integration. Dimms are attached to a dimmbus. The dimmbus is a child > of i440fx device in the pc machine. Hot-add and remove are done with > normal > device_add / device_del operations on the dimmbus. New commands > "dimm_add" and > "dimm_del" are obsolete. > - Add _PS3 method to allow OSPM-induced hot operations. > - pci-window calculation in Seabios takes dimms into account(for both > 32-bit and > 64-bit windows) > - rename new qmp commands: query-memory-total and query-memory-hotplug > - balloon driver can see the hotplugged memory > > Changes v1->v2 > > - memory map is automatically calculated for hotplug dimms. Dimms are > added from > top-of-memory skipping the pci hole at [PCI_HOLE_START, 4G). > - Renamed from "-memslot" to "-dimm". Commands changed to "dimm_add", > "dimm_del" > - Seabios ejection array reduced to a byte. Use extraction macros for dimm > ssdt. > - additional SRAT paravirt info does not break previous SRAT fw_cfg layout. > - Documentation of new acpi_piix4 registers and paravirt data. > - add ACPI _OST support for _OST enabled guests. This allows qemu to > receive > notification for success / failure of memory hot-add and hot-remove > operations. > Guest needs to support _OST (https://lkml.org/lkml/2012/6/25/321) > - add monitor info command to report total guest memory (initial + > hot-added) > > Issues: > > - hot-remove needs to only unmap the dimm device from guest's view. > Freeing the > memory should happen when the last user of the device (e.g. virtio-blk) > unrefs > the device. A testcase is needed for this. > > - Live Migration: Ramblocks are migrated before qdev VMStates are > migrated. So > the DimmDevice is handled diferrently than other devices. Should this be > reworked ?( DimmDevice structure currently does not define a > VMStateDescription) > Live migration works as long as the dimm layout (command line args) are > identical at the source and destination qemu command line, and destination > takes > into account hot-operations that have occured on source. (v3 patch 10/19 > created the DimmDevice that corresponds to an unknown incoming ramblock, > e.g. > for a dimm that was hot-added on source. but has been dropped for the > moment). > > - A main blocker issue is windows guest functionality. The patchset does > not > work for windows currently. Testing on win2012 server RC or windows2008 > consumer prerelease, when adding a DIMM, there is a BSOD with > ACPI_BIOS_ERROR > message. After this, the VM keeps rebooting with ACPI_BIOS_ERROR. The > windows > pnpmem driver obviosuly has a problem with the seabios dimm implementation > (or the seabios dimm implementation is not fully ACPI-compliant). If > someone > can review the seabios patches or has any ideas to debug this, let me know. > > - hot-operation notification lists need to be added to migration state. > > series is based on: > - qemu master (commit a8a826a3) + patch: > https://lists.gnu.org/archive/html/qemu-devel/2012-11/msg02699.html > - seabios master (commit a810e4e7) > > Can also be found at: > > http://github.com/vliaskov/qemu-kvm/commits/memhp-v4 > http://github.com/vliaskov/seabios/commits/memhp-v4 > > Vasilis Liaskovitis (21): > qapi: make visit_type_size fallback to type_int > Add SIZE type to qdev properties > qemu-option: export parse_option_number > Implement dimm device abstraction > vl: handle "-device dimm" > acpi_piix4 : Implement memory device hotplug registers > acpi_ich9 : Implement memory device hotplug registers > piix_pci and pc_piix: refactor > piix_pci: Add i440fx dram controller initialization > q35: Add i440fx dram controller initialization > pc: Add dimm paravirt SRAT info > Introduce paravirt interface QEMU_CFG_PCI_WINDOW > Implement "info memory-total" and "query-memory-total" > balloon: update with hotplugged memory > Implement dimm-info > dimm: add hot-remove capability > acpi_piix4: add hot-remove capability > acpi_ich9: add hot-remove capability > Implement qmp and hmp commands for notification lists > Add _OST dimm support > Implement _PS3 for dimm > > docs/specs/acpi_hotplug.txt | 54 ++++++ > docs/specs/fwcfg.txt | 28 +++ > hmp-commands.hx | 6 + > hmp.c | 41 ++++ > hmp.h | 3 + > hw/Makefile.objs | 2 +- > hw/acpi.h | 5 + > hw/acpi_ich9.c | 115 +++++++++++- > hw/acpi_ich9.h | 12 +- > hw/acpi_piix4.c | 126 ++++++++++++- > hw/dimm.c | 444 > +++++++++++++++++++++++++++++++++++++++++++ > hw/dimm.h | 102 ++++++++++ > hw/fw_cfg.h | 1 + > hw/lpc_ich9.c | 2 +- > hw/pc.c | 28 +++- > hw/pc.h | 1 + > hw/pc_piix.c | 74 ++++++-- > hw/pc_q35.c | 18 ++- > hw/piix_pci.c | 249 ++++++++----------------- > hw/q35.c | 27 +++ > hw/q35.h | 5 + > hw/qdev-properties.c | 60 ++++++ > hw/qdev-properties.h | 3 + > hw/virtio-balloon.c | 13 +- > monitor.c | 21 ++ > qapi-schema.json | 63 ++++++ > qapi/qapi-visit-core.c | 11 +- > qemu-option.c | 4 +- > qemu-option.h | 4 + > qmp-commands.hx | 57 ++++++ > sysemu.h | 1 + > vl.c | 60 ++++++ > 32 files changed, 1432 insertions(+), 208 deletions(-) > create mode 100644 docs/specs/acpi_hotplug.txt > create mode 100644 docs/specs/fwcfg.txt > create mode 100644 hw/dimm.c > create mode 100644 hw/dimm.h > > > Vasilis Liaskovitis (9): > Add ACPI_EXTRACT_DEVICE* macros > Add SSDT memory device support > acpi-dsdt: Implement functions for memory hotplug > acpi: generate hotplug memory devices > q35: Add memory hotplug handler > pci: Use paravirt interface for pcimem_start and pcimem64_start > acpi: add _EJ0 operation and eject port for memory devices > Add _OST dimm method > Implement _PS3 method for memory device > > Makefile | 2 +- > src/acpi-dsdt-mem-hotplug.dsl | 136 +++++++++++++++++++++++++++++++++++ > src/acpi-dsdt.dsl | 5 +- > src/acpi.c | 158 > +++++++++++++++++++++++++++++++++++++++-- > src/paravirt.c | 6 ++ > src/paravirt.h | 2 + > src/pciinit.c | 9 +++ > src/q35-acpi-dsdt.dsl | 6 +- > src/ssdt-mem.dsl | 73 +++++++++++++++++++ > tools/acpi_extract.py | 28 +++++++ > 10 files changed, 415 insertions(+), 10 deletions(-) > create mode 100644 src/acpi-dsdt-mem-hotplug.dsl > create mode 100644 src/ssdt-mem.dsl > > -- > 1.7.9 > > >

7 years, 5 months

[PATCH] Move malloc's ZoneFSeg and ZoneLow setup to malloc_init.

by Kevin O'Connor

This reduces some duplicate code between malloc_preinit() and csm_malloc_preinit(). Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/pmm.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/pmm.c b/src/pmm.c index 0bd30b2..c717884 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -254,12 +254,8 @@ malloc_preinit(void) addSpace(&ZoneTmpHigh, (void*)s, (void*)e); } - // Populate other regions + // Populate regions addSpace(&ZoneTmpLow, (void*)BUILD_STACK_ADDR, (void*)BUILD_EBDA_MINIMUM); - addSpace(&ZoneFSeg, BiosTableSpace, &BiosTableSpace[CONFIG_MAX_BIOSTABLE]); - extern u8 final_varlow_start[]; - addSpace(&ZoneLow, zonelow_base + OPROM_HEADER_RESERVE, final_varlow_start); - RomBase = findLast(&ZoneLow); if (highram) { addSpace(&ZoneHigh, (void*)highram , (void*)highram + CONFIG_MAX_HIGHTABLE); @@ -280,10 +276,6 @@ csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size) addSpace(&ZoneTmpHigh, (void *)hi_pmm, (void *)hi_pmm + hi_pmm_size); } addSpace(&ZoneTmpLow, (void *)low_pmm, (void *)low_pmm + low_pmm_size); - addSpace(&ZoneFSeg, BiosTableSpace, &BiosTableSpace[CONFIG_MAX_BIOSTABLE]); - extern u8 final_varlow_start[]; - addSpace(&ZoneLow, zonelow_base + OPROM_HEADER_RESERVE, final_varlow_start); - RomBase = findLast(&ZoneLow); } // Update pointers after code relocation. @@ -303,11 +295,14 @@ malloc_init(void) } } - // Move low-memory initial variable content to new location. + // Initialize low-memory region extern u8 varlow_start[], varlow_end[], final_varlow_start[]; memmove(final_varlow_start, varlow_start, varlow_end - varlow_start); + addSpace(&ZoneLow, zonelow_base + OPROM_HEADER_RESERVE, final_varlow_start); + RomBase = findLast(&ZoneLow); // Add space available in f-segment to ZoneFSeg + addSpace(&ZoneFSeg, BiosTableSpace, &BiosTableSpace[CONFIG_MAX_BIOSTABLE]); extern u8 final_code32flat_start[]; if ((u32)final_code32flat_start > BUILD_BIOS_ADDR) { memset((void*)BUILD_BIOS_ADDR, 0 -- 1.7.11.7

7 years, 5 months

[PATCH] Calculate "RamSize" dynamically when needed by 16bit interface.

by Kevin O'Connor

Modify handle_1588() and handle_15e801() (the only two external interfaces that require "RamSize") to calculate the information dynamically from the e820 map. All other users of the RamSize (and RamSizeOver4G) variables are specific to QEMU, so move the declarations to paravirt.c. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/acpi.c | 1 + src/coreboot.c | 17 +---------------- src/misc.c | 5 ----- src/mtrr.c | 1 + src/paravirt.c | 6 ++++++ src/paravirt.h | 2 ++ src/pciinit.c | 1 + src/pmm.c | 2 -- src/smbios.c | 1 + src/system.c | 19 +++++++++++++++++-- src/util.h | 2 -- src/xen.c | 13 ------------- 12 files changed, 30 insertions(+), 40 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index f7a2e55..7575fc6 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -13,6 +13,7 @@ #include "pci_regs.h" // PCI_INTERRUPT_LINE #include "ioport.h" // inl #include "config.h" // CONFIG_* +#include "paravirt.h" // RamSize #include "dev-q35.h" /****************************************************/ diff --git a/src/coreboot.c b/src/coreboot.c index 0d44834..f0484e1 100644 --- a/src/coreboot.c +++ b/src/coreboot.c @@ -148,28 +148,15 @@ coreboot_preinit(void) if (!cbm) goto fail; - u64 maxram = 0, maxram_over4G = 0; int i, count = MEM_RANGE_COUNT(cbm); for (i=0; i<count; i++) { struct cb_memory_range *m = &cbm->map[i]; u32 type = m->type; - if (type == CB_MEM_TABLE) { + if (type == CB_MEM_TABLE) type = E820_RESERVED; - } else if (type == E820_ACPI || type == E820_RAM) { - u64 end = m->start + m->size; - if (end > 0x100000000ull) { - end -= 0x100000000ull; - if (end > maxram_over4G) - maxram_over4G = end; - } else if (end > maxram) - maxram = end; - } add_e820(m->start, m->size, type); } - RamSize = maxram; - RamSizeOver4G = maxram_over4G; - // Ughh - coreboot likes to set a map at 0x0000-0x1000, but this // confuses grub. So, override it. add_e820(0, 16*1024, E820_RAM); @@ -186,8 +173,6 @@ coreboot_preinit(void) fail: // No table found.. Use 16Megs as a dummy value. dprintf(1, "Unable to find coreboot table!\n"); - RamSize = 16*1024*1024; - RamSizeOver4G = 0; add_e820(0, 16*1024*1024, E820_RAM); return; } diff --git a/src/misc.c b/src/misc.c index fb7aad4..a34405c 100644 --- a/src/misc.c +++ b/src/misc.c @@ -10,11 +10,6 @@ #include "util.h" // debug_enter #include "pic.h" // enable_hwirq -// Amount of continuous ram under 4Gig -u32 RamSize VARFSEG; -// Amount of continuous ram >4Gig -u64 RamSizeOver4G; - /**************************************************************** * Misc 16bit ISRs diff --git a/src/mtrr.c b/src/mtrr.c index 56f85f9..0f94c2c 100644 --- a/src/mtrr.c +++ b/src/mtrr.c @@ -7,6 +7,7 @@ #include "util.h" // dprintf #include "config.h" // CONFIG_* #include "pci.h" // pcimem_start +#include "paravirt.h" // RamSize #define MSR_MTRRcap 0x000000fe #define MSR_MTRRfix64K_00000 0x00000250 diff --git a/src/paravirt.c b/src/paravirt.c index 9ea3dd5..f061039 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -21,6 +21,10 @@ #include "pci.h" // create_pirtable #include "xen.h" // xen_biostable_setup +// Amount of continuous ram under 4Gig +u32 RamSize; +// Amount of continuous ram >4Gig +u64 RamSizeOver4G; // Type of emulator platform. int PlatformRunningOn VARFSEG; @@ -83,6 +87,8 @@ qemu_preinit(void) /* reserve 256KB BIOS area at the end of 4 GB */ add_e820(0xfffc0000, 256*1024, E820_RESERVED); + + dprintf(1, "Ram Size=0x%08x (0x%016llx high)\n", RamSize, RamSizeOver4G); } void diff --git a/src/paravirt.h b/src/paravirt.h index 7237731..fce5af9 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -9,6 +9,8 @@ #define PF_XEN (1<<1) #define PF_KVM (1<<2) +extern u32 RamSize; +extern u64 RamSizeOver4G; extern int PlatformRunningOn; static inline int runningOnQEMU(void) { diff --git a/src/pciinit.c b/src/pciinit.c index 306b125..77cac0a 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -12,6 +12,7 @@ #include "ioport.h" // PORT_ATA1_CMD_BASE #include "config.h" // CONFIG_* #include "memmap.h" // add_e820 +#include "paravirt.h" // RamSize #include "dev-q35.h" /* PM Timer ticks per second (HZ) */ diff --git a/src/pmm.c b/src/pmm.c index c717884..43be19b 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -225,8 +225,6 @@ malloc_preinit(void) ASSERT32FLAT(); dprintf(3, "malloc preinit\n"); - dprintf(1, "Ram Size=0x%08x (0x%016llx high)\n", RamSize, RamSizeOver4G); - // Don't declare any memory between 0xa0000 and 0x100000 add_e820(BUILD_LOWRAM_END, BUILD_BIOS_ADDR-BUILD_LOWRAM_END, E820_HOLE); diff --git a/src/smbios.c b/src/smbios.c index a9d76f0..f0b83b3 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -7,6 +7,7 @@ #include "util.h" // dprintf #include "config.h" // CONFIG_* +#include "paravirt.h" // RamSize #include "smbios.h" // struct smbios_entry_point struct smbios_entry_point *SMBiosAddr; diff --git a/src/system.c b/src/system.c index dc1dd7d..6de7da6 100644 --- a/src/system.c +++ b/src/system.c @@ -170,11 +170,26 @@ handle_1587(struct bregs *regs) set_code_success(regs); } +// Calculate the maximum ramsize (less than 4gig) from e820 map. +static u32 +getRamSize(void) +{ + int i; + for (i=e820_count-1; i>=0; i--) { + struct e820entry *en = &e820_list[i]; + u64 end = GET_GLOBAL(en->start) + GET_GLOBAL(en->size); + u32 type = GET_GLOBAL(en->type); + if (end <= 0xffffffff && (type == E820_ACPI || type == E820_RAM)) + return end; + } + return 0; +} + // Get the amount of extended memory (above 1M) static void handle_1588(struct bregs *regs) { - u32 rs = GET_GLOBAL(RamSize); + u32 rs = getRamSize(); // According to Ralf Brown's interrupt the limit should be 15M, // but real machines mostly return max. 63M. @@ -270,7 +285,7 @@ handle_15e801(struct bregs *regs) // regs.u.r16.ax = 0; // regs.u.r16.bx = 0; - u32 rs = GET_GLOBAL(RamSize); + u32 rs = getRamSize(); // Get the amount of extended memory (above 1M) if (rs > 16*1024*1024) { diff --git a/src/util.h b/src/util.h index 9303b5a..fa7af17 100644 --- a/src/util.h +++ b/src/util.h @@ -450,8 +450,6 @@ void reset_vector(void) __noreturn; // misc.c void mathcp_setup(void); -extern u32 RamSize; -extern u64 RamSizeOver4G; extern u8 BiosChecksum; // version (auto generated file out/version.c) diff --git a/src/xen.c b/src/xen.c index 569fcc0..db542c3 100644 --- a/src/xen.c +++ b/src/xen.c @@ -130,7 +130,6 @@ void xen_biostable_setup(void) void xen_ramsize_preinit(void) { - u64 maxram = 0, maxram_over4G = 0; int i; struct xen_seabios_info *info = (void *)INFO_PHYSICAL_ADDRESS; struct e820entry *e820 = (struct e820entry *)info->e820; @@ -140,18 +139,6 @@ void xen_ramsize_preinit(void) for (i = 0; i < info->e820_nr; i++) { struct e820entry *e = &e820[i]; - if (e->type == E820_ACPI || e->type == E820_RAM) { - u64 end = e->start + e->size; - if (end > 0x100000000ull) { - end -= 0x100000000ull; - if (end > maxram_over4G) - maxram_over4G = end; - } else if (end > maxram) - maxram = end; - } add_e820(e->start, e->size, e->type); } - - RamSize = maxram; - RamSizeOver4G = maxram_over4G; } -- 1.7.11.7

7 years, 5 months

[PATCH] Don't relocate "varlow" variable references at runtime.

by Kevin O'Connor

Since the final location of the "varlow" variables are known at build time, link the final locations into the binary during the build. The 16bit code was already done at link time - update the build so the 32bit code is also done at link time. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/pmm.c | 34 +++++++++++++++-------------- src/post.c | 8 +------ src/types.h | 2 +- src/util.h | 2 +- tools/layoutrom.py | 63 +++++++++++++++++++++++++++++++----------------------- 5 files changed, 57 insertions(+), 52 deletions(-) diff --git a/src/pmm.c b/src/pmm.c index 8944bae..0bd30b2 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -223,7 +223,7 @@ void malloc_preinit(void) { ASSERT32FLAT(); - dprintf(3, "malloc setup\n"); + dprintf(3, "malloc preinit\n"); dprintf(1, "Ram Size=0x%08x (0x%016llx high)\n", RamSize, RamSizeOver4G); @@ -288,29 +288,31 @@ csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size) // Update pointers after code relocation. void -malloc_fixupreloc_init(void) +malloc_init(void) { ASSERT32FLAT(); - if (!CONFIG_RELOCATE_INIT) - return; - dprintf(3, "malloc fixup reloc\n"); - - int i; - for (i=0; i<ARRAY_SIZE(Zones); i++) { - struct zone_s *zone = Zones[i]; - if (zone->info) - zone->info->pprev = &zone->info; + dprintf(3, "malloc init\n"); + + if (CONFIG_RELOCATE_INIT) { + // Fixup malloc pointers after relocation + int i; + for (i=0; i<ARRAY_SIZE(Zones); i++) { + struct zone_s *zone = Zones[i]; + if (zone->info) + zone->info->pprev = &zone->info; + } } // Move low-memory initial variable content to new location. extern u8 varlow_start[], varlow_end[], final_varlow_start[]; memmove(final_varlow_start, varlow_start, varlow_end - varlow_start); - // Add space free'd during relocation in f-segment to ZoneFSeg - extern u8 code32init_end[]; - if ((u32)code32init_end > BUILD_BIOS_ADDR) { - memset((void*)BUILD_BIOS_ADDR, 0, (u32)code32init_end - BUILD_BIOS_ADDR); - addSpace(&ZoneFSeg, (void*)BUILD_BIOS_ADDR, code32init_end); + // Add space available in f-segment to ZoneFSeg + extern u8 final_code32flat_start[]; + if ((u32)final_code32flat_start > BUILD_BIOS_ADDR) { + memset((void*)BUILD_BIOS_ADDR, 0 + , (u32)final_code32flat_start - BUILD_BIOS_ADDR); + addSpace(&ZoneFSeg, (void*)BUILD_BIOS_ADDR, final_code32flat_start); } } diff --git a/src/post.c b/src/post.c index 7f096de..44bb0b0 100644 --- a/src/post.c +++ b/src/post.c @@ -105,7 +105,7 @@ void interface_init(void) { // Running at new code address - do code relocation fixups - malloc_fixupreloc_init(); + malloc_init(); // Setup romfile items. qemu_cfg_init(); @@ -264,8 +264,6 @@ reloc_preinit(void *f, void *arg) extern u32 _reloc_rel_start[], _reloc_rel_end[]; extern u32 _reloc_init_start[], _reloc_init_end[]; extern u8 code32init_start[], code32init_end[]; - extern u32 _reloc_varlow_start[], _reloc_varlow_end[]; - extern u8 varlow_start[], varlow_end[], final_varlow_start[]; // Allocate space for init code. u32 initsize = code32init_end - code32init_start; @@ -275,10 +273,6 @@ reloc_preinit(void *f, void *arg) panic("No space for init relocation.\n"); // Copy code and update relocs (init absolute, init relative, and runtime) - dprintf(1, "Relocating low data from %p to %p (size %d)\n" - , varlow_start, final_varlow_start, varlow_end - varlow_start); - updateRelocs(code32flat_start, _reloc_varlow_start, _reloc_varlow_end - , final_varlow_start - varlow_start); dprintf(1, "Relocating init from %p to %p (size %d)\n" , code32init_start, codedest, initsize); s32 delta = codedest - (void*)code32init_start; diff --git a/src/types.h b/src/types.h index 4df1476..03104a2 100644 --- a/src/types.h +++ b/src/types.h @@ -90,7 +90,7 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VAR16 __section(".discard.var16." UNIQSEC) # define VAR16FIXED(addr) VAR16 __VISIBLE __weak # define VAR32SEG __section(".discard.var32seg." UNIQSEC) -# define VARLOW __section(".data.varlow." UNIQSEC) __VISIBLE +# define VARLOW __section(".data.varlow." UNIQSEC) __VISIBLE __weak # define VARFSEG __section(".data.varfseg." UNIQSEC) __VISIBLE # define ASM16(code) # define ASM32FLAT(code) __ASM(code) diff --git a/src/util.h b/src/util.h index 5729a2f..9303b5a 100644 --- a/src/util.h +++ b/src/util.h @@ -371,7 +371,7 @@ int rom_confirm(u32 size); void csm_malloc_preinit(u32 low_pmm, u32 low_pmm_size, u32 hi_pmm, u32 hi_pmm_size); void malloc_preinit(void); -void malloc_fixupreloc_init(void); +void malloc_init(void); void malloc_prepboot(void); void *pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align); int pmm_free(void *data); diff --git a/tools/layoutrom.py b/tools/layoutrom.py index 2543c58..284ce99 100755 --- a/tools/layoutrom.py +++ b/tools/layoutrom.py @@ -152,17 +152,20 @@ def getSectionsPrefix(sections, prefix): # The sections (and associated information) to be placed in output rom class LayoutInfo: + genreloc = None sections16 = sec16_start = sec16_align = None sections32seg = sec32seg_start = sec32seg_align = None sections32flat = sec32flat_start = sec32flat_align = None sections32init = sec32init_start = sec32init_align = None sections32low = sec32low_start = sec32low_align = None sections32fseg = sec32fseg_start = sec32fseg_align = None - zonelow_base = final_sec32low_start = None + final_code32flat_start = final_sec32low_start = zonelow_base = None + exportsyms = varlowsyms = None # Determine final memory addresses for sections def doLayout(sections, genreloc): li = LayoutInfo() + li.genreloc = genreloc # Determine 16bit positions li.sections16 = getSectionsCategory(sections, '16') textsections = getSectionsPrefix(li.sections16, '.text.') @@ -221,19 +224,20 @@ def doLayout(sections, genreloc): textsections + rodatasections + datasections + bsssections , li.sec32flat_start, 16) - # Determine "low memory" data positions - li.sections32low = getSectionsCategory(sections, '32low') if genreloc: - sec32low_top = li.sec32init_start - final_sec32low_top = min(BUILD_BIOS_ADDR, li.sec32flat_start) + li.final_code32flat_start = li.sec32flat_start else: - sec32low_top = min(BUILD_BIOS_ADDR, li.sec32init_start) - final_sec32low_top = sec32low_top - relocdelta = final_sec32low_top - sec32low_top - zonelow_base = final_sec32low_top - 64*1024 + li.final_code32flat_start = li.sec32init_start + + # Determine "low memory" data positions + li.sections32low = getSectionsCategory(sections, '32low') + sec32low_end = li.sec32init_start + final_sec32low_start = min(BUILD_BIOS_ADDR, li.final_code32flat_start) + relocdelta = final_sec32low_start - sec32low_end + zonelow_base = final_sec32low_start - 64*1024 li.zonelow_base = max(BUILD_ROM_START, alignpos(zonelow_base, 2*1024)) li.sec32low_start, li.sec32low_align = setSectionsStart( - li.sections32low, sec32low_top, 16 + li.sections32low, sec32low_end, 16 , segoffset=li.zonelow_base - relocdelta) li.final_sec32low_start = li.sec32low_start + relocdelta @@ -243,7 +247,7 @@ def doLayout(sections, genreloc): size32fseg = li.sec32seg_start - li.sec32fseg_start size32flat = li.sec32fseg_start - li.sec32flat_start size32init = li.sec32flat_start - li.sec32init_start - sizelow = sec32low_top - li.sec32low_start + sizelow = sec32low_end - li.sec32low_start print "16bit size: %d" % size16 print "32bit segmented size: %d" % size32seg print "32bit flat size: %d" % size32flat @@ -258,7 +262,7 @@ def doLayout(sections, genreloc): ###################################################################### # Write LD script includes for the given cross references -def outXRefs(sections, useseg=0, exportsyms=[]): +def outXRefs(sections, useseg=0, exportsyms=[], forcedelta=0): xrefs = dict([(symbol.name, symbol) for symbol in exportsyms]) out = "" for section in sections: @@ -272,7 +276,7 @@ def outXRefs(sections, useseg=0, exportsyms=[]): loc = symbol.section.finalloc if useseg: loc = symbol.section.finalsegloc - out += "%s = 0x%x ;\n" % (symbolname, loc + symbol.offset) + out += "%s = 0x%x ;\n" % (symbolname, loc + forcedelta + symbol.offset) return out # Write LD script includes for the given sections using relative offsets @@ -319,7 +323,7 @@ def getSectionsStart(sections, defaddr=0): if section.finalloc is not None] or [defaddr]) # Output the linker scripts for all required sections. -def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): +def writeLinkerScripts(li, out16, out32seg, out32flat): # Write 16bit linker script out = outXRefs(li.sections16, useseg=1) + """ zonelow_base = 0x%x ; @@ -350,11 +354,10 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): outfile.close() # Write 32flat linker script - sections32all = (li.sections32flat + li.sections32init + li.sections32low - + li.sections32fseg) + sections32all = (li.sections32flat + li.sections32init + li.sections32fseg) sec32all_start = li.sec32low_start relocstr = "" - if genreloc: + if li.genreloc: # Generate relocations absrelocs = getRelocs( li.sections32init, type='R_386_32', category='32init') @@ -363,16 +366,17 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): initrelocs = getRelocs( li.sections32flat + li.sections32low + li.sections16 + li.sections32seg + li.sections32fseg, category='32init') - lowrelocs = getRelocs(sections32all, category='32low') relocstr = (strRelocs("_reloc_abs", "code32init_start", absrelocs) + strRelocs("_reloc_rel", "code32init_start", relrelocs) - + strRelocs("_reloc_init", "code32flat_start", initrelocs) - + strRelocs("_reloc_varlow", "code32flat_start", lowrelocs)) - numrelocs = len(absrelocs + relrelocs + initrelocs + lowrelocs) + + strRelocs("_reloc_init", "code32flat_start", initrelocs)) + numrelocs = len(absrelocs + relrelocs + initrelocs) sec32all_start -= numrelocs * 4 - out = outXRefs(sections32all, exportsyms=exportsyms) + """ + out = outXRefs(li.sections32low, exportsyms=li.varlowsyms + , forcedelta=li.final_sec32low_start-li.sec32low_start) + out += outXRefs(sections32all, exportsyms=li.exportsyms) + """ _reloc_min_align = 0x%x ; zonelow_base = 0x%x ; + final_code32flat_start = 0x%x ; final_varlow_start = 0x%x ; code32flat_start = 0x%x ; @@ -394,6 +398,7 @@ def writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat): } :text """ % (li.sec32init_align, li.zonelow_base, + li.final_code32flat_start, li.final_sec32low_start, sec32all_start, relocstr, @@ -634,13 +639,17 @@ def main(): li = doLayout(sections, genreloc) # Exported symbols - exportsyms = [symbol for symbol in info16[1].values() - if (symbol.section is not None - and '.export.' in symbol.section.name - and symbol.name != symbol.section.name)] + li.exportsyms = [symbol for symbol in info16[1].values() + if (symbol.section is not None + and '.export.' in symbol.section.name + and symbol.name != symbol.section.name)] + li.varlowsyms = [symbol for symbol in info32flat[1].values() + if (symbol.section is not None + and '.data.varlow.' in symbol.section.name + and symbol.name != symbol.section.name)] # Write out linker script files. - writeLinkerScripts(li, exportsyms, genreloc, out16, out32seg, out32flat) + writeLinkerScripts(li, out16, out32seg, out32flat) if __name__ == '__main__': main() -- 1.7.11.7

7 years, 5 months

[PATCH 2/2] Convert VAR16VISIBLE, VAR16EXPORT, and VAR32VISIBLE to VARFSEG.

by Kevin O'Connor

Convert all users of the alternative variable exports to VARFSEG. There isn't a significant distinction between the existing types of exports, so it's simpler to just use one type going forward. The new VARFSEG declaration is only emitting when in 32bit mode, so update and move some variables as needed. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- Makefile | 8 ++++---- src/block.c | 6 +++--- src/cdrom.c | 2 +- src/clock.c | 6 +++--- src/csm.c | 4 ++-- src/floppy.c | 4 ++-- src/memmap.c | 4 ++++ src/memmap.h | 5 +---- src/misc.c | 20 ++++++++------------ src/output.c | 2 +- src/paravirt.c | 3 +++ src/paravirt.h | 1 - src/pci.c | 2 +- src/pcibios.c | 2 +- src/pirtable.c | 4 ++-- src/pmm.c | 5 ++++- src/pnpbios.c | 4 ++-- src/resume.c | 2 +- src/smp.c | 10 +++++----- src/stacks.c | 4 ++-- src/system.c | 4 ---- src/types.h | 16 ++-------------- src/usb-hid.c | 4 ++-- src/vgahooks.c | 6 +++--- vgasrc/vgabios.c | 2 +- 25 files changed, 58 insertions(+), 72 deletions(-) diff --git a/Makefile b/Makefile index ab9ca0e..1ce2f79 100644 --- a/Makefile +++ b/Makefile @@ -8,15 +8,15 @@ OUT=out/ # Source files -SRCBOTH=misc.c stacks.c pmm.c output.c util.c block.c floppy.c ata.c mouse.c \ +SRCBOTH=misc.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \ kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \ - pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \ + pnpbios.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \ usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \ virtio-ring.c virtio-pci.c virtio-blk.c virtio-scsi.c apm.c ahci.c \ usb-uas.c lsi-scsi.c esp-scsi.c megasas.c SRC16=$(SRCBOTH) system.c disk.c font.c -SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ - acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ +SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c pmm.c coreboot.c boot.c \ + acpi.c smm.c mptable.c pirtable.c smbios.c pciinit.c optionroms.c mtrr.c \ lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \ biostables.c xen.c bmp.c romfile.c csm.c SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c diff --git a/src/block.c b/src/block.c index c202f5a..9ea4ca7 100644 --- a/src/block.c +++ b/src/block.c @@ -14,10 +14,10 @@ #include "virtio-blk.h" // process_virtio_blk_op #include "blockcmd.h" // cdb_* -u8 FloppyCount VAR16VISIBLE; +u8 FloppyCount VARFSEG; u8 CDCount; -struct drive_s *IDMap[3][CONFIG_MAX_EXTDRIVE] VAR16VISIBLE; -u8 *bounce_buf_fl VAR16VISIBLE; +struct drive_s *IDMap[3][CONFIG_MAX_EXTDRIVE] VARFSEG; +u8 *bounce_buf_fl VARFSEG; struct dpte_s DefaultDPTE VARLOW; struct drive_s * diff --git a/src/cdrom.c b/src/cdrom.c index 81b97f7..01eb87a 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -21,7 +21,7 @@ u8 CDRom_locks[CONFIG_MAX_EXTDRIVE] VARLOW; ****************************************************************/ struct cdemu_s CDEmu VARLOW; -struct drive_s *cdemu_drive_gf VAR16VISIBLE; +struct drive_s *cdemu_drive_gf VARFSEG; static int cdemu_read(struct disk_op_s *op) diff --git a/src/clock.c b/src/clock.c index 708d413..79b18f9 100644 --- a/src/clock.c +++ b/src/clock.c @@ -62,10 +62,10 @@ #define CALIBRATE_COUNT 0x800 // Approx 1.7ms -u32 cpu_khz VAR16VISIBLE; -u8 no_tsc VAR16VISIBLE; +u32 cpu_khz VARFSEG; +u8 no_tsc VARFSEG; -u16 pmtimer_ioport VAR16VISIBLE; +u16 pmtimer_ioport VARFSEG; u32 pmtimer_wraps VARLOW; u32 pmtimer_last VARLOW; diff --git a/src/csm.c b/src/csm.c index b5d8b54..8882ee5 100644 --- a/src/csm.c +++ b/src/csm.c @@ -18,9 +18,9 @@ #include "smbios.h" #include "pic.h" -struct rsdp_descriptor VAR32FLATVISIBLE __aligned(16) csm_rsdp; +struct rsdp_descriptor csm_rsdp VARFSEG __aligned(16); -EFI_COMPATIBILITY16_TABLE csm_compat_table VAR32FLATVISIBLE __aligned(16) = { +EFI_COMPATIBILITY16_TABLE csm_compat_table VARFSEG __aligned(16) = { .Signature = 0x24454649, .TableChecksum = 0 /* Filled in by checkrom.py */, .TableLength = sizeof(csm_compat_table), diff --git a/src/floppy.c b/src/floppy.c index 2887e78..d73e4ae 100644 --- a/src/floppy.c +++ b/src/floppy.c @@ -28,7 +28,7 @@ // Since no provisions are made for multiple drive types, most // values in this table are ignored. I set parameters for 1.44M // floppy here -struct floppy_ext_dbt_s diskette_param_table2 VAR16VISIBLE = { +struct floppy_ext_dbt_s diskette_param_table2 VARFSEG = { .dbt = { .specify1 = 0xAF, // step rate 12ms, head unload 240ms .specify2 = 0x02, // head load time 4ms, DMA used @@ -55,7 +55,7 @@ struct floppyinfo_s { u8 media_state; }; -struct floppyinfo_s FloppyInfo[] VAR16VISIBLE = { +struct floppyinfo_s FloppyInfo[] VARFSEG = { // Unknown { {0, 0, 0}, 0x00, 0x00}, // 1 - 360KB, 5.25" - 2 heads, 40 tracks, 9 sectors diff --git a/src/memmap.c b/src/memmap.c index 29ca644..f029ce2 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -13,6 +13,10 @@ * e820 memory map ****************************************************************/ +// Info on e820 map location and size. +struct e820entry e820_list[CONFIG_MAX_E820] VARFSEG; +int e820_count VARFSEG; + // Remove an entry from the e820_list. static void remove_e820(int i) diff --git a/src/memmap.h b/src/memmap.h index 783a042..7bda56e 100644 --- a/src/memmap.h +++ b/src/memmap.h @@ -22,11 +22,8 @@ void memmap_prepboot(void); // A typical OS page size #define PAGE_SIZE 4096 -// e820 map storage (defined in system.c) +// e820 map storage extern struct e820entry e820_list[]; extern int e820_count; -// Space for exported bios tables (defined in misc.c) -extern char BiosTableSpace[]; - #endif // e820map.h diff --git a/src/misc.c b/src/misc.c index 05d0cf5..fb7aad4 100644 --- a/src/misc.c +++ b/src/misc.c @@ -11,13 +11,9 @@ #include "pic.h" // enable_hwirq // Amount of continuous ram under 4Gig -u32 RamSize VAR16VISIBLE; +u32 RamSize VARFSEG; // Amount of continuous ram >4Gig u64 RamSizeOver4G; -// Space for bios tables built an run-time. -char BiosTableSpace[CONFIG_MAX_BIOSTABLE] __aligned(MALLOC_MIN_ALIGN) VAR16VISIBLE; -// Type of emulator platform. -int PlatformRunningOn VAR16VISIBLE; /**************************************************************** @@ -133,23 +129,23 @@ struct bios_config_table_s BIOS_CONFIG_TABLE VAR16FIXED(0xe6f5) = { ****************************************************************/ // Real mode IDT descriptor -struct descloc_s rmode_IDT_info VAR16VISIBLE = { +struct descloc_s rmode_IDT_info VARFSEG = { .length = sizeof(struct rmode_IVT) - 1, .addr = (u32)MAKE_FLATPTR(SEG_IVT, 0), }; // Dummy IDT that forces a machine shutdown if an irq happens in // protected mode. -u8 dummy_IDT VAR16VISIBLE; +u8 dummy_IDT VARFSEG; // Protected mode IDT descriptor -struct descloc_s pmode_IDT_info VAR16VISIBLE = { +struct descloc_s pmode_IDT_info VARFSEG = { .length = sizeof(dummy_IDT) - 1, - .addr = (u32)MAKE_FLATPTR(SEG_BIOS, &dummy_IDT), + .addr = (u32)&dummy_IDT, }; // GDT -u64 rombios32_gdt[] VAR16VISIBLE __aligned(8) = { +u64 rombios32_gdt[] VARFSEG __aligned(8) = { // First entry can't be used. 0x0000000000000000LL, // 32 bit flat code segment (SEG32_MODE32_CS) @@ -167,9 +163,9 @@ u64 rombios32_gdt[] VAR16VISIBLE __aligned(8) = { }; // GDT descriptor -struct descloc_s rombios32_gdt_48 VAR16VISIBLE = { +struct descloc_s rombios32_gdt_48 VARFSEG = { .length = sizeof(rombios32_gdt) - 1, - .addr = (u32)MAKE_FLATPTR(SEG_BIOS, rombios32_gdt), + .addr = (u32)rombios32_gdt, }; diff --git a/src/output.c b/src/output.c index e623d37..79c3ada 100644 --- a/src/output.c +++ b/src/output.c @@ -23,7 +23,7 @@ struct putcinfo { #define DEBUG_TIMEOUT 100000 -u16 DebugOutputPort VAR16VISIBLE = 0x402; +u16 DebugOutputPort VARFSEG = 0x402; void debug_serial_preinit(void) diff --git a/src/paravirt.c b/src/paravirt.c index f76b47f..9ea3dd5 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -21,6 +21,9 @@ #include "pci.h" // create_pirtable #include "xen.h" // xen_biostable_setup +// Type of emulator platform. +int PlatformRunningOn VARFSEG; + /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It * should be used to determine that a VM is running under KVM. */ diff --git a/src/paravirt.h b/src/paravirt.h index 96b35ba..7237731 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -9,7 +9,6 @@ #define PF_XEN (1<<1) #define PF_KVM (1<<2) -// misc.c extern int PlatformRunningOn; static inline int runningOnQEMU(void) { diff --git a/src/pci.c b/src/pci.c index 071c302..4f6a6fa 100644 --- a/src/pci.c +++ b/src/pci.c @@ -86,7 +86,7 @@ pci_next(int bdf, int bus) } struct pci_device *PCIDevices; -int MaxPCIBus VAR16VISIBLE; +int MaxPCIBus VARFSEG; // Check if PCI is available at all int diff --git a/src/pcibios.c b/src/pcibios.c index f084fa1..0f3ec5b 100644 --- a/src/pcibios.c +++ b/src/pcibios.c @@ -223,7 +223,7 @@ struct bios32_s { u8 reserved[5]; } PACKED; -struct bios32_s BIOS32HEADER __aligned(16) VAR16EXPORT = { +struct bios32_s BIOS32HEADER __aligned(16) VARFSEG = { .signature = 0x5f32335f, // _32_ .length = sizeof(BIOS32HEADER) / 16, }; diff --git a/src/pirtable.c b/src/pirtable.c index 8b79791..02e2a67 100644 --- a/src/pirtable.c +++ b/src/pirtable.c @@ -9,7 +9,7 @@ #include "config.h" // CONFIG_* #include "util.h" // checksum -struct pir_header *PirAddr VAR16VISIBLE; +struct pir_header *PirAddr VARFSEG; struct pir_table { struct pir_header pir; @@ -18,7 +18,7 @@ struct pir_table { extern struct pir_table PIR_TABLE; #if CONFIG_PIRTABLE -struct pir_table PIR_TABLE __aligned(16) VAR16EXPORT = { +struct pir_table PIR_TABLE __aligned(16) VARFSEG = { .pir = { .version = 0x0100, .size = sizeof(struct pir_table), diff --git a/src/pmm.c b/src/pmm.c index 790177e..8944bae 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -216,6 +216,9 @@ rom_confirm(u32 size) * Setup ****************************************************************/ +// Space for bios tables built an run-time. +char BiosTableSpace[CONFIG_MAX_BIOSTABLE] __aligned(MALLOC_MIN_ALIGN) VARFSEG; + void malloc_preinit(void) { @@ -457,7 +460,7 @@ extern struct pmmheader PMMHEADER; #define PMM_SIGNATURE 0x4d4d5024 // $PMM #if CONFIG_PMM -struct pmmheader PMMHEADER __aligned(16) VAR16EXPORT = { +struct pmmheader PMMHEADER __aligned(16) VARFSEG = { .signature = PMM_SIGNATURE, .version = 0x01, .length = sizeof(PMMHEADER), diff --git a/src/pnpbios.c b/src/pnpbios.c index c8bc8f4..fddcc81 100644 --- a/src/pnpbios.c +++ b/src/pnpbios.c @@ -28,7 +28,7 @@ extern struct pnpheader PNPHEADER; extern char pnp_string[]; #if CONFIG_PNPBIOS -struct pnpheader PNPHEADER __aligned(16) VAR16EXPORT = { +struct pnpheader PNPHEADER __aligned(16) VARFSEG = { .signature = PNP_SIGNATURE, .version = 0x10, .length = sizeof(PNPHEADER), @@ -41,7 +41,7 @@ struct pnpheader PNPHEADER __aligned(16) VAR16EXPORT = { // We need a copy of this string in the 0xf000 segment, but we are not // actually a PnP BIOS, so make sure it is *not* aligned, so OSes will // not see it if they scan. -char pnp_string[] __aligned(2) VAR16VISIBLE = " $PnP"; +char pnp_string[] __aligned(2) VARFSEG = " $PnP"; #endif #define FUNCTION_NOT_SUPPORTED 0x82 diff --git a/src/resume.c b/src/resume.c index adc3594..b30d62e 100644 --- a/src/resume.c +++ b/src/resume.c @@ -15,7 +15,7 @@ #include "cmos.h" // inb_cmos // Indicator if POST phase has been run. -int HaveRunPost VAR16VISIBLE; +int HaveRunPost VARFSEG; // Reset DMA controller void diff --git a/src/smp.c b/src/smp.c index f971647..0dfec29 100644 --- a/src/smp.c +++ b/src/smp.c @@ -16,8 +16,8 @@ #define APIC_ENABLED 0x0100 -struct { u32 ecx, eax, edx; } smp_mtrr[32] VAR16VISIBLE; -u32 smp_mtrr_count VAR16VISIBLE; +struct { u32 ecx, eax, edx; } smp_mtrr[32] VARFSEG; +u32 smp_mtrr_count VARFSEG; void wrmsr_smp(u32 index, u64 val) @@ -33,10 +33,10 @@ wrmsr_smp(u32 index, u64 val) smp_mtrr_count++; } -u32 CountCPUs VAR16VISIBLE; -u32 MaxCountCPUs VAR16VISIBLE; +u32 CountCPUs VARFSEG; +u32 MaxCountCPUs VARFSEG; // 256 bits for the found APIC IDs -u32 FoundAPICIDs[256/32] VAR16VISIBLE; +u32 FoundAPICIDs[256/32] VARFSEG; extern void smp_ap_boot_code(void); ASM16( " .global smp_ap_boot_code\n" diff --git a/src/stacks.c b/src/stacks.c index 93da7b5..7423939 100644 --- a/src/stacks.c +++ b/src/stacks.c @@ -243,7 +243,7 @@ struct thread_info { void *stackpos; struct thread_info **pprev; }; -struct thread_info VAR32FLATVISIBLE MainThread = { +struct thread_info MainThread VARFSEG = { &MainThread, NULL, &MainThread.next }; #define THREADSTACKSIZE 4096 @@ -424,7 +424,7 @@ mutex_unlock(struct mutex_s *mutex) * Thread preemption ****************************************************************/ -int VAR16VISIBLE CanPreempt; +int CanPreempt VARFSEG; static u32 PreemptCount; // Turn on RTC irqs and arrange for them to check the 32bit threads. diff --git a/src/system.c b/src/system.c index 6658e22..dc1dd7d 100644 --- a/src/system.c +++ b/src/system.c @@ -290,10 +290,6 @@ handle_15e801(struct bregs *regs) set_success(regs); } -// Info on e820 map location and size. -struct e820entry e820_list[CONFIG_MAX_E820] VAR16VISIBLE; -int e820_count VAR16VISIBLE; - static void handle_15e820(struct bregs *regs) { diff --git a/src/types.h b/src/types.h index ce0f081..4df1476 100644 --- a/src/types.h +++ b/src/types.h @@ -51,16 +51,10 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VISIBLE32SEG // Designate a variable as (only) visible to 16bit code. # define VAR16 __section(".data16." UNIQSEC) -// Designate a variable as visible to 16bit, 32bit, and assembler code. -# define VAR16VISIBLE VAR16 __VISIBLE -// Designate a variable as externally visible (in addition to all internal code). -# define VAR16EXPORT __section(".data16.export." UNIQSEC) __VISIBLE // Designate a variable at a specific 16bit address # define VAR16FIXED(addr) __aligned(1) __VISIBLE __section(".fixedaddr." __stringify(addr)) // Designate a variable as (only) visible to 32bit segmented code. # define VAR32SEG __section(".discard.var32seg." UNIQSEC) -// Designate a 32bit variable also available in 16bit "big real" mode. -# define VAR32FLATVISIBLE __section(".discard.var32flat." UNIQSEC) __VISIBLE __weak // Designate a variable as visible and located in the e-segment. # define VARLOW __section(".discard.varlow." UNIQSEC) __VISIBLE __weak // Designate a variable as visible and located in the f-segment. @@ -79,11 +73,8 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VISIBLE32INIT # define VISIBLE32SEG __VISIBLE # define VAR16 __section(".discard.var16." UNIQSEC) -# define VAR16VISIBLE VAR16 __VISIBLE __weak -# define VAR16EXPORT VAR16VISIBLE -# define VAR16FIXED(addr) VAR16VISIBLE +# define VAR16FIXED(addr) VAR16 __VISIBLE __weak # define VAR32SEG __section(".data32seg." UNIQSEC) -# define VAR32FLATVISIBLE __section(".discard.var32flat." UNIQSEC) __VISIBLE __weak # define VARLOW __section(".discard.varlow." UNIQSEC) __VISIBLE __weak # define VARFSEG __section(".discard.varfseg." UNIQSEC) __VISIBLE __weak # define ASM16(code) @@ -97,11 +88,8 @@ extern void __force_link_error__only_in_16bit(void) __noreturn; # define VISIBLE32INIT __section(".text.init." UNIQSEC) __VISIBLE # define VISIBLE32SEG # define VAR16 __section(".discard.var16." UNIQSEC) -# define VAR16VISIBLE VAR16 __VISIBLE __weak -# define VAR16EXPORT VAR16VISIBLE -# define VAR16FIXED(addr) VAR16VISIBLE +# define VAR16FIXED(addr) VAR16 __VISIBLE __weak # define VAR32SEG __section(".discard.var32seg." UNIQSEC) -# define VAR32FLATVISIBLE __section(".data.runtime." UNIQSEC) __VISIBLE # define VARLOW __section(".data.varlow." UNIQSEC) __VISIBLE # define VARFSEG __section(".data.varfseg." UNIQSEC) __VISIBLE # define ASM16(code) diff --git a/src/usb-hid.c b/src/usb-hid.c index 0d5f371..deb3ea5 100644 --- a/src/usb-hid.c +++ b/src/usb-hid.c @@ -11,8 +11,8 @@ #include "biosvar.h" // GET_GLOBAL #include "ps2port.h" // ATKBD_CMD_GETID -struct usb_pipe *keyboard_pipe VAR16VISIBLE; -struct usb_pipe *mouse_pipe VAR16VISIBLE; +struct usb_pipe *keyboard_pipe VARFSEG; +struct usb_pipe *mouse_pipe VARFSEG; /**************************************************************** diff --git a/src/vgahooks.c b/src/vgahooks.c index 20a2e2e..c9a4448 100644 --- a/src/vgahooks.c +++ b/src/vgahooks.c @@ -15,7 +15,7 @@ #define VH_VIA 1 #define VH_INTEL 2 -int VGAHookHandlerType VAR16VISIBLE; +int VGAHookHandlerType VARFSEG; static void handle_155fXX(struct bregs *regs) @@ -28,7 +28,7 @@ handle_155fXX(struct bregs *regs) * Via hooks ****************************************************************/ -int ViaFBsize VAR16VISIBLE, ViaRamSpeed VAR16VISIBLE; +int ViaFBsize VARFSEG, ViaRamSpeed VARFSEG; static void via_155f01(struct bregs *regs) @@ -167,7 +167,7 @@ via_setup(struct pci_device *pci) * Intel VGA hooks ****************************************************************/ -u8 IntelDisplayType VAR16VISIBLE, IntelDisplayId VAR16VISIBLE; +u8 IntelDisplayType VARFSEG, IntelDisplayId VARFSEG; static void intel_155f35(struct bregs *regs) diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 3e26e32..6abe639 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -37,7 +37,7 @@ struct VideoParam_s video_param_table[29] VAR16; * PCI Data ****************************************************************/ -struct pci_data rom_pci_data VAR16VISIBLE = { +struct pci_data rom_pci_data VAR16 VISIBLE16 = { .signature = PCI_ROM_SIGNATURE, .vendor = CONFIG_VGA_VID, .device = CONFIG_VGA_DID, -- 1.7.11.7

7 years, 5 months

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS February 2013