switch-coreboot/console/vtxprintf.c
Ronald G. Minnich 446979be46 This set of changes:
- makes sprintf work, in a re-entrant way
- gets rid of a lot of ugly debug stuff (thanks for the Kconfig log
  level stuff guys!)
- boots like a bat out of hell on qemu :-)

The changes are trivial, I am self-acking. 

To run this under qemu, I do this:

cp LinuxBIOSv3/build/linuxbios.rom bios.bin ;  qemu -nographic -L .
-kernel linux-2.6.15-bochs/vmlinux -hdc hda -hda hda | tee  out 2>&1

here is the output from a run. Note that cpu's still don't have a path
of any kind, and that show_all_devs is not working right. But we're
getting there. I think I'll next try to really boot a linux with a hard
drive, and see how it goes.


LinuxBIOS-3.0.0- Tue Mar  6 18:41:59 MST 2007 starting...
Start search at 0xfffc0000, size 258048
filename is normal/initram
start 0xfffc0000 len 0x3f000
fullname is normal/initram
RAM init code started
Nothing to do.Done ram init code
filename is normal/stage2
start (qemu) 0xfffc0000 len 0x3f000
fullname is normal/initram
fullname is normal/stage2
Phase 1: done
show all devs..
cpus: Unknown device path type: 0
Phase 2: Early setup...
Phase 2: Done.
show all devs..
cpus: Unknown device path type: 0
Phase 3: Enumerating buses...
qemu-x86 enable_dev done
dev_phase3_scan: scanning root(Root Device)
scan_static_bus for root(Root Device)
cpus: Unknown device path type: 0
i440bxemulation_enable_dev: 
i440bxemulation_enable_dev: Done.
dev_phase5: device0_0(PCI: 00:00.0) missing ops
domain0(PCI_DOMAIN: 0000) scanning...
dev_phase3_scan: scanning domain0(PCI_DOMAIN: 0000)
set_pci_ops: dev 00007aa0(device0_0) set ops to 00007220
set_pci_ops: dev 00007d80(dynamic PCI: 00:01.0) set ops to 00007220
set_pci_ops: dev 00008040(dynamic PCI: 00:01.1) set ops to 00007220
set_pci_ops: dev 00008300(dynamic PCI: 00:01.3) set ops to 00007220
set_pci_ops: dev 000085c0(dynamic PCI: 00:02.0) set ops to 00007220
set_pci_ops: dev 00008880(dynamic PCI: 00:03.0) set ops to 00007220
dev_phase3_scan: device0_0: busdevice 00007aa0 enabled 1 ops 00007220
dev_phase3_scan: can not scan from here, returning 0
dev_phase3_scan: dynamic PCI: 00:01.0: busdevice 00007d80 enabled 1 ops 00007220
dev_phase3_scan: can not scan from here, returning 0
dev_phase3_scan: dynamic PCI: 00:01.1: busdevice 00008040 enabled 1 ops 00007220
dev_phase3_scan: can not scan from here, returning 0
dev_phase3_scan: dynamic PCI: 00:01.3: busdevice 00008300 enabled 1 ops 00007220
dev_phase3_scan: can not scan from here, returning 0
dev_phase3_scan: dynamic PCI: 00:02.0: busdevice 000085c0 enabled 1 ops 00007220
dev_phase3_scan: can not scan from here, returning 0
dev_phase3_scan: dynamic PCI: 00:03.0: busdevice 00008880 enabled 1 ops 00007220
dev_phase3_scan: can not scan from here, returning 0
dev_phase3_scan: returning 0
scan_static_bus for root(Root Device) done
dev_phase3_scan: returning 0
Phase 3: Done.
show all devs..
cpus: Unknown device path type: 0
Phase 4: Allocating resources...
Phase 4: Reading resources...
cpus: Unknown device path type: 0
read_resources: cpus() missing phase4_read_resources
cpus: Unknown device path type: 0
read_resources: cpus() missing phase4_read_resources
Phase 4: Done reading resources.
Phase 4: Setting resources...
cpus: Unknown device path type: 0
read_resources: cpus() missing phase4_read_resources
cpus: Unknown device path type: 0
read_resources: cpus() missing phase4_read_resources
ram_resource: add ram resoource 33554432 bytes
Phase 4: Done setting resources.
Phase 4: Done allocating resources.
show all devs..
cpus: Unknown device path type: 0
Phase 5: Enabling resources...
cpus: Unknown device path type: 0
dev_phase5: cpus() missing ops
Phase 5: Done.
show all devs..
cpus: Unknown device path type: 0
Phase 6: Initializing devices...
Phase 6: Devices initialized.
show all devs..
cpus: Unknown device path type: 0
lb_memory_range: start 0x0 size 0x2000000
lb_cleanup_memory_ranges: # entries 1
  #0: base 0x0 size 0x2000000
