WebSVN – HelenOS – Path Comparison – / – /branches/tracing/boot/ Rev 3423 and /branches/tracing/boot/ Rev 3424

Ignore whitespace Rev 3423 → Rev 3424

 /branches/tracing/boot/arch/sparc64/loader/asm.S
 ,6 → 98,16
     mov %o1, %o0
 jump_to_kernel:
+    /*
+     * We have copied code and now we need to guarantee cache coherence.
+     * 1. Make sure that the code we have moved has drained to main memory.
+     * 2. Invalidate I-cache.
+     * 3. Flush instruction pipeline.
+     */
+    call    icache_flush
+    membar  #StoreStore
+    flush   %i7
     mov %o0, %l1
     mov %o1, %o0
     mov %o2, %o1
 ,6 → 115,24
     jmp %l1             ! jump to kernel
     nop
+#define ICACHE_SIZE     8192
+#define ICACHE_LINE_SIZE    32
+#define ICACHE_SET_BIT      (1 << 13)
+#define ASI_ICACHE_TAG      0x67
+# Flush I-cache
+icache_flush:
+    set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
+    stxa    %g0, [%g1] ASI_ICACHE_TAG
+:  membar  #Sync
+    subcc   %g1, ICACHE_LINE_SIZE, %g1
+    bnz,pt  %xcc, 0b
+    stxa    %g0, [%g1] ASI_ICACHE_TAG
+    membar  #Sync
+    retl
+    ! SF Erratum #51
+    nop
 .global ofw
 ofw:
     save %sp, -STACK_WINDOW_SAVE_AREA_SIZE, %sp

 /branches/tracing/boot/arch/sparc64/loader/ofwarch.c
 ,18 → 69,23
     uint64_t current_mid;
-    asm volatile ("ldxa [%1] %2, %0\n" : "=r" (current_mid) : "r" (0), "i" (ASI_UPA_CONFIG));
+    asm volatile ("ldxa [%1] %2, %0\n"
+        : "=r" (current_mid)
+        : "r" (0), "i" (ASI_UPA_CONFIG));
     current_mid >>= UPA_CONFIG_MID_SHIFT;
     current_mid &= UPA_CONFIG_MID_MASK;
     int cpus;
-    for (cpus = 0; node != 0 && node != -1; node = ofw_get_peer_node(node), cpus++) {
-        if (ofw_get_property(node, "device_type", type_name, sizeof(type_name)) > 0) {
+    for (cpus = 0; node != 0 && node != -1; node = ofw_get_peer_node(node),
+        cpus++) {
+        if (ofw_get_property(node, "device_type", type_name,
+            sizeof(type_name)) > 0) {
             if (strcmp(type_name, "cpu") == 0) {
                 uint32_t mid;
-                if (ofw_get_property(node, "upa-portid", &mid, sizeof(mid)) <= 0)
+                if (ofw_get_property(node, "upa-portid", &mid,
+                    sizeof(mid)) <= 0)
                     continue;
                 if (current_mid != mid) {
 ,9 → 92,10
                     /*
                      * Start secondary processor.
                      */
-                    (void) ofw_call("SUNW,start-cpu", 3, 1, NULL, node,
-                         KERNEL_VIRTUAL_ADDRESS,
-                         bootinfo.physmem_start | AP_PROCESSOR);
+                    (void) ofw_call("SUNW,start-cpu", 3, 1,
+                        NULL, node, KERNEL_VIRTUAL_ADDRESS,
+                        bootinfo.physmem_start |
+                        AP_PROCESSOR);
                 }
             }
         }

 /branches/tracing/boot/arch/sparc64/loader/Makefile
 ,14 → 78,17
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+RD_TASKS = \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/sctrace/sctrace \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
 ,17 → 103,24
 -include Makefile.depend
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-    $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+    $(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
-    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_TASKS) _link.ld.in
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+    ../../../../tools/mktmpfs.py 16384 $(USPACEDIR)/dist/ initrd.img
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS) ./initrd.img
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /branches/tracing/boot/arch/ia64/loader/gefi/apps/Makefile
 ,7 → 28,7
 CRTOBJS     = ../gnuefi/crt0-efi-$(ARCH).o
 LDSCRIPT    = ../gnuefi/elf_$(ARCH)_efi.lds
 LDFLAGS     += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
-LOADLIBES   = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
+LOADLIBES   = -lefi -lgnuefi
 FORMAT      = efi-app-$(ARCH)
 TARGETS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi printenv.efi t7.efi

 /branches/tracing/boot/arch/ia64/loader/gefi/HelenOS/Makefile
 ,7 → 28,7
 CRTOBJS     = ../gnuefi/crt0-efi-$(ARCH).o
 LDSCRIPT    = ../gnuefi/elf_$(ARCH)_efi.lds
 LDFLAGS     += -T $(LDSCRIPT) -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
-LOADLIBES   = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
+LOADLIBES   = -lefi -lgnuefi
 FORMAT      = efi-app-$(ARCH)
 ,7 → 36,7
 clean:
-    rm -f *.efi *~ *.o *.so
+    rm -f *.efi *~ *.o *.so *.map *.disass *.bin
 .PHONY: install

 /branches/tracing/boot/arch/ia64/loader/Makefile
 ,7 → 121,8
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend ../../../../image.bin ../../../../hello.efi
+    make -C gefi clean
     make -C gefi/HelenOS clean
 _components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in

 /branches/tracing/boot/arch/arm32/loader/boot.S
 ,6 → 39,11
     b bootstrap
 jump_to_kernel:
+    #
+    # TODO
+    # Make sure that the I-cache, D-cache and memory are mutually coherent
+    # before passing control to the copied code.
+    #
     bx r0

 /branches/tracing/boot/arch/ppc32/loader/Makefile
 ,14 → 75,17
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+RD_TASKS = \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/sctrace/sctrace \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
 ,17 → 100,24
 -include Makefile.depend
-image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
-    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
+image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)
+    $(LD) -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) -o $@
 depend:
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
-    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_TASKS) _link.ld.in
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+    ../../../../tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ initrd.img
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS) ./initrd.img
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /branches/tracing/boot/arch/amd64/grub/menu.lst
 ,19 → 2,12
 timeout 10
 title=HelenOS
