r224 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-09 14:52:34 +0200 (Sat, 09 Aug 2008)
New Revision: 224
Modified:
openbios-devel/arch/sparc64/console.c
Log:
Switch keyboard controller to translated mode so it works as expected
Modified: openbios-devel/arch/sparc64/console.c
===================================================================
--- openbios-devel/arch/sparc64/console.c 2008-08-06 23:24:48 UTC (rev 223)
+++ openbios-devel/arch/sparc64/console.c 2008-08-09 12:52:34 UTC (rev 224)
@@ -309,6 +309,15 @@
while (inb(0x64) & 2);
}
+static void keyboard_controller_cmd(unsigned char cmd, unsigned char val)
+{
+ outb(cmd, 0x64);
+ /* wait until keyboard controller accepts cmds: */
+ while (inb(0x64) & 2);
+ outb(val, 0x60);
+ while (inb(0x64) & 2);
+}
+
static char keyboard_poll(void)
{
unsigned int c;
@@ -575,4 +584,6 @@
fword("encode-int");
push_str("stdout");
fword("property");
+
+ keyboard_controller_cmd(0x60, 0x40); // Write mode command, translated mode
}
11 years, 10 months
- 1
- 0
r223 - openbios-devel/forth/system
by svn＠openbios.org
Author: stepan
Date: 2008-08-07 01:24:48 +0200 (Thu, 07 Aug 2008)
New Revision: 223
Modified:
openbios-devel/forth/system/ciface.fs
Log:
add set-callback for Aurora 2.0
Modified: openbios-devel/forth/system/ciface.fs
===================================================================
--- openbios-devel/forth/system/ciface.fs 2008-08-06 18:24:51 UTC (rev 222)
+++ openbios-devel/forth/system/ciface.fs 2008-08-06 23:24:48 UTC (rev 223)
@@ -11,6 +11,8 @@
\ private stuff
\ -------------------------------------------------------------
+variable callback-function
+
: ?phandle ( phandle -- phandle )
dup 0= if ." NULL phandle" -1 throw then
;
@@ -267,7 +269,12 @@
\ ." --- " cr
;
-\ : set-callback ( newfunc -- oldfunc ) ;
+: set-callback ( newfunc -- oldfunc )
+ callback-function @
+ swap
+ callback-function !
+;
+
\ : set-symbol-lookup ( sym-to-value -- value-to-sym ) ;
11 years, 10 months
- 1
- 0
r222 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-06 20:24:51 +0200 (Wed, 06 Aug 2008)
New Revision: 222
Modified:
openbios-devel/arch/sparc64/boot.c
Log:
Fix device names to allow Net/OpenBSD to boot
Modified: openbios-devel/arch/sparc64/boot.c
===================================================================
--- openbios-devel/arch/sparc64/boot.c 2008-08-06 18:23:13 UTC (rev 221)
+++ openbios-devel/arch/sparc64/boot.c 2008-08-06 18:24:51 UTC (rev 222)
@@ -39,11 +39,11 @@
path = "/obio/SUNW,fdtwo";
break;
case 'c':
- path = "/pci/isa/ide0/disk@0,0:a";
+ path = "disk";
break;
default:
case 'd':
- path = "/pci/isa/ide1/cdrom@0,0:a";
+ path = "cdrom";
break;
case 'n':
path = "net";
11 years, 10 months
- 1
- 0
r221 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-06 20:23:13 +0200 (Wed, 06 Aug 2008)
New Revision: 221
Modified:
openbios-devel/arch/sparc64/openbios.c
Log:
More realistic mmu_translate
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:57 UTC (rev 220)
+++ openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:23:13 UTC (rev 221)
@@ -22,6 +22,7 @@
#include "boot.h"
#include "../../drivers/timer.h" // XXX
#include "asi.h"
+#include "spitfire.h"
#include "libc/vsprintf.h"
#define REGISTER_NAMED_NODE( name, path ) do { \
@@ -84,22 +85,42 @@
static void
mmu_translate(void)
{
- unsigned long virt, phys;
+ unsigned long virt, phys, tag, data, mask;
+ unsigned int i;
virt = POP();
- asm("ldxa [%1] %2, %0\n"
- : "=r"(phys) : "r" (virt), "i" (ASI_DTLB_TAG_READ));
-
- if (phys & 0x8000000000000000) { // Valid entry?
- phys &= 0x000001fffffff000;
- PUSH(phys & 0xffffffff);
- PUSH(phys >> 32);
- PUSH(0); // XXX
- PUSH(-1);
- } else {
- PUSH(0);
+ for (i = 0; i < 64; i++) {
+ data = spitfire_get_dtlb_data(i);
+ if (data & 0x8000000000000000) { // Valid entry?
+ switch ((data >> 61) & 3) {
+ default:
+ case 0x0: // 8k
+ mask = 0xffffffffffffe000ULL;
+ break;
+ case 0x1: // 64k
+ mask = 0xffffffffffff0000ULL;
+ break;
+ case 0x2: // 512k
+ mask = 0xfffffffffff80000ULL;
+ break;
+ case 0x3: // 4M
+ mask = 0xffffffffffc00000ULL;
+ break;
+ }
+ tag = spitfire_get_dtlb_tag(i);
+ if ((virt & mask) == (tag & mask)) {
+ phys = tag & mask & 0x000001fffffff000;
+ phys |= virt & ~mask;
+ PUSH(phys & 0xffffffff);
+ PUSH(phys >> 32);
+ PUSH(data & 0xfff);
+ PUSH(-1);
+ return;
+ }
+ }
}
+ PUSH(0);
}
static void
11 years, 10 months
- 1
- 0
r220 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-06 20:20:57 +0200 (Wed, 06 Aug 2008)
New Revision: 220
Modified:
openbios-devel/arch/sparc64/openbios.c
Log:
Fix typo
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:12 UTC (rev 219)
+++ openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:57 UTC (rev 220)
@@ -164,7 +164,7 @@
} else if (currsize >= PAGE_SIZE_512K &&
(virt & PAGE_MASK_512K) == 0 &&
(phys & PAGE_MASK_512K) == 0) {
- currsize = PAGE_SIZE_8K;
+ currsize = PAGE_SIZE_512K;
tte_data = 4ULL << 60;
} else if (currsize >= PAGE_SIZE_64K &&
(virt & PAGE_MASK_64K) == 0 &&
11 years, 10 months
- 1
- 0
r219 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-06 20:20:12 +0200 (Wed, 06 Aug 2008)
New Revision: 219
Modified:
openbios-devel/arch/sparc64/openbios.c
openbios-devel/arch/sparc64/tree.fs
Log:
Fix #size-cells for HelenOS, add /openprom/version node
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:59:05 UTC (rev 218)
+++ openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:12 UTC (rev 219)
@@ -216,6 +216,21 @@
//unmap_pages(virt, size);
}
+/*
+ 3.6.5 claim
+ ( virt size align -- base )
+*/
+static void
+mmu_claim(void)
+{
+ unsigned long virt, size, align;
+
+ align = POP();
+ size = POP();
+ virt = POP();
+ PUSH(virt); // XXX
+}
+
DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0);
NODE_METHODS(mmu) = {
@@ -226,6 +241,7 @@
{ "SUNW,itlb-load", itlb_load },
{ "map", mmu_map },
{ "unmap", mmu_unmap },
+ { "claim", mmu_claim },
};
/*
Modified: openbios-devel/arch/sparc64/tree.fs
===================================================================
--- openbios-devel/arch/sparc64/tree.fs 2008-08-02 10:59:05 UTC (rev 218)
+++ openbios-devel/arch/sparc64/tree.fs 2008-08-06 18:20:12 UTC (rev 219)
@@ -1,7 +1,7 @@
" /" find-device
2 encode-int " #address-cells" property
- 1 encode-int " #size-cells" property
+ 2 encode-int " #size-cells" property
" sun4u" encode-string " compatible" property
\ : encode-unit encode-unit-sbus ;
@@ -13,6 +13,7 @@
: open true ;
: close ;
\ claim ( phys size align -- base )
+ : claim 2drop ;
\ release ( phys size -- )
finish-device
@@ -22,9 +23,12 @@
: open true ;
: close ;
\ claim ( phys size align -- base )
+ : claim 2drop ;
\ release ( phys size -- )
finish-device
" /options" find-device
" disk" encode-string " boot-from" property
+" /openprom" find-device
+ " OBP 3.10.24 1999/01/01 01:01" encode-string " version" property
11 years, 10 months
- 1
- 0
r218 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-02 12:59:05 +0200 (Sat, 02 Aug 2008)
New Revision: 218
Modified:
openbios-devel/arch/sparc64/boot.c
openbios-devel/arch/sparc64/ldscript
openbios-devel/arch/sparc64/openbios.c
Log:
Finally fix the very obscure problem which prevented normal and especially
FCode boot: too small heap (used for Forth memory)!
Remove forced arch_init and boot hacks
Modified: openbios-devel/arch/sparc64/boot.c
===================================================================
--- openbios-devel/arch/sparc64/boot.c 2008-08-02 10:53:24 UTC (rev 217)
+++ openbios-devel/arch/sparc64/boot.c 2008-08-02 10:59:05 UTC (rev 218)
@@ -39,11 +39,11 @@
path = "/obio/SUNW,fdtwo";
break;
case 'c':
- path = "disk";
+ path = "/pci/isa/ide0/disk@0,0:a";
break;
default:
case 'd':
- path = "cdrom";
+ path = "/pci/isa/ide1/cdrom@0,0:a";
break;
case 'n':
path = "net";
Modified: openbios-devel/arch/sparc64/ldscript
===================================================================
--- openbios-devel/arch/sparc64/ldscript 2008-08-02 10:53:24 UTC (rev 217)
+++ openbios-devel/arch/sparc64/ldscript 2008-08-02 10:59:05 UTC (rev 218)
@@ -10,8 +10,8 @@
*/
BASE_ADDR = 0x00000000ffd00000;
-/* 16KB heap and stack */
-HEAP_SIZE = 16384;
+/* 512KB heap and 16KB stack */
+HEAP_SIZE = 512 * 1024;
STACK_SIZE = 16384;
VMEM_SIZE = 128 * 1024;
IOMEM_SIZE = 256 * 1024 + 768 * 1024;
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:53:24 UTC (rev 217)
+++ openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:59:05 UTC (rev 218)
@@ -52,8 +52,6 @@
static uint8_t idprom[32];
-static const char *bootpath;
-
struct cpudef {
unsigned long iu_version;
const char *name;
@@ -410,6 +408,7 @@
unsigned char *nvptr = (unsigned char *)&nv_info;
uint32_t size;
const struct cpudef *cpu;
+ const char *bootpath;
for (i = 0; i < sizeof(ohwcfg_v3_t); i++) {
outb(i & 0xff, 0x74);
@@ -674,6 +673,7 @@
device_end();
bind_func("platform-boot", boot );
+ printk("\n"); // XXX needed for boot, why?
}
int openbios(void)
@@ -723,10 +723,6 @@
#endif
enterforth((xt_t)PC);
- arch_init(); // XXX
- printk("force boot\n");
- push_str(bootpath);
- boot(); // XXX
printk("falling off...\n");
return 0;
}
11 years, 10 months
- 1
- 0
r217 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-02 12:53:24 +0200 (Sat, 02 Aug 2008)
New Revision: 217
Modified:
openbios-devel/arch/sparc64/openbios.c
Log:
Add bootargs property for kernel command line
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:51:51 UTC (rev 216)
+++ openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:53:24 UTC (rev 217)
@@ -605,6 +605,11 @@
fword("encode-string");
push_str("bootpath");
fword("property");
+
+ push_str(obio_cmdline);
+ fword("encode-string");
+ push_str("bootargs");
+ fword("property");
}
void arch_nvram_put(char *data)
11 years, 10 months
- 1
- 0
r216 - openbios-devel/arch/sparc64
by svn＠openbios.org
Author: blueswirl
Date: 2008-08-02 12:51:51 +0200 (Sat, 02 Aug 2008)
New Revision: 216
Modified:
openbios-devel/arch/sparc64/openbios.c
Log:
Fix wrong translations
Modified: openbios-devel/arch/sparc64/openbios.c
===================================================================
--- openbios-devel/arch/sparc64/openbios.c 2008-07-22 07:07:37 UTC (rev 215)
+++ openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:51:51 UTC (rev 216)
@@ -512,16 +512,16 @@
push_str("/virtual-memory");
fword("find-device");
- // 0 to va2pa(_start): 1:1
+ // 0 to 16M: 1:1
PUSH(0);
fword("encode-int");
PUSH(0);
fword("encode-int");
fword("encode+");
- PUSH((va2pa((unsigned long)&_data) - 8192) >> 32);
+ PUSH(0);
fword("encode-int");
fword("encode+");
- PUSH((va2pa((unsigned long)&_data) - 8192) & 0xffffffff);
+ PUSH(16 * 1024 * 1024);
fword("encode-int");
fword("encode+");
PUSH(0x80000000);
@@ -555,7 +555,7 @@
PUSH(0);
fword("encode-int");
fword("encode+");
- PUSH((unsigned long)&_start);
+ PUSH((unsigned long)&_data);
fword("encode-int");
fword("encode+");
PUSH(0);
11 years, 10 months
- 1
- 0