lb_memory_range: start 0x0 size 0x500
lb_cleanup_memory_ranges: # entries 2
  #0: base 0x500 size 0x1fffb00
  #1: base 0x0 size 0x500
lb_memory_range: start 0xf0000 size 0x0
lb_cleanup_memory_ranges: # entries 4
  #0: base 0x0 size 0x500
  #1: base 0x500 size 0xefb00
  #2: base 0xf0000 size 0x1f10000
  #3: base 0xf0000 size 0x0
show all devs..
cpus: Unknown device path type: 0
Done stage2 code
filename is normal/payload
start 0xfffc0000 len 0x3f000
fullname is normal/initram
fullname is normal/stage2
fullname is normal/payload

Elfboot
set 00100000 to 0 for 137936 bytes
Copy to 00100000 from fffc6ef4 for 30472 bytes
set 00121ae0 to 0 for 72 bytes
Copy to 00121ae0 from fffce614 for 72 bytes
FILO version 0.5 (rminnich@q.ccstar.lanl.gov) Tue Mar  6 18:41:56 MST 2007
collect_sys_info: boot eax = 0xfe
collect_sys_info: boot ebx = 0xffffd444
collect_sys_info: boot arg = 0x1049c0
collect_sys_info: info->memrange 00000000
collect_linuxbios_info: Searching for LinuxBIOS tables...
find_lb_table: Found candidate at: 00000500
find_lb_table: header checksum o.k.
find_lb_table: table checksum o.k.
find_lb_table: record count o.k.
collect_linuxbios_info: collect_linuxbios_info: yes
collect_linuxbios_info: Found LinuxBIOS table at: 00000500
read_lbtable: read_lbtable begin
read_lbtable: lbrec tag 1 LB_TAG_MEMORY 1
convert_memmap: info->memrange 0x107740
convert_memmap: 0x00000000000000 0x000000000005a4 16
convert_memmap: 0x000000000005a4 0x000000000efa5c 1
convert_memmap: 0x000000000f0000 0x00000001f10000 1
convert_memmap: 0x000000000f0000 0x00000000000000 16
read_lbtable: lbrec tag 3 LB_TAG_MEMORY 1
read_lbtable: lbrec tag 4 LB_TAG_MEMORY 1
read_lbtable: read_lbtable end
collect_linuxbios_info: collect_linuxbios_info: done
collect_sys_info: after collect info->memrange 00107740
collect_sys_info: 00000000000005a4-00000000000f0000
collect_sys_info: 00000000000f0000-0000000002000000
collect_sys_info: RAM 32 MB
relocate: virt_offset is 0
relocate: Current location: 0x100000-0x121b27
relocate: Relocating to 0x1fde4d0-0x1fffff7... ok
setup_timers: CPU 599 MHz
Press <Enter> for default boot, or <Esc> for boot prompt... 2 1 timed out
boot: hda:/bzImage console=ttyS0,115200
malloc_diag: alloc: 0 bytes (0 blocks), free: 16376 bytes (1 blocks)
malloc_diag: alloc: 48 bytes (1 blocks), free: 16328 bytes (1 blocks)
malloc_diag: alloc: 64 bytes (2 blocks), free: 16312 bytes (1 blocks)
file_open: dev=hda, path=/bzImage
ide_software_reset: Waiting for ide0 to become ready for reset... ok
init_drive: Testing for hda
init_drive: Probing for hda
init_drive: LBA mode, sectors=32768
init_drive: LBA48 mode, sectors=32768
init_drive: Init device params... ok
hda: LBA48 16MB: QEMU HARDDISK                           
Mounted ext2fs
malloc_diag: alloc: 48 bytes (1 blocks), free: 16328 bytes (1 blocks)
elf_load: Not a bootable ELF image
malloc_diag: alloc: 64 bytes (2 blocks), free: 16312 bytes (1 blocks)
file_open: dev=hda, path=/bzImage
devopen: already open
malloc_diag: alloc: 48 bytes (1 blocks), free: 16328 bytes (1 blocks)
Found Linux version 2.6.15-geode (rminnich@q.ccstar.lanl.gov) #36 Sun Mar 4 22:20:47 MST 2007 (protocol 0x204) (loadflags 0x1) bzImage.
init_linux_params: Setting up paramters at 0x90000
set_memory_size: 00000000000005a4 - 00000000000f0000
set_memory_size: 00000000000f0000 - 0000000002000000
set_memory_size: ramtop=0x2000000
set_memory_size: ext_mem_k=31744, alt_mem_k=31744
parse_command_line: original command line: "console=ttyS0,115200"
parse_command_line: kernel command line at 0x91000
parse_command_line: kernel command line (20 bytes): "console=ttyS0,115200"
load_linux_kernel: offset=0x1600 addr=0x100000 size=0x1175e1
Loading kernel... ok
start_linux: eip=0x100000
Jumping to entry point...
Linux version 2.6.15-geode (rminnich@q.ccstar.lanl.gov) (gcc version 4.0.2 20051125 (Red Hat 4.0.2-8)) #36 Sun Mar 4 22:20:47 MST 2007
BIOS-provided physical RAM map:
 BIOS-e801: 0000000000000000 - 000000000009f000 (usable)
 BIOS-e801: 0000000000100000 - 0000000002000000 (usable)
