diff --git a/sys/arch/acorn32/acorn32/rpc_machdep.c b/sys/arch/acorn32/acorn32/rpc_machdep.c index 6a803f9aa8eb..2e5b9e6a439a 100644 --- a/sys/arch/acorn32/acorn32/rpc_machdep.c +++ b/sys/arch/acorn32/acorn32/rpc_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: rpc_machdep.c,v 1.13 2002/02/11 08:28:16 skrll Exp $ */ +/* $NetBSD: rpc_machdep.c,v 1.14 2002/02/11 18:47:36 reinoud Exp $ */ /* * Copyright (c) 2000-2001 Reinoud Zandijk. @@ -47,6 +47,7 @@ * Updated for new bootloader 22/10/00 */ + #include "opt_cputypes.h" #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -100,12 +101,11 @@ * This is machine architecture dependant as it varies depending * on where the ROM appears when you turn the MMU off. */ +u_int cpu_reset_address = 0x0; /* XXX 0x3800000 too for rev0 RiscPC 600 */ + #define VERBOSE_INIT_ARM -u_int cpu_reset_address = 0x0; /* XXX 0x3800000 too for rev0 RiscPC 600 */ - -#define MAX_BOOT_STRING 0xff /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 @@ -116,12 +116,12 @@ u_int cpu_reset_address = 0x0; /* XXX 0x3800000 too for rev0 RiscPC 600 */ #define UND_STACK_SIZE 1 #endif + BootConfig bootconfig; /* Boot config storage */ videomemory_t videomemory; /* Video memory descriptor */ -char *boot_args = NULL; -char *boot_file = NULL; -char booted_kernel[80]; +char *boot_args = NULL; /* holds the pre-processed boot arguments */ +extern char *booted_kernel; /* used for ioctl to retrieve booted kernel */ extern int *vidc_base; extern u_int32_t iomd_base; @@ -371,9 +371,7 @@ cpu_reboot(howto, bootstr) * time with section mappings. * * XXX One big assumption in the current architecture seems that the kernel is - * XXX supposed to be mapped into bootconfig.dram[0], so the bootloader will - * XXX put other area's at the end when deciding to move the kernel to a - * XXX different dram block. + * XXX supposed to be mapped into bootconfig.dram[0]. */ #define ONE_MB 0x100000 @@ -397,37 +395,76 @@ struct l1_sec_map { }; -/* - * temporary compat stuff - * XXX delete me as soon as posible - */ - -#ifdef COMPAT_OLD_BOOTLOADER - -u_int initarm_new_bootloader __P((BootConfig *bootconf)); -u_int initarm_old_bootloader __P((BootConfig *bootconf)); - -u_int -initarm(bootconf) +static void +canonicalise_bootconfig(bootconf, raw_bootconf) BootConfig *bootconf; + BootConfig *raw_bootconf; { - if (bootconf->magic == BOOTCONFIG_MAGIC) - return initarm_new_bootloader(bootconf); - else - return initarm_old_bootloader(bootconf); + BootConfig_v1 *old_v1_style; + int block; + + /* check for bootconfig v2+ structure */ + if (raw_bootconf->magic == BOOTCONFIG_MAGIC) { + /* v2+ cleaned up structure found */ + *bootconf = *raw_bootconf; + return; + } else { + /* old messy structure assumed */ + old_v1_style = (BootConfig_v1 *) raw_bootconf; + + bootconf->magic = old_v1_style->magic; + bootconf->version = 1; + memcpy(bootconf->machine_id, old_v1_style->machine_id, 4); + memcpy(bootconf->kernelname, old_v1_style->kernelname, 80); + memcpy(bootconf->args, (char *) old_v1_style->argvirtualbase, 512); + + bootconf->kernvirtualbase = old_v1_style->kernvirtualbase; + bootconf->kernphysicalbase = old_v1_style->kernphysicalbase; + bootconf->kernsize = old_v1_style->kernsize; + bootconf->scratchvirtualbase = old_v1_style->scratchvirtualbase; + bootconf->scratchphysicalbase = old_v1_style->scratchphysicalbase; + bootconf->scratchsize = old_v1_style->scratchsize; + + /* this shouldn't be happening */ + bootconf->ksym_start = 0; + bootconf->ksym_end = 0; + + /* Mode definition file */ + bootconf->MDFvirtualbase = 0; + bootconf->MDFphysicalbase = 0; + bootconf->MDFsize = 0; + + bootconf->display_phys = old_v1_style->display_phys; + bootconf->display_start = old_v1_style->display_start; + bootconf->display_size = old_v1_style->display_size; + bootconf->width = old_v1_style->width; + bootconf->height = old_v1_style->height; + bootconf->log2_bpp = old_v1_style->log2_bpp; + bootconf->framerate = old_v1_style->framerate; + + memset(bootconf->reserved, 0, 512); + + bootconf->pagesize = old_v1_style->pagesize; + bootconf->drampages = old_v1_style->drampages; + bootconf->vrampages = old_v1_style->vrampages; + bootconf->dramblocks = old_v1_style->dramblocks; + bootconf->vramblocks = old_v1_style->vramblocks; + + for(block=0; block<4; block++) { + bootconf->dram[block].address = old_v1_style->dram[block].address; + bootconf->dram[block].pages = old_v1_style->dram[block].pages; + bootconf->dram[block].flags = 0; /* XXX */ + }; + + bootconf->vram[0].address = old_v1_style->vram[0].address; + bootconf->vram[0].pages = old_v1_style->vram[0].pages; + }; } -#else -# define initarm_new_bootloader(a) initarm(a) -#endif -/* - * The new bootloader initarm ... should be renamed to initarm when the old - * bootloader compatibility is removed - */ u_int -initarm_new_bootloader(bootconf) - BootConfig *bootconf; +initarm(raw_bootconf) + BootConfig *raw_bootconf; { int loop; int loop1; @@ -445,8 +482,9 @@ initarm_new_bootloader(bootconf) */ set_cpufuncs(); - /* Copy the boot configuration structure */ - bootconfig = *bootconf; + /* canonicalise the boot configuration structure to alow versioning */ + canonicalise_bootconfig(&bootconfig, raw_bootconf); + booted_kernel = bootconfig.kernelname; /* if the wscons interface is used, switch off VERBOSE booting :( */ #if NVIDCVIDEO>0 @@ -515,7 +553,7 @@ initarm_new_bootloader(bootconf) /* Check to make sure the page size is correct */ if (NBPG != bootconfig.pagesize) - panic2(("Page size is %d bytes in stead of %d !! (huh?)\n", bootconfig.pagesize, NBPG)); + panic2(("Page size is %d bytes instead of %d !! (huh?)\n", bootconfig.pagesize, NBPG)); /* process arguments */ process_kernel_args(); @@ -551,10 +589,10 @@ initarm_new_bootloader(bootconf) /* dma_range_end = 0x18000000; */ /* AHUM !! set this variable ... it was set up in the old 1st stage bootloader */ - kerneldatasize = bootconfig.kernsize + bootconfig.argsize; + kerneldatasize = bootconfig.kernsize + bootconfig.MDFsize; /* Update the address of the first free page of physical memory */ - physical_freestart += bootconfig.kernsize + bootconfig.argsize + bootconfig.scratchsize; + physical_freestart += bootconfig.kernsize + bootconfig.MDFsize + bootconfig.scratchsize; free_pages -= (physical_freestart - physical_start) / NBPG; /* Define a macro to simplify memory allocation */ @@ -919,13 +957,13 @@ initarm_new_bootloader(bootconf) printf("NetBSD/acorn32 booting ... \n"); /* Tell the user if his boot loader is too old */ - if (bootconfig.magic > BOOTCONFIG_MAGIC) { + if ((bootconfig.magic < BOOTCONFIG_MAGIC) || (bootconfig.version != BOOTCONFIG_VERSION)) { printf("\nDETECTED AN OLD BOOTLOADER. PLEASE UPGRADE IT\n\n"); delay(5000000); } printf("Kernel loaded from file %s\n", bootconfig.kernelname); - printf("Kernel arg string (@%p) %s\n", (void *) bootconfig.argvirtualbase, (char *)bootconfig.argvirtualbase); + printf("Kernel arg string (@%p) %s\n", bootconfig.args, bootconfig.args); printf("\nBoot configuration structure reports the following memory\n"); printf(" DRAM block 0a at %08x size %08x DRAM block 0b at %08x size %08x\n\r", @@ -961,16 +999,17 @@ initarm_new_bootloader(bootconf) #ifdef DDB db_machine_init(); + #ifdef __ELF__ - ddb_init(0, NULL, NULL); /* XXX */ + ddb_init(bootconfig.ksym_end - bootconfig.ksym_start, + (void *) bootconfig.ksym_start, (void *) bootconfig.ksym_end); #else { - extern int end; - extern int *esym; - + extern int end, *esym; ddb_init(*(int *)&end, ((int *)&end) + 1, esym); - } -#endif /* __ELF__ */ + }; +#endif + if (boothowto & RB_KDB) Debugger(); @@ -987,7 +1026,7 @@ process_kernel_args(void) char *args; /* Ok now we will check the arguments for interesting parameters. */ - args = (char *)bootconfig.argvirtualbase; + args = bootconfig.args; boothowto = 0; /* Only arguments itself are passed from the new bootloader */ @@ -1005,7 +1044,6 @@ parse_rpc_bootargs(args) char *args; { int integer; - char *kernel_name; if (get_bootconf_option(args, "videodram", BOOTOPT_TYPE_INT, &integer)) { videodram_size = integer; @@ -1016,13 +1054,6 @@ parse_rpc_bootargs(args) videodram_size = 1024*1024; }; - if (get_bootconf_option(args, "booted_kernel", BOOTOPT_TYPE_STRING, &kernel_name)) { - strncpy(booted_kernel, kernel_name, 80); /* XXX 80 ? */ - } else { - /* no booted kernel name */ - strcpy(booted_kernel, ""); - }; - #if 0 /* XXX this I would rather have in the new bootconfig structure */ if (get_bootconf_option(args, "kinetic", BOOTOPT_TYPE_BOOLEAN, &integer)) { @@ -1062,819 +1093,4 @@ rpc_sa110_cc_setup(void) } #endif /* CPU_SA110 */ - -/******************************************************************************* - ******************************************************************************* - ******************************************************************************* - ****************************** Compat stuff *********************************** - ******************************************************************************* - ******************************************************************************* - *******************************************************************************/ - -#ifdef COMPAT_OLD_BOOTLOADER -# if NVIDCVIDEO>0 -# error "Option COMPAT_OLD_BOOTLOADER is not compatible with WSCONS" -# endif -#endif - -#ifdef COMPAT_OLD_BOOTLOADER -/* - * u_int initarm_old_bootloader(bootConfig *bootconf) - * - * Reinoud : Only kept here for compatibility reasons.... it really needs to - * go ASAP !!!! - * - * Initial entry point on startup. This gets called before main() is - * entered. - * It should be responsible for setting up everything that must be - * in place when main is called. - * This includes - * Taking a copy of the boot configuration structure. - * Initialising the physical console so characters can be printed. - * Setting up page tables for the kernel - * Relocating the kernel to the bottom of physical memory - */ - -/* This routine is frightening mess ! This is what my mind looks like -mark */ - -/* - * This code is looking even worse these days ... - * This is the problem you get when you are booting from another Operating System - * without a proper boot loader - * Made even worse by the fact that if the machine does not have VRAM - * the video memory tends to be physically sitting where we relocate the - * kernel to. - */ - -#undef valloc_pages -#undef alloc_pages - -u_int -initarm_old_bootloader(bootconf) - BootConfig *bootconf; -{ - int loop; - int loop1; - u_int logical; - u_int kerneldatasize; - u_int l1pagetable; - u_int l2pagetable; - extern char page0[], page0_end[]; - struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE; - pv_addr_t kernel_l1pt; - pv_addr_t kernel_ptpt; - - /* - * Heads up ... Setup the CPU / MMU / TLB functions - */ - set_cpufuncs(); - - /* Copy the boot configuration structure */ - bootconfig = *bootconf; - - /* - * Initialise the video memory descriptor - * - * Note: all references to the video memory virtual/physical address - * should go via this structure. - */ - - /* - * In the future ... - * - * All console output will be postponed until the primary bootstrap - * has been completed so that we have had a chance to reserve some - * memory for the video system if we do not have separate VRAM. - */ - - /* Hardwire it in case we have an old boot loader */ - - videomemory.vidm_vbase = bootconfig.display_start; - videomemory.vidm_pbase = VRAM_BASE; - videomemory.vidm_type = VIDEOMEM_TYPE_VRAM; - videomemory.vidm_size = bootconfig.display_size; - - if (bootconfig.magic == BOOTCONFIG_MAGIC) { - videomemory.vidm_vbase = bootconfig.display_start; - videomemory.vidm_pbase = bootconfig.display_phys; - videomemory.vidm_size = bootconfig.display_size; - if (bootconfig.vram[0].pages) - videomemory.vidm_type = VIDEOMEM_TYPE_VRAM; - else - videomemory.vidm_type = VIDEOMEM_TYPE_DRAM; - }; - vidc_base = (int *) VIDC_BASE; - iomd_base = IOMD_BASE; - - /* - * Initialise the physical console - * This is done in main() but for the moment we do it here so that - * we can use printf in initarm() before main() has been called. - */ - consinit(); - - /* Talk to the user */ - printf("initarm...\n"); - - /* Tell the user if his boot loader is too old */ - if (bootconfig.magic != BOOTCONFIG_MAGIC) { - printf("\n !!! OLD STYLE BOOTLOADER DETECTED !!! PLEASE UPGRADE TO NEW BOOTLOADER ASAP !\n\n"); - delay(5000000); - } - - printf("Kernel loaded from file %s\n", bootconfig.kernelname); - printf("Kernel arg string %s\n", (char *)bootconfig.argvirtualbase); - - printf("\nBoot configuration structure reports the following memory\n"); - - printf(" DRAM block 0a at %08x size %08x DRAM block 0b at %08x size %08x\n\r", - bootconfig.dram[0].address, - bootconfig.dram[0].pages * bootconfig.pagesize, - bootconfig.dram[1].address, - bootconfig.dram[1].pages * bootconfig.pagesize); - printf(" DRAM block 1a at %08x size %08x DRAM block 1b at %08x size %08x\n\r", - bootconfig.dram[2].address, - bootconfig.dram[2].pages * bootconfig.pagesize, - bootconfig.dram[3].address, - bootconfig.dram[3].pages * bootconfig.pagesize); - printf(" VRAM block 0 at %08x size %08x\n\r", - bootconfig.vram[0].address, - bootconfig.vram[0].pages * bootconfig.pagesize); - -/* printf(" videomem: VA=%08x PA=%08x\n", videomemory.vidm_vbase, videomemory.vidm_pbase);*/ - - /* Check to make sure the page size is correct */ - if (NBPG != bootconfig.pagesize) - panic("Page size is not %d bytes\n", NBPG); - - /* - * Ok now we have the hard bit. - * We have the kernel allocated up high. The rest of the memory map is - * available. We are still running on RISC OS page tables. - * - * We need to construct new page tables move the kernel in physical - * memory and switch to them. - * - * The booter will have left us 6 pages at the top of memory. - * Two of these are used as L2 page tables and the other 4 form the L1 - * page table. - */ - - /* - * Ok we must construct own own page table tables. - * Once we have these we can reorganise the memory as required - */ - - /* - * We better check to make sure the booter has set up the scratch - * area for us correctly. We use this area to create temporary pagetables - * while we reorganise the memory map. - */ - - if ((bootconfig.scratchphysicalbase & 0x3fff) != 0) - panic("initarm: Scratch area not aligned on 16KB boundry\n"); - - if ((bootconfig.scratchsize < 0xc000) != 0) - panic("initarm: Scratch area too small (need >= 48KB)\n"); - - /* - * Ok start the primary bootstrap. - * The primary bootstrap basically replaces the booter page tables with - * new ones that it creates in the boot scratch area. These page tables - * map the rest of the physical memory into the virtaul memory map. - * This allows low physical memory to be accessed to create the - * kernels page tables, relocate the kernel code from high physical - * memory to low physical memory etc. - */ - printf("initarm: Primary bootstrap ... "); - - kerneldatasize = bootconfig.kernsize + bootconfig.argsize; - - l2pagetable = bootconfig.scratchvirtualbase; - l1pagetable = l2pagetable + 0x4000; - - if (bootconfig.vram[0].pages > 0) { - /* - * Now we construct a L2 pagetables for the VRAM - */ - for (logical = 0; logical < 0x200000; logical += NBPG) { - map_entry(l2pagetable + 0x1000, logical, - bootconfig.vram[0].address + logical); - map_entry(l2pagetable + 0x1000, logical + 0x200000, - bootconfig.vram[0].address + logical); - } - - /* - * Update the videomemory structure to reflect the mapping - * changes - */ - videomemory.vidm_vbase = VMEM_VBASE; - videomemory.vidm_pbase = VRAM_BASE; - videomemory.vidm_type = VIDEOMEM_TYPE_VRAM; - videomemory.vidm_size = bootconfig.vram[0].pages * NBPG; - } else { - if (bootconfig.display_phys != bootconfig.dram[0].address) - panic("video DRAM is being unpredictable\n"); - - /* - * Now we construct a L2 pagetables for the DRAM - */ - for (logical = 0; logical < bootconfig.display_size; - logical += NBPG) { - map_entry(l2pagetable + 0x1000, logical, - bootconfig.display_phys + logical); - } - - /* - * Update the videomemory structure to reflect the mapping - * changes - */ - videomemory.vidm_vbase = VMEM_VBASE; - videomemory.vidm_pbase = bootconfig.display_phys; - videomemory.vidm_type = VIDEOMEM_TYPE_DRAM; - videomemory.vidm_size = bootconfig.display_size; - } - - /* - * Now map L2 page tables for the current kernel memory - * and the new kernel memory - */ - for (logical = 0; logical < kerneldatasize + bootconfig.scratchsize; - logical += NBPG) { - map_entry(l2pagetable + 0x3000, logical, - bootconfig.kernphysicalbase + logical); - } - - for (logical = 0; logical < 0x400000; logical += NBPG) { - map_entry(l2pagetable + 0x2000, logical, - bootconfig.dram[0].address + logical); - } - - /* - * Now we construct the L1 pagetable. This only needs the minimum to - * keep us going until we can contruct the proper kernel L1 page table. - */ - map_section(l1pagetable, VIDC_BASE, VIDC_HW_BASE, 0); - map_section(l1pagetable, IOMD_BASE, IOMD_HW_BASE, 0); - - map_pagetable(l1pagetable, 0x00000000, - bootconfig.scratchphysicalbase + 0x2000); - map_pagetable(l1pagetable, KERNEL_BASE, - bootconfig.scratchphysicalbase + 0x3000); - map_pagetable(l1pagetable, VMEM_VBASE, - bootconfig.scratchphysicalbase + 0x1000); - - /* Print some debugging info */ -/* printf("page tables look like this ...\n"); - printf("V0x00000000 - %08x\n", ReadWord(l1pagetable + 0x0000)); - printf("V0x00100000 - %08x\n", ReadWord(l1pagetable + 0x0004)); - printf("V0x00200000 - %08x\n", ReadWord(l1pagetable + 0x0008)); - printf("V0x00300000 - %08x\n", ReadWord(l1pagetable + 0x000C)); - printf("V0x03500000 - %08x\n", ReadWord(l1pagetable + 0x00d4)); - printf("V0x00200000 - %08x\n", ReadWord(l1pagetable + 0x0080)); - printf("V0xf0000000 - %08x\n", ReadWord(l1pagetable + 0x3c00)); - printf("V0xf0100000 - %08x\n", ReadWord(l1pagetable + 0x3c04)); - printf("V0xf0200000 - %08x\n", ReadWord(l1pagetable + 0x3c08)); - printf("V0xf0300000 - %08x\n", ReadWord(l1pagetable + 0x3c0C)); - printf("V0xf1000000 - %08x\n", ReadWord(l1pagetable + 0x3c40)); - printf("V0xf2000000 - %08x\n", ReadWord(l1pagetable + 0x3c80)); - printf("V0xf3000000 - %08x\n", ReadWord(l1pagetable + 0x3cc0)); - printf("V0xf4000000 - %08x\n", ReadWord(l1pagetable + 0x3d00)); - printf("V0xf5000000 - %08x\n", ReadWord(l1pagetable + 0x3d40)); - printf("V0xf6000000 - %08x\n", ReadWord(l1pagetable + 0x3d80)); - printf("V0xf7000000 - %08x\n", ReadWord(l1pagetable + 0x3dc0)); - printf("page dir = P%08x\n", bootconfig.scratchphysicalbase + 0x4000); - printf("l1= V%08x\n", l1pagetable); -*/ - - /* Grind to a halt if no VRAM */ - -/* if (bootconfig.vram[0].pages == 0) { - printf("Switching to bootstrap pagetables\n"); - printf("[Hit a key top continue]\n"); - cngetc(); - }*/ - - /* If no VRAM kill the VIDC DAC's until the end of the bootstrap */ - if (bootconfig.vram[0].pages == 0) - vidcrender_blank(vconsole_current, BLANK_OFF); - - /* If we don't have VRAM .. - * Ahhhhhhhhhhhhhhhhhhhhhh - * We have just mapped the kernel across the video DRAM from RISCOS. - * Better block all printing until we complete the secondary - * bootstrap and have allocate new video DRAM. - */ - - /* - * Pheww right we are ready to switch page tables !!! - * The L1 table is at bootconfig.scratchphysicalbase + 0x4000 - */ - - /* Switch tables */ - setttb(bootconfig.scratchphysicalbase + 0x4000); - - /* - * We must now clean the cache again.... - * Cleaning may be done by reading new data to displace any - * dirty data in the cache. This will have happened in setttb() - * but since we are boot strapping the addresses used for the read - * may have just been remapped and thus the cache could be out - * of sync. A re-clean after the switch will cure this. - * After booting there are no gross reloations of the kernel thus - * this problem wil not occur after initarm(). - */ - cpu_idcache_wbinv_all(); - - /* - * Since we have mapped the VRAM up into kernel space we must - * now update the bootconfig and display structures by hand. - */ - if (bootconfig.vram[0].pages != 0) { - bootconfig.display_start = VMEM_VBASE; - physcon_display_base(VMEM_VBASE); - } - - if (bootconfig.vram[0].pages != 0) - printf("done.\n"); - - /* - * Ok we have finished the primary boot strap. All this has done is to - * allow us to access all the physical memory from known virtual - * location. We also now know that all the used pages are at the top - * of the physical memory and where they are in the virtual memory map. - * - * This should be the stage we are at at the end of the bootstrap when - * we have a two stage booter. - * - * The secondary bootstrap has the responsibility to sort locating the - * kernel to the correct address and for creating the kernel page tables. - * It must also set up various memory pointers that are used by pmap etc. - */ - process_kernel_args(); - - if (bootconfig.vram[0].pages != 0) - printf("initarm: Secondary bootstrap ... "); - - /* Zero down the memory we mapped in for the secondary bootstrap */ - memset(0x00000000, 0, 0x400000); /* XXX */ - - /* - * Set up the variables that define the availablilty of physcial - * memory - */ - physical_start = bootconfig.dram[0].address; - physical_freestart = physical_start; - physical_end = bootconfig.dram[bootconfig.dramblocks - 1].address - + bootconfig.dram[bootconfig.dramblocks - 1].pages * NBPG; - physical_freeend = physical_end; - free_pages = bootconfig.drampages; - - for (loop = 0; loop < bootconfig.dramblocks; ++loop) - physmem += bootconfig.dram[loop].pages; - - /* - * Reserve some pages at the top of the memory for later use - * - * This area is not currently used but could be used for the allocation - * of L1 page tables for each process. - * The size of this memory would be determined by the maximum number of - * processes. - * - * For the moment we just reserve a few pages just to make sure the - * system copes. - */ - physical_freeend -= videodram_size; - free_pages -= (videodram_size / NBPG); - videodram_start = physical_freeend; - - if (videodram_size) { - videomemory.vidm_vbase = VMEM_VBASE; - videomemory.vidm_pbase = videodram_start; - videomemory.vidm_type = VIDEOMEM_TYPE_DRAM; - videomemory.vidm_size = videodram_size; - } - - /* - * Right We have the bottom meg of memory mapped to 0x00000000 - * so was can get at it. The kernel will ocupy the start of it. - * After the kernel/args we allocate some of the fixed page tables - * we need to get the system going. - * We allocate one page directory and 8 page tables and store the - * physical addresses in the kernel_pt_table array. - * Must remember that neither the page L1 or L2 page tables are the - * same size as a page ! - * - * Ok the next bit of physical allocate may look complex but it is - * simple really. I have done it like this so that no memory gets - * wasted during the allocate of various pages and tables that are - * all different sizes. - * The start address will be page aligned. - * We allocate the kernel page directory on the first free 16KB - * boundry we find. - * We allocate the kernel page tables on the first 1KB boundry we find. - * We allocate 9 PT's. This means that in the process we - * KNOW that we will encounter at least 1 16KB boundry. - * - * Eventually if the top end of the memory gets used for process L1 - * page tables the kernel L1 page table may be moved up there. - */ - -#ifdef VERBOSE_INIT_ARM - printf("Allocating page tables\n"); -#endif - - /* Update the address of the first free page of physical memory */ - physical_freestart = physical_start + kerneldatasize; - free_pages -= (physical_freestart - physical_start) / NBPG; - - /* Define a macro to simplify memory allocation */ -#define valloc_pages(var, np) \ - alloc_pages((var).pv_pa, (np)); \ - (var).pv_va = KERNEL_BASE + (var).pv_pa - physical_start; - -#define alloc_pages(var, np) \ - (var) = physical_freestart; \ - physical_freestart += ((np) * NBPG); \ - free_pages -= (np); \ - memset((char *)(var) - physical_start, 0, ((np) * NBPG)); - - loop1 = 0; - kernel_l1pt.pv_pa = 0; - for (loop = 0; loop <= NUM_KERNEL_PTS; ++loop) { - /* Are we 16KB aligned for an L1 ? */ - if ((physical_freestart & (PD_SIZE - 1)) == 0 - && kernel_l1pt.pv_pa == 0) { - valloc_pages(kernel_l1pt, PD_SIZE / NBPG); - } else { - alloc_pages(kernel_pt_table[loop1], PT_SIZE / NBPG); - ++loop1; - } - } - -#ifdef DIAGNOSTIC - /* This should never be able to happen but better confirm that. */ - if (!kernel_l1pt.pv_pa || (kernel_l1pt.pv_pa & (PD_SIZE-1)) != 0) - panic("initarm: Failed to align the kernel page directory\n"); -#endif - - /* - * Allocate a page for the system page mapped to V0x00000000 - * This page will just contain the system vectors and can be - * shared by all processes. - */ - alloc_pages(systempage.pv_pa, 1); - - /* Allocate a page for the page table to map kernel page tables*/ - valloc_pages(kernel_ptpt, PT_SIZE / NBPG); - - /* Allocate stacks for all modes */ - valloc_pages(irqstack, IRQ_STACK_SIZE); - valloc_pages(abtstack, ABT_STACK_SIZE); - valloc_pages(undstack, UND_STACK_SIZE); - valloc_pages(kernelstack, UPAGES); - -#ifdef VERBOSE_INIT_ARM - printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa, irqstack.pv_va); - printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa, abtstack.pv_va); - printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa, undstack.pv_va); - printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa, kernelstack.pv_va); -#endif - - alloc_pages(msgbufphys, round_page(MSGBUFSIZE) / NBPG); - -#ifdef CPU_SA110 - /* - * XXX totally stuffed hack to work round problems introduced - * in recent versions of the pmap code. Due to the calls used there - * we cannot allocate virtual memory during bootstrap. - */ - sa110_cc_base = (KERNEL_BASE + (physical_freestart - physical_start) - + (CPU_SA110_CACHE_CLEAN_SIZE - 1)) - & ~(CPU_SA110_CACHE_CLEAN_SIZE - 1); -#endif /* CPU_SA110 */ - - /* - * Ok we have allocated physical pages for the primary kernel - * page tables - */ - -#ifdef VERBOSE_INIT_ARM - printf("Creating L1 page table\n"); -#endif - - /* - * Now we start consturction of the L1 page table - * We start by mapping the L2 page tables into the L1. - * This means that we can replace L1 mappings later on if necessary - */ - l1pagetable = kernel_l1pt.pv_pa - physical_start; - - /* Map the L2 pages tables in the L1 page table */ - map_pagetable(l1pagetable, 0x00000000, - kernel_pt_table[KERNEL_PT_SYS]); - map_pagetable(l1pagetable, KERNEL_BASE, - kernel_pt_table[KERNEL_PT_KERNEL]); - for (loop = 0; loop < KERNEL_PT_VMDATA_NUM; ++loop) - map_pagetable(l1pagetable, KERNEL_VM_BASE + loop * 0x00400000, - kernel_pt_table[KERNEL_PT_VMDATA + loop]); - map_pagetable(l1pagetable, PROCESS_PAGE_TBLS_BASE, - kernel_ptpt.pv_pa); - map_pagetable(l1pagetable, VMEM_VBASE, - kernel_pt_table[KERNEL_PT_VMEM]); - - -#ifdef VERBOSE_INIT_ARM - printf("Mapping kernel\n"); -#endif - - /* Now we fill in the L2 pagetable for the kernel code/data */ - l2pagetable = kernel_pt_table[KERNEL_PT_KERNEL] - physical_start; - - if (N_GETMAGIC(kernexec[0]) == ZMAGIC) { - /* - * This is a work around for a recent problem that occurred - * with ARM 610 processors and some ARM 710 processors - * Other ARM 710 and StrongARM processors don't have a problem. - */ -#if defined(CPU_ARM6) || defined(CPU_ARM7) - logical = map_chunk(0, l2pagetable, KERNEL_TEXT_BASE, - physical_start, kernexec->a_text, - AP_KRW, PT_CACHEABLE); -#else /* CPU_ARM6 || CPU_ARM7 */ - logical = map_chunk(0, l2pagetable, KERNEL_TEXT_BASE, - physical_start, kernexec->a_text, - AP_KR, PT_CACHEABLE); -#endif /* CPU_ARM6 || CPU_ARM7 */ - logical += map_chunk(0, l2pagetable, KERNEL_TEXT_BASE + logical, - physical_start + logical, kerneldatasize - kernexec->a_text, - AP_KRW, PT_CACHEABLE); - } else - map_chunk(0, l2pagetable, KERNEL_TEXT_BASE, - physical_start, kerneldatasize, - AP_KRW, PT_CACHEABLE); - -#ifdef VERBOSE_INIT_ARM - printf("Constructing L2 page tables\n"); -#endif - - /* Map the stack pages */ - map_chunk(0, l2pagetable, irqstack.pv_va, irqstack.pv_pa, - IRQ_STACK_SIZE * NBPG, AP_KRW, PT_CACHEABLE); - map_chunk(0, l2pagetable, abtstack.pv_va, abtstack.pv_pa, - ABT_STACK_SIZE * NBPG, AP_KRW, PT_CACHEABLE); - map_chunk(0, l2pagetable, undstack.pv_va, undstack.pv_pa, - UND_STACK_SIZE * NBPG, AP_KRW, PT_CACHEABLE); - map_chunk(0, l2pagetable, kernelstack.pv_va, kernelstack.pv_pa, - UPAGES * NBPG, AP_KRW, PT_CACHEABLE); - map_chunk(0, l2pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa, - PD_SIZE, AP_KRW, 0); - - /* Map the page table that maps the kernel pages */ - map_entry_nc(l2pagetable, kernel_ptpt.pv_pa - physical_start, - kernel_ptpt.pv_pa); - - /* Now we fill in the L2 pagetable for the VRAM */ - - /* - * Current architectures mean that the VRAM is always in 1 continuous - * bank. - * This means that we can just map the 2 meg that the VRAM would occupy. - * In theory we don't need a page table for VRAM, we could section map - * it but we would need the page tables if DRAM was in use. - */ - l2pagetable = kernel_pt_table[KERNEL_PT_VMEM] - physical_start; - - map_chunk(0, l2pagetable, VMEM_VBASE, videomemory.vidm_pbase, - videomemory.vidm_size, AP_KRW, PT_CACHEABLE); - map_chunk(0, l2pagetable, VMEM_VBASE + videomemory.vidm_size, - videomemory.vidm_pbase, videomemory.vidm_size, - AP_KRW, PT_CACHEABLE); - - /* - * Map entries in the page table used to map PTE's - * Basically every kernel page table gets mapped here - */ - /* The -2 is slightly bogus, it should be -log2(sizeof(pt_entry_t)) */ - l2pagetable = kernel_ptpt.pv_pa - physical_start; - map_entry_nc(l2pagetable, (KERNEL_BASE >> (PGSHIFT-2)), - kernel_pt_table[KERNEL_PT_KERNEL]); - map_entry_nc(l2pagetable, (PROCESS_PAGE_TBLS_BASE >> (PGSHIFT-2)), - kernel_ptpt.pv_pa); - map_entry_nc(l2pagetable, (VMEM_VBASE >> (PGSHIFT-2)), - kernel_pt_table[KERNEL_PT_VMEM]); - map_entry_nc(l2pagetable, (0x00000000 >> (PGSHIFT-2)), - kernel_pt_table[KERNEL_PT_SYS]); - for (loop = 0; loop < KERNEL_PT_VMDATA_NUM; ++loop) { - map_entry_nc(l2pagetable, ((KERNEL_VM_BASE + - (loop * 0x00400000)) >> (PGSHIFT-2)), - kernel_pt_table[KERNEL_PT_VMDATA + loop]); - } - - /* - * Map the system page in the kernel page table for the bottom 1Meg - * of the virtual memory map. - */ - l2pagetable = kernel_pt_table[KERNEL_PT_SYS] - physical_start; - map_entry(l2pagetable, 0x0000000, systempage.pv_pa); - - /* Map the VIDC20, IOMD, COMBO and podules */ - - /* Map the VIDC20 */ - map_section(l1pagetable, VIDC_BASE, VIDC_HW_BASE, 0); - - /* Map the IOMD (and SLOW and MEDIUM simple podules) */ - map_section(l1pagetable, IOMD_BASE, IOMD_HW_BASE, 0); - - /* Map the COMBO (and module space) */ - map_section(l1pagetable, IO_BASE, IO_HW_BASE, 0); - - /* Bit more debugging info */ -/* printf("page tables look like this ...\n"); - printf("V0x00000000 - %08x\n", ReadWord(l1pagetable + 0x0000)); - printf("V0x03200000 - %08x\n", ReadWord(l1pagetable + 0x00c8)); - printf("V0x03500000 - %08x\n", ReadWord(l1pagetable + 0x00d4)); - printf("V0xf0000000 - %08x\n", ReadWord(l1pagetable + 0x3c00)); - printf("V0xf0100000 - %08x\n", ReadWord(l1pagetable + 0x3c04)); - printf("V0xf1000000 - %08x\n", ReadWord(l1pagetable + 0x3c40)); - printf("V0xf2000000 - %08x\n", ReadWord(l1pagetable + 0x3c80)); - printf("V0xf3000000 - %08x\n", ReadWord(l1pagetable + 0x3cc0)); - printf("V0xf3300000 - %08x\n", ReadWord(l1pagetable + 0x3ccc)); - printf("V0xf4000000 - %08x\n", ReadWord(l1pagetable + 0x3d00)); - printf("V0xf5000000 - %08x\n", ReadWord(l1pagetable + 0x3d40)); - printf("V0xf6000000 - %08x\n", ReadWord(l1pagetable + 0x3d80)); - printf("V0xf7000000 - %08x\n", ReadWord(l1pagetable + 0x3dc0)); - printf("V0xefc00000 - %08x\n", ReadWord(l1pagetable + 0x3bf8)); - printf("V0xef800000 - %08x\n", ReadWord(l1pagetable + 0x3bfc)); -*/ - - /* - * Now we have the real page tables in place so we can switch to them. - * Once this is done we will be running with the REAL kernel page - * tables. - */ - - /* - * The last thing we must do is copy the kernel down to the new memory. - * This copies all our kernel data structures and variables as well - * which is why it is left to the last moment. - */ - if (bootconfig.vram[0].pages != 0) - printf("mapping ... "); - - memcpy((char *)0x00000000, (char *)KERNEL_TEXT_BASE, kerneldatasize); - - /* Switch tables */ -#ifdef VERBOSE_INIT_ARM - printf("switching to new L1 page table\n"); -#endif - - setttb(kernel_l1pt.pv_pa); - - /* - * We must now clean the cache again.... - * Cleaning may be done by reading new data to displace any - * dirty data in the cache. This will have happened in setttb() - * but since we are boot strapping the addresses used for the read - * may have just been remapped and thus the cache could be out - * of sync. A re-clean after the switch will cure this. - * After booting there are no gross reloations of the kernel thus - * this problem will not occur after initarm(). - */ - cpu_idcache_wbinv_all(); - - if (videodram_size != 0) { - bootconfig.display_start = VMEM_VBASE; - physcon_display_base(VMEM_VBASE); - vidcrender_reinit(); - - /* Turn the VIDC DAC's on again. */ - vidcrender_blank(vconsole_current, BLANK_NONE); - printf("\x0cSecondary bootstrap: "); - } - - printf("done.\n"); - - /* Right set up the vectors at the bottom of page 0 */ - memcpy((char *)0x00000000, page0, page0_end - page0); - - /* We have modified a text page so sync the icache */ - cpu_icache_sync_range(0, page0_end - page0); - - /* - * Pages were allocated during the secondary bootstrap for the - * stacks for different CPU modes. - * We must now set the r13 registers in the different CPU modes to - * point to these stacks. - * Since the ARM stacks use STMFD etc. we must set r13 to the top end - * of the stack memory. - */ - printf("init subsystems: stacks "); - console_flush(); - - set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * NBPG); - set_stackptr(PSR_ABT32_MODE, abtstack.pv_va + ABT_STACK_SIZE * NBPG); - set_stackptr(PSR_UND32_MODE, undstack.pv_va + UND_STACK_SIZE * NBPG); -#ifdef PMAP_DEBUG - if (pmap_debug_level >= 0) - printf("kstack V%08lx P%08lx\n", kernelstack.pv_va, - kernelstack.pv_pa); -#endif /* PMAP_DEBUG */ - - /* - * Well we should set a data abort handler. - * Once things get going this will change as we will need a proper - * handler. Until then we will use a handler that just panics but - * tells us why. - * Initialisation of the vectors will just panic on a data abort. - * This just fills in a slighly better one. - */ - printf("vectors "); - data_abort_handler_address = (u_int)data_abort_handler; - prefetch_abort_handler_address = (u_int)prefetch_abort_handler; - undefined_handler_address = (u_int)undefinedinstruction_bounce; - console_flush(); - -#if 0 - /* Diagnostic stuff. while writing the boot code */ - for (loop = 0x0; loop < 0x1000; ++loop) { - if (ReadWord(PAGE_DIRS_BASE + loop * 4) != 0) - printf("Pagetable for V%08x = %08x\n", loop << 20, - ReadWord(0xf2000000 + loop * 4)); - } - - for (loop = 0x0; loop < 0x400; ++loop) { - if (ReadWord(kernel_pt_table[KERNEL_PT_PTE] + loop * 4) != 0) - printf("Pagetable for V%08x P%08x = %08x\n", - loop << 22, kernel_pt_table[KERNEL_PT_PTE]+loop*4, - ReadWord(kernel_pt_table[KERNEL_PT_PTE]+loop * 4)); - } -#endif - - /* At last ! - * We now have the kernel in physical memory from the bottom upwards. - * Kernel page tables are physically above this. - * The kernel is mapped to 0xf0000000 - * The kernel data PTs will handle the mapping of 0xf1000000-0xf1ffffff - * 2Meg of VRAM is mapped to 0xf4000000 - * The page tables are mapped to 0xefc00000 - * The IOMD is mapped to 0xf6000000 - * The VIDC is mapped to 0xf6100000 - */ - - /* Initialise the undefined instruction handlers */ - printf("undefined "); - undefined_init(); - console_flush(); - - /* Boot strap pmap telling it where the kernel page table is */ - printf("pmap "); - pmap_bootstrap((pd_entry_t *)kernel_l1pt.pv_va, kernel_ptpt); - console_flush(); - - /* Setup the IRQ system */ - printf("irq "); - console_flush(); - irq_init(); - printf("done.\n"); - - if (cmos_read(RTC_ADDR_REBOOTCNT) > 0) - printf("Warning: REBOOTCNT = %d\n", - cmos_read(RTC_ADDR_REBOOTCNT)); - -#ifdef CPU_SA110 - if (cputype == CPU_ID_SA110) - rpc_sa110_cc_setup(); -#endif /* CPU_SA110 */ - -#ifdef IPKDB - /* Initialise ipkdb */ - ipkdb_init(); - if (boothowto & RB_KDB) - ipkdb_connect(0); -#endif /* NIPKDB */ - -#ifdef DDB - db_machine_init(); -#ifdef __ELF__ - ddb_init(0, NULL, NULL); /* XXX */ -#else - { - extern int end; - extern int *esym; - - ddb_init(*(int *)&end, ((int *)&end) + 1, esym); - } -#endif /* __ELF__ */ - - if (boothowto & RB_KDB) - Debugger(); -#endif /* DDB */ - - /* We return the new stack pointer address */ - return(kernelstack.pv_va + USPACE_SVC_STACK_TOP); -} - -#endif - /* End of machdep.c */ diff --git a/sys/arch/acorn32/include/bootconfig.h b/sys/arch/acorn32/include/bootconfig.h index 7eb466ae1b61..cc8a2d314829 100644 --- a/sys/arch/acorn32/include/bootconfig.h +++ b/sys/arch/acorn32/include/bootconfig.h @@ -1,6 +1,7 @@ -/* $NetBSD: bootconfig.h,v 1.2 2002/02/09 23:58:30 reinoud Exp $ */ +/* $NetBSD: bootconfig.h,v 1.3 2002/02/11 18:47:37 reinoud Exp $ */ /* + * Copyright (c) 2002 Reinoud Zandijk. * Copyright (c) 1994 Mark Brinicombe. * Copyright (c) 1994 Brini. * All rights reserved. @@ -37,20 +38,76 @@ * * boot configuration structures * - * Created : 12/09/94 - * - * Based on kate/boot/bootconfig.h */ -typedef struct _PhysMem { - u_int address; - u_int pages; -} PhysMem; - #if defined(_KERNEL) -#define DRAM_BLOCKS 4 + +/* get some spare blocks ;) */ +#define DRAM_BLOCKS 32 +#define VRAM_BLOCKS 16 + + +typedef struct { + u_int address; + u_int pages; + u_int flags; +} phys_mem; + + typedef struct _BootConfig { + u_int magic; + u_int version; /* version 2+ */ + + u_char machine_id[4]; + char kernelname[80]; + char args[512]; /* 512 bytes is better than 4096 */ + + u_int kernvirtualbase; /* not used now */ + u_int kernphysicalbase; /* not used now */ + u_int kernsize; + u_int scratchvirtualbase; + u_int scratchphysicalbase; + u_int scratchsize; + + u_int ksym_start; + u_int ksym_end; + + u_int MDFvirtualbase; /* not used yet */ + u_int MDFphysicalbase; /* not used yet */ + u_int MDFsize; /* not used yet */ + + u_int display_phys; + u_int display_start; + u_int display_size; + u_int width; + u_int height; + u_int log2_bpp; + u_int framerate; + + char reserved[512]; /* future expansion */ + + u_int pagesize; + u_int drampages; + u_int vrampages; + u_int dramblocks; + u_int vramblocks; + + phys_mem dram[DRAM_BLOCKS]; + phys_mem vram[VRAM_BLOCKS]; + +} BootConfig; + + +/************ compat stuff ************/ + +typedef struct { + u_int address; + u_int pages; +} phys_mem_v1; + + +typedef struct { u_int kernvirtualbase; u_int kernphysicalbase; u_int kernsize; @@ -67,8 +124,8 @@ typedef struct _BootConfig { u_int height; u_int log2_bpp; - PhysMem dram[DRAM_BLOCKS]; - PhysMem vram[1]; + phys_mem_v1 dram[4]; + phys_mem_v1 vram[1]; u_int dramblocks; u_int vramblocks; @@ -82,10 +139,12 @@ typedef struct _BootConfig { u_char machine_id[4]; u_int magic; u_int display_phys; -} BootConfig; +} BootConfig_v1; + +/************ end compat stuff ***********/ -#define OLD_BOOTCONFIG_MAGIC 0x42301068 #define BOOTCONFIG_MAGIC 0x43112233 +#define BOOTCONFIG_VERSION 0x2 extern BootConfig bootconfig; #endif /* _KERNEL */ @@ -105,4 +164,5 @@ extern char *boot_args; extern char *boot_file; #endif /* _KERNEL */ + /* End of bootconfig.h */