by Kevin O'Connor
Now that the PMM code is only run in 32bit mode, remove the
GET/SET_PMMVAR macros and other 16bit wrappers.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/pmm.c | 131 +++++++++++++++++++++++++-----------------------------------
1 files changed, 55 insertions(+), 76 deletions(-)
diff --git a/src/pmm.c b/src/pmm.c
index 2e9d1ff..b812515 100644
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -10,22 +10,6 @@
#include "farptr.h" // GET_FARVAR
#include "biosvar.h" // GET_BDA
-
-#if MODESEGMENT
-// The 16bit pmm entry points runs in "big real" mode, and can
-// therefore read/write to the 32bit malloc variables.
-#define GET_PMMVAR(var) ({ \
- SET_SEG(ES, 0); \
- __GET_VAR("addr32 ", ES, (var)); })
-#define SET_PMMVAR(var, val) do { \
- SET_SEG(ES, 0); \
- __SET_VAR("addr32 ", ES, (var), (val)); \
- } while (0)
-#else
-#define GET_PMMVAR(var) (var)
-#define SET_PMMVAR(var, val) do { (var) = (val); } while (0)
-#endif
-
// Information on a reserved area.
struct allocinfo_s {
struct allocinfo_s *next, **pprev;
@@ -44,13 +28,9 @@ struct zone_s {
struct allocinfo_s *info;
};
-struct zone_s ZoneLow;
-struct zone_s ZoneHigh;
-struct zone_s ZoneFSeg;
-struct zone_s ZoneTmpLow;
-struct zone_s ZoneTmpHigh;
+struct zone_s ZoneLow, ZoneHigh, ZoneFSeg, ZoneTmpLow, ZoneTmpHigh;
-struct zone_s *Zones[] = {
+static struct zone_s *Zones[] = {
&ZoneTmpLow, &ZoneLow, &ZoneFSeg, &ZoneTmpHigh, &ZoneHigh
};
@@ -64,24 +44,24 @@ static void *
allocSpace(struct zone_s *zone, u32 size, u32 align, struct allocinfo_s *fill)
{
struct allocinfo_s *info;
- for (info = GET_PMMVAR(zone->info); info; info = GET_PMMVAR(info->next)) {
- void *dataend = GET_PMMVAR(info->dataend);
- void *allocend = GET_PMMVAR(info->allocend);
+ for (info = zone->info; info; info = info->next) {
+ void *dataend = info->dataend;
+ void *allocend = info->allocend;
void *newallocend = (void*)ALIGN_DOWN((u32)allocend - size, align);
if (newallocend >= dataend && newallocend <= allocend) {
// Found space - now reserve it.
- struct allocinfo_s **pprev = GET_PMMVAR(info->pprev);
+ struct allocinfo_s **pprev = info->pprev;
if (!fill)
fill = newallocend;
- SET_PMMVAR(fill->next, info);
- SET_PMMVAR(fill->pprev, pprev);
- SET_PMMVAR(fill->data, newallocend);
- SET_PMMVAR(fill->dataend, newallocend + size);
- SET_PMMVAR(fill->allocend, allocend);
-
- SET_PMMVAR(info->allocend, newallocend);
- SET_PMMVAR(info->pprev, &fill->next);
- SET_PMMVAR(*pprev, fill);
+ fill->next = info;
+ fill->pprev = pprev;
+ fill->data = newallocend;
+ fill->dataend = newallocend + size;
+ fill->allocend = allocend;
+
+ info->allocend = newallocend;
+ info->pprev = &fill->next;
+ *pprev = fill;
return newallocend;
}
}
@@ -92,13 +72,13 @@ allocSpace(struct zone_s *zone, u32 size, u32 align, struct allocinfo_s *fill)
static void
freeSpace(struct allocinfo_s *info)
{
- struct allocinfo_s *next = GET_PMMVAR(info->next);
- struct allocinfo_s **pprev = GET_PMMVAR(info->pprev);
- SET_PMMVAR(*pprev, next);
+ struct allocinfo_s *next = info->next;
+ struct allocinfo_s **pprev = info->pprev;
+ *pprev = next;
if (next) {
- if (GET_PMMVAR(next->allocend) == GET_PMMVAR(info->data))
- SET_PMMVAR(next->allocend, GET_PMMVAR(info->allocend));
- SET_PMMVAR(next->pprev, pprev);
+ if (next->allocend == info->data)
+ next->allocend = info->allocend;
+ next->pprev = pprev;
}
}
@@ -109,8 +89,8 @@ addSpace(struct zone_s *zone, void *start, void *end)
// Find position to add space
struct allocinfo_s **pprev = &zone->info, *info;
for (;;) {
- info = GET_PMMVAR(*pprev);
- if (!info || GET_PMMVAR(info->data) < start)
+ info = *pprev;
+ if (!info || info->data < start)
break;
pprev = &info->next;
}
@@ -121,10 +101,9 @@ addSpace(struct zone_s *zone, void *start, void *end)
tempdetail.datainfo.pprev = pprev;
tempdetail.datainfo.data = tempdetail.datainfo.dataend = start;
tempdetail.datainfo.allocend = end;
- struct allocdetail_s *tempdetailp = MAKE_FLATPTR(GET_SEG(SS), &tempdetail);
- SET_PMMVAR(*pprev, &tempdetailp->datainfo);
+ *pprev = &tempdetail.datainfo;
if (info)
- SET_PMMVAR(info->pprev, &tempdetailp->datainfo.next);
+ info->pprev = &tempdetail.datainfo.next;
// Allocate final allocation info.
struct allocdetail_s *detail = allocSpace(
@@ -133,23 +112,21 @@ addSpace(struct zone_s *zone, void *start, void *end)
detail = allocSpace(&ZoneTmpLow, sizeof(*detail)
, MALLOC_MIN_ALIGN, NULL);
if (!detail) {
- SET_PMMVAR(*tempdetail.datainfo.pprev, tempdetail.datainfo.next);
+ *tempdetail.datainfo.pprev = tempdetail.datainfo.next;
if (tempdetail.datainfo.next)
- SET_PMMVAR(tempdetail.datainfo.next->pprev
- , tempdetail.datainfo.pprev);
+ tempdetail.datainfo.next->pprev = tempdetail.datainfo.pprev;
warn_noalloc();
return;
}
}
// Replace temp alloc space with final alloc space
- memcpy_fl(&detail->datainfo, &tempdetailp->datainfo
- , sizeof(detail->datainfo));
- SET_PMMVAR(detail->handle, PMM_DEFAULT_HANDLE);
+ memcpy(&detail->datainfo, &tempdetail.datainfo, sizeof(detail->datainfo));
+ detail->handle = PMM_DEFAULT_HANDLE;
- SET_PMMVAR(*tempdetail.datainfo.pprev, &detail->datainfo);
+ *tempdetail.datainfo.pprev = &detail->datainfo;
if (tempdetail.datainfo.next)
- SET_PMMVAR(tempdetail.datainfo.next->pprev, &detail->datainfo.next);
+ tempdetail.datainfo.next->pprev = &detail->datainfo.next;
}
// Search all zones for an allocation obtained from allocSpace()
@@ -158,10 +135,10 @@ findAlloc(void *data)
{
int i;
for (i=0; i<ARRAY_SIZE(Zones); i++) {
- struct zone_s *zone = GET_PMMVAR(Zones[i]);
+ struct zone_s *zone = Zones[i];
struct allocinfo_s *info;
- for (info = GET_PMMVAR(zone->info); info; info = GET_PMMVAR(info->next))
- if (GET_PMMVAR(info->data) == data)
+ for (info = zone->info; info; info = info->next)
+ if (info->data == data)
return info;
}
return NULL;
@@ -171,11 +148,11 @@ findAlloc(void *data)
static struct allocinfo_s *
findLast(struct zone_s *zone)
{
- struct allocinfo_s *info = GET_PMMVAR(zone->info);
+ struct allocinfo_s *info = zone->info;
if (!info)
return NULL;
for (;;) {
- struct allocinfo_s *next = GET_PMMVAR(info->next);
+ struct allocinfo_s *next = info->next;
if (!next)
return info;
info = next;
@@ -244,6 +221,7 @@ malloc_fixupreloc(void)
void
malloc_finalize(void)
{
+ ASSERT32FLAT();
dprintf(3, "malloc finalize\n");
// Reserve more low-mem if needed.
@@ -273,9 +251,8 @@ relocate_ebda(u32 newebda, u32 oldebda, u8 ebda_size)
// EBDA isn't at end of ram - give up.
return -1;
- // Do copy (this assumes memcpy copies forward - otherwise memmove
- // is needed)
- memcpy_fl((void*)newebda, (void*)oldebda, ebda_size * 1024);
+ // Do copy
+ memmove((void*)newebda, (void*)oldebda, ebda_size * 1024);
// Update indexes
dprintf(1, "ebda moved from %x to %x\n", oldebda, newebda);
@@ -291,9 +268,9 @@ zonelow_expand(u32 size, u32 align)
struct allocinfo_s *info = findLast(&ZoneLow);
if (!info)
return;
- u32 oldpos = (u32)GET_PMMVAR(info->allocend);
+ u32 oldpos = (u32)info->allocend;
u32 newpos = ALIGN_DOWN(oldpos - size, align);
- u32 bottom = (u32)GET_PMMVAR(info->dataend);
+ u32 bottom = (u32)info->dataend;
if (newpos >= bottom && newpos <= oldpos)
// Space already present.
return;
@@ -317,8 +294,8 @@ zonelow_expand(u32 size, u32 align)
// Update zone
if (ebda_end == bottom) {
- SET_PMMVAR(info->data, (void*)newbottom);
- SET_PMMVAR(info->dataend, (void*)newbottom);
+ info->data = (void*)newbottom;
+ info->dataend = (void*)newbottom;
} else
addSpace(&ZoneLow, (void*)newbottom, (void*)ebda_end);
}
@@ -352,6 +329,7 @@ allocExpandSpace(struct zone_s *zone, u32 size, u32 align
void * __malloc
pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align)
{
+ ASSERT32FLAT();
if (!size)
return NULL;
@@ -376,7 +354,7 @@ pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align)
" ret=%p (detail=%p)\n"
, zone, handle, size, align
, data, detail);
- SET_PMMVAR(detail->handle, handle);
+ detail->handle = handle;
return data;
}
@@ -385,8 +363,9 @@ pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align)
int
pmm_free(void *data)
{
+ ASSERT32FLAT();
struct allocinfo_s *info = findAlloc(data);
- if (!info || data == (void*)info || data == GET_PMMVAR(info->dataend))
+ if (!info || data == (void*)info || data == info->dataend)
return -1;
struct allocdetail_s *detail = container_of(
info, struct allocdetail_s, datainfo);
@@ -404,8 +383,8 @@ pmm_getspace(struct zone_s *zone)
// XXX - results not reliable when CONFIG_THREAD_OPTIONROMS
u32 maxspace = 0;
struct allocinfo_s *info;
- for (info = GET_PMMVAR(zone->info); info; info = GET_PMMVAR(info->next)) {
- u32 space = GET_PMMVAR(info->allocend) - GET_PMMVAR(info->dataend);
+ for (info = zone->info; info; info = info->next) {
+ u32 space = info->allocend - info->dataend;
if (space > maxspace)
maxspace = space;
}
@@ -425,16 +404,15 @@ pmm_find(u32 handle)
{
int i;
for (i=0; i<ARRAY_SIZE(Zones); i++) {
- struct zone_s *zone = GET_PMMVAR(Zones[i]);
+ struct zone_s *zone = Zones[i];
struct allocinfo_s *info;
- for (info = GET_PMMVAR(zone->info); info
- ; info = GET_PMMVAR(info->next)) {
- if (GET_PMMVAR(info->data) != (void*)info)
+ for (info = zone->info; info; info = info->next) {
+ if (info->data != (void*)info)
continue;
struct allocdetail_s *detail = container_of(
info, struct allocdetail_s, detailinfo);
- if (GET_PMMVAR(detail->handle) == handle)
- return GET_PMMVAR(detail->datainfo.data);
+ if (detail->handle == handle)
+ return detail->datainfo.data;
}
}
return NULL;
@@ -561,6 +539,7 @@ handle_pmmXX(u16 *args)
u32 VISIBLE32INIT
handle_pmm(u16 *args)
{
+ ASSERT32FLAT();
if (! CONFIG_PMM)
return PMM_FUNCTION_NOT_SUPPORTED;
--
1.7.4.4
by Kevin O'Connor
Use call32() to jump into handle_pmm(). This reduces the amount of
16bit code needed.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/pmm.c | 51 ++++++++++++++++++++++++++++++++++++++++-----------
src/post.c | 3 +++
src/romlayout.S | 6 ++++--
src/stacks.c | 2 +-
src/util.h | 2 ++
5 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/src/pmm.c b/src/pmm.c
index e0770ac..2e9d1ff 100644
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -44,13 +44,13 @@ struct zone_s {
struct allocinfo_s *info;
};
-struct zone_s ZoneLow VAR32FLATVISIBLE;
-struct zone_s ZoneHigh VAR32FLATVISIBLE;
-struct zone_s ZoneFSeg VAR32FLATVISIBLE;
-struct zone_s ZoneTmpLow VAR32FLATVISIBLE;
-struct zone_s ZoneTmpHigh VAR32FLATVISIBLE;
+struct zone_s ZoneLow;
+struct zone_s ZoneHigh;
+struct zone_s ZoneFSeg;
+struct zone_s ZoneTmpLow;
+struct zone_s ZoneTmpHigh;
-struct zone_s *Zones[] VAR32FLATVISIBLE = {
+struct zone_s *Zones[] = {
&ZoneTmpLow, &ZoneLow, &ZoneFSeg, &ZoneTmpHigh, &ZoneHigh
};
@@ -225,6 +225,22 @@ malloc_setup(void)
}
}
+// Update pointers after code relocation.
+void
+malloc_fixupreloc(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];
+ zone->info->pprev = &zone->info;
+ }
+}
+
void
malloc_finalize(void)
{
@@ -542,7 +558,7 @@ handle_pmmXX(u16 *args)
return PMM_FUNCTION_NOT_SUPPORTED;
}
-u32 VISIBLE16
+u32 VISIBLE32INIT
handle_pmm(u16 *args)
{
if (! CONFIG_PMM)
@@ -551,12 +567,25 @@ handle_pmm(u16 *args)
u16 arg1 = args[0];
dprintf(DEBUG_HDL_pmm, "pmm call arg1=%x\n", arg1);
+ int oldpreempt;
+ if (CONFIG_THREAD_OPTIONROMS) {
+ // Not a preemption event - don't wait in wait_preempt()
+ oldpreempt = CanPreempt;
+ CanPreempt = 0;
+ }
+
+ u32 ret;
switch (arg1) {
- case 0x00: return handle_pmm00(args);
- case 0x01: return handle_pmm01(args);
- case 0x02: return handle_pmm02(args);
- default: return handle_pmmXX(args);
+ case 0x00: ret = handle_pmm00(args); break;
+ case 0x01: ret = handle_pmm01(args); break;
+ case 0x02: ret = handle_pmm02(args); break;
+ default: ret = handle_pmmXX(args); break;
}
+
+ if (CONFIG_THREAD_OPTIONROMS)
+ CanPreempt = oldpreempt;
+
+ return ret;
}
// romlayout.S
diff --git a/src/post.c b/src/post.c
index d98941c..6f7aa14 100644
--- a/src/post.c
+++ b/src/post.c
@@ -210,6 +210,9 @@ startBoot(void)
static void
maininit(void)
{
+ // Running at new code address - do code relocation fixups
+ malloc_fixupreloc();
+
// Setup ivt/bda/ebda
init_ivt();
init_bda();
diff --git a/src/romlayout.S b/src/romlayout.S
index fbc5cb3..5983a4a 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -264,8 +264,10 @@ entry_pmm:
pushw %ds
movw %ss, %cx // Move %ss to %ds
movw %cx, %ds
- leal 28(%esp), %eax // %eax points to start of args
- calll handle_pmm
+ movl $_cfunc32flat_handle_pmm, %eax // Setup: call32(handle_pmm, args, -1)
+ leal 28(%esp), %edx // %edx points to start of args
+ movl $-1, %ecx
+ calll call32
movw %ax, 12(%esp) // Modify %ax:%dx to return %eax
shrl $16, %eax
movw %ax, 4(%esp)
diff --git a/src/stacks.c b/src/stacks.c
index 17495d5..17f1a4a 100644
--- a/src/stacks.c
+++ b/src/stacks.c
@@ -32,7 +32,7 @@ static inline void lgdt(struct descloc_s *desc) {
}
// Call a 32bit SeaBIOS function from a 16bit SeaBIOS function.
-u32
+u32 VISIBLE16
call32(void *func, u32 eax, u32 errret)
{
ASSERT16();
diff --git a/src/util.h b/src/util.h
index 5cdb483..174e94b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -226,6 +226,7 @@ int get_keystroke(int msec);
u32 call32(void *func, u32 eax, u32 errret);
inline u32 stack_hop(u32 eax, u32 edx, void *func);
extern struct thread_info MainThread;
+extern int CanPreempt;
struct thread_info *getCurThread(void);
void yield(void);
void wait_irq(void);
@@ -415,6 +416,7 @@ void pnp_setup(void);
// pmm.c
extern struct zone_s ZoneLow, ZoneHigh, ZoneFSeg, ZoneTmpLow, ZoneTmpHigh;
void malloc_setup(void);
+void malloc_fixupreloc(void);
void malloc_finalize(void);
void *pmm_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align);
int pmm_free(void *data);
--
1.7.4.4
by Stefan Berger
With gcc 4.6.0 (20110530) and ld version 2.21.52.0.1-5.fc16 I get the
following compilation errors/warnings:
Working around non-functional -combine
Working around non-functional -combine
Working around non-functional -combine
Build Kconfig config file
Compiling whole program out/ccode.16.s
Compiling to assembler out/asm-offsets.s
In file included from out/ccode.16.s.tmp.c:35:0:
out/../src/ahci.c: In function ‘ahci_detect’:
out/../src/ahci.c:411:25: warning: variable ‘port’ set but not used
[-Wunused-but-set-variable]
Compiling whole program out/ccode32flat.o
Compiling whole program out/code32seg.o
Generating offset file out/asm-offsets.h
Compiling (16bit) out/code16.o
In file included from out/ccode32flat.o.tmp.c:35:0:
out/../src/ahci.c: In function ‘ahci_detect’:
out/../src/ahci.c:411:25: warning: variable ‘port’ set but not used
[-Wunused-but-set-variable]
In file included from out/ccode32flat.o.tmp.c:57:0:
out/../src/bmp.c: At top level:
out/../src/bmp.c:15:16: error: redefinition of ‘struct tagBITMAPFILEHEADER’
out/../src/bmp.c:15:16: note: originally defined here
out/../src/bmp.c:21:3: error: conflicting types for ‘BITMAPFILEHEADER’
out/../src/bmp.c:21:3: note: previous declaration of ‘BITMAPFILEHEADER’
was here
out/../src/bmp.c:21:21: error: conflicting types for ‘tagBITMAPFILEHEADER’
out/../src/bmp.c:21:21: note: previous declaration of
‘tagBITMAPFILEHEADER’ was here
out/../src/bmp.c:23:16: error: redefinition of ‘struct tagBITMAPINFOHEADER’
out/../src/bmp.c:23:16: note: originally defined here
out/../src/bmp.c:35:3: error: conflicting types for ‘BITMAPINFOHEADER’
out/../src/bmp.c:35:3: note: previous declaration of ‘BITMAPINFOHEADER’
was here
out/../src/bmp.c:35:21: error: conflicting types for ‘tagBITMAPINFOHEADER’
out/../src/bmp.c:35:21: note: previous declaration of
‘tagBITMAPINFOHEADER’ was here
out/../src/bmp.c:37:16: error: redefinition of ‘struct tagRGBQUAD’
out/../src/bmp.h:6:12: note: originally defined here
out/../src/bmp.c:42:3: error: conflicting types for ‘RGBQUAD’
out/../src/bmp.c:42:3: note: previous declaration of ‘RGBQUAD’ was here
out/../src/bmp.c:42:12: error: conflicting types for ‘tagRGBQUAD’
out/../src/bmp.c:42:12: note: previous declaration of ‘tagRGBQUAD’ was here
out/../src/bmp.c:50:13: error: redefinition of
‘raw_data_format_adjust_24bpp’
out/../src/bmp.c:50:13: note: previous definition of
‘raw_data_format_adjust_24bpp’ was here
out/../src/bmp.c:61:21: error: redefinition of ‘bmp_alloc’
out/../src/bmp.c:61:21: note: previous definition of ‘bmp_alloc’ was here
out/../src/bmp.c:67:5: error: redefinition of ‘bmp_decode’
out/../src/bmp.c:67:5: note: previous definition of ‘bmp_decode’ was here
out/../src/bmp.c:86:6: error: redefinition of ‘bmp_get_size’
out/../src/bmp.c:86:6: note: previous definition of ‘bmp_get_size’ was here
out/../src/bmp.c:93:5: error: redefinition of ‘bmp_show’
out/../src/bmp.c:93:5: note: previous definition of ‘bmp_show’ was here
make: *** [out/ccode32flat.o] Error 1
make: *** Waiting for unfinished jobs....
cp: cannot stat `out/bios.bin': No such file or directory
cp: cannot stat `out/bios.bin': No such file or directory
cp: cannot stat `out/bios.bin': No such file or directory
cp: cannot stat `out/bios.bin': No such file or directory
cp: cannot stat `out/bios.bin': No such file or directory
The following patch fixes them.
Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com>
diff --git a/Makefile b/Makefile
index 2786c9e..a4ca497 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ 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 \
lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \
- pci_region.c biostables.c xen.c bmp.c
+ pci_region.c biostables.c xen.c
SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c
cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \
diff --git a/src/ahci.c b/src/ahci.c
index fb4b70c..f7bd4b5 100644
--- a/src/ahci.c
+++ b/src/ahci.c
@@ -408,7 +408,6 @@ static void
ahci_detect(void *data)
{
struct ahci_ctrl_s *ctrl = data;
- struct ahci_port_s *port;
u32 pnr, max;
int rc;
@@ -422,7 +421,7 @@ ahci_detect(void *data)
dprintf(1, "AHCI/%d: link %s\n", pnr, rc == 0 ? "up" : "down");
if (rc != 0)
continue;
- port = ahci_port_init(ctrl, pnr);
+ ahci_port_init(ctrl, pnr);
}
}
by Kevin O'Connor
On Sun, Feb 21, 2010 at 04:18:38PM -0700, Brandon Bennett wrote:
> > On Sat, Feb 20, 2010 at 9:05 PM, Kevin O'Connor <kevin(a)koconnor.net> wrote:
> >> Should a kernel fail during boot, I'd suspect it doesn't like one of
> >> the apm/pcibios callbacks, or it doesn't like one of the
> >> smbios/mptable/acpi tables. You could try compiling the SeaBIOS code
> >> (see http://seabios.org/Download ) and increasing the debugging by
> >> modifying src/config.h. Specifically, you could increase
> >> CONFIG_DEBUG_LEVEL, and set DEBUG_HDL_pcibios32 and DEBUG_HDL_apm to
> >> 1. Also, you could try disabling some of the features to see if that
> >> prevents the fault (eg, disabling CONFIG_ACPI / CONFIG_SMBIOS /
> >> CONFIG_MPTABLE).
> >
>
> I have narrowed it down to SMBIOS. If I disable CONFIG_SMBIOS the
> image boots up fine.
Gleb, have you seen this thread?
Some of the recent changes to smbios that look like possible culprits
are:
Make SMBIOS table pass MS SVVP test
Use MaxCountCPUs during building of per cpu tables.
Add malloc_high/fseg() and rework bios table creation to use them.
There were other changes, but the comments indicate they were only
ports of changes already in bochs. I suppose it's also possible the
lack of smbios is turning off some other feature in the guest (eg,
acpi) that's the real culprit.
-Kevin
by Kevin O'Connor
Detect a resume/reboot by inspecting HaveRunPost instead of inspecting
the cmos reset code. Inspecting a global variable is both simpler and
safer.
Move the reboot logic from post.c to resume.c - this makes the code in
post.c simpler as it is now only called once on machine startup. This
also makes it easier to ensure all POST initialization code resides in
the relocatable "init" sections.
Also, rename _start() to handle_post() so that it is more in keeping
with the entry_xxx() and handle_xxx() function naming.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/post.c | 74 +++++++++---------------------------
src/resume.c | 111 ++++++++++++++++++++++++++++++++++++-------------------
src/romlayout.S | 59 +++++------------------------
src/stacks.c | 5 --
src/util.h | 10 +++++
5 files changed, 113 insertions(+), 146 deletions(-)
diff --git a/src/post.c b/src/post.c
index 813ff20..d98941c 100644
--- a/src/post.c
+++ b/src/post.c
@@ -277,7 +277,7 @@ maininit(void)
/****************************************************************
- * Code relocation
+ * POST entry and code relocation
****************************************************************/
// Update given relocs for the code at 'dest' with a given 'delta'
@@ -289,8 +289,7 @@ updateRelocs(void *dest, u32 *rstart, u32 *rend, u32 delta)
*((u32*)(dest + *reloc)) += delta;
}
-// Start of Power On Self Test - the BIOS initilization. This
-// function sets up for and attempts relocation of the init code.
+// Relocate init code and then call maininit() at new address.
static void
reloc_init(void)
{
@@ -329,63 +328,23 @@ reloc_init(void)
}
// Start of Power On Self Test (POST) - the BIOS initilization phase.
-// This function sets up for and attempts relocation of the init code.
+// This function does the setup needed for code relocation, and then
+// invokes the relocation and main setup code.
void VISIBLE32INIT
-post(void)
+handle_post(void)
{
- // Detect ram and setup internal malloc.
- qemu_cfg_port_probe();
- ram_probe();
- malloc_setup();
-
- reloc_init();
-}
-
-
-/****************************************************************
- * POST entry point
- ****************************************************************/
-
-static int HaveRunPost;
-
-// Attempt to invoke a hard-reboot.
-static void
-tryReboot(void)
-{
- dprintf(1, "Attempting a hard reboot\n");
-
- // Setup for reset on qemu.
- if (! CONFIG_COREBOOT) {
- qemu_prep_reset();
- if (HaveRunPost)
- apm_shutdown();
- }
-
- // Try keyboard controller reboot.
- i8042_reboot();
-
- // Try PCI 0xcf9 reboot
- pci_reboot();
+ debug_serial_setup();
+ dprintf(1, "Start bios (version %s)\n", VERSION);
- // Try triple fault
- asm volatile("int3");
+ // Enable CPU caching
+ setcr0(getcr0() & ~(CR0_CD|CR0_NW));
- panic("Could not reboot");
-}
+ // Clear CMOS reboot flag.
+ outb_cmos(0, CMOS_RESET_CODE);
-// 32-bit entry point.
-void VISIBLE32FLAT
-_start(void)
-{
+ // Make sure legacy DMA isn't running.
init_dma();
- debug_serial_setup();
- dprintf(1, "Start bios (version %s)\n", VERSION);
-
- if (HaveRunPost)
- // This is a soft reboot - invoke a hard reboot.
- tryReboot();
-
// Check if we are running under Xen.
xen_probe();
@@ -393,6 +352,11 @@ _start(void)
make_bios_writable();
HaveRunPost = 1;
- // Perform main setup code.
- post();
+ // Detect ram and setup internal malloc.
+ qemu_cfg_port_probe();
+ ram_probe();
+ malloc_setup();
+
+ // Relocate initialization code and call maininit().
+ reloc_init();
}
diff --git a/src/resume.c b/src/resume.c
index 20e2e3d..4390fb5 100644
--- a/src/resume.c
+++ b/src/resume.c
@@ -10,6 +10,12 @@
#include "biosvar.h" // struct bios_data_area_s
#include "bregs.h" // struct bregs
#include "acpi.h" // find_resume_vector
+#include "ps2port.h" // i8042_reboot
+#include "pci.h" // pci_reboot
+#include "cmos.h" // inb_cmos
+
+// Indicator if POST phase has been run.
+int HaveRunPost VAR16VISIBLE;
// Reset DMA controller
void
@@ -26,34 +32,19 @@ init_dma(void)
// Handler for post calls that look like a resume.
void VISIBLE16
-handle_resume(u8 status)
+handle_resume(void)
{
- init_dma();
-
debug_serial_setup();
+ int status = inb_cmos(CMOS_RESET_CODE);
+ outb_cmos(0, CMOS_RESET_CODE);
dprintf(1, "In resume (status=%d)\n", status);
+ init_dma();
+
switch (status) {
- case 0xfe:
- if (CONFIG_S3_RESUME) {
- // S3 resume request. Jump to 32bit mode to handle the resume.
- asm volatile(
- "movw %w1, %%ss\n"
- "movl %0, %%esp\n"
- "movl $_cfunc32flat_s3_resume, %%edx\n"
- "jmp transition32\n"
- : : "i"(BUILD_S3RESUME_STACK_ADDR), "r"(0)
- );
- break;
- }
- // NO BREAK
- case 0x00:
- case 0x0d ... 0xfd:
- case 0xff:
- // Normal post - now that status has been cleared a reset will
- // run regular boot code..
- reset_vector();
- break;
+ case 0x01 ... 0x04:
+ case 0x06 ... 0x09:
+ panic("Unimplemented shutdown status: %02x\n", status);
case 0x05:
// flush keyboard (issue EOI) and jump via 40h:0067h
@@ -88,19 +79,33 @@ handle_resume(u8 status)
: : "m"(BDA_JUMP), "r"(SEG_BDA)
);
break;
+
+ default:
+ break;
}
- panic("Unimplemented shutdown status: %02x\n", status);
+ // Not a 16bit resume - do remaining checks in 32bit mode
+ asm volatile(
+ "movw %w1, %%ss\n"
+ "movl %0, %%esp\n"
+ "movl $_cfunc32flat_handle_resume32, %%edx\n"
+ "jmp transition32\n"
+ : : "i"(BUILD_S3RESUME_STACK_ADDR), "r"(0), "a"(status)
+ );
}
-void VISIBLE32FLAT
+// Handle an S3 resume event
+static void
s3_resume(void)
{
- ASSERT32FLAT();
if (!CONFIG_S3_RESUME)
- panic("S3 resume support not compiled in.\n");
+ return;
- dprintf(1, "In 32bit resume\n");
+ u32 s3_resume_vector = find_resume_vector();
+ if (!s3_resume_vector) {
+ dprintf(1, "No resume vector set!\n");
+ return;
+ }
smm_init();
@@ -108,18 +113,48 @@ s3_resume(void)
make_bios_readonly();
- u32 s3_resume_vector = find_resume_vector();
-
// Invoke the resume vector.
struct bregs br;
memset(&br, 0, sizeof(br));
- if (s3_resume_vector) {
- dprintf(1, "Jump to resume vector (%x)\n", s3_resume_vector);
- br.code = FLATPTR_TO_SEGOFF((void*)s3_resume_vector);
- } else {
- dprintf(1, "No resume vector set!\n");
- // Jump to the post vector to restart with a normal boot.
- br.code = SEGOFF(SEG_BIOS, (u32)reset_vector - BUILD_BIOS_ADDR);
- }
+ dprintf(1, "Jump to resume vector (%x)\n", s3_resume_vector);
+ br.code = FLATPTR_TO_SEGOFF((void*)s3_resume_vector);
call16big(&br);
}
+
+// Attempt to invoke a hard-reboot.
+static void
+tryReboot(void)
+{
+ dprintf(1, "Attempting a hard reboot\n");
+
+ // Setup for reset on qemu.
+ if (! CONFIG_COREBOOT) {
+ qemu_prep_reset();
+ if (HaveRunPost)
+ apm_shutdown();
+ }
+
+ // Try keyboard controller reboot.
+ i8042_reboot();
+
+ // Try PCI 0xcf9 reboot
+ pci_reboot();
+
+ // Try triple fault
+ asm volatile("int3");
+
+ panic("Could not reboot");
+}
+
+void VISIBLE32FLAT
+handle_resume32(int status)
+{
+ ASSERT32FLAT();
+ dprintf(1, "In 32bit resume\n");
+
+ if (status == 0xfe)
+ s3_resume();
+
+ // Must be a soft reboot - invoke a hard reboot.
+ tryReboot();
+}
diff --git a/src/romlayout.S b/src/romlayout.S
index f540c1e..f5c36fc 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -230,64 +230,25 @@ __call16big_from32:
/****************************************************************
- * POST entry point
+ * Misc. entry points.
****************************************************************/
- DECLFUNC entry_post
-entry_post:
- // Enable cache
- movl %cr0, %eax
- andl $~(CR0_CD|CR0_NW), %eax
- movl %eax, %cr0
-
+// Resume (and reboot) entry point - called from entry_post
+ DECLFUNC entry_resume
+entry_resume:
// Disable interrupts
cli
cld
-
- // Check for restart indicator.
- movl $CMOS_RESET_CODE|NMI_DISABLE_BIT, %eax
- outb %al, $PORT_CMOS_INDEX
- inb $PORT_CMOS_DATA, %al
- cmpb $0x0, %al
- jnz 1f
-
- // Normal entry point
- ENTRY_INTO32 _cfunc32flat__start
-
- // Entry point when a post call looks like a resume.
-1:
- // Save old shutdown status.
- movl %eax, %ebx
-
- // Clear shutdown status register.
- movl $CMOS_RESET_CODE|NMI_DISABLE_BIT, %eax
- outb %al, $PORT_CMOS_INDEX
- xorl %eax, %eax
- outb %al, $PORT_CMOS_DATA
-
// Use a stack in EBDA
movw $SEG_BDA, %ax
movw %ax, %ds
movw BDA_ebda_seg, %ax
-
- cmpw $EBDA_SEGMENT_START, %ax
- jle 2f
- // EBDA segment doesn't look valid - use startup value.
- movw $EBDA_SEGMENT_START, %ax
-
-2: movw %ax, %ds
+ movw %ax, %ds
movw %ax, %ss
movl $EBDA_OFFSET_TOP_STACK, %esp
-
// Call handler.
- movl %ebx, %eax
jmp handle_resume
-
-/****************************************************************
- * Misc. entry points.
- ****************************************************************/
-
// PMM entry point
DECLFUNC entry_pmm
entry_pmm:
@@ -418,7 +379,7 @@ post32:
movw %ax, %gs
movw %ax, %ss
movl $BUILD_STACK_ADDR, %esp
- ljmpl $SEG32_MODE32_CS, $_cfunc32flat__start
+ ljmpl $SEG32_MODE32_CS, $_cfunc32flat_handle_post
.code16gcc
@@ -494,8 +455,10 @@ entry_18:
.endm
ORG 0xe05b
-entry_post_official:
- jmp entry_post
+entry_post:
+ cmpl $0, %cs:HaveRunPost // Check for resume/reboot
+ jnz entry_resume
+ ENTRY_INTO32 _cfunc32flat_handle_post // Normal entry point
ORG 0xe2c3
IRQ_ENTRY 02
@@ -578,7 +541,7 @@ entry_iret_official:
ORG 0xfff0 // Power-up Entry Point
.global reset_vector
reset_vector:
- ljmpw $SEG_BIOS, $entry_post_official
+ ljmpw $SEG_BIOS, $entry_post
// 0xfff5 - BiosDate in misc.c
diff --git a/src/stacks.c b/src/stacks.c
index 53bf669..17495d5 100644
--- a/src/stacks.c
+++ b/src/stacks.c
@@ -24,11 +24,6 @@ struct thread_info VAR32FLATVISIBLE MainThread = {
* Low level helpers
****************************************************************/
-static inline u32 getcr0(void) {
- u32 cr0;
- asm("movl %%cr0, %0" : "=r"(cr0));
- return cr0;
-}
static inline void sgdt(struct descloc_s *desc) {
asm("sgdtl %0" : "=m"(*desc));
}
diff --git a/src/util.h b/src/util.h
index 303c524..4319f63 100644
--- a/src/util.h
+++ b/src/util.h
@@ -61,6 +61,15 @@ static inline void cpuid(u32 index, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
: "0" (index));
}
+static inline u32 getcr0(void) {
+ u32 cr0;
+ asm("movl %%cr0, %0" : "=r"(cr0));
+ return cr0;
+}
+static inline void setcr0(u32 cr0) {
+ asm("movl %0, %%cr0" : : "r"(cr0));
+}
+
static inline u64 rdmsr(u32 index)
{
u64 ret;
@@ -424,6 +433,7 @@ void enable_bootsplash(void);
void disable_bootsplash(void);
// resume.c
+extern int HaveRunPost;
void init_dma(void);
// pnpbios.c
--
1.7.4.4
by Kevin O'Connor
debug_serial() was doing a full flush while debug_serial_flush() was
only doing a partial flush. Fix that.
---
Changes from v1 - fix bit math so it actually checks the correct bit.
---
src/output.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/output.c b/src/output.c
index 5c91ae5..462ffb7 100644
--- a/src/output.c
+++ b/src/output.c
@@ -49,7 +49,7 @@ debug_serial(char c)
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x60) != 0x60)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x20) != 0x20)
if (!timeout--)
// Ran out of time.
return;
@@ -63,7 +63,7 @@ debug_serial_flush(void)
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x40) != 0x40)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x60) != 0x60)
if (!timeout--)
// Ran out of time.
return;
--
1.7.4.4
by Kevin O'Connor
Some serial ports have slightly different timing. These timing
variations result in less accurate boot time reporting. So, add a
calibration mechanism to the tool so that one can determine how much
time a specific machine's serial port uses.
Also, extend the main part of the tool to allow the user to specify
an exact timing parameter.
---
tools/readserial.py | 73 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/tools/readserial.py b/tools/readserial.py
index 9c955c6..d85392e 100755
--- a/tools/readserial.py
+++ b/tools/readserial.py
@@ -15,18 +15,48 @@ import optparse
# Reset time counter after this much idle time.
RESTARTINTERVAL = 60
-# Alter timing reports based on how much time would be spent writing
-# to serial.
-ADJUSTBAUD = 1
# Number of bits in a transmitted byte - 8N1 is 1 start bit + 8 data
# bits + 1 stop bit.
BITSPERBYTE = 10
-def readserial(infile, logfile, baudrate):
+def calibrateserialwrite(outfile, byteadjust):
+ # Build 4000 bytes of dummy data.
+ data = "0123456789" * 4 + "012345678" + "\n"
+ data = data * 80
+ while 1:
+ st = time.time()
+ outfile.write(data)
+ outfile.flush()
+ et = time.time()
+ sys.stdout.write(
+ "Wrote %d - %.1fus per char (theory states %.1fus)\n" % (
+ len(data), (et-st) / len(data) * 1000000, byteadjust * 1000000))
+ sys.stdout.flush()
+ time.sleep(3)
+
+def calibrateserialread(infile, byteadjust):
+ starttime = lasttime = 0
+ totalchars = 0
+ while 1:
+ select.select([infile], [], [])
+ d = infile.read(4096)
+ curtime = time.time()
+ if curtime - lasttime > 1.0:
+ if starttime and totalchars:
+ sys.stdout.write(
+ "Calibrating on %d bytes - %.1fus per char"
+ " (theory states %.1fus)\n" % (
+ totalchars,
+ float(lasttime - starttime) * 1000000 / totalchars,
+ byteadjust * 1000000))
+ totalchars = 0
+ starttime = curtime
+ else:
+ totalchars += len(d)
+ lasttime = curtime
+
+def readserial(infile, logfile, byteadjust):
lasttime = 0
- byteadjust = 0.0
- if ADJUSTBAUD:
- byteadjust = float(BITSPERBYTE) / baudrate
while 1:
# Read data
try:
@@ -52,8 +82,8 @@ def readserial(infile, logfile, baudrate):
starttime = datatime
charcount = 0
isnewline = 1
- msg = "\n\n======= %s (adjust=%d)\n" % (
- time.asctime(time.localtime(datatime)), ADJUSTBAUD)
+ msg = "\n\n======= %s (adjust=%.1fus)\n" % (
+ time.asctime(time.localtime(datatime)), byteadjust * 1000000)
sys.stdout.write(msg)
logfile.write(msg)
lasttime = datatime
@@ -97,6 +127,15 @@ def main():
opts.add_option("-n", "--no-adjust",
action="store_false", dest="adjustbaud", default=True,
help="don't adjust times by serial rate")
+ opts.add_option("-c", "--calibrate-read",
+ action="store_true", dest="calibrate_read", default=False,
+ help="read from serial port to calibrate it")
+ opts.add_option("-C", "--calibrate-write",
+ action="store_true", dest="calibrate_write", default=False,
+ help="write to serial port to calibrate it")
+ opts.add_option("-t", "--time",
+ type="float", dest="time", default=None,
+ help="time to write one byte on serial port (in us)")
options, args = opts.parse_args()
serialport = 0
baud = 115200
@@ -106,8 +145,11 @@ def main():
serialport = args[0]
if len(args) > 1:
baud = int(args[1])
- global ADJUSTBAUD
- ADJUSTBAUD=options.adjustbaud
+ byteadjust = float(BITSPERBYTE) / baud
+ if options.time is not None:
+ byteadjust = options.time / 1000000.0
+ if not options.adjustbaud:
+ byteadjust = 0.0
if options.serial:
# Read from serial port
@@ -129,9 +171,16 @@ Or: apt-get install python-serial
fcntl.fcntl(ser, fcntl.F_SETFL
, fcntl.fcntl(ser, fcntl.F_GETFL) | os.O_NONBLOCK)
+ if options.calibrate_read:
+ calibrateserialread(ser, byteadjust)
+ return
+ if options.calibrate_write:
+ calibrateserialwrite(ser, byteadjust)
+ return
+
logname = time.strftime("seriallog-%Y%m%d_%H%M%S.log")
f = open(logname, 'wb')
- readserial(ser, f, baud)
+ readserial(ser, f, byteadjust)
if __name__ == '__main__':
main()
--
1.7.4.4
by Kevin O'Connor
debug_serial() was doing a full flush while debug_serial_flush() was
only doing a partial flush. Fix that.
---
src/output.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/output.c b/src/output.c
index 5c91ae5..8b8371f 100644
--- a/src/output.c
+++ b/src/output.c
@@ -49,7 +49,7 @@ debug_serial(char c)
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x60) != 0x60)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x40) != 0x40)
if (!timeout--)
// Ran out of time.
return;
@@ -63,7 +63,7 @@ debug_serial_flush(void)
if (!CONFIG_DEBUG_SERIAL)
return;
int timeout = DEBUG_TIMEOUT;
- while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x40) != 0x40)
+ while ((inb(CONFIG_DEBUG_SERIAL_PORT+SEROFF_LSR) & 0x60) != 0x60)
if (!timeout--)
// Ran out of time.
return;
--
1.7.4.4
by Kevin O'Connor
This patch series is the last of the 'struct pci_device' code
conversions. The goal of this series is to replace the use of 'u16
bdf' with 'struct pci_device' in the boot priority code. At the end
of this series the 'find_pci()' code, which was introduced in the
beginning of the pci_device conversion, can be removed.
-Kevin
Kevin O'Connor (7):
Push 'struct pci_device' into USB code (instead of using u16 bdf).
Push use of 'struct pci_device' to bootprio_find_usb().
Push use of 'struct pci_device' to bootprio_find_pci_device().
Push use of 'struct pci_device' to bootprio_find_fdc_device().
Push use of 'struct pci_device' to bootprio_find_ata_device().
Push use of 'struct pci_device' to bootprio_find_pci_rom().
Remove now unneeded find_pci().
src/ata.c | 20 +++++++++++---------
src/ata.h | 1 +
src/boot.c | 37 ++++++++++++-------------------------
src/boot.h | 11 ++++++-----
src/floppy.c | 2 +-
src/optionroms.c | 4 ++--
src/usb-ehci.c | 40 +++++++++++++++-------------------------
src/usb-ehci.h | 2 +-
src/usb-msc.c | 4 ++--
src/usb-ohci.c | 5 +++--
src/usb-ohci.h | 2 +-
src/usb-uhci.c | 5 +++--
src/usb-uhci.h | 2 +-
src/usb.c | 6 +++---
src/usb.h | 2 +-
src/virtio-blk.c | 7 ++++---
16 files changed, 67 insertions(+), 83 deletions(-)
--
1.7.4.4