-root (cd)
-kernel /boot/kernel.bin
-module /boot/ns
-module /boot/init
-module /boot/pci
-module /boot/fb
-module /boot/kbd
-module /boot/console
-module /boot/sctrace
-module /boot/tetris
-module /boot/tester
-module /boot/klog
-module /boot/tmpfs
-module /boot/fat
-module /boot/vfs
-module /boot/devmap
+    root (cd)
+    kernel /boot/kernel.bin
+    module /boot/ns
+    module /boot/init
+    module /boot/devmap
+    module /boot/rd
+    module /boot/vfs
+    module /boot/tmpfs
+    module /boot/initrd.img

 /branches/tracing/boot/arch/amd64/Makefile.inc
 ,17 → 26,20
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-TASKS = \
+INIT_TASKS = \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+RD_TASKS = \
     $(USPACEDIR)/srv/pci/pci \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+    $(USPACEDIR)/srv/console/console \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/sctrace/sctrace \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
 ,16 → 47,23
 build: $(BASE)/image.iso
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS)
+$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)
     mkdir -p arch/$(ARCH)/iso/boot/grub
     cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
     cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
     cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
-    for task in $(TASKS) ; do \
+    for task in $(INIT_TASKS) ; do \
         cp $$task arch/$(ARCH)/iso/boot/ ; \
     done
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+    $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
     mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 clean:
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
     -rm -fr arch/$(ARCH)/iso
     -rm -f $(BASE)/image.iso

 /branches/tracing/boot/arch/mips32/loader/asm.S
 ,6 → 106,10
     move    $v0,$a1
 jump_to_kernel:
-#   .word 0x39
+    #
+    # TODO
+    # Make sure that the I-cache, D-cache and memory are mutually coherent
+    # before passing control to the copied code.
+    #
     j $a0
     nop

 /branches/tracing/boot/arch/ia32/grub/menu.lst
 ,20 → 2,12
 timeout 10
 title=HelenOS
-root (cd)
-kernel /boot/kernel.bin
-module /boot/ns
-module /boot/init
-module /boot/pci
-module /boot/fb
-module /boot/kbd
-module /boot/console
-module /boot/vfs
-module /boot/tmpfs
-module /boot/fat
-module /boot/devmap
-module /boot/sctrace
-module /boot/tetris
-module /boot/tester
-module /boot/klog
-module /boot/debug
+    root (cd)
+    kernel /boot/kernel.bin
+    module /boot/ns
+    module /boot/init
+    module /boot/devmap
+    module /boot/rd
+    module /boot/vfs
+    module /boot/tmpfs
+    module /boot/initrd.img

 /branches/tracing/boot/arch/ia32/Makefile.inc
 ,17 → 26,20
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-TASKS = \
+INIT_TASKS = \
     $(USPACEDIR)/srv/ns/ns \
+    $(USPACEDIR)/app/init/init \
+    $(USPACEDIR)/srv/devmap/devmap \
+    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/vfs/vfs \
+    $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+RD_TASKS = \
     $(USPACEDIR)/srv/pci/pci \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
-    $(USPACEDIR)/srv/vfs/vfs \
-    $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     $(USPACEDIR)/srv/fs/fat/fat \
-    $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/app/sctrace/sctrace \
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
 ,16 → 48,23
 build: $(BASE)/image.iso
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS)
+$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)
     mkdir -p arch/$(ARCH)/iso/boot/grub
     cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
     cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/
     cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
-    for task in $(TASKS) ; do \
+    for task in $(INIT_TASKS) ; do \
         cp $$task arch/$(ARCH)/iso/boot/ ; \
     done
+    for task in $(RD_TASKS) ; do \
+        cp $$task $(USPACEDIR)/dist/sbin/ ; \
+    done
+    $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
     mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 clean:
+    -for task in $(RD_TASKS) ; do \
+        rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+    done
     -rm -fr arch/$(ARCH)/iso
     -rm -f $(BASE)/image.iso

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3423 → Rev 3424