OpenBIOS May 2006

openbios@openbios.org

8 participants
40 discussions

by Stefan Reinauer

Hi, some voices whisper that EFI programs are so much easier and simpler than Open Firmware. I am not making any statement but let you, much valued readers, decide here: http://www.osxbook.com/book/bonus/chapter4/efiprogramming/ vs: http://www.kernelthread.com/hanoi/src/hanoimania/hanoi.macprom Regards, Stefan

15 years

Sparc progress, sort of

by Blue Swirl

I noticed that when using the preloaded kernel, the kernel has 4 bytes memory corruption at address 0xf001000c (physical 0x1000c). The corrupting value is 0x7ffffffff, MAXINT. If I restore the original value manually from gdb session, Linux boots much better. I haven't yet found where the corruption happens. I made a dirty (don't commit this) version which takes the hardcoded prom tree and tree browsing functions from Proll. If OLD_OBP is enabled, the version can boot Linux as well as Proll/Qemu can at the moment, meaning that we can reach the userland installer without any faults. There could be bugs in the Forth-based tree, or maybe calling Forth is not working so well after Linux has started doing more things. _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

15 years

Re: [OpenBIOS] old shoes vs new shoes.

by Asif Haswarey

My 2 pennies, I know EFI device driver developers here at work and I know for sure that among other things EFI's debugging framework is not as powerful as OpenFirmware. Heck! you can literally _interactively_ develope an FCode driver in OpenFirmware. This you cannot do in EFI. Perhaps OpenBIOS will be to EFI/x86Bios, what Linux is to Windows today. We'll find out within the next ~5 years. _____________ Asif Haswarey C1069W QLogic Corporation 26650 Aliso Viejo Parkway Aliso Viejo, CA 92656 Phone: 949.389.7607 Fax: 949.389.6308 -----Original Message----- From: openbios-bounces(a)openbios.org [mailto:openbios-bounces@openbios.org] On Behalf Of Ronald G Minnich Sent: Tuesday, May 23, 2006 9:42 AM To: The OpenBIOS Mailinglist Subject: Re: [OpenBIOS] old shoes vs new shoes. Stefan Reinauer wrote: > Hi, > > some voices whisper that EFI programs are so much easier and simpler > than Open Firmware. I am not making any statement but let you, much > valued readers, decide here: > > http://www.osxbook.com/book/bonus/chapter4/efiprogramming/ yes, but EFI is such a powerful operating system! And, fortunately, the API is totally new and incompatible with EVERYTHING, and it's not a very good API, so we get the benefit of having to learn a whole new api, with a special toolchain, that is useless for everything else we do. I am sure I have not listed all the benefits of this new EFI operating system :-) ron -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you

15 years

r29 - openbios-devel/arch/ppc

by svn＠openbios.org