32MB LOWMEM available.
DMI not present.
Allocating PCI resources starting at 10000000 (gap: 02000000:fe000000)
Built 1 zonelists
Kernel command line: console=ttyS0,115200
Initializing CPU#0
PID hash table entries: 256 (order: 8, 4096 bytes)
Detected 1694.987 MHz processor.
Using pit for high-res timesource
Console: colour dummy device 80x25
Dentry cache hash table entries: 8192 (order: 3, 32768 bytes)
Inode-cache hash table entries: 4096 (order: 2, 16384 bytes)
Memory: 29752k/32768k available (1500k kernel code, 2628k reserved, 502k data, 144k init, 0k highmem)
Checking if this processor honours the WP bit even in supervisor mode... Ok.
Mount-cache hash table entries: 512
CPU: L1 I cache: 8K
CPU: L2 cache: 128K
mtrr: v2.0 (20020519)
CPU: Intel Pentium II (Klamath) stepping 03
Enabling fast FPU save and restore... done.
Enabling unmasked SIMD FPU exception support... done.
Checking 'hlt' instruction... OK.
Checking for popad bug... OK.
NET: Registered protocol family 16
PCI: Using configuration type 1
PCI: Probing PCI hardware
PCI quirk: region b100-b10f claimed by PIIX4 SMB
PCI: Ignore bogus resource 6 [0:0] of 0000:00:02.0
Initializing Cryptographic API
io scheduler noop registered
io scheduler anticipatory registered
io scheduler deadline registered
io scheduler cfq registered
PCI: PIIX3: Enabling Passive Release on 0000:00:01.0
Limiting direct PCI/PCI transfers.
Activating ISA DMA hang workarounds.
serio: i8042 AUX port at 0x60,0x64 irq 12
serio: i8042 KBD port at 0x60,0x64 irq 1
Serial: 8250/16550 driver $Revision: 1.90 $ 4 ports, IRQ sharing disabled
serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16450
RAMDISK driver initialized: 16 RAM disks of 4096K size 1024 blocksize
loop: loaded (max 8 devices)
e100: Intel(R) PRO/100 Network Driver, 3.4.14-k4-NAPI
e100: Copyright(c) 1999-2005 Intel Corporation
tun: Universal TUN/TAP device driver, 1.6
tun: (C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>
Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2
ide: Assuming 33MHz system bus speed for PIO modes; override with idebus=xx
PIIX3: IDE controller at PCI slot 0000:00:01.1
PIIX3: chipset revision 0
PIIX3: not 100% native mode: will probe irqs later
PIIX3: neither IDE port enabled (BIOS)
hda: QEMU HARDDISK, ATA DISK drive
hdc: QEMU HARDDISK, ATA DISK drive
ide0 at 0x1f0-0x1f7,0x3f6 on irq 14
ide1 at 0x170-0x177,0x376 on irq 15
hda: max request size: 1024KiB
hda: 32768 sectors (16 MB) w/256KiB Cache, CHS=32/255/63
hda: set_multmode: status=0x41 { DriveReady Error }
hda: set_multmode: error=0x04 { DriveStatusError }
ide: failed opcode was: 0xef
hda: cache flushes supported
 hda: hda1
hdc: max request size: 1024KiB
hdc: 32768 sectors (16 MB) w/256KiB Cache, CHS=32/255/63
hdc: set_multmode: status=0x41 { DriveReady Error }
hdc: set_multmode: error=0x04 { DriveStatusError }
ide: failed opcode was: 0xef
hdc: cache flushes supported
 hdc: hdc1
mice: PS/2 mouse device common for all mice
NET: Registered protocol family 2
input: AT Raw Set 2 keyboard as /class/input/input0
input: ImExPS/2 Generic Explorer Mouse as /class/input/input1
IP route cache hash table entries: 512 (order: -1, 2048 bytes)
TCP established hash table entries: 2048 (order: 1, 8192 bytes)
TCP bind hash table entries: 2048 (order: 1, 8192 bytes)
TCP: Hash tables configured (established 2048 bind 2048)
TCP reno registered
TCP bic registered
NET: Registered protocol family 1
NET: Registered protocol family 17
Using IPI Shortcut mode
VFS: Cannot open root device "<NULL>" or unknown-block(3,2)
Please append a correct "root=" boot option
Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(3,2)
 

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@207 f3766cd6-281f-0410-b1cd-43a5c92072e9
2007-03-07 00:53:40 +00:00

289 lines
6.3 KiB
C

/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* vtxprintf.c, from
* linux/lib/vsprintf.c
*
* Copyright (C) 1991, 1992 Linus Torvalds
*/
#include <stdarg.h>
#include <string.h>
#include <div64.h>
#define isdigit(c) ((c) >= '0' && (c) <= '9')
#define is_digit isdigit
#define isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
static int skip_atoi(const char **s)
{
int i=0;
while (is_digit(**s))
i = i*10 + *((*s)++) - '0';
return i;
}
#define ZEROPAD 1 /* pad with zero */
#define SIGN 2 /* unsigned/signed long */
#define PLUS 4 /* show plus */
#define SPACE 8 /* space if plus */
#define LEFT 16 /* left justified */
#define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
static int number(void (*tx_byte)(unsigned char byte, void *arg), void *arg,
unsigned long long num, int base, int size, int precision, int type)
{
char c,sign,tmp[66];
const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
int i;
int count = 0;
if (type & LARGE)
digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
if (type & LEFT)
type &= ~ZEROPAD;
if (base < 2 || base > 36)
return 0;
c = (type & ZEROPAD) ? '0' : ' ';
sign = 0;
if (type & SIGN) {
if ((signed long long)num < 0) {
sign = '-';
num = -num;
size--;
} else if (type & PLUS) {
sign = '+';
size--;
} else if (type & SPACE) {
sign = ' ';
size--;
}
}
if (type & SPECIAL) {
if (base == 16)
size -= 2;
else if (base == 8)
size--;
}
i = 0;
if (num == 0)
tmp[i++]='0';
else while (num != 0)
tmp[i++] = digits[do_div(num,base)];
if (i > precision)
precision = i;
size -= precision;
if (!(type&(ZEROPAD+LEFT)))
while(size-->0)
tx_byte(' ', arg), count++;
if (sign)
tx_byte(sign, arg), count++;
if (type & SPECIAL) {
if (base==8)
tx_byte('0', arg), count++;
else if (base==16) {
tx_byte('0', arg), count++;
tx_byte(digits[33], arg), count++;
}
}
if (!(type & LEFT))
while (size-- > 0)
tx_byte(c, arg), count++;
while (i < precision--)
tx_byte('0', arg), count++;
while (i-- > 0)
tx_byte(tmp[i], arg), count++;
while (size-- > 0)
tx_byte(' ', arg), count++;
return count;
}
int vtxprintf(void (*tx_byte)(unsigned char byte, void *arg), void *arg, const char *fmt, va_list args)
{
int len;
unsigned long long num;
int i, base;
const char *s;
int flags; /* flags to number() */
int field_width; /* width of output field */
int precision; /* min. # of digits for integers; max
number of chars for from string */
int qualifier; /* 'h', 'l', or 'L' for integer fields */
int count;
for (count=0; *fmt ; ++fmt) {
if (*fmt != '%') {
tx_byte(*fmt, arg), count++;
continue;
}
/* process flags */
flags = 0;
repeat:
++fmt; /* this also skips first '%' */
switch (*fmt) {
case '-': flags |= LEFT; goto repeat;
case '+': flags |= PLUS; goto repeat;
case ' ': flags |= SPACE; goto repeat;
case '#': flags |= SPECIAL; goto repeat;
case '0': flags |= ZEROPAD; goto repeat;
}
/* get field width */
field_width = -1;
if (is_digit(*fmt))
field_width = skip_atoi(&fmt);
else if (*fmt == '*') {
++fmt;
/* it's the next argument */
field_width = va_arg(args, int);
if (field_width < 0) {
field_width = -field_width;
flags |= LEFT;
}
}
/* get the precision */
precision = -1;
if (*fmt == '.') {
++fmt;
if (is_digit(*fmt))
precision = skip_atoi(&fmt);
else if (*fmt == '*') {
++fmt;
/* it's the next argument */
precision = va_arg(args, int);
}
if (precision < 0)
precision = 0;
}
/* get the conversion qualifier */
qualifier = -1;
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') {
qualifier = *fmt;
++fmt;
if (*fmt == 'l') {
qualifier = 'L';
++fmt;
}
}
/* default base */
base = 10;
switch (*fmt) {
case 'c':
if (!(flags & LEFT))
while (--field_width > 0)
tx_byte(' ', arg), count++;
tx_byte((unsigned char) va_arg(args, int), arg), count++;
while (--field_width > 0)
tx_byte(' ', arg), count++;
continue;
case 's':
s = va_arg(args, char *);
if (!s)
s = "<NULL>";
len = strnlen(s, precision);
if (!(flags & LEFT))
while (len < field_width--)
tx_byte(' ', arg), count++;
for (i = 0; i < len; ++i)
tx_byte(*s++, arg), count++;
while (len < field_width--)
tx_byte(' ', arg), count++;
continue;
case 'p':
if (field_width == -1) {
field_width = 2*sizeof(void *);
flags |= ZEROPAD;
}
count += number(tx_byte, arg,
(unsigned long) va_arg(args, void *), 16,
field_width, precision, flags);
continue;
case 'n':
if (qualifier == 'L') {
long long *ip = va_arg(args, long long *);
*ip = count;
} else if (qualifier == 'l') {
long * ip = va_arg(args, long *);
*ip = count;
} else {
int * ip = va_arg(args, int *);
*ip = count;
}
continue;
case '%':
tx_byte('%', arg), count++;
continue;
/* integer number formats - set up the flags and "break" */
case 'o':
base = 8;
break;
case 'X':
flags |= LARGE;
case 'x':
base = 16;
break;
case 'd':
case 'i':
flags |= SIGN;
case 'u':
break;
default:
tx_byte('%', arg), count++;
if (*fmt)
tx_byte(*fmt, arg), count++;
else
--fmt;
continue;
}
if (qualifier == 'L') {
num = va_arg(args, unsigned long long);
} else if (qualifier == 'l') {
num = va_arg(args, unsigned long);
} else if (qualifier == 'h') {
num = (unsigned short) va_arg(args, int);
if (flags & SIGN)
num = (short) num;
} else if (flags & SIGN) {
num = va_arg(args, int);
} else {
num = va_arg(args, unsigned int);
}
count += number(tx_byte, arg, num, base, field_width, precision, flags);
}
return count;
}