WebSVN – HelenOS – Path Comparison – / – /branches/arm/boot/arch/sparc64 Rev 4533 and /branches/arm/boot/arch/sparc64 Rev 4647

Ignore whitespace Rev 4533 → Rev 4647

 /branches/arm/boot/arch/sparc64/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,16 → 57,8
     OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
 endif
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     _components.c \
 ,6 → 71,9
     asm.S \
     boot.S
+#
+# All components that go to image.boot without the ramdisk.
+#
 COMPONENTS = \
     $(KERNELDIR)/kernel.bin \
     $(USPACEDIR)/srv/ns/ns \
 ,7 → 80,7
     $(USPACEDIR)/app/init/init \
     $(USPACEDIR)/srv/loader/loader \
     $(USPACEDIR)/srv/devmap/devmap \
-    $(USPACEDIR)/srv/rd/rd \
+    $(USPACEDIR)/srv/bd/rd/rd \
     $(USPACEDIR)/srv/vfs/vfs
 ifeq ($(RDFMT),tmpfs)
     COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
 ,22 → 89,43
     COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
 endif
+#
+# Final list of all components that go to image.boot.
+#
+ALL_COMPONENTS = $(COMPONENTS)
+ifeq ($(CONFIG_RD_EXTERNAL),n)
+    ALL_COMPONENTS += ./initrd.img
+endif
 RD_SRVS = \
     $(USPACEDIR)/srv/fb/fb \
     $(USPACEDIR)/srv/kbd/kbd \
     $(USPACEDIR)/srv/console/console \
+    $(USPACEDIR)/srv/fs/devfs/devfs \
     $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-    $(USPACEDIR)/srv/fs/fat/fat
+    $(USPACEDIR)/srv/bd/file_bd/file_bd
+ifeq ($(MACHINE),generic)
+RD_SRVS += \
+    $(USPACEDIR)/srv/fs/fat/fat \
+    $(USPACEDIR)/srv/cir/fhc/fhc \
+    $(USPACEDIR)/srv/cir/obio/obio
+endif
 RD_APPS = \
+    $(USPACEDIR)/app/getvc/getvc \
     $(USPACEDIR)/app/tetris/tetris \
-    $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/trace/trace \
     $(USPACEDIR)/app/bdsh/bdsh \
     $(USPACEDIR)/app/klog/klog
+ifeq ($(MACHINE),generic)
+RD_APPS += \
+    $(USPACEDIR)/app/tester/tester
+endif
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
+ALL_COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(ALL_COMPONENTS))))
 .PHONY: all clean depend
 ,11 → 133,11
 -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 $(ALL_COMPONENT_OBJECTS) $(OBJECTS)
+    $(LD) -Map image.map -no-check-sections -N -T _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS) -o $@
 depend:
-    -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
+    -makedepend -f - -- $(DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
     -for file in $(RD_SRVS) ; do \
 ,9 → 146,9
     -for file in $(RD_APPS) ; do \
         rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
     done
-    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
+    -rm -f _components.h _components.c _link.ld $(ALL_COMPONENT_OBJECTS) $(OBJECTS) initrd.img image.boot image.map image.disasm Makefile.depend
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+_components.h _components.c _link.ld $(ALL_COMPONENT_OBJECTS): $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
     for file in $(RD_SRVS) ; do \
         cp $$file $(USPACEDIR)/dist/srv/ ; \
     done
 ,11 → 159,11
     ../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs
 endif
 ifeq ($(RDFMT),fat)
-    ../../../../tools/mkfat.sh $(USPACEDIR)/dist/ initrd.fs
+    ../../../../tools/mkfat.py $(USPACEDIR)/dist/ initrd.fs
 endif
     ../../../../tools/mkhord.py 16384 initrd.fs initrd.img
     rm initrd.fs
-    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS)
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(ALL_COMPONENTS)
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

 /branches/arm/boot/arch/sparc64/loader/asm.S
 ,7 → 40,7
 .global jump_to_kernel
 halt:
-    b halt
+    ba %xcc, halt
     nop
 memcpy:
 ,9 → 105,28
      * 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
+     */
+    /*
+     * US3 processors have a write-invalidate cache, so explicitly
+     * invalidating it is not required. Whether to invalidate I-cache
+     * or not is decided according to the value of the global
+     * "subarchitecture" variable (set in the bootstrap).
+     */
+    set subarchitecture, %g2
+    ldub [%g2], %g2
+    cmp %g2, 3
+    be %xcc, 1f
+    nop
+:
+    call icache_flush
+    nop
+:
+    membar #StoreStore
+    /*
+     * Flush the instruction pipeline.
+     */
     flush   %i7
     mov %o0, %l1
 ,7 → 153,6
     retl
     ! SF Erratum #51
     nop
 .global ofw
 ofw:
     save %sp, -STACK_WINDOW_SAVE_AREA_SIZE, %sp

 /branches/arm/boot/arch/sparc64/loader/boot.S
 ,7 → 43,7
 .global start
 start:
-    b 1f
+    ba %xcc, 1f
     nop
 /*
 ,7 → 83,7
     call ofw_init       ! initialize OpenFirmware
     stx %o4, [%l0]
-    b bootstrap
+    ba %xcc, bootstrap
     nop
 .align STACK_ALIGNMENT

 /branches/arm/boot/arch/sparc64/loader/main.c
 ,25 → 36,36
 #include <ofw_tree.h>
 #include "ofwarch.h"
 #include <align.h>
+#include <macros.h>
 #include <string.h>
 bootinfo_t bootinfo;
 component_t components[COMPONENTS];
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif
+/** UltraSPARC subarchitecture - 1 for US, 3 for US3 */
+uint8_t subarchitecture;
+/**
+ * mask of the MID field inside the ICBUS_CONFIG register shifted by
+ * MID_SHIFT bits to the right
+ */
+uint16_t mid_mask;
 /** Print version information. */
 static void version_print(void)
 {
 ,6 → 74,39
         release, revision, timestamp);
 }
+/* the lowest ID (read from the VER register) of some US3 CPU model */
+#define FIRST_US3_CPU   0x14
+/* the greatest ID (read from the VER register) of some US3 CPU model */
+#define LAST_US3_CPU    0x19
+/* UltraSPARC IIIi processor implementation code */
+#define US_IIIi_CODE    0x15
+/**
+ * Sets the global variables "subarchitecture" and "mid_mask" to
+ * correct values.
+ */
+static void detect_subarchitecture(void)
+{
+    uint64_t v;
+    asm volatile ("rdpr %%ver, %0\n" : "=r" (v));
+    v = (v << 16) >> 48;
+    if ((v >= FIRST_US3_CPU) && (v <= LAST_US3_CPU)) {
+        subarchitecture = SUBARCH_US3;
+        if (v == US_IIIi_CODE)
+            mid_mask = (1 << 5) - 1;
+        else
+            mid_mask = (1 << 10) - 1;
+    } else if (v < FIRST_US3_CPU) {
+        subarchitecture = SUBARCH_US;
+        mid_mask = (1 << 5) - 1;
+    } else {
+        printf("\nThis CPU is not supported by HelenOS.");
+    }
+}
 void bootstrap(void)
 {
     void *base = (void *) KERNEL_VIRTUAL_ADDRESS;
 ,6 → 116,7
     version_print();
+    detect_subarchitecture();
     init_components(components);
     if (!ofw_get_physmem_start(&bootinfo.physmem_start)) {
 ,7 → 128,7
         printf("Error: unable to get memory map, halting.\n");
         halt();
     }
     if (bootinfo.memmap.total == 0) {
         printf("Error: no memory detected, halting.\n");
         halt();
 ,8 → 143,8
         silo_ramdisk_image += bootinfo.physmem_start;
         silo_ramdisk_image -= 0x400000;
         /* Install 1:1 mapping for the ramdisk. */
-        if (ofw_map((void *)((uintptr_t)silo_ramdisk_image),
-            (void *)((uintptr_t)silo_ramdisk_image),
+        if (ofw_map((void *)((uintptr_t) silo_ramdisk_image),
+            (void *)((uintptr_t) silo_ramdisk_image),
             silo_ramdisk_size, -1) != 0) {
             printf("Failed to map ramdisk.\n");
             halt();
 ,6 → 179,9
                 base + top;
             bootinfo.taskmap.tasks[bootinfo.taskmap.count].size =
                 components[i].size;
+            strncpy(bootinfo.taskmap.tasks[
+                bootinfo.taskmap.count].name, components[i].name,
+                BOOTINFO_TASK_NAME_BUFLEN);
             bootinfo.taskmap.count++;
         }
         top += components[i].size;
 ,7 → 207,8
          * given to us by SILO.
          */
         (void) ofw_claim_phys(base + top, silo_ramdisk_size);
-        (void) ofw_map(base + top, base + top, silo_ramdisk_size, -1);
+        (void) ofw_map(bootinfo.physmem_start + base + top, base + top,
+            silo_ramdisk_size, -1);
         memmove(base + top, (void *)((uintptr_t)silo_ramdisk_image),
             silo_ramdisk_size);
         printf("done.\n");
 ,7 → 258,8
     balloc_base = base + ALIGN_UP(top, PAGE_SIZE);
     (void) ofw_claim_phys(bootinfo.physmem_start + balloc_base,
         BALLOC_MAX_SIZE);
-    (void) ofw_map(balloc_base, balloc_base, BALLOC_MAX_SIZE, -1);
+    (void) ofw_map(bootinfo.physmem_start + balloc_base, balloc_base,
+        BALLOC_MAX_SIZE, -1);
     balloc_init(&bootinfo.ballocs, (uintptr_t)balloc_base);
     printf("\nCanonizing OpenFirmware device tree...");
 ,7 → 266,7
     bootinfo.ofw_root = ofw_tree_build();
     printf("done.\n");
-#ifdef CONFIG_SMP
+#ifdef CONFIG_AP
     printf("\nChecking for secondary processors...");
     if (!ofw_cpu())
         printf("Error: unable to get CPU properties\n");
 ,9 → 273,10
     printf("done.\n");
 #endif
+    ofw_setup_palette();
     printf("\nBooting the kernel...\n");
     jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,
         bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo,
         sizeof(bootinfo));
 }

 /branches/arm/boot/arch/sparc64/loader/main.h
 ,12 → 38,19
 #define TASKMAP_MAX_RECORDS 32
+/** Size of buffer for storing task name in task_t. */
+#define BOOTINFO_TASK_NAME_BUFLEN 32
 #define BSP_PROCESSOR   1
 #define AP_PROCESSOR    0
+#define SUBARCH_US  1
+#define SUBARCH_US3 3
 typedef struct {
     void *addr;
     uint32_t size;
+    char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 typedef struct {

 /branches/arm/boot/arch/sparc64/loader/ofwarch.c
 ,7 → 32,7
  * @brief   Architecture dependent parts of OpenFirmware interface.
  */
-#include <ofwarch.h>
+#include <ofwarch.h>
 #include <ofw.h>
 #include <printf.h>
 #include <string.h>
 ,6 → 40,10
 #include "main.h"
 #include "asm.h"
+/* these tho variables will be set by the detect_subarchitecture function */
+extern uint8_t subarchitecture;
+extern uint16_t mid_mask;
 void write(const char *str, const int len)
 {
     int i;
 ,36 → 60,40
     return flag != -1;
 }
-int ofw_cpu(void)
+/**
+ * Starts all CPUs represented by following siblings of the given node,
+ * except for the current CPU.
+ *
+ * @param child     The first child of the OFW tree node whose children
+ *          represent CPUs to be woken up.
+ * @param current_mid   MID of the current CPU, the current CPU will
+ *          (of course) not be woken up.
+ * @return      Number of CPUs which have the same parent node as
+ *          "child".
+ */
+static int wake_cpus_in_node(phandle child, uint64_t current_mid)
 {
+    int cpus;
     char type_name[BUF_SIZE];
-    phandle node;
-    node = ofw_get_child_node(ofw_root);
-    if (node == 0 || node == -1) {
-        printf("Could not find any child nodes of the root node.\n");
-        return 0;
-    }
-    uint64_t current_mid;
-    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,
+    for (cpus = 0; child != 0 && child != -1;
+        child = ofw_get_peer_node(child), cpus++) {
+        if (ofw_get_property(child, "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)
+                /*
+                 * "upa-portid" for US, "portid" for US-III,
+                 * "cpuid" for US-IV
+                 */
+                if (ofw_get_property(
+                    child, "upa-portid",
+                    &mid, sizeof(mid)) <= 0
+                    && ofw_get_property(child, "portid",
+                    &mid, sizeof(mid)) <= 0
+                    && ofw_get_property(child, "cpuid",
+                    &mid, sizeof(mid)) <= 0)
                     continue;
                 if (current_mid != mid) {
 ,7 → 101,7
                      * Start secondary processor.
                      */
                     (void) ofw_call("SUNW,start-cpu", 3, 1,
-                        NULL, node, KERNEL_VIRTUAL_ADDRESS,
+                        NULL, child, KERNEL_VIRTUAL_ADDRESS,
                         bootinfo.physmem_start |
                         AP_PROCESSOR);
                 }
 ,12 → 112,59
     return cpus;
 }
+/**
+ * Finds out the current CPU's MID and wakes up all AP processors.
+ */
+int ofw_cpu(void)
+{
+    int cpus;
+    phandle node;
+    phandle subnode;
+    phandle cpus_parent;
+    phandle cmp;
+    char name[BUF_SIZE];
+    /* get the current CPU MID */
+    uint64_t current_mid;
+    asm volatile ("ldxa [%1] %2, %0\n"
+        : "=r" (current_mid)
+        : "r" (0), "i" (ASI_ICBUS_CONFIG));
+    current_mid >>= ICBUS_CONFIG_MID_SHIFT;
+    current_mid &= mid_mask;
+    /* wake up CPUs */
+    cpus_parent = ofw_find_device("/ssm@0,0");
+    if (cpus_parent == 0 || cpus_parent == -1) {
+        cpus_parent = ofw_find_device("/");
+    }
+    node = ofw_get_child_node(cpus_parent);
+    cpus = wake_cpus_in_node(node, current_mid);
+    while (node != 0 && node != -1) {
+        if (ofw_get_property(node, "name", name,
+            sizeof(name)) > 0) {
+            if (strcmp(name, "cmp") == 0) {
+                subnode = ofw_get_child_node(node);
+                cpus += wake_cpus_in_node(subnode,
+                    current_mid);
+            }
+        }
+        node = ofw_get_peer_node(node);
+    }
+    return cpus;
+}
 /** Get physical memory starting address.
  *
- * @param start Pointer to variable where the physical memory starting
- *      address will be stored.
+ * @param start     Pointer to variable where the physical memory starting
+ *          address will be stored.
  *
- * @return Non-zero on succes, zero on failure.
+ * @return      Non-zero on succes, zero on failure.
  */
 int ofw_get_physmem_start(uintptr_t *start)
 {

 /branches/arm/boot/arch/sparc64/loader/register.h
 ,8 → 33,7
 #define PSTATE_PRIV_BIT 4
 #define PSTATE_AM_BIT   8
-#define ASI_UPA_CONFIG          0x4a
-#define UPA_CONFIG_MID_SHIFT    17
-#define UPA_CONFIG_MID_MASK     0x1f
+#define ASI_ICBUS_CONFIG        0x4a
+#define ICBUS_CONFIG_MID_SHIFT      17
 #endif

 /branches/arm/boot/arch/sparc64/Makefile.inc
 ,27 → 26,40
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-TMP=distroot
+TMP = distroot
+ifeq ($(CONFIG_AOUT_ISOFS_B),y)
+    SILO_PACKAGE = silo.tar.gz
+else
+    SILO_PACKAGE = silo.patched.tar.gz
+endif
 build: $(BASE)/image.iso
-$(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot
+$(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
     mkdir -p $(TMP)/boot
     mkdir -p $(TMP)/HelenOS
-    cat arch/$(ARCH)/silo/silo.tar.gz | (cd $(TMP)/boot; tar xvfz -)
-    cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING arch/$(ARCH)/silo/silo.conf $(TMP)/boot
-    cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
+    cat arch/$(BARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
+    cp arch/$(BARCH)/silo/README arch/$(BARCH)/silo/COPYING $(TMP)/boot
+ifeq ($(CONFIG_RD_EXTERNAL),y)
+    cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
+else
+    cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
+endif
+    cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
     gzip -f $(TMP)/HelenOS/image.boot
-    cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
-    mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
+ifeq ($(CONFIG_RD_EXTERNAL),y)
+    cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
+endif
+    mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $@ $(TMP)/
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    $(MAKE) -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+    $(MAKE) -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean: generic_clean
-    $(MAKE) -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+    $(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -fr $(TMP)
     -rm -f $(BASE)/image.iso

/branches/arm/boot/arch/sparc64/silo/silo.patched.tar.gz
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4533 → Rev 4647