r157 - openbios-devel/arch/sparc32
by svn＠openbios.org
Author: blueswirl
Date: 2007-06-27 22:25:34 +0200 (Wed, 27 Jun 2007)
New Revision: 157
Modified:
openbios-devel/arch/sparc32/entry.S
Log:
Allow boot start PC to be different from virtual location (boot mode)
Modified: openbios-devel/arch/sparc32/entry.S
===================================================================
--- openbios-devel/arch/sparc32/entry.S 2007-06-27 20:19:09 UTC (rev 156)
+++ openbios-devel/arch/sparc32/entry.S 2007-06-27 20:25:34 UTC (rev 157)
@@ -241,7 +241,7 @@
ba 2f
nop
1:
- lda [%g4] ASI_M_BYPASS, %g1
+ lda [%g4] ASI_M_KERNELTXT, %g1
sta %g1, [%g3] ASI_M_BYPASS
2:
cmp %g4, %g5
@@ -254,9 +254,11 @@
sta %g7, [%g2] ASI_M_MMUREGS ! set ctx table ptr
set AC_M_CXR, %g2
sta %g0, [%g2] ASI_M_MMUREGS ! context 0
+ set highmem, %g2
set 1, %g1
- sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu
-
+ jmp %g2
+ sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu
+highmem:
/*
* The code which enables traps is a simplified version of
* kernel head.S.
13 years
- 1
- 0
r156 - openbios-devel
by svn＠openbios.org
Author: blueswirl
Date: 2007-06-27 22:19:09 +0200 (Wed, 27 Jun 2007)
New Revision: 156
Modified:
openbios-devel/Makefile
Log:
Hack for building on CIFS directory
Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile 2007-06-27 20:16:01 UTC (rev 155)
+++ openbios-devel/Makefile 2007-06-27 20:19:09 UTC (rev 156)
@@ -33,16 +33,21 @@
directories: clean
@printf "Initializing build tree..."
@mkdir $(ODIR)
+ @mkdir -p $(ODIR)/target
@mkdir -p $(ODIR)/target/include
+ @mkdir -p $(ODIR)/target/arch
@mkdir -p $(ODIR)/target/arch/unix
@mkdir -p $(ODIR)/target/arch/$(ARCH)
+ @mkdir -p $(ODIR)/target/arch/ppc
@mkdir -p $(ODIR)/target/arch/ppc/briq # no autodetection of those..
@mkdir -p $(ODIR)/target/arch/ppc/pearpc
@mkdir -p $(ODIR)/target/arch/ppc/mol
+ @mkdir -p $(ODIR)/target/arch/x86
@mkdir -p $(ODIR)/target/arch/x86/xbox
@mkdir -p $(ODIR)/target/libgcc
@mkdir -p $(ODIR)/target/kernel
@mkdir -p $(ODIR)/target/modules
+ @mkdir -p $(ODIR)/target/fs
@mkdir -p $(ODIR)/target/fs/grubfs
@mkdir -p $(ODIR)/target/fs/hfs
@mkdir -p $(ODIR)/target/fs/hfsplus
13 years
- 1
- 0
r155 - in openbios-devel: arch/sparc32 drivers modules
by svn＠openbios.org
Author: blueswirl
Date: 2007-06-27 22:16:01 +0200 (Wed, 27 Jun 2007)
New Revision: 155
Modified:
openbios-devel/arch/sparc32/boot.c
openbios-devel/drivers/esp.c
openbios-devel/drivers/obio.c
openbios-devel/modules/bindings.c
openbios-devel/modules/video.c
Log:
Fix pop_fstr_copy memory leaks
- console one prevented Debian 3.1r1 from installing in console=prom mode
- fixing this also needed the real malloc/free
Modified: openbios-devel/arch/sparc32/boot.c
===================================================================
--- openbios-devel/arch/sparc32/boot.c 2007-06-27 20:11:08 UTC (rev 154)
+++ openbios-devel/arch/sparc32/boot.c 2007-06-27 20:16:01 UTC (rev 155)
@@ -45,18 +45,18 @@
} else {
switch (boot_device) {
case 'a':
- path = "/obio/SUNW,fdtwo";
+ path = strdup("/obio/SUNW,fdtwo");
oldpath = "fd()";
unit = 0;
break;
case 'c':
- path = "disk";
+ path = strdup("disk");
oldpath = "sd(0,0,0):d";
unit = 0;
break;
default:
case 'd':
- path = "cdrom";
+ path = strdup("cdrom");
// FIXME: hardcoding this looks almost definitely wrong.
// With sd(0,2,0):b we get to see the solaris kernel though
//oldpath = "sd(0,2,0):d";
@@ -64,7 +64,7 @@
unit = 2;
break;
case 'n':
- path = "net";
+ path = strdup("net");
oldpath = "le()";
unit = 0;
break;
Modified: openbios-devel/drivers/esp.c
===================================================================
--- openbios-devel/drivers/esp.c 2007-06-27 20:11:08 UTC (rev 154)
+++ openbios-devel/drivers/esp.c 2007-06-27 20:16:01 UTC (rev 155)
@@ -279,8 +279,14 @@
*sd = &global_esp->sd[id];
#ifdef CONFIG_DEBUG_ESP
- fword("my-args");
- DPRINTF("opening drive %d args %s\n", id, pop_fstr_copy());
+ {
+ char *args;
+
+ fword("my-args");
+ args = pop_fstr_copy();
+ DPRINTF("opening drive %d args %s\n", id, args);
+ free(args);
+ }
#endif
selfword("open-deblocker");
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2007-06-27 20:11:08 UTC (rev 154)
+++ openbios-devel/drivers/obio.c 2007-06-27 20:16:01 UTC (rev 155)
@@ -223,10 +223,13 @@
*address = *prop;
fword("my-args");
args = pop_fstr_copy();
- if (args && args[0] == 'a')
- *address += 4;
+ if (args) {
+ if (args[0] == 'a')
+ *address += 4;
+ //printk("zs_open: address %lx, args %s\n", *address, args);
+ free(args);
+ }
- //printk("zs_open: address %lx, args %s\n", *address, args);
RET ( -1 );
}
Modified: openbios-devel/modules/bindings.c
===================================================================
--- openbios-devel/modules/bindings.c 2007-06-27 20:11:08 UTC (rev 154)
+++ openbios-devel/modules/bindings.c 2007-06-27 20:16:01 UTC (rev 155)
@@ -253,6 +253,8 @@
if( !len )
return NULL;
str = malloc( len + 1 );
+ if( !str )
+ return NULL;
memcpy( str, p, len );
str[len] = 0;
return str;
Modified: openbios-devel/modules/video.c
===================================================================
--- openbios-devel/modules/video.c 2007-06-27 20:11:08 UTC (rev 154)
+++ openbios-devel/modules/video.c 2007-06-27 20:16:01 UTC (rev 155)
@@ -253,6 +253,7 @@
addr = pop_fstr_copy();
console_draw_str(addr);
+ free(addr);
PUSH(len);
}
13 years
- 1
- 0
r154 - openbios-devel/arch/sparc32
by svn＠openbios.org
Author: blueswirl
Date: 2007-06-27 22:11:08 +0200 (Wed, 27 Jun 2007)
New Revision: 154
Modified:
openbios-devel/arch/sparc32/romvec.c
Log:
Update totavail when memory is allocated by dumb memory allocator
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2007-06-27 20:09:08 UTC (rev 153)
+++ openbios-devel/arch/sparc32/romvec.c 2007-06-27 20:11:08 UTC (rev 154)
@@ -53,8 +53,6 @@
static struct linux_romvec romvec0;
-static unsigned long free_ram;
-
static void doublewalk(__attribute__((unused)) unsigned int ptab1,
__attribute__((unused)) unsigned int va)
{
@@ -418,8 +416,9 @@
{
static unsigned int next_free_address = 0xFFEDA000;
- free_ram -= size;
- DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size, free_ram);
+ totmap[0].num_bytes -= size;
+ DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size,
+ totmap[0].num_bytes);
// If va is null, the allocator is supposed to pick a "suitable" address.
// (See OpenSolaric prom_alloc.c) There's not any real guidance as
@@ -432,7 +431,7 @@
DPRINTF("obp_dumb_memalloc req null -> 0x%x\n", va);
}
- obp_dumb_mmap(va, 0, free_ram, size);
+ obp_dumb_mmap(va, 0, totmap[0].num_bytes, size);
return va;
}
@@ -499,8 +498,6 @@
void *
init_openprom(unsigned long memsize)
{
- free_ram = va2pa((int)&_start) - PAGE_SIZE;
-
ptphys = totphys;
ptmap = totmap;
ptavail = totavail;
@@ -514,7 +511,7 @@
totavail[0].theres_more = NULL;
totavail[0].start_adr = (char *) 0;
- totavail[0].num_bytes = free_ram;
+ totavail[0].num_bytes = va2pa((int)&_start) - PAGE_SIZE;
totmap[0].theres_more = NULL;
totmap[0].start_adr = &_start;
13 years
- 1
- 0
r153 - openbios-devel/arch/sparc32
by svn＠openbios.org
Author: blueswirl
Date: 2007-06-27 22:09:08 +0200 (Wed, 27 Jun 2007)
New Revision: 153
Modified:
openbios-devel/arch/sparc32/lib.c
Log:
Get a real memory allocator for Sparc, based on PPC ofmem
Modified: openbios-devel/arch/sparc32/lib.c
===================================================================
--- openbios-devel/arch/sparc32/lib.c 2007-06-27 20:07:37 UTC (rev 152)
+++ openbios-devel/arch/sparc32/lib.c 2007-06-27 20:09:08 UTC (rev 153)
@@ -32,16 +32,127 @@
return i;
}
+typedef struct alloc_desc {
+ struct alloc_desc *next;
+ int size; /* size (including) this struct */
+} alloc_desc_t;
+
+typedef struct mem_range {
+ struct mem_range *next;
+ ulong start;
+ ulong size;
+} range_t;
+
+typedef struct trans {
+ struct trans *next;
+ ulong virt; /* chain is sorted by virt */
+ ulong size;
+ ulong phys;
+ int mode;
+} translation_t;
+
+static struct {
+ char *next_malloc;
+ int left;
+ alloc_desc_t *mfree; /* list of free malloc blocks */
+
+ range_t *phys_range;
+ range_t *virt_range;
+
+ translation_t *trans; /* this is really a translation_t */
+} ofmem;
+#define ALLOC_BLOCK (64 * 1024)
+
void *malloc(int size)
{
- extern struct mem cmem;
+ alloc_desc_t *d, **pp;
+ char *ret;
+ extern struct mem cmem;
- return mem_alloc(&cmem, size, 4);
+ if( !size )
+ return NULL;
+
+ if( size & 3 )
+ size += 4 - (size & 3);
+ size += sizeof(alloc_desc_t);
+
+ /* look in the freelist */
+ for( pp=&ofmem.mfree; *pp && (**pp).size < size; pp = &(**pp).next )
+ ;
+
+ /* waste at most 4K by taking an entry from the freelist */
+ if( *pp && (**pp).size < size + 0x1000 ) {
+ ret = (char*)*pp + sizeof(alloc_desc_t);
+ memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) );
+ *pp = (**pp).next;
+ return ret;
+ }
+
+ if( !ofmem.next_malloc || ofmem.left < size) {
+ unsigned long alloc_size = ALLOC_BLOCK;
+ if (size > ALLOC_BLOCK)
+ alloc_size = size;
+ // Recover possible leftover
+ if (ofmem.left > sizeof(alloc_desc_t) + 4) {
+ alloc_desc_t *d;
+
+ d = (alloc_desc_t*)ofmem.next_malloc;
+ d->size = ofmem.left - sizeof(alloc_desc_t);
+ free((unsigned long)d + sizeof(alloc_desc_t));
+ }
+
+ ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 4);
+ ofmem.left = alloc_size;
+ }
+
+ if( ofmem.left < size) {
+ printk("out of malloc memory (%x)!\n", size );
+ return NULL;
+ }
+ d = (alloc_desc_t*) ofmem.next_malloc;
+ ofmem.next_malloc += size;
+ ofmem.left -= size;
+
+ d->next = NULL;
+ d->size = size;
+
+ ret = (char*)d + sizeof(alloc_desc_t);
+ memset( ret, 0, size - sizeof(alloc_desc_t) );
+ return ret;
}
void free(void *ptr)
{
- /* Nothing yet */
+ alloc_desc_t **pp, *d;
+
+ /* it is legal to free NULL pointers (size zero allocations) */
+ if( !ptr )
+ return;
+
+ d = (alloc_desc_t*)((unsigned long)ptr - sizeof(alloc_desc_t));
+ d->next = ofmem.mfree;
+
+ /* insert in the (sorted) freelist */
+ for( pp=&ofmem.mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next )
+ ;
+ d->next = *pp;
+ *pp = d;
}
+void *
+realloc( void *ptr, size_t size )
+{
+ alloc_desc_t *d = (alloc_desc_t*)((unsigned long)ptr - sizeof(alloc_desc_t));
+ char *p;
+ if( !ptr )
+ return malloc( size );
+ if( !size ) {
+ free( ptr );
+ return NULL;
+ }
+ p = malloc( size );
+ memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) );
+ free( ptr );
+ return p;
+}
13 years
- 1
- 0
r152 - openbios-devel/drivers
by svn＠openbios.org
Author: blueswirl
Date: 2007-06-27 22:07:37 +0200 (Wed, 27 Jun 2007)
New Revision: 152
Modified:
openbios-devel/drivers/iommu.c
Log:
Fix mapping more than 2G memory
Modified: openbios-devel/drivers/iommu.c
===================================================================
--- openbios-devel/drivers/iommu.c 2007-06-10 15:56:42 UTC (rev 151)
+++ openbios-devel/drivers/iommu.c 2007-06-27 20:07:37 UTC (rev 152)
@@ -93,7 +93,8 @@
pa &= ~(align - 1);
p = (char *)pa2va(pa);
- if (p >= t->uplim || p + size > t->uplim)
+ if ((unsigned long)p >= (unsigned long)t->uplim ||
+ (unsigned long)p + size > (unsigned long)t->uplim)
return 0;
t->curp = p + size;
13 years
- 1
- 0
r453 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-06-26 19:17:25 +0200 (Tue, 26 Jun 2007)
New Revision: 453
Modified:
cpu/x86/pc/olpc/usb8388.bth
Log:
OLPC - Minor fix to last commit to usb8388.bth
Modified: cpu/x86/pc/olpc/usb8388.bth
===================================================================
--- cpu/x86/pc/olpc/usb8388.bth 2007-06-26 15:46:28 UTC (rev 452)
+++ cpu/x86/pc/olpc/usb8388.bth 2007-06-26 17:17:25 UTC (rev 453)
@@ -5,7 +5,7 @@
fload ${BP}/cpu/x86/pc/olpc/versions.fth
-" rm usb8388.bin" expand$ $sh
+" rm -f usb8388.bin" expand$ $sh
" wget -q http://dev.laptop.org/pub/firmware/libertas/usb8388-${WLAN_VERSION}.bin" expand$ $sh
13 years
- 1
- 0
r452 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-06-26 17:46:28 +0200 (Tue, 26 Jun 2007)
New Revision: 452
Modified:
cpu/x86/pc/olpc/usb8388.bth
Log:
OLPC build process - Changed usb8388.bth to fetch the wireless firmware from http://dev.laptop.org/pub/firmware/libertas/ instead of a RedHat RPM repository.
Modified: cpu/x86/pc/olpc/usb8388.bth
===================================================================
--- cpu/x86/pc/olpc/usb8388.bth 2007-06-15 19:53:41 UTC (rev 451)
+++ cpu/x86/pc/olpc/usb8388.bth 2007-06-26 15:46:28 UTC (rev 452)
@@ -5,16 +5,16 @@
fload ${BP}/cpu/x86/pc/olpc/versions.fth
-" rm -rf ./lib" $sh
-" wget -O - http://download.fedora.redhat.com/pub/fedora/projects/olpc/development/i386… | rpm2cpio - | cpio -i -u --make-directories --no-absolute-filenames" expand$ $sh
+" rm usb8388.bin" expand$ $sh
+" wget -q http://dev.laptop.org/pub/firmware/libertas/usb8388-${WLAN_VERSION}.bin" expand$ $sh
-\ reading libertas.version
-\ here dup d# 50 ifd @ fgets ( adr len )
-\ ifd @ fclose ( adr len )
+" wget -q -O - http://dev.laptop.org/pub/firmware/libertas/MD5SUMS | grep ${WLAN_VERSION} >usb8388.md5" expand$ $sh
-" cp ./lib/firmware/usb8388.bin ." $sh
+" md5sum usb8388-${WLAN_VERSION}.bin | cmp - usb8388.md5" expand$ $sh
+" mv usb8388-${WLAN_VERSION}.bin usb8388.bin" expand$ $sh
+
\ This forces the creation of a .log file, so we don't re-fetch
writing usb8388.version
" ${WLAN_VERSION}"n" expand$ ofd @ fputs
13 years
- 1
- 0
install/boot question
by gpguard-openbios＠yahoo.com
Hey folks,
I wanted to create a VMware image that would boot into OpenBios, and simply present the user with
a Forth command line. Is this feasible. In fact, taking the question up a level, how would you
"install" OpenBIOS on any x86 machine?
I have done Linux installs where you go through this process of formatting the disks, setting a
swap, then placing a bootloader on the boot partition.
I would assume that some sort of openbios "machine code" needs to be installed to the boot sector
of the x86 machine in order for it to work. Is this correct, or am I missing something.
Thanks for your help, as you can probably tell I am new to the list, and still trying to wrap my
head around the OpenBIOS concepts.
Geoff
13 years
- 2
- 1
r451 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-06-15 21:53:41 +0200 (Fri, 15 Jun 2007)
New Revision: 451
Modified:
cpu/x86/pc/olpc/resume.bth
Log:
OLPC resume - reset DCON SMBus controller during resume by sending an address cycle.
Modified: cpu/x86/pc/olpc/resume.bth
===================================================================
--- cpu/x86/pc/olpc/resume.bth 2007-06-15 19:52:57 UTC (rev 450)
+++ cpu/x86/pc/olpc/resume.bth 2007-06-15 19:53:41 UTC (rev 451)
@@ -20,6 +20,7 @@
\ This code will be copied to RAM at suspend-base
\ create save-display
+create reset-smbus
create restore-usb-power
h# fe00.0000 constant gp-pa
@@ -477,6 +478,45 @@
al lods dx inc al dx out \ Reg 6
al lods dx dec al dx out \ Reg 5 with the enable bit
+[ifdef] reset-smbus
+ \ This little dance resets the DCON's SMbus interface
+ h# 1 # al mov \ START
+ h# 18b3 # dx mov \ SMBUS control 1
+ al dx out \ Initiate an SMBUS cycle to the DCON
+
+ \ We could split here and move the following down, so as to overlap
+ \ the delay time with other work, but it doesn't matter because the
+ \ later CaFe chip setup will stall anyway.
+
+ d# 32 # cx mov \ Loop count (usually ready in 20 uS)
+ h# 18b1 # dx mov \ SMBUS status
+ begin
+ dx al in
+ h# 40 # al test
+ loope \ Wait for ready to accept byte or timeout
+
+ h# 1a # al mov \ Address byte
+ h# 18b0 # dx mov \ SMBUS data
+ al dx out \ Initiate address out cycle
+
+ \ Another possible split point, in case we should need to overlap
+ d# 256 # cx mov \ Loop count (usually ready in 172 uS)
+ h# 18b1 # dx mov \ SMBUS status
+ begin
+ dx al in
+ h# 50 # al test
+ loope \ Wait for done or error or timeout
+
+ h# 2 # al mov \ Stop
+ h# 18b3 # dx mov \ SMBUS status
+ al dx out \ Initiate STOP
+
+ h# 10 # al mov \ Ack NEGACK
+ h# 18b1 # dx mov \ SMBUS status
+ al dx out \ While acking the NEGACK
+ \ End of DCON SMbus reset dance
+[then]
+
\ MFGPTs 0-5. MFGPT 6 and 7 are in the standby domain, live during suspend
h# 1800 # dx mov \ MFGPT base port
h# 18 # cx mov
13 years
- 1
- 0