Author: stepan Date: 2006-05-23 00:37:46 +0200 (Tue, 23 May 2006) New Revision: 29 Modified: openbios-devel/arch/ppc/kernel.c Log: forgot this one Modified: openbios-devel/arch/ppc/kernel.c =================================================================== --- openbios-devel/arch/ppc/kernel.c 2006-05-22 22:36:01 UTC (rev 28) +++ openbios-devel/arch/ppc/kernel.c 2006-05-22 22:37:46 UTC (rev 29) @@ -36,12 +36,6 @@ /* F U N C T I O N S */ /************************************************************************/ -void -exception( int errcode ) -{ - /* no-op */ -} - int forth_segv_handler( char *segv_addr ) {

15 years

r28 - in openbios-devel: arch/amd64 arch/sparc32 arch/x86 include/amd64 include/openbios include/ppc include/x86 kernel

by svn＠openbios.org

Author: stepan Date: 2006-05-23 00:36:01 +0200 (Tue, 23 May 2006) New Revision: 28 Modified: openbios-devel/arch/amd64/openbios.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/x86/openbios.c openbios-devel/include/amd64/io.h openbios-devel/include/openbios/bindings.h openbios-devel/include/openbios/drivers.h openbios-devel/include/ppc/io.h openbios-devel/include/x86/io.h openbios-devel/kernel/forth.c openbios-devel/kernel/internal.c Log: drop io from bootstrap and exception stuff from non-bootstrap compiles. Modified: openbios-devel/arch/amd64/openbios.c =================================================================== --- openbios-devel/arch/amd64/openbios.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/arch/amd64/openbios.c 2006-05-22 22:36:01 UTC (rev 28) @@ -34,14 +34,6 @@ PUSH(0x9FFFF); } -void exception(cell no) -{ - /* The exception mechanism is used during bootstrap to catch - * build errors. In a running system this is a noop since we - * can't break out to the unix host os anyways. - */ -} - static void arch_init( void ) { Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:36:01 UTC (rev 28) @@ -39,14 +39,6 @@ PUSH((unsigned int)&_eheap); } -void exception(__attribute__((unused))cell no) -{ - /* The exception mechanism is used during bootstrap to catch - * build errors. In a running system this is a noop since we - * can't break out to the unix host os anyways. - */ -} - static void arch_init( void ) { Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/arch/x86/openbios.c 2006-05-22 22:36:01 UTC (rev 28) @@ -34,14 +34,6 @@ PUSH(0x9FFFF); } -void exception(cell no) -{ - /* The exception mechanism is used during bootstrap to catch - * build errors. In a running system this is a noop since we - * can't break out to the unix host os anyways. - */ -} - static void arch_init( void ) { Modified: openbios-devel/include/amd64/io.h =================================================================== --- openbios-devel/include/amd64/io.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/amd64/io.h 2006-05-22 22:36:01 UTC (rev 28) @@ -42,27 +42,8 @@ __asm__ __volatile__("rep; ins" #bwl : "+D"(addr), "+c"(count) : "d"(port)); \ } -#ifndef BOOTSTRAP BUILDIO(b,b,char) BUILDIO(w,w,short) BUILDIO(l,,int) -#else -#ifdef FCOMPILER -#define inb(reg) ((u8)0xff) -#define inw(reg) ((u16)0xffff) -#define inl(reg) ((u32)0xffffffff) -#define outb(reg, val) /* nothing */ -#define outw(reg, val) /* nothing */ -#define outl(reg, val) /* nothing */ -#else -extern u8 inb( u32 reg ); -extern u16 inw( u32 reg ); -extern u32 inl( u32 reg ); -extern void insw( u32 reg, void *addr, unsigned long count ); -extern void outb( u32 reg, u8 val ); -extern void outw( u32 reg, u16 val ); -extern void outl( u32 reg, u32 val ); -extern void outsw( u32 reg, const void *addr, unsigned long count); + #endif -#endif -#endif Modified: openbios-devel/include/openbios/bindings.h =================================================================== --- openbios-devel/include/openbios/bindings.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/openbios/bindings.h 2006-05-22 22:36:01 UTC (rev 28) @@ -26,7 +26,6 @@ /* initialization */ extern int initialize_forth( void ); -extern void exception( cell errcode ); /* panic */ extern int forth_segv_handler( char *segv_addr ); Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/openbios/drivers.h 2006-05-22 22:36:01 UTC (rev 28) @@ -21,7 +21,7 @@ int ob_ide_init(void); #endif #ifdef CONFIG_DRIVER_ESP -int ob_esp_init(void); +int ob_esp_init(unsigned long base); #endif #ifdef CONFIG_DRIVER_OBIO int ob_obio_init(unsigned long slavio_base); Modified: openbios-devel/include/ppc/io.h =================================================================== --- openbios-devel/include/ppc/io.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/ppc/io.h 2006-05-22 22:36:01 UTC (rev 28) @@ -143,23 +143,6 @@ ns--; } } -#else /* BOOTSTRAP */ -#ifdef FCOMPILER -#define inb(reg) ((u8)0xff) -#define inw(reg) ((u16)0xffff) -#define inl(reg) ((u32)0xffffffff) -#define outb(reg, val) // nothing -#define outw(reg, val) // nothing -#define outl(reg, val) // nothing -#else -extern u8 inb(u32 reg); -extern u16 inw(u32 reg); -extern u32 inl(u32 reg); -extern void insw(u32 reg, void *addr, unsigned long count); -extern void outb(u32 reg, u8 val); -extern void outw(u32 reg, u16 val); -extern void outl(u32 reg, u32 val); -extern void outsw(u32 reg, const void *addr, unsigned long count); #endif -#endif + #endif /* _ASM_IO_H */ Modified: openbios-devel/include/x86/io.h =================================================================== --- openbios-devel/include/x86/io.h 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/include/x86/io.h 2006-05-22 22:36:01 UTC (rev 28) @@ -46,25 +46,6 @@ BUILDIO(b,b,char) BUILDIO(w,w,short) BUILDIO(l,,int) -#else -#ifdef FCOMPILER -#define inb(reg) ((u8)0xff) -#define inw(reg) ((u16)0xffff) -#define inl(reg) ((u32)0xffffffff) -// #define insw( u32 reg, void *addr, unsigned long count ); -#define outb(reg, val) // nothing -#define outw(reg, val) // nothing -#define outl(reg, val) // nothing -// #define outsw( u32 reg, const void *addr, unsigned long count); -#else -extern u8 inb( u32 reg ); -extern u16 inw( u32 reg ); -extern u32 inl( u32 reg ); -extern void insw( u32 reg, void *addr, unsigned long count ); -extern void outb( u32 reg, u8 val ); -extern void outw( u32 reg, u16 val ); -extern void outl( u32 reg, u32 val ); -extern void outsw( u32 reg, const void *addr, unsigned long count); #endif + #endif -#endif Modified: openbios-devel/kernel/forth.c =================================================================== --- openbios-devel/kernel/forth.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/kernel/forth.c 2006-05-22 22:36:01 UTC (rev 28) @@ -796,9 +796,11 @@ static void emit(void) { +#ifndef FCOMPILER cell tmp = POP(); -#ifndef FCOMPILER putchar(tmp); +#else + (void) POP(); #endif } @@ -834,8 +836,13 @@ static void iocfetch(void) { +#ifndef FCOMPILER cell reg = POP(); PUSH(inb(reg)); +#else + (void)POP(); + PUSH(0); +#endif } @@ -845,8 +852,13 @@ static void iowfetch(void) { +#ifndef FCOMPILER cell reg = POP(); PUSH(inw(reg)); +#else + (void)POP(); + PUSH(0); +#endif } /* @@ -855,8 +867,13 @@ static void iolfetch(void) { +#ifndef FCOMPILER cell reg = POP(); PUSH(inl(reg)); +#else + (void)POP(); + PUSH(0); +#endif } @@ -866,10 +883,15 @@ static void iocstore(void) { +#ifndef FCOMPILER cell reg = POP(); cell val = POP(); outb(reg, val); +#else + (void)POP(); + (void)POP(); +#endif } @@ -879,10 +901,15 @@ static void iowstore(void) { +#ifndef FCOMPILER cell reg = POP(); cell val = POP(); outw(reg, val); +#else + (void)POP(); + (void)POP(); +#endif } @@ -892,10 +919,15 @@ static void iolstore(void) { +#ifndef FCOMPILER ucell reg = POP(); ucell val = POP(); outl(reg, val); +#else + (void)POP(); + (void)POP(); +#endif } /* Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2006-05-22 22:16:20 UTC (rev 27) +++ openbios-devel/kernel/internal.c 2006-05-22 22:36:01 UTC (rev 28) @@ -179,7 +179,9 @@ static void sysdebug(void) { cell errorno=POP(); +#ifdef FCOMPILER exception(errorno); +#endif } static void dodoes(void)

15 years

r27 - in openbios-devel: arch/sparc32 config/examples include/sparc32

by svn＠openbios.org

Author: stepan Date: 2006-05-23 00:16:20 +0200 (Tue, 23 May 2006) New Revision: 27 Modified: openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/elfload.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc32/tree.fs openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/include/sparc32/io.h Log: openbios.patch-15-svn25.bz2 part II merge Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/arch/sparc32/aoutload.c 2006-05-22 22:16:20 UTC (rev 27) @@ -57,16 +57,23 @@ int image_retval; struct exec ehdr; unsigned long start, size; + unsigned int offset; image_name = image_version = 0; if (!file_open(filename)) goto out; - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { - debug("Can't read a.out header\n"); - retval = LOADER_NOT_SUPPORT; - goto out; + for (offset = 0; offset < 16 * 512; offset += 512) { + if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read a.out header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + if (!N_BADMAG(ehdr)) + break; + + file_seek(offset); } if (N_BADMAG(ehdr)) { @@ -76,9 +83,9 @@ } if (N_MAGIC(ehdr) == NMAGIC) { - size = N_DATADDR(ehdr) + ehdr.a_data; + size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data); } else { - size = ehdr.a_text + ehdr.a_data; + size = addr_fixup(ehdr.a_text) + addr_fixup(ehdr.a_data); } start = 0x4000; // N_TXTADDR(ehdr); @@ -88,7 +95,7 @@ printf("Loading a.out %s...\n", image_name ? image_name : "image"); - file_seek(N_TXTOFF(ehdr)); + file_seek(offset + N_TXTOFF(ehdr)); if (N_MAGIC(ehdr) == NMAGIC) { if (lfile_read(start, ehdr.a_text) != ehdr.a_text) { @@ -108,18 +115,19 @@ debug("Loaded %lu bytes\n", size); - debug("entry point is %#x\n", start); + debug("entry point is %#lx\n", start); printf("Jumping to entry point...\n"); #if 1 { extern unsigned int qemu_mem_size; + extern char boot_device; void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device); int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); const void *romvec; - romvec = init_openprom(qemu_mem_size, cmdline, 'c'); + romvec = init_openprom(qemu_mem_size, cmdline, boot_device); entry = (void *) addr_fixup(start); image_retval = entry(romvec, 0, 0, 0, 0); } Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/arch/sparc32/boot.c 2006-05-22 22:16:20 UTC (rev 27) @@ -16,24 +16,54 @@ void boot(void); struct sys_info sys_info; +uint32_t kernel_image; +uint32_t kernel_size; +uint32_t cmdline; +uint32_t cmdline_size; +char boot_device; void boot(void) { char *path=pop_fstr_copy(), *param; - // char *param="root=/dev/hda2 console=ttyS0,115200n8 console=tty0"; - + if (kernel_size) { + extern unsigned int qemu_mem_size; + void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device); + + int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + const void *romvec; + + printk("[sparc] Kernel already loaded\n"); + romvec = init_openprom(qemu_mem_size, (void *)cmdline, boot_device); + entry = (void *) kernel_image; + entry(romvec, 0, 0, 0, 0); + } + if(!path) { + switch(boot_device) { + case 'a': + path = "/obio/SUNW,fdtwo"; + break; + case 'c': + path = "disk"; + break; + default: + case 'd': path = "cdrom"; - //printk("[sparc] Booting default not supported.\n"); - //return; + break; + case 'n': + path = "net"; + break; + } } param = strchr(path, ' '); if(param) { *param = '\0'; param++; - } + } else if (cmdline_size) { + param = (char *)cmdline; + } printk("[sparc] Booting file '%s' with parameters '%s'\n",path, param); Modified: openbios-devel/arch/sparc32/elfload.c =================================================================== --- openbios-devel/arch/sparc32/elfload.c 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/arch/sparc32/elfload.c 2006-05-22 22:16:20 UTC (rev 27) @@ -76,7 +76,8 @@ } static unsigned long process_image_notes(Elf_phdr *phdr, int phnum, - unsigned short *sum_ptr) + unsigned short *sum_ptr, + unsigned int offset) { int i; char *buf = NULL; @@ -90,7 +91,7 @@ if (phdr[i].p_type != PT_NOTE) continue; buf = malloc(phdr[i].p_filesz); - file_seek(phdr[i].p_offset); + file_seek(offset + phdr[i].p_offset); if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read note segment\n"); goto out; @@ -132,7 +133,8 @@ } static int load_segments(Elf_phdr *phdr, int phnum, - unsigned long checksum_offset) + unsigned long checksum_offset, + unsigned int offset) { unsigned long bytes; //unsigned int start_time, time; @@ -145,7 +147,7 @@ continue; debug("segment %d addr:%#x file:%#x mem:%#x ", i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); - file_seek(phdr[i].p_offset); + file_seek(offset + phdr[i].p_offset); debug("loading... "); if (lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) != phdr[i].p_filesz) { @@ -309,16 +311,24 @@ Elf_Bhdr *boot_notes = NULL; int retval = -1; int image_retval; + unsigned int offset; image_name = image_version = 0; if (!file_open(filename)) goto out; - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { - debug("Can't read ELF header\n"); - retval = LOADER_NOT_SUPPORT; - goto out; + for (offset = 0; offset < 16 * 512; offset += 512) { + if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read ELF header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + + if (ehdr.e_ident[EI_MAG0] == ELFMAG0) + break; + + file_seek(offset); } if (ehdr.e_ident[EI_MAG0] != ELFMAG0 @@ -339,7 +349,7 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); - file_seek(ehdr.e_phoff); + file_seek(offset + ehdr.e_phoff); if (lfile_read(phdr, phdr_size) != phdr_size) { printf("Can't read program header\n"); goto out; @@ -348,14 +358,14 @@ if (!check_mem_ranges(info, phdr, ehdr.e_phnum)) goto out; - checksum_offset = process_image_notes(phdr, ehdr.e_phnum, &checksum); + checksum_offset = process_image_notes(phdr, ehdr.e_phnum, &checksum, offset); printf("Loading %s", image_name ? image_name : "image"); if (image_version) printf(" version %s", image_version); printf("...\n"); - if (!load_segments(phdr, ehdr.e_phnum, checksum_offset)) + if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset)) goto out; if (checksum_offset) { @@ -373,12 +383,13 @@ #if 1 { extern unsigned int qemu_mem_size; + extern char boot_device; void *init_openprom(unsigned long memsize, const char *cmdline, char boot_device); int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); const void *romvec; - romvec = init_openprom(qemu_mem_size, cmdline, 'c'); + romvec = init_openprom(qemu_mem_size, cmdline, boot_device); entry = (void *) addr_fixup(ehdr.e_entry); image_retval = entry(romvec, 0, 0, 0, 0); } Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/arch/sparc32/openbios.c 2006-05-22 22:16:20 UTC (rev 27) @@ -19,6 +19,10 @@ void boot(void); void ob_ide_init(void); +#define IOMMU_BASE 0x10000000 /* First page of sun4m IOMMU */ +#define SLAVIO_BASE 0x71000000 +#define MACIO_BASE 0x70000000 + static unsigned char intdict[256 * 1024]; static void init_memory(void) @@ -50,17 +54,19 @@ modules_init(); #ifdef CONFIG_DRIVER_SBUS - init_mmu_swift(); + init_mmu_swift(IOMMU_BASE); ob_sbus_init(); #endif #ifdef CONFIG_DRIVER_ESP - ob_esp_init(); + ob_esp_init(MACIO_BASE); #endif #ifdef CONFIG_DRIVER_OBIO - ob_obio_init(0x71000000); + ob_obio_init(SLAVIO_BASE); + nvram_init(); #endif device_end(); + bind_func("platform-boot", boot ); } Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/arch/sparc32/romvec.c 2006-05-22 22:16:20 UTC (rev 27) @@ -61,9 +61,6 @@ static void (*synch_hook)(void); static struct linux_romvec romvec0; -static int prop_mem_reg[3]; -static int prop_mem_avail[3]; -static int prop_vmem_avail[6]; static void doublewalk(__attribute__((unused)) unsigned int ptab1, __attribute__((unused)) unsigned int va) @@ -418,31 +415,18 @@ /* * Form memory descriptors. */ - totphys[0].theres_more = 0; + totphys[0].theres_more = NULL; totphys[0].start_adr = (char *) 0; totphys[0].num_bytes = memsize; - totavail[0].theres_more = 0; - totavail[0].start_adr = (char*) 0; + totavail[0].theres_more = NULL; + totavail[0].start_adr = (char *) 0; totavail[0].num_bytes = memsize; - totmap[0].theres_more = 0; + totmap[0].theres_more = NULL; totmap[0].start_adr = &_start; totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start; - prop_mem_reg[0] = 0; - prop_mem_reg[1] = 0; - prop_mem_reg[2] = memsize; - prop_mem_avail[0] = 0; - prop_mem_avail[1] = 0; - prop_mem_avail[2] = va2pa((unsigned long)&_data) - 1; - prop_vmem_avail[0] = 0; - prop_vmem_avail[1] = 0; - prop_vmem_avail[2] = (unsigned long)&_start - 1; - prop_vmem_avail[3] = 0; - prop_vmem_avail[4] = 0xffe00000; - prop_vmem_avail[5] = 0x00200000; - // Linux wants a R/W romvec table romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC; romvec0.pv_romvers = 0; @@ -478,6 +462,7 @@ romvec0.pv_v2devops.v2_dev_seek = obp_devseek; obp_arg.boot_dev_ctrl = 0; obp_arg.boot_dev_unit = 0; + obp_arg.dev_partition = 4; obp_arg.argv[0] = "sd(0,0,0):d"; switch(boot_device) { @@ -503,7 +488,7 @@ } obp_arg.argv[1] = cmdline; romvec0.pv_v2bootargs.bootpath = &obp_arg.argv[0]; - romvec0.pv_v2bootargs.bootargs = &cmdline; + romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1]; romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin; romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout; Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/arch/sparc32/tree.fs 2006-05-22 22:16:20 UTC (rev 27) @@ -5,9 +5,6 @@ " SUNW,SparcStation-5" encode-string " name" property " SparcStation" encode-string " banner-name" property " sun4m" encode-string " compatible" property - h# 01800000 encode-int 0 encode-int encode+ 0 encode-int encode+ h# 00000081 encode-int encode+ - 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ - " idprom" property \ XXX " /obio/zs@0,100000:a" encode-string " stdin-path" property " /obio/zs@0,100000:a" encode-string " stdout-path" property : encode-unit encode-unit-sbus ; @@ -15,8 +12,6 @@ new-device " memory" device-name - h# 100000 encode-int " available" property \ XXX - h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property \ XXX external : open true ; : close ; @@ -26,8 +21,6 @@ new-device " virtual-memory" device-name - h# 100000 encode-int " available" property \ XXX - h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property \ XXX external : open true ; : close ; @@ -131,7 +124,6 @@ " /iommu/sbus" find-device new-device " espdma" device-name - h# 4 encode-int h# 08400000 encode-int encode+ h# 00000010 encode-int encode+ " reg" property external : encode-unit encode-unit-sbus ; : decode-unit decode-unit-sbus ; @@ -180,76 +172,6 @@ : decode-unit decode-unit-sbus ; finish-device -" /obio" find-device -new-device - " SUNW,fdtwo" device-name - " block" device-type - h# 0 encode-int h# 00400000 encode-int encode+ h# 0000000f encode-int encode+ " reg" property - h# 2b encode-int 0 encode-int encode+ " intr" property -finish-device - -" /obio" find-device -new-device - " auxio" device-name - h# 0 encode-int h# 00900000 encode-int encode+ h# 00000001 encode-int encode+ " reg" property -finish-device - -" /obio" find-device -new-device - " counter" device-name - h# 0 encode-int h# 00d00000 encode-int encode+ h# 00000010 encode-int encode+ - h# 0 encode-int encode+ h# 00d10000 encode-int encode+ h# 00000010 encode-int encode+ - " reg" property -finish-device - -" /obio" find-device -new-device - " eeprom" device-name - h# 0 encode-int h# 00200000 encode-int encode+ h# 00002000 encode-int encode+ " reg" property - " mk48t08" model -finish-device - -" /obio" find-device -new-device - " interrupt" device-name - h# 0 encode-int h# 00e00000 encode-int encode+ h# 00000010 encode-int encode+ - h# 0 encode-int encode+ h# 00e10000 encode-int encode+ h# 00000010 encode-int encode+ - " reg" property -finish-device - -" /obio" find-device -new-device - " power" device-name - h# 0 encode-int h# 00910000 encode-int encode+ h# 00000001 encode-int encode+ " reg" property - h# 22 encode-int 0 encode-int encode+ " intr" property -finish-device - -" /obio" find-device -new-device - " slavioconfig" device-name - h# 0 encode-int h# 00800000 encode-int encode+ h# 00000001 encode-int encode+ " reg" property -finish-device - -" /obio" find-device -new-device - " zs" device-name - " serial" device-type - h# 0 encode-int h# 00000000 encode-int encode+ h# 00000008 encode-int encode+ " reg" property - 1 encode-int " slave" property - h# 2c encode-int 0 encode-int encode+ " intr" property - -1 encode-int " keyboard" property - -1 encode-int " mouse" property -finish-device - -" /obio" find-device -new-device - " zs" device-name - " serial" device-type - h# 0 encode-int h# 00100000 encode-int encode+ h# 00000008 encode-int encode+ " reg" property - 0 encode-int " slave" property - h# 2c encode-int 0 encode-int encode+ " intr" property -finish-device - " /options" find-device " disk" encode-string " boot-from" property Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 22:16:20 UTC (rev 27) @@ -61,6 +61,7 @@ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/config/examples/sparc32_config.xml 2006-05-22 22:16:20 UTC (rev 27) @@ -61,6 +61,7 @@ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2006-05-22 22:10:54 UTC (rev 26) +++ openbios-devel/include/sparc32/io.h 2006-05-22 22:16:20 UTC (rev 27) @@ -38,7 +38,7 @@ void *mem_zalloc(struct mem *t, int size, int align); int map_page(unsigned long va, unsigned long epa, int type); void *map_io(unsigned pa, int size); -void init_mmu_swift(void); +void init_mmu_swift(unsigned long base); void *dvma_alloc(int size, unsigned int *pphys); #ifndef BOOTSTRAP

15 years

r26 - openbios-devel/drivers

by svn＠openbios.org

Author: stepan Date: 2006-05-23 00:10:54 +0200 (Tue, 23 May 2006) New Revision: 26 Added: openbios-devel/drivers/obio.h Modified: openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c Log: drivers part from openbios.patch-15-svn25.bz2 Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2006-05-22 10:37:34 UTC (rev 25) +++ openbios-devel/drivers/esp.c 2006-05-22 22:10:54 UTC (rev 26) @@ -25,8 +25,9 @@ #include "asm/dma.h" #include "esp.h" -#define PHYS_JJ_ESPDMA 0x78400000 /* ESP DMA controller */ -#define PHYS_JJ_ESP 0x78800000 /* ESP SCSI */ +#define MACIO_ESPDMA 0x08400000 /* ESP DMA controller */ +#define MACIO_ESP 0x08800000 /* ESP SCSI */ + #define BUFSIZE 4096 #define REGISTER_NAMED_NODE( name, path ) do { \ @@ -294,16 +295,14 @@ static int -espdma_init(struct esp_dma *espdma) +espdma_init(unsigned long base, struct esp_dma *espdma) { - void *p; + espdma->regs = (void *)map_io(base + MACIO_ESPDMA, 0x10); - /* Hardcode everything for MrCoffee. */ - if ((p = (void *)map_io(PHYS_JJ_ESPDMA, 0x10)) == 0) { + if (espdma->regs == 0) { DPRINTF("espdma_init: cannot map registers\n"); return -1; } - espdma->regs = p; DPRINTF("dma1: "); @@ -340,6 +339,21 @@ } DPRINTF("\n"); + push_str("/iommu/sbus/espdma"); + fword("find-device"); + + /* set reg */ + PUSH(4); + fword("encode-int"); + PUSH(MACIO_ESPDMA); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000010); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + return 0; } @@ -358,7 +372,7 @@ /* set reg */ PUSH(4); fword("encode-int"); - PUSH(0x08800000); + PUSH(MACIO_ESP); fword("encode-int"); fword("encode+"); PUSH(0x00000010); @@ -407,7 +421,8 @@ fword("property"); } -int ob_esp_init(void) +int +ob_esp_init(unsigned long base) { int id, diskcount = 0, cdcount = 0, *counter_ptr; char nodebuff[256], aliasbuff[256]; @@ -423,11 +438,11 @@ global_esp = esp; - if (espdma_init(&esp->espdma) != 0) { + if (espdma_init(base, &esp->espdma) != 0) { return -1; } /* Get the IO region */ - esp->ll = (void *)map_io(PHYS_JJ_ESP, sizeof(struct esp_regs)); + esp->ll = (void *)map_io(base + MACIO_ESP, sizeof(struct esp_regs)); if (esp->ll == 0) { DPRINTF("Can't map ESP registers\n"); return -1; Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2006-05-22 10:37:34 UTC (rev 25) +++ openbios-devel/drivers/iommu.c 2006-05-22 22:10:54 UTC (rev 26) @@ -18,7 +18,6 @@ #include "pgtsrmmu.h" #include "iommu.h" -#define PHYS_JJ_IOMMU 0x10000000 /* First page of sun4m IOMMU */ #define IOPERM (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID) #define MKIOPTE(phys) (((((phys)>>4) & IOPTE_PAGE) | IOPERM) & ~IOPTE_WAZ) #define LOWMEMSZ 32 * 1024 * 1024 @@ -61,7 +60,8 @@ #define NCTX_SWIFT 0x100 -static void iommu_init(struct iommu *t); +static void iommu_init(struct iommu *t, unsigned long base); + static void iommu_invalidate(struct iommu_regs *regs) { regs->tlbflush = 0; @@ -199,11 +199,72 @@ * Switch page tables. */ void -init_mmu_swift(void) +init_mmu_swift(unsigned long base) { + extern unsigned int qemu_mem_size; unsigned int addr, i; unsigned long pa, va; + push_str("/memory"); + fword("find-device"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(qemu_mem_size); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(va2pa((unsigned long)&_data) - 1); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + + push_str("/virtual-memory"); + fword("find-device"); + + PUSH(0); + fword("encode-int"); + PUSH(base); + fword("encode-int"); + fword("encode+"); + PUSH(0x300); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(va2pa((unsigned long)&_start) - 1); + fword("encode-int"); + fword("encode+"); + + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(va2pa((unsigned long)&_iomem)); + fword("encode-int"); + fword("encode+"); + PUSH(-va2pa((unsigned long)&_iomem)); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + mem_init(&cio, (char *)&_end, (char *)&_iomem); context_table = mem_zalloc(&cmem, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); @@ -249,7 +310,7 @@ srmmu_set_context(0); srmmu_set_ctable_ptr(va2pa((unsigned long)context_table)); srmmu_flush_whole_tlb(); - iommu_init(&ciommu); + iommu_init(&ciommu, base); } /* * XXX This is a problematic interface. We alloc _memory_ which is uncached. @@ -311,7 +372,7 @@ * the routine is higher in food chain. */ static void -iommu_init(struct iommu *t) +iommu_init(struct iommu *t, unsigned long base) { unsigned int *ptab; int ptsize; @@ -319,7 +380,7 @@ unsigned int impl, vers; unsigned int tmp; - if ((regs = map_io(PHYS_JJ_IOMMU, sizeof(struct iommu_regs))) == 0) { + if ((regs = map_io(base, sizeof(struct iommu_regs))) == 0) { DPRINTF("Cannot map IOMMU\n"); for (;;) { } } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2006-05-22 10:37:34 UTC (rev 25) +++ openbios-devel/drivers/obio.c 2006-05-22 22:10:54 UTC (rev 26) @@ -17,69 +17,395 @@ #include "libc/vsprintf.h" #include "openbios/drivers.h" +#include "openbios/nvram.h" +#include "obio.h" +#define REGISTER_NAMED_NODE( name, path ) do { \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + + +/* DECLARE data structures for the nodes. */ +DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); + static void -ob_zs_init(unsigned long slavio_base) +ob_new_obio_device(const char *name, const char *type) { - unsigned long zs_addr; + push_str("/obio"); + fword("find-device"); + fword("new-device"); - zs_addr = (unsigned long)map_io(slavio_base + 0x0, 8); - push_str("/obio/zs@0,0"); - fword("find-device"); - - PUSH(zs_addr); + push_str(name); + fword("device-name"); + + if (type) { + push_str(type); + fword("device-type"); + } +} + +static unsigned long +ob_reg(unsigned long base, unsigned long offset, unsigned long size, int map) +{ + PUSH(0); fword("encode-int"); - PUSH(sizeof(zs_addr)); + PUSH(offset); fword("encode-int"); fword("encode+"); - push_str("address"); + PUSH(size); + fword("encode-int"); + fword("encode+"); + push_str("reg"); fword("property"); - zs_addr = (unsigned long)map_io(slavio_base + 0x00100000, 8); - push_str("/obio/zs@0,100000"); + if (map) { + unsigned long addr; + + addr = (unsigned long)map_io(base + offset, size); + + PUSH(addr); + fword("encode-int"); + PUSH(4); + fword("encode-int"); + fword("encode+"); + push_str("address"); + fword("property"); + return addr; + } + return 0; +} + +static void +ob_intr(int intr) +{ + PUSH(intr); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("intr"); + fword("property"); +} + + +static void +ob_zs_init(unsigned long base, unsigned long offset, int intr, int slave, int keyboard) +{ + ob_new_obio_device("zs", "serial"); + + ob_reg(base, offset, ZS_REGS, 1); + + PUSH(slave); + fword("encode-int"); + push_str("slave"); + fword("property"); + + if (keyboard) { + PUSH(-1); + fword("encode-int"); + push_str("keyboard"); + fword("property"); + + PUSH(-1); + fword("encode-int"); + push_str("mouse"); + fword("property"); + } + + ob_intr(intr); + + fword("finish-device"); +} + +static char *nvram; +struct qemu_nvram_v1 nv_info; + +void +arch_nvram_get(char *data) +{ + memcpy(data, nvram, NVRAM_SIZE); +} + +void +arch_nvram_put(char *data) +{ + memcpy(nvram, data, NVRAM_SIZE); +} + +int +arch_nvram_size(void) +{ + return NVRAM_SIZE; +} + +static void +ob_nvram_init(unsigned long base, unsigned long offset) +{ + extern uint32_t kernel_image; + extern uint32_t kernel_size; + extern uint32_t cmdline; + extern uint32_t cmdline_size; + extern char boot_device; + + ob_new_obio_device("eeprom", NULL); + + nvram = (char *)ob_reg(base, offset, NVRAM_SIZE, 1); + + memcpy(&nv_info, nvram, sizeof(nv_info)); + + printk("Nvram id %s, version %d\n", nv_info.id_string, nv_info.version); + if (strcmp(nv_info.id_string, "QEMU_BIOS") || nv_info.version != 1) { + printk("Unknown nvram, freezing!\n"); + for (;;); + } + kernel_image = nv_info.kernel_image; + kernel_size = nv_info.kernel_size; + cmdline = nv_info.cmdline; + cmdline_size = nv_info.cmdline_size; + boot_device = nv_info.boot_device; + + push_str("mk48t08"); + fword("model"); + + fword("finish-device"); + + push_str("/"); fword("find-device"); - PUSH(zs_addr); + PUSH((long)&nvram[NVRAM_IDPROM]); + PUSH(32); + fword("encode-bytes"); + push_str("idprom"); + fword("property"); +} + +static void +ob_fd_init(unsigned long base, unsigned long offset, int intr) +{ + ob_new_obio_device("SUNW,fdtwo", "block"); + + ob_reg(base, offset, FD_REGS, 0); + + ob_intr(intr); + + fword("finish-device"); +} + + +static void +ob_sconfig_init(unsigned long base, unsigned long offset) +{ + ob_new_obio_device("slavioconfig", NULL); + + ob_reg(base, offset, SCONFIG_REGS, 0); + + fword("finish-device"); +} + +static void +ob_auxio_init(unsigned long base, unsigned long offset) +{ + ob_new_obio_device("auxio", NULL); + + ob_reg(base, offset, AUXIO_REGS, 0); + + fword("finish-device"); +} + +static void +ob_power_init(unsigned long base, unsigned long offset, int intr) +{ + ob_new_obio_device("power", NULL); + + ob_reg(base, offset, POWER_REGS, 0); + + ob_intr(intr); + + fword("finish-device"); +} + +static void +ob_counter_init(unsigned long base, unsigned long offset) +{ + volatile struct sun4m_timer_regs *regs; + + ob_new_obio_device("counter", NULL); + + PUSH(0); fword("encode-int"); - PUSH(sizeof(zs_addr)); + PUSH(offset); fword("encode-int"); fword("encode+"); - push_str("address"); + PUSH(COUNTER_REGS); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(offset + 0x10000); + fword("encode-int"); + fword("encode+"); + PUSH(COUNTER_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); fword("property"); + + fword("finish-device"); + + regs = map_io(base + offset, sizeof(*regs)); + regs->l10_timer_limit = (((1000000/100) + 1) << 10); + regs->cpu_timers[0].l14_timer_limit = 0; } static void -ob_obio_open(int *idx) +ob_interrupt_init(unsigned long base, unsigned long offset) { + volatile struct sun4m_intregs *regs; + + ob_new_obio_device("interrupt", NULL); + + PUSH(0); + fword("encode-int"); + PUSH(offset); + fword("encode-int"); + fword("encode+"); + PUSH(INTERRUPT_REGS); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(offset + 0x10000); + fword("encode-int"); + fword("encode+"); + PUSH(INTERRUPT_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + fword("finish-device"); + + regs = map_io(base + offset, sizeof(*regs)); + regs->set = ~SUN4M_INT_MASKALL; + regs->cpu_intregs[0].clear = ~0x17fff; +} + + +static void +ob_obio_open(__attribute__((unused))int *idx) +{ int ret=1; RET ( -ret ); } static void -ob_obio_close(int *idx) +ob_obio_close(__attribute__((unused))int *idx) { selfword("close-deblocker"); } static void -ob_obio_initialize(int *idx) +ob_obio_initialize(__attribute__((unused))int *idx) { + push_str("/"); + fword("find-device"); + fword("new-device"); + + push_str("obio"); + fword("device-name"); + + push_str("hierarchical"); + fword("device-type"); + + PUSH(2); + fword("encode-int"); + push_str("#address-cells"); + fword("property"); + + PUSH(1); + fword("encode-int"); + push_str("#size-cells"); + fword("property"); + + fword("finish-device"); } +static void +ob_set_obio_ranges(unsigned long base) +{ + push_str("/obio"); + fword("find-device"); + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(base); + fword("encode-int"); + fword("encode+"); + PUSH(SLAVIO_SIZE); + fword("encode-int"); + fword("encode+"); + push_str("ranges"); + fword("property"); +} -NODE_METHODS(ob_obio_node) = { +static void +ob_obio_decodeunit(__attribute__((unused)) int *idx) +{ + fword("decode-unit-sbus"); +} + + +static void +ob_obio_encodeunit(__attribute__((unused)) int *idx) +{ + fword("encode-unit-sbus"); +} + +NODE_METHODS(ob_obio) = { { NULL, ob_obio_initialize }, { "open", ob_obio_open }, { "close", ob_obio_close }, + { "encode-unit", ob_obio_encodeunit }, + { "decode-unit", ob_obio_decodeunit }, }; -int ob_obio_init(unsigned long slavio_base) +int +ob_obio_init(unsigned long slavio_base) { //printk("Initializing OBIO devices...\n"); - - ob_zs_init(slavio_base); - +#if 0 // XXX + REGISTER_NAMED_NODE(ob_obio, "/obio"); + device_end(); + ob_set_obio_ranges(slavio_base); +#endif + + ob_zs_init(slavio_base, SLAVIO_ZS, ZS_INTR, 1, 1); + + ob_zs_init(slavio_base, SLAVIO_ZS1, ZS_INTR, 0, 0); + + ob_nvram_init(slavio_base, SLAVIO_NVRAM); + + ob_fd_init(slavio_base, SLAVIO_FD, FD_INTR); + + ob_sconfig_init(slavio_base, SLAVIO_SCONFIG); + + ob_auxio_init(slavio_base, SLAVIO_AUXIO); + + ob_power_init(slavio_base, SLAVIO_POWER, POWER_INTR); + + ob_counter_init(slavio_base, SLAVIO_COUNTER); + + ob_interrupt_init(slavio_base, SLAVIO_INTERRUPT); + return 0; } Added: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h (rev 0) +++ openbios-devel/drivers/obio.h 2006-05-22 22:10:54 UTC (rev 26) @@ -0,0 +1,187 @@ +/* Addresses, interrupt numbers, register sizes */ + +#define SLAVIO_ZS 0x00000000 +#define SLAVIO_ZS1 0x00100000 +#define ZS_INTR 0x2c +#define ZS_REGS 8 + +#define SLAVIO_NVRAM 0x00200000 +#define NVRAM_SIZE 0x2000 +#define NVRAM_IDPROM 0x1fd8 + +#define SLAVIO_FD 0x00400000 +#define FD_REGS 15 +#define FD_INTR 0x2b + +#define SLAVIO_SCONFIG 0x00800000 +#define SCONFIG_REGS 1 + +#define SLAVIO_AUXIO 0x00900000 +#define AUXIO_REGS 1 + +#define SLAVIO_POWER 0x00910000 +#define POWER_REGS 1 +#define POWER_INTR 0x22 + +#define SLAVIO_COUNTER 0x00d00000 +#define COUNTER_REGS 0x10 + +#define SLAVIO_INTERRUPT 0x00e00000 +#define INTERRUPT_REGS 0x10 + +#define SLAVIO_SIZE 0x01000000 + +struct qemu_nvram_v1 { + char id_string[16]; + uint32_t version; + uint32_t nvram_size; // not used in Sun4m + char unused1[8]; + char arch[12]; + char smp_cpus; + char unused2; + char nographic; + uint32_t ram_size; + char boot_device; + char unused3[3]; + uint32_t kernel_image; + uint32_t kernel_size; + uint32_t cmdline; + uint32_t cmdline_size; + uint32_t initrd_image; + uint32_t initrd_size; + uint32_t nvram_image; + uint16_t width; + uint16_t height; + uint16_t depth; + char unused4[158]; + uint16_t crc; +}; + +#define SUN4M_NCPUS 16 +#define PAGE_SIZE 4096 + +/* linux/include/asm-sparc/timer.h */ + +/* A sun4m has two blocks of registers which are probably of the same + * structure. LSI Logic's L64851 is told to _decrement_ from the limit + * value. Aurora behaves similarly but its limit value is compacted in + * other fashion (it's wider). Documented fields are defined here. + */ + +/* As with the interrupt register, we have two classes of timer registers + * which are per-cpu and master. Per-cpu timers only hit that cpu and are + * only level 14 ticks, master timer hits all cpus and is level 10. + */ + +#define SUN4M_PRM_CNT_L 0x80000000 +#define SUN4M_PRM_CNT_LVALUE 0x7FFFFC00 + +struct sun4m_timer_percpu_info { + __volatile__ unsigned int l14_timer_limit; /* Initial value is 0x009c4000 */ + __volatile__ unsigned int l14_cur_count; + + /* This register appears to be write only and/or inaccessible + * on Uni-Processor sun4m machines. + */ + __volatile__ unsigned int l14_limit_noclear; /* Data access error is here */ + + __volatile__ unsigned int cntrl; /* =1 after POST on Aurora */ + __volatile__ unsigned char space[PAGE_SIZE - 16]; +}; + +struct sun4m_timer_regs { + struct sun4m_timer_percpu_info cpu_timers[SUN4M_NCPUS]; + volatile unsigned int l10_timer_limit; + volatile unsigned int l10_cur_count; + + /* Again, this appears to be write only and/or inaccessible + * on uni-processor sun4m machines. + */ + volatile unsigned int l10_limit_noclear; + + /* This register too, it must be magic. */ + volatile unsigned int foobar; + + volatile unsigned int cfg; /* equals zero at boot time... */ +}; + +/* + * Registers of hardware timer in sun4m. + */ +struct sun4m_timer_percpu { + volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 */ + volatile unsigned int l14_cur_count; +}; + +struct sun4m_timer_global { + volatile unsigned int l10_timer_limit; + volatile unsigned int l10_cur_count; +}; + +/* linux/include/asm-sparc/irq.h */ + +/* These registers are used for sending/receiving irqs from/to + * different cpu's. + */ +struct sun4m_intreg_percpu { + unsigned int tbt; /* Interrupts still pending for this cpu. */ + + /* These next two registers are WRITE-ONLY and are only + * "on bit" sensitive, "off bits" written have NO affect. + */ + unsigned int clear; /* Clear this cpus irqs here. */ + unsigned int set; /* Set this cpus irqs here. */ + unsigned char space[PAGE_SIZE - 12]; +}; + +/* + * djhr + * Actually the clear and set fields in this struct are misleading.. + * according to the SLAVIO manual (and the same applies for the SEC) + * the clear field clears bits in the mask which will ENABLE that IRQ + * the set field sets bits in the mask to DISABLE the IRQ. + * + * Also the undirected_xx address in the SLAVIO is defined as + * RESERVED and write only.. + * + * DAVEM_NOTE: The SLAVIO only specifies behavior on uniprocessor + * sun4m machines, for MP the layout makes more sense. + */ +struct sun4m_intregs { + struct sun4m_intreg_percpu cpu_intregs[SUN4M_NCPUS]; + unsigned int tbt; /* IRQ's that are still pending. */ + unsigned int irqs; /* Master IRQ bits. */ + + /* Again, like the above, two these registers are WRITE-ONLY. */ + unsigned int clear; /* Clear master IRQ's by setting bits here. */ + unsigned int set; /* Set master IRQ's by setting bits here. */ + + /* This register is both READ and WRITE. */ + unsigned int undirected_target; /* Which cpu gets undirected irqs. */ +}; + +/* Dave Redman (djhr(a)tadpole.co.uk) + * The sun4m interrupt registers. + */ +#define SUN4M_INT_ENABLE 0x80000000 +#define SUN4M_INT_E14 0x00000080 +#define SUN4M_INT_E10 0x00080000 + +#define SUN4M_HARD_INT(x) (0x000000001 << (x)) +#define SUN4M_SOFT_INT(x) (0x000010000 << (x)) + +#define SUN4M_INT_MASKALL 0x80000000 /* mask all interrupts */ +#define SUN4M_INT_MODULE_ERR 0x40000000 /* module error */ +#define SUN4M_INT_M2S_WRITE 0x20000000 /* write buffer error */ +#define SUN4M_INT_ECC 0x10000000 /* ecc memory error */ +#define SUN4M_INT_FLOPPY 0x00400000 /* floppy disk */ +#define SUN4M_INT_MODULE 0x00200000 /* module interrupt */ +#define SUN4M_INT_VIDEO 0x00100000 /* onboard video */ +#define SUN4M_INT_REALTIME 0x00080000 /* system timer */ +#define SUN4M_INT_SCSI 0x00040000 /* onboard scsi */ +#define SUN4M_INT_AUDIO 0x00020000 /* audio/isdn */ +#define SUN4M_INT_ETHERNET 0x00010000 /* onboard ethernet */ +#define SUN4M_INT_SERIAL 0x00008000 /* serial ports */ +#define SUN4M_INT_KBDMS 0x00004000 /* keyboard/mouse */ +#define SUN4M_INT_SBUSBITS 0x00003F80 /* sbus int bits */ +

15 years

r25 - in openbios-devel: config/examples drivers include/libc include/sparc32 modules toke

by svn＠openbios.org

Author: stepan Date: 2006-05-22 12:37:34 +0200 (Mon, 22 May 2006) New Revision: 25 Modified: openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/pgtsrmmu.h openbios-devel/include/libc/string.h openbios-devel/include/sparc32/io.h openbios-devel/modules/nvram.c openbios-devel/toke/stream.c Log: blueswirl -14 generic and sparc32 related code Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-05-22 10:37:34 UTC (rev 25) @@ -46,20 +46,20 @@ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> - <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>  @@ -69,7 +69,7 @@ <option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/> <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/> - <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2006-05-22 10:37:34 UTC (rev 25) @@ -21,6 +21,8 @@ STRIP := sparc-linux-strip RANLIB := sparc-linux-ranlib CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/config/examples/sparc32_config.xml 2006-05-22 10:37:34 UTC (rev 25) @@ -46,20 +46,20 @@ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> - <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>  @@ -69,7 +69,7 @@ <option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/> <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/> - <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/config/examples/sparc32_rules.xml 2006-05-22 10:37:34 UTC (rev 25) @@ -27,6 +27,8 @@ endif CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/drivers/esp.c 2006-05-22 10:37:34 UTC (rev 25) @@ -263,7 +263,10 @@ id = POP(); *sd = &global_esp->sd[id]; - DPRINTF("opening drive %d\n", id); +#ifdef CONFIG_DEBUG_ESP + fword("my-args"); + DPRINTF("opening drive %d args %s\n", id, pop_fstr_copy()); +#endif selfword("open-deblocker"); @@ -393,7 +396,7 @@ }; static void -add_alias(const unsigned char *device, const unsigned char *alias) +add_alias(const char *device, const char *alias) { push_str("/aliases"); fword("find-device"); @@ -413,6 +416,11 @@ DPRINTF("Initializing SCSI..."); esp = malloc(sizeof(esp_private_t)); + if (!esp) { + DPRINTF("Can't allocate ESP private structure\n"); + return -1; + } + global_esp = esp; if (espdma_init(&esp->espdma) != 0) { @@ -433,7 +441,9 @@ // Chip reset esp->ll->regs[ESP_CMD] = ESP_CMD_RC; - + + DPRINTF("ESP at 0x%lx, buffer va 0x%lx dva 0x%lx\n", (unsigned long)esp, + (unsigned long)esp->buffer, (unsigned long)esp->buffer_dvma); DPRINTF("done\n"); DPRINTF("Initializing SCSI devices..."); @@ -448,8 +458,7 @@ #endif } - sprintf(nodebuff, "/iommu/sbus/espdma/esp"); - REGISTER_NAMED_NODE(ob_esp, nodebuff); + REGISTER_NAMED_NODE(ob_esp, "/iommu/sbus/espdma/esp"); device_end(); for (id = 0; id < 8; id++) { Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/drivers/iommu.c 2006-05-22 10:37:34 UTC (rev 25) @@ -70,7 +70,7 @@ /* * Allocate memory. This is reusable. */ -static void +void mem_init(struct mem *t, char *begin, char *limit) { t->start = begin; @@ -82,8 +82,14 @@ mem_alloc(struct mem *t, int size, int align) { char *p; + unsigned long pa; - p = (char *)((((unsigned int)t->curp) + (align-1)) & ~(align-1)); + // The alignment restrictions refer to physical, not virtual + // addresses + pa = va2pa((unsigned long)t->curp) + (align - 1); + pa &= ~(align - 1); + p = (char *)pa2va(pa); + if (p >= t->uplim || p + size > t->uplim) return 0; t->curp = p + size; @@ -193,12 +199,11 @@ * Switch page tables. */ void -init_mmu_swift() +init_mmu_swift(void) { unsigned int addr, i; unsigned long pa, va; - mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); mem_init(&cio, (char *)&_end, (char *)&_iomem); context_table = mem_zalloc(&cmem, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); @@ -343,11 +348,12 @@ /* flush_cache_all(); */ /** flush_tlb_all(); **/ - regs->base = ((unsigned int)va2pa((unsigned long)ptab)) >> 4; + tmp = (unsigned int)va2pa((unsigned long)ptab); + regs->base = tmp >> 4; iommu_invalidate(regs); - DPRINTF("IOMMU: impl %d vers %d page table at 0x%p of size %d bytes\n", - impl, vers, t->page_table, ptsize); + DPRINTF("IOMMU: impl %d vers %d page table at 0x%p (pa 0x%x) of size %d bytes\n", + impl, vers, t->page_table, tmp, ptsize); mem_init(&t->bmap, (char*)t->plow, (char *)0xfffff000); } Modified: openbios-devel/drivers/pgtsrmmu.h =================================================================== --- openbios-devel/drivers/pgtsrmmu.h 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/drivers/pgtsrmmu.h 2006-05-22 10:37:34 UTC (rev 25) @@ -83,7 +83,7 @@ #ifndef __ASSEMBLY__ /* Accessing the MMU control register. */ -extern __inline__ unsigned int srmmu_get_mmureg(void) +static __inline__ unsigned int srmmu_get_mmureg(void) { unsigned int retval; __asm__ __volatile__("lda [%%g0] %1, %0\n\t" : @@ -92,14 +92,14 @@ return retval; } -extern __inline__ void srmmu_set_mmureg(unsigned long regval) +static __inline__ void srmmu_set_mmureg(unsigned long regval) { __asm__ __volatile__("sta %0, [%%g0] %1\n\t" : : "r" (regval), "i" (ASI_M_MMUREGS) : "memory"); } -extern __inline__ void srmmu_set_ctable_ptr(unsigned long paddr) +static __inline__ void srmmu_set_ctable_ptr(unsigned long paddr) { paddr = ((paddr >> 4) & SRMMU_CTX_PMASK); __asm__ __volatile__("sta %0, [%1] %2\n\t" : : @@ -108,7 +108,7 @@ "memory"); } -extern __inline__ unsigned long srmmu_get_ctable_ptr(void) +static __inline__ unsigned long srmmu_get_ctable_ptr(void) { unsigned int retval; @@ -119,14 +119,14 @@ return (retval & SRMMU_CTX_PMASK) << 4; } -extern __inline__ void srmmu_set_context(int context) +static __inline__ void srmmu_set_context(int context) { __asm__ __volatile__("sta %0, [%1] %2\n\t" : : "r" (context), "r" (SRMMU_CTX_REG), "i" (ASI_M_MMUREGS) : "memory"); } -extern __inline__ int srmmu_get_context(void) +static __inline__ int srmmu_get_context(void) { register int retval; __asm__ __volatile__("lda [%1] %2, %0\n\t" : @@ -136,7 +136,7 @@ return retval; } -extern __inline__ unsigned int srmmu_get_fstatus(void) +static __inline__ unsigned int srmmu_get_fstatus(void) { unsigned int retval; @@ -146,7 +146,7 @@ return retval; } -extern __inline__ unsigned int srmmu_get_faddr(void) +static __inline__ unsigned int srmmu_get_faddr(void) { unsigned int retval; @@ -157,7 +157,7 @@ } /* This is guaranteed on all SRMMU's. */ -extern __inline__ void srmmu_flush_whole_tlb(void) +static __inline__ void srmmu_flush_whole_tlb(void) { __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : "r" (0x400), /* Flush entire TLB!! */ @@ -166,7 +166,7 @@ } /* These flush types are not available on all chips... */ -extern __inline__ void srmmu_flush_tlb_ctx(void) +static __inline__ void srmmu_flush_tlb_ctx(void) { __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : "r" (0x300), /* Flush TLB ctx.. */ @@ -174,7 +174,7 @@ } -extern __inline__ void srmmu_flush_tlb_region(unsigned long addr) +static __inline__ void srmmu_flush_tlb_region(unsigned long addr) { addr &= SRMMU_PGDIR_MASK; __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : @@ -184,7 +184,7 @@ } -extern __inline__ void srmmu_flush_tlb_segment(unsigned long addr) +static __inline__ void srmmu_flush_tlb_segment(unsigned long addr) { addr &= SRMMU_PMD_MASK; __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : @@ -193,7 +193,7 @@ } -extern __inline__ void srmmu_flush_tlb_page(unsigned long page) +static __inline__ void srmmu_flush_tlb_page(unsigned long page) { page &= PAGE_MASK; __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : @@ -202,7 +202,7 @@ } -extern __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr) +static __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr) { unsigned long retval; @@ -214,7 +214,7 @@ return retval; } -extern __inline__ int +static __inline__ int srmmu_get_pte (unsigned long addr) { register unsigned long entry; Modified: openbios-devel/include/libc/string.h =================================================================== --- openbios-devel/include/libc/string.h 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/include/libc/string.h 2006-05-22 10:37:34 UTC (rev 25) @@ -42,7 +42,7 @@ extern void *memcpy(void * dest,const void *src,size_t count); extern void *memmove(void * dest,const void *src,size_t count); extern int memcmp(const void * cs,const void * ct,size_t count); -extern void *memscan(void * addr, int c, size_t size);void * memscan(void * addr, int c, size_t size); +extern void *memscan(void * addr, int c, size_t size); extern char *strstr(const char * s1,const char * s2); extern void *memchr(const void *s, int c, size_t n); Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/include/sparc32/io.h 2006-05-22 10:37:34 UTC (rev 25) @@ -4,7 +4,8 @@ #include "asm/types.h" extern unsigned int va_shift; // Set in entry.S -extern char _start, _data, _end, _vmem, _evmem, _iomem; // Defined in ldscript +extern char _start, _data, _heap, _eheap, _stack, _estack, _end, + _vmem, _evmem,_iomem; // Defined in ldscript static inline unsigned long va2pa(unsigned long va) @@ -32,11 +33,12 @@ struct mem; +void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); void *mem_zalloc(struct mem *t, int size, int align); int map_page(unsigned long va, unsigned long epa, int type); void *map_io(unsigned pa, int size); -void init_mmu_swift(); +void init_mmu_swift(void); void *dvma_alloc(int size, unsigned int *pphys); #ifndef BOOTSTRAP Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/modules/nvram.c 2006-05-22 10:37:34 UTC (rev 25) @@ -49,7 +49,7 @@ static unsigned int nvpart_checksum( nvpart_t* hdr ) { - unsigned char *p = (char*)hdr; + unsigned char *p = (unsigned char*)hdr; int i, val = p[0]; for( i=2; i<16; i++ ) { Modified: openbios-devel/toke/stream.c =================================================================== --- openbios-devel/toke/stream.c 2006-05-22 10:33:31 UTC (rev 24) +++ openbios-devel/toke/stream.c 2006-05-22 10:37:34 UTC (rev 25) @@ -104,7 +104,7 @@ oname = (u8 *)strdup( out_name ); else { ext=strrchr(in_name, '.'); - len=ext ? (ext-in_name) : (unsigned int)strlen(in_name) ; + len=ext ? (unsigned int)(ext-in_name) : (unsigned int)strlen(in_name) ; oname=malloc(len+4); memcpy(oname, in_name, len); oname[len] = 0;

15 years, 1 month

r24 - in openbios-devel/arch/sparc32: . libgcc

by svn＠openbios.org

Author: stepan Date: 2006-05-22 12:33:31 +0200 (Mon, 22 May 2006) New Revision: 24 Added: openbios-devel/arch/sparc32/libgcc/__lshrdi3.c Modified: openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/context.c openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/ldscript openbios-devel/arch/sparc32/lib.c openbios-devel/arch/sparc32/libgcc/build.xml openbios-devel/arch/sparc32/loadfs.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc32/switch.S openbios-devel/arch/sparc32/sys_info.c openbios-devel/arch/sparc32/tree.fs Log: blueswirl -14 sparc32 related Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/aoutload.c 2006-05-22 10:33:31 UTC (rev 24) @@ -92,16 +92,16 @@ if (N_MAGIC(ehdr) == NMAGIC) { if (lfile_read(start, ehdr.a_text) != ehdr.a_text) { - printf("Can't read program text segment (size 0x%x)\n", ehdr.a_text); + printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text); goto out; } if (lfile_read(start + N_DATADDR(ehdr), ehdr.a_data) != ehdr.a_data) { - printf("Can't read program data segment (size 0x%x)\n", ehdr.a_data); + printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data); goto out; } } else { if (lfile_read(start, size) != size) { - printf("Can't read program (size 0x%x)\n", size); + printf("Can't read program (size 0x%lx)\n", size); goto out; } } Modified: openbios-devel/arch/sparc32/context.c =================================================================== --- openbios-devel/arch/sparc32/context.c 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/context.c 2006-05-22 10:33:31 UTC (rev 24) @@ -20,8 +20,8 @@ * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ -struct context main_ctx __attribute__((section (".initctx"))) = { - .regs[REG_SP] = (uint32_t) SP_LOC(&main_ctx), +struct context main_ctx = { + .regs[REG_SP] = (uint32_t) &_estack - 96, .pc = (uint32_t) start_main, .npc = (uint32_t) start_main + 4, .return_addr = (uint32_t) __exit_context, Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/entry.S 2006-05-22 10:33:31 UTC (rev 24) @@ -64,6 +64,7 @@ or %g3, 0x1, %g3 sta %g3, [%g2] ASI_M_BYPASS add %g2, 0x4, %g2 ! s+0x800 +#if 0 set 0x40, %g6 set ((7 << 2) | 2), %g3 ! 7 = U: --- S: RWX (main memory) 1: sta %g3, [%g2] ASI_M_BYPASS @@ -71,6 +72,9 @@ deccc %g6 bne 1b nop +#else + add %g2, 0x100, %g2 +#endif ! s+0x900 add %g2, 0xa00 - 0x900, %g3 ! l3 table for rom at s+0xa00 add %g2, 0x0d0, %g2 ! s+0x9d0 @@ -182,7 +186,7 @@ /* Zero out our BSS section. */ set _bss - 4, %o0 ! First address of BSS - set _end, %o1 ! Last address of BSS + set _estack, %o1 ! Last address of BSS ba 2f nop 1: @@ -192,8 +196,6 @@ bl 1b add %o0, 0x4, %o0 - set _estack, %sp - mov 0, %fp mov 2, %g1 wr %g1, 0x0, %wim ! make window 1 invalid WRITE_PAUSE @@ -218,7 +220,7 @@ wr %g3, PSR_ET, %psr WRITE_PAUSE - call openbios + call __switch_context_nosave nop /* We get here when the main context switches back to Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/ldscript 2006-05-22 10:33:31 UTC (rev 24) @@ -1,6 +1,9 @@ OUTPUT_FORMAT(elf32-sparc) OUTPUT_ARCH(sparc) +/* Qemu ELF loader can't handle very complex files, so we put ELFBoot +info to rodata and put initctx to data.*/ + ENTRY(trap_table) /* Initial load address @@ -35,6 +38,7 @@ sound_drivers_end = .; *(.rodata) *(.rodata.*) + *(.note.ELFBoot) } .data ALIGN(4096): { _data = .; @@ -68,18 +72,12 @@ _estack = .; } - .initctx : { - /* Initial contents of stack. This MUST BE just after the stack. */ - *(.initctx) - } - /* Putting ELF notes near beginning of file might help bootloaders. - * We discard .note sections other than .note.ELFBoot, - * because some versions of GCC generates useless ones. */ - .note : { *(.note.ELFBoot) } - . = ALIGN(4096); _end = .; _iomem = _end + IOMEM_SIZE; - /DISCARD/ : { *(.comment.*) *(.note.*) } + /* We discard .note sections other than .note.ELFBoot, + * because some versions of GCC generates useless ones. */ + + /DISCARD/ : { *(.comment*) *(.note.*) } } Modified: openbios-devel/arch/sparc32/lib.c =================================================================== --- openbios-devel/arch/sparc32/lib.c 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/lib.c 2006-05-22 10:33:31 UTC (rev 24) @@ -32,22 +32,11 @@ return i; } -// dumb quick memory allocator until we get a decent thing here. - -#define MEMSIZE 128*1024 -static char memory[MEMSIZE]; -static void *memptr=memory; -static int memsize=MEMSIZE; - void *malloc(int size) { - void *ret=(void *)0; - if(memsize>=size) { - memsize-=size; - ret=memptr; - memptr+=size; - } - return ret; + extern struct mem cmem; + + return mem_alloc(&cmem, size, 4); } void free(void *ptr) Added: openbios-devel/arch/sparc32/libgcc/__lshrdi3.c =================================================================== --- openbios-devel/arch/sparc32/libgcc/__lshrdi3.c (rev 0) +++ openbios-devel/arch/sparc32/libgcc/__lshrdi3.c 2006-05-22 10:33:31 UTC (rev 24) @@ -0,0 +1,62 @@ +/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */ +/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC 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 GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define BITS_PER_UNIT 8 + +typedef int SItype __attribute__ ((mode (SI))); +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef int word_type __attribute__ ((mode (__word__))); + +struct DIstruct {SItype high, low;}; + +typedef union +{ + struct DIstruct s; + DItype ll; +} DIunion; + +DItype +__lshrdi3 (DItype u, word_type b) +{ + DIunion w; + word_type bm; + DIunion uu; + + if (b == 0) + return u; + + uu.ll = u; + + bm = (sizeof (SItype) * BITS_PER_UNIT) - b; + if (bm <= 0) + { + w.s.high = 0; + w.s.low = (USItype)uu.s.high >> -bm; + } + else + { + USItype carries = (USItype)uu.s.high << bm; + w.s.high = (USItype)uu.s.high >> b; + w.s.low = ((USItype)uu.s.low >> b) | carries; + } + + return w.ll; +} Modified: openbios-devel/arch/sparc32/libgcc/build.xml =================================================================== --- openbios-devel/arch/sparc32/libgcc/build.xml 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/libgcc/build.xml 2006-05-22 10:33:31 UTC (rev 24) @@ -7,6 +7,7 @@ <object source="__udivdi3.c"/> <object source="__udivmoddi4.c"/> <object source="__umoddi3.c"/> + <object source="__lshrdi3.c"/> </library> </build> Modified: openbios-devel/arch/sparc32/loadfs.c =================================================================== --- openbios-devel/arch/sparc32/loadfs.c 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/loadfs.c 2006-05-22 10:33:31 UTC (rev 24) @@ -8,26 +8,35 @@ int file_open(const char *filename) { load_fd=open_io(filename); - /* if(load_fd!=-1) */ seek_io(load_fd, 0); + if(load_fd >= 0) + seek_io(load_fd, 0); return load_fd>-1; } int lfile_read(void *buf, unsigned long len) { - int ret; - ret=read_io(load_fd, buf, len); + int ret = 0; + + if (load_fd >= 0) + ret=read_io(load_fd, buf, len); return ret; } int file_seek(unsigned long offset) { - return seek_io(load_fd, offset); + if (load_fd >= 0) + return seek_io(load_fd, offset); + else + return -1; } unsigned long file_size(void) { llong fpos, fsize; + if (load_fd < 0) + return 0; + /* save current position */ fpos=tell(load_fd); Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/openbios.c 2006-05-22 10:33:31 UTC (rev 24) @@ -19,11 +19,10 @@ void boot(void); void ob_ide_init(void); -static char intdict[256 * 1024]; +static unsigned char intdict[256 * 1024]; static void init_memory(void) { - extern char _heap, _eheap; /* push start and end of available memory to the stack * so that the forth word QUIT can initialize memory @@ -36,7 +35,7 @@ PUSH((unsigned int)&_eheap); } -void exception(cell no) +void exception(__attribute__((unused))cell no) { /* The exception mechanism is used during bootstrap to catch * build errors. In a running system this is a noop since we @@ -68,6 +67,9 @@ int openbios(void) { extern struct sys_info sys_info; + extern struct mem cmem; + + mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/romvec.c 2006-05-22 10:33:31 UTC (rev 24) @@ -65,7 +65,8 @@ static int prop_mem_avail[3]; static int prop_vmem_avail[6]; -static void doublewalk(unsigned ptab1, unsigned va) +static void doublewalk(__attribute__((unused)) unsigned int ptab1, + __attribute__((unused)) unsigned int va) { } @@ -215,14 +216,14 @@ for (;;) {} } -static void obp_abort() +static void obp_abort(void) { printk("abort, power off\n"); outb(0x71910000, 1); for (;;) {} } -static void obp_halt() +static void obp_halt(void) { printk("halt, power off\n"); outb(0x71910000, 1); @@ -278,7 +279,7 @@ unsigned int off; unsigned int mva; - DPRINTF("obp_dumb_mmap: virta 0x%x, which_io %d, paddr 0x%x, sz %d\n", va, which_io, pa, size); + DPRINTF("obp_dumb_mmap: virta 0x%x, which_io %d, paddr 0x%x, sz %d\n", (unsigned int)va, which_io, pa, size); off = pa & (PAGE_SIZE-1); npages = (off + size + (PAGE_SIZE-1)) / PAGE_SIZE; pa &= ~(PAGE_SIZE-1); @@ -296,7 +297,7 @@ static void obp_dumb_munmap(__attribute__((unused)) char *va, __attribute__((unused)) unsigned int size) { - DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", va, size); + DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size); } static int obp_devread(int dev_desc, char *buf, int nbytes) @@ -360,14 +361,18 @@ return ret; } -static int obp_cpustart(unsigned int whichcpu, int ctxtbl_ptr, - int thiscontext, char *prog_counter) +static int obp_cpustart(__attribute__((unused))unsigned int whichcpu, + __attribute__((unused))int ctxtbl_ptr, + __attribute__((unused))int thiscontext, + __attribute__((unused))char *prog_counter) { //int cpu, found; +#ifdef CONFIG_DEBUG_OBP struct linux_prom_registers *smp_ctable = (void *)ctxtbl_ptr; +#endif DPRINTF("obp_cpustart: cpu %d, ctxptr 0x%x, ctx %d, pc 0x%x\n", whichcpu, - smp_ctable->phys_addr, thiscontext, prog_counter); + smp_ctable->phys_addr, thiscontext, (unsigned int)prog_counter); #if 0 found = obp_getprop(whichcpu, "mid", (char *)&cpu); if (found == -1) Modified: openbios-devel/arch/sparc32/switch.S =================================================================== --- openbios-devel/arch/sparc32/switch.S 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/switch.S 2006-05-22 10:33:31 UTC (rev 24) @@ -21,62 +21,94 @@ /* XXX: totally bogus for sparc, need to save and restore all windows */ __switch_context: /* Save everything in current stack */ + set __context, %g1 + st %g2, [%g1 + 8] + st %g3, [%g1 + 12] + st %g4, [%g1 + 16] + st %g5, [%g1 + 20] + st %g6, [%g1 + 24] + st %g7, [%g1 + 28] + st %o0, [%g1 + 32] + st %o1, [%g1 + 36] + st %o2, [%g1 + 40] + st %o3, [%g1 + 44] + st %o4, [%g1 + 48] + st %o5, [%g1 + 52] + st %o6, [%g1 + 56] + st %o7, [%g1 + 60] + + st %l0, [%g1 + 64] + st %l1, [%g1 + 68] + st %l2, [%g1 + 72] + st %l3, [%g1 + 76] + st %l4, [%g1 + 80] + st %l5, [%g1 + 84] + st %l6, [%g1 + 88] + st %l7, [%g1 + 92] + + st %i0, [%g1 + 96] + st %i1, [%g1 + 100] + st %i2, [%g1 + 104] + st %i3, [%g1 + 108] + st %i4, [%g1 + 112] + st %i5, [%g1 + 116] + st %i6, [%g1 + 120] + st %i7, [%g1 + 124] + __switch_context_nosave: /* Interrupts are not allowed... */ /* Turn on Supervisor, EnableFloating, and all the PIL bits. * Also puts us in register window zero with traps off. */ +#if 0 set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2 wr %g2, 0x0, %psr +#endif /* Load all registers */ set __context, %g1 - lda [%g1] ASI_BP, %g1 - add %g1, 8, %g1 /* skip %g0 and %g1*/ + ld [%g1], %g1 + ld [%g1 + 8], %g2 + ld [%g1 + 12], %g3 + ld [%g1 + 16], %g4 + ld [%g1 + 20], %g5 + ld [%g1 + 24], %g6 + ld [%g1 + 28], %g7 -#define load_reg(reg) lda [%g1] ASI_BP, reg ; add %g1, 4, %g1 + ld [%g1 + 32], %o0 + ld [%g1 + 36], %o1 + ld [%g1 + 40], %o2 + ld [%g1 + 44], %o3 + ld [%g1 + 48], %o4 + ld [%g1 + 52], %o5 + ld [%g1 + 56], %o6 + ld [%g1 + 60], %o7 - load_reg(%g2) - load_reg(%g3) - load_reg(%g4) - load_reg(%g5) - load_reg(%g6) - load_reg(%g7) + ld [%g1 + 64], %l0 + ld [%g1 + 68], %l1 + ld [%g1 + 72], %l2 + ld [%g1 + 76], %l3 + ld [%g1 + 80], %l4 + ld [%g1 + 84], %l5 + ld [%g1 + 88], %l6 + ld [%g1 + 92], %l7 - load_reg(%o0) - load_reg(%o1) - load_reg(%o2) - load_reg(%o3) - load_reg(%o4) - load_reg(%o5) - load_reg(%o6) - load_reg(%o7) - - load_reg(%l0) - load_reg(%l1) - load_reg(%l2) - load_reg(%l3) - load_reg(%l4) - load_reg(%l5) - load_reg(%l6) - load_reg(%l7) - - load_reg(%i0) - load_reg(%i1) - load_reg(%i2) - load_reg(%i3) - load_reg(%i4) - load_reg(%i5) - load_reg(%i6) - load_reg(%i7) - + ld [%g1 + 96], %i0 + ld [%g1 + 100], %i1 + ld [%g1 + 104], %i2 + ld [%g1 + 108], %i3 + ld [%g1 + 112], %i4 + ld [%g1 + 116], %i5 + ld [%g1 + 120], %i6 + ld [%g1 + 124], %i7 + + ld [%g1 + 128], %g1 /* Finally, load new %pc */ - lda [%g1] ASI_BP, %g1 jmp %g1 - nop + clr %g1 __exit_context: /* Get back to the original context */ Modified: openbios-devel/arch/sparc32/sys_info.c =================================================================== --- openbios-devel/arch/sparc32/sys_info.c 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/sys_info.c 2006-05-22 10:33:31 UTC (rev 24) @@ -1,5 +1,6 @@ #include "openbios/config.h" #include "openbios/kernel.h" +#include "elf_boot.h" #include "sys_info.h" #include "context.h" @@ -19,6 +20,7 @@ int i; unsigned long long total = 0; struct memrange *mmap; + extern struct elf_image_note elf_image_notes; /* Pick up paramters given by bootloader to us */ //info->boot_type = boot_ctx->eax; @@ -26,6 +28,8 @@ info->boot_arg = boot_ctx->param[0]; //debug("boot eax = %#lx\n", info->boot_type); //debug("boot ebx = %#lx\n", info->boot_data); + info->boot_type = ELF_BHDR_MAGIC; + info->boot_data = virt_to_phys(&elf_image_notes); debug("boot arg = %#lx\n", info->boot_arg); collect_elfboot_info(info); Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2006-05-18 21:57:08 UTC (rev 23) +++ openbios-devel/arch/sparc32/tree.fs 2006-05-22 10:33:31 UTC (rev 24) @@ -8,6 +8,8 @@ h# 01800000 encode-int 0 encode-int encode+ 0 encode-int encode+ h# 00000081 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ " idprom" property \ XXX + " /obio/zs@0,100000:a" encode-string " stdin-path" property + " /obio/zs@0,100000:a" encode-string " stdout-path" property : encode-unit encode-unit-sbus ; : decode-unit decode-unit-sbus ;

15 years, 1 month

Sparc update

by Blue Swirl

I added handling of Qemu parameters in nvram. Now kernel arguments, default boot device etc. can be set in the Qemu command line. Interrupt controller and timer are initialised. No progress with Linux. _________________________________________________________________ Don't just search. Find. Check out the new MSN Search! http://search.msn.com/

15 years, 1 month