WebSVN – HelenOS – Path Comparison – / – /branches/dd/kernel/arch/ppc32/src Rev 3022 and /branches/dd/kernel/arch/ppc32/src/ Rev 4055

Regard whitespace Rev 3022 → Rev 4055

 /branches/dd/kernel/arch/ppc32/src/exception.S
 ,7 → 60,7
 :
-    subi sp, sp, 160
+    subi sp, sp, 164
     stw r0, 8(sp)
     stw r2, 12(sp)
     stw r3, 16(sp)
 ,11 → 109,14
     mfxer r12
     stw r12, 148(sp)
-    mfsprg1 r12
+    mfdar r12
     stw r12, 152(sp)
+    mfsprg1 r12
+    stw r12, 156(sp)
     mfsprg2 r12
-    stw r12, 156(sp)
+    stw r12, 160(sp)
 .endm
 .org 0x100
 ,33 → 140,15
 exc_data_storage:
     CONTEXT_STORE
-    li r3, 2
-    mr r4, sp
-    addi r4, r4, 8
-    bl pht_real_refill
+    b data_storage
-    cmpwi r3, 0
-    bne iret_real
-    li r3, 2
-    b jump_to_kernel
 .org 0x400
 .global exc_instruction_storage
 exc_instruction_storage:
     CONTEXT_STORE
-    li r3, 3
-    mr r4, sp
-    addi r4, r4, 8
-    bl pht_real_refill
+    b instruction_storage
-    cmpwi r3, 0
-    bne iret_real
-    li r3, 3
-    b jump_to_kernel
 .org 0x500
 .global exc_external
 exc_external:
 ,7 → 220,63
     li r3, 12
     b jump_to_kernel
+.org 0x1000
+.global exc_itlb_miss
+exc_itlb_miss:
+    CONTEXT_STORE
+    b tlb_miss
+.org 0x1100
+.global exc_dtlb_miss_load
+exc_dtlb_miss_load:
+    CONTEXT_STORE
+    b tlb_miss
+.org 0x1200
+.global exc_dtlb_miss_store
+exc_dtlb_miss_store:
+    CONTEXT_STORE
+    b tlb_miss
 .org 0x4000
+data_storage:
+    li r3, 2
+    mr r4, sp
+    addi r4, r4, 8
+    bl pht_refill_real
+    cmpwi r3, 0
+    bne iret_real
+    li r3, 2
+    b jump_to_kernel
+instruction_storage:
+    li r3, 3
+    mr r4, sp
+    addi r4, r4, 8
+    bl pht_refill_real
+    cmpwi r3, 0
+    bne iret_real
+    li r3, 3
+    b jump_to_kernel
+tlb_miss:
+    li r3, 16
+    mfspr r4, tlbmiss
+    mfspr r5, ptehi
+    mfspr r6, ptelo
+    mr r7, sp
+    addi r7, r7, 20
+    bl tlb_refill_real
+    b iret_real
 jump_to_kernel:
     lis r12, iret@ha
     addi r12, r12, iret@l
 ,7 → 313,6
     rfi
 iret_real:
     lwz r0, 8(sp)
     lwz r2, 12(sp)
     lwz r3, 16(sp)
 ,7 → 362,7
     lwz r12, 148(sp)
     mtxer r12
-    lwz r12, 152(sp)
-    lwz sp, 156(sp)
+    lwz r12, 156(sp)
+    lwz sp, 160(sp)
     rfi

 /branches/dd/kernel/arch/ppc32/src/asm.S
 ,6 → 66,10
     mr sp, r4
+    # %r6 is defined to hold pcb_ptr - set it to 0
+    xor r6, r6, r6
     # jump to userspace
     rfi
 ,8 → 131,8
     lwz r12, 148(sp)
     mtxer r12
-    lwz r12, 152(sp)
-    lwz sp, 156(sp)
+    lwz r12, 156(sp)
+    lwz sp, 160(sp)
     rfi
 ,54 → 197,14
     lwz r12, 148(sp)
     mtxer r12
-    lwz r12, 152(sp)
-    lwz sp, 156(sp)
+    lwz r12, 156(sp)
+    lwz sp, 160(sp)
     rfi
 memsetb:
-    rlwimi r5, r5, 8, 16, 23
-    rlwimi r5, r5, 16, 0, 15
+    b _memsetb
-    addi r14, r3, -4
-    cmplwi 0, r4, 4
-    blt 7f
-    stwu r5, 4(r14)
-    beqlr
-    andi. r15, r14, 3
-    add r4, r15, r4
-    subf r14, r15, r14
-    srwi r15, r4, 2
-    mtctr r15
-    bdz 6f
-:
-        stwu r5, 4(r14)
-        bdnz 1b
-:
-    andi. r4, r4, 3
-:
-    cmpwi 0, r4, 0
-    beqlr
-    mtctr r4
-    addi r6, r6, 3
-:
-    stbu r5, 1(r14)
-    bdnz 8b
-    blr
 memcpy:
 memcpy_from_uspace:
 memcpy_to_uspace:
 ,4 → 272,6
 memcpy_from_uspace_failover_address:
 memcpy_to_uspace_failover_address:
-    b memcpy_from_uspace_failover_address
+    # return zero, failure
+    xor r3, r3, r3
+    blr

 /branches/dd/kernel/arch/ppc32/src/ppc32.c
 ,21 → 45,25
 #include <ddi/device.h>
 #include <ddi/irq.h>
 #include <arch/drivers/pic.h>
+#include <macros.h>
+#include <string.h>
 #define IRQ_COUNT   64
 bootinfo_t bootinfo;
+/** Performs ppc32-specific initialization before main_bsp() is called. */
 void arch_pre_main(void)
 {
-    /* Setup usermode */
     init.cnt = bootinfo.taskmap.count;
     uint32_t i;
-    for (i = 0; i < bootinfo.taskmap.count; i++) {
+    for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
         init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr);
         init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+        strncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name,
+            CONFIG_TASK_NAME_BUFLEN);
     }
 }
 ,6 → 80,7
 {
     if (config.cpu_active == 1) {
         /* Initialize framebuffer */
+        if (bootinfo.screen.addr) {
         unsigned int visual;
         switch (bootinfo.screen.bpp) {
 ,18 → 97,30
             visual = VISUAL_RGB_0_8_8_8;
             break;
         default:
-            panic("Unsupported bits per pixel");
+                panic("Unsupported bits per pixel.");
         }
-        fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.scanline, visual);
+            fb_properties_t prop = {
+                .addr = bootinfo.screen.addr,
+                .offset = 0,
+                .x = bootinfo.screen.width,
+                .y = bootinfo.screen.height,
+                .scan = bootinfo.screen.scanline,
+                .visual = visual,
+            };
+            fb_init(&prop);
+        }
         /* Initialize IRQ routing */
         irq_init(IRQ_COUNT, IRQ_COUNT);
+        if (bootinfo.macio.addr) {
         /* Initialize PIC */
-        pic_init(bootinfo.keyboard.addr, PAGE_SIZE);
+            pic_init(bootinfo.macio.addr, PAGE_SIZE);
         /* Initialize I/O controller */
-        cuda_init(device_assign_devno(), bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE);
+            cuda_init(device_assign_devno(),
+                bootinfo.macio.addr + 0x16000, 2 * PAGE_SIZE);
+        }
         /* Merge all zones to 1 big zone */
         zone_merge_all();
 ,11 → 145,13
 void userspace(uspace_arg_t *kernel_uarg)
 {
-    userspace_asm((uintptr_t) kernel_uarg->uspace_uarg, (uintptr_t) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (uintptr_t) kernel_uarg->uspace_entry);
+    userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
+        (uintptr_t) kernel_uarg->uspace_stack +
+        THREAD_STACK_SIZE - SP_DELTA,
+        (uintptr_t) kernel_uarg->uspace_entry);
     /* Unreachable */
-    for (;;)
-        ;
+    while (true);
 }
 /** Acquire console back for kernel
 ,7 → 159,7
  */
 void arch_grab_console(void)
 {
-    cuda_grab();
+    fb_redraw();
 }
 /** Return console to userspace
 ,8 → 167,21
  */
 void arch_release_console(void)
 {
-    cuda_release();
 }
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+    return addr;
+}
 /** @}
  */

 /branches/dd/kernel/arch/ppc32/src/mm/tlb.c
 ,12 → 35,23
 #include <mm/tlb.h>
 #include <arch/mm/tlb.h>
 #include <arch/interrupt.h>
+#include <interrupt.h>
 #include <mm/as.h>
 #include <arch.h>
 #include <print.h>
 #include <symtab.h>
+#include <macros.h>
+static unsigned int seed = 10;
+static unsigned int seed_real __attribute__ ((section("K_UNMAPPED_DATA_START"))) = 42;
+#define TLB_FLUSH \
+    "tlbie %0\n" \
+    "addi %0, %0, 0x1000\n"
 /** Try to find PTE for faulting address
  *
  * Try to find PTE for faulting address.
 ,17 → 63,20
  * @param badvaddr Faulting virtual address.
  * @param access   Access mode that caused the fault.
  * @param istate   Pointer to interrupted state.
- * @param pfrc     Pointer to variable where as_page_fault() return code will be stored.
+ * @param pfrc      Pointer to variable where as_page_fault() return code
+ *          will be stored.
  * @return         PTE on success, NULL otherwise.
  *
  */
-static pte_t *find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access, istate_t *istate, int *pfrc)
+static pte_t *
+find_mapping_and_check(as_t *as, bool lock, uintptr_t badvaddr, int access,
+    istate_t *istate, int *pfrc)
 {
     /*
      * Check if the mapping exists in page tables.
      */
     pte_t *pte = page_mapping_find(as, badvaddr);
-    if ((pte) && (pte->p)) {
+    if ((pte) && (pte->present)) {
         /*
          * Mapping found in page tables.
          * Immediately succeed.
 ,7 → 98,7
                  */
                 page_table_lock(as, lock);
                 pte = page_mapping_find(as, badvaddr);
-                ASSERT((pte) && (pte->p));
+            ASSERT((pte) && (pte->present));
                 *pfrc = 0;
                 return pte;
             case AS_PF_DEFER:
 ,11 → 107,10
                 return NULL;
             case AS_PF_FAULT:
                 page_table_lock(as, lock);
-                printf("Page fault.\n");
                 *pfrc = rc;
                 return NULL;
             default:
-                panic("unexpected rc (%d)\n", rc);
+            panic("Unexpected rc (%d).", rc);
         }
     }
 }
 ,17 → 121,21
     char *symbol = "";
     char *sym2 = "";
-    char *s = get_symtab_entry(istate->pc);
-    if (s)
-        symbol = s;
-    s = get_symtab_entry(istate->lr);
-    if (s)
-        sym2 = s;
-    panic("%p: PHT Refill Exception at %p (%s<-%s)\n", badvaddr, istate->pc, symbol, sym2);
+    char *str = get_symtab_entry(istate->pc);
+    if (str)
+        symbol = str;
+    str = get_symtab_entry(istate->lr);
+    if (str)
+        sym2 = str;
+    fault_if_from_uspace(istate,
+        "PHT Refill Exception on %p.", badvaddr);
+    panic("%p: PHT Refill Exception at %p (%s<-%s).", badvaddr,
+        istate->pc, symbol, sym2);
 }
-static void pht_insert(const uintptr_t vaddr, const pfn_t pfn)
+static void pht_insert(const uintptr_t vaddr, const pte_t *pte)
 {
     uint32_t page = (vaddr >> 12) & 0xffff;
     uint32_t api = (vaddr >> 22) & 0x3f;
 ,10 → 161,12
     uint32_t i;
     bool found = false;
-    /* Find unused or colliding
-       PTE in PTEG */
+    /* Find colliding PTE in PTEG */
     for (i = 0; i < 8; i++) {
-        if ((!phte[base + i].v) || ((phte[base + i].vsid == vsid) && (phte[base + i].api == api))) {
+        if ((phte[base + i].v)
+            && (phte[base + i].vsid == vsid)
+            && (phte[base + i].api == api)
+            && (phte[base + i].h == 0)) {
             found = true;
             break;
         }
 ,80 → 173,36
     }
     if (!found) {
-        /* Secondary hash (not) */
-        uint32_t base2 = (~hash & 0x3ff) << 3;
-        /* Find unused or colliding
-           PTE in PTEG */
+        /* Find unused PTE in PTEG */
         for (i = 0; i < 8; i++) {
-            if ((!phte[base2 + i].v) || ((phte[base2 + i].vsid == vsid) && (phte[base2 + i].api == api))) {
+            if (!phte[base + i].v) {
                 found = true;
-                base = base2;
-                h = 1;
                 break;
             }
         }
+    }
         if (!found) {
-            // TODO: A/C precedence groups
-            i = page % 8;
-        }
-    }
+        /* Secondary hash (not) */
+        uint32_t base2 = (~hash & 0x3ff) << 3;
-    phte[base + i].v = 1;
-    phte[base + i].vsid = vsid;
-    phte[base + i].h = h;
-    phte[base + i].api = api;
-    phte[base + i].rpn = pfn;
-    phte[base + i].r = 0;
-    phte[base + i].c = 0;
-    phte[base + i].pp = 2; // FIXME
-}
-static void pht_real_insert(const uintptr_t vaddr, const pfn_t pfn)
-{
-    uint32_t page = (vaddr >> 12) & 0xffff;
-    uint32_t api = (vaddr >> 22) & 0x3f;
-    uint32_t vsid;
-    asm volatile (
-        "mfsrin %0, %1\n"
-        : "=r" (vsid)
-        : "r" (vaddr)
-    );
-    uint32_t sdr1;
-    asm volatile (
-        "mfsdr1 %0\n"
-        : "=r" (sdr1)
-    );
-    phte_t *phte_physical = (phte_t *) (sdr1 & 0xffff0000);
-    /* Primary hash (xor) */
-    uint32_t h = 0;
-    uint32_t hash = vsid ^ page;
-    uint32_t base = (hash & 0x3ff) << 3;
-    uint32_t i;
-    bool found = false;
-    /* Find unused or colliding
-       PTE in PTEG */
+        /* Find colliding PTE in PTEG */
     for (i = 0; i < 8; i++) {
-        if ((!phte_physical[base + i].v) || ((phte_physical[base + i].vsid == vsid) && (phte_physical[base + i].api == api))) {
+            if ((phte[base2 + i].v)
+                && (phte[base2 + i].vsid == vsid)
+                && (phte[base2 + i].api == api)
+                && (phte[base2 + i].h == 1)) {
             found = true;
+                base = base2;
+                h = 1;
             break;
         }
     }
     if (!found) {
-        /* Secondary hash (not) */
-        uint32_t base2 = (~hash & 0x3ff) << 3;
-        /* Find unused or colliding
-           PTE in PTEG */
+            /* Find unused PTE in PTEG */
         for (i = 0; i < 8; i++) {
-            if ((!phte_physical[base2 + i].v) || ((phte_physical[base2 + i].vsid == vsid) && (phte_physical[base2 + i].api == api))) {
+                if (!phte[base2 + i].v) {
                 found = true;
                 base = base2;
                 h = 1;
 ,27 → 209,27
                 break;
             }
         }
+        }
-        if (!found) {
-            // TODO: A/C precedence groups
-            i = page % 8;
+        if (!found)
+            i = RANDI(seed) % 8;
         }
-    }
-    phte_physical[base + i].v = 1;
-    phte_physical[base + i].vsid = vsid;
-    phte_physical[base + i].h = h;
-    phte_physical[base + i].api = api;
-    phte_physical[base + i].rpn = pfn;
-    phte_physical[base + i].r = 0;
-    phte_physical[base + i].c = 0;
-    phte_physical[base + i].pp = 2; // FIXME
+    phte[base + i].v = 1;
+    phte[base + i].vsid = vsid;
+    phte[base + i].h = h;
+    phte[base + i].api = api;
+    phte[base + i].rpn = pte->pfn;
+    phte[base + i].r = 0;
+    phte[base + i].c = 0;
+    phte[base + i].wimg = (pte->page_cache_disable ? WIMG_NO_CACHE : 0);
+    phte[base + i].pp = 2; // FIXME
 }
-/** Process Instruction/Data Storage Interrupt
+/** Process Instruction/Data Storage Exception
  *
- * @param n Interrupt vector number.
+ * @param n      Exception vector number.
  * @param istate Interrupted register context.
  *
  */
 ,17 → 249,15
         lock = true;
     }
-    if (n == VECTOR_DATA_STORAGE) {
-        asm volatile (
-            "mfdar %0\n"
-            : "=r" (badvaddr)
-        );
-    } else
+    if (n == VECTOR_DATA_STORAGE)
+        badvaddr = istate->dar;
+    else
         badvaddr = istate->pc;
     page_table_lock(as, lock);
-    pte = find_mapping_and_check(as, lock, badvaddr, PF_ACCESS_READ /* FIXME */, istate, &pfrc);
+    pte = find_mapping_and_check(as, lock, badvaddr,
+        PF_ACCESS_READ /* FIXME */, istate, &pfrc);
     if (!pte) {
         switch (pfrc) {
             case AS_PF_FAULT:
 ,12 → 271,12
                 page_table_unlock(as, lock);
                 return;
             default:
-                panic("Unexpected pfrc (%d)\n", pfrc);
+            panic("Unexpected pfrc (%d).", pfrc);
         }
     }
-    pte->a = 1; /* Record access to PTE */
-    pht_insert(badvaddr, pte->pfn);
+    pte->accessed = 1; /* Record access to PTE */
+    pht_insert(badvaddr, pte);
     page_table_unlock(as, lock);
     return;
 ,22 → 287,19
 }
-/** Process Instruction/Data Storage Interrupt in Real Mode
+/** Process Instruction/Data Storage Exception in Real Mode
  *
- * @param n Interrupt vector number.
+ * @param n      Exception vector number.
  * @param istate Interrupted register context.
  *
  */
-bool pht_real_refill(int n, istate_t *istate)
+bool pht_refill_real(int n, istate_t *istate)
 {
     uintptr_t badvaddr;
-    if (n == VECTOR_DATA_STORAGE) {
-        asm volatile (
-            "mfdar %0\n"
-            : "=r" (badvaddr)
-        );
-    } else
+    if (n == VECTOR_DATA_STORAGE)
+        badvaddr = istate->dar;
+    else
         badvaddr = istate->pc;
     uint32_t physmem;
 ,12 → 308,137
         : "=r" (physmem)
     );
-    if ((badvaddr >= PA2KA(0)) && (badvaddr < PA2KA(physmem))) {
-        pht_real_insert(badvaddr, KA2PA(badvaddr) >> 12);
+    if ((badvaddr < PA2KA(0)) || (badvaddr >= PA2KA(physmem)))
+        return false;
+    uint32_t page = (badvaddr >> 12) & 0xffff;
+    uint32_t api = (badvaddr >> 22) & 0x3f;
+    uint32_t vsid;
+    asm volatile (
+        "mfsrin %0, %1\n"
+        : "=r" (vsid)
+        : "r" (badvaddr)
+    );
+    uint32_t sdr1;
+    asm volatile (
+        "mfsdr1 %0\n"
+        : "=r" (sdr1)
+    );
+    phte_t *phte_real = (phte_t *) (sdr1 & 0xffff0000);
+    /* Primary hash (xor) */
+    uint32_t h = 0;
+    uint32_t hash = vsid ^ page;
+    uint32_t base = (hash & 0x3ff) << 3;
+    uint32_t i;
+    bool found = false;
+    /* Find colliding PTE in PTEG */
+    for (i = 0; i < 8; i++) {
+        if ((phte_real[base + i].v)
+            && (phte_real[base + i].vsid == vsid)
+            && (phte_real[base + i].api == api)
+            && (phte_real[base + i].h == 0)) {
+            found = true;
+            break;
+        }
+    }
+    if (!found) {
+        /* Find unused PTE in PTEG */
+        for (i = 0; i < 8; i++) {
+            if (!phte_real[base + i].v) {
+                found = true;
+                break;
+            }
+        }
+    }
+    if (!found) {
+        /* Secondary hash (not) */
+        uint32_t base2 = (~hash & 0x3ff) << 3;
+        /* Find colliding PTE in PTEG */
+        for (i = 0; i < 8; i++) {
+            if ((phte_real[base2 + i].v)
+                && (phte_real[base2 + i].vsid == vsid)
+                && (phte_real[base2 + i].api == api)
+                && (phte_real[base2 + i].h == 1)) {
+                found = true;
+                base = base2;
+                h = 1;
+                break;
+            }
+        }
+        if (!found) {
+            /* Find unused PTE in PTEG */
+            for (i = 0; i < 8; i++) {
+                if (!phte_real[base2 + i].v) {
+                    found = true;
+                    base = base2;
+                    h = 1;
+                    break;
+                }
+            }
+        }
+        if (!found) {
+            /* Use secondary hash to avoid collisions
+               with usual PHT refill handler. */
+            i = RANDI(seed_real) % 8;
+            base = base2;
+            h = 1;
+        }
+    }
+    phte_real[base + i].v = 1;
+    phte_real[base + i].vsid = vsid;
+    phte_real[base + i].h = h;
+    phte_real[base + i].api = api;
+    phte_real[base + i].rpn = KA2PA(badvaddr) >> 12;
+    phte_real[base + i].r = 0;
+    phte_real[base + i].c = 0;
+    phte_real[base + i].wimg = 0;
+    phte_real[base + i].pp = 2; // FIXME
         return true;
     }
-    return false;
+/** Process ITLB/DTLB Miss Exception in Real Mode
+ *
+ *
+ */
+void tlb_refill_real(int n, uint32_t tlbmiss, ptehi_t ptehi, ptelo_t ptelo, istate_t *istate)
+{
+    uint32_t badvaddr = tlbmiss & 0xfffffffc;
+    uint32_t physmem;
+    asm volatile (
+        "mfsprg3 %0\n"
+        : "=r" (physmem)
+    );
+    if ((badvaddr < PA2KA(0)) || (badvaddr >= PA2KA(physmem)))
+        return; // FIXME
+    ptelo.rpn = KA2PA(badvaddr) >> 12;
+    ptelo.wimg = 0;
+    ptelo.pp = 2; // FIXME
+    uint32_t index = 0;
+    asm volatile (
+        "mtspr 981, %0\n"
+        "mtspr 982, %1\n"
+        "tlbld %2\n"
+        "tlbli %2\n"
+        : "=r" (index)
+        : "r" (ptehi),
+          "r" (ptelo)
+    );
 }
 ,9 → 450,87
 void tlb_invalidate_all(void)
 {
+    uint32_t index;
     asm volatile (
-        "tlbia\n"
+        "li %0, 0\n"
+        "sync\n"
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        TLB_FLUSH
+        "eieio\n"
         "tlbsync\n"
+        "sync\n"
+        : "=r" (index)
     );
 }
 ,7 → 546,8
     uint32_t i;
     for (i = 0; i < 8192; i++) {
-        if ((phte[i].v) && (phte[i].vsid >= (asid << 4)) && (phte[i].vsid < ((asid << 4) + 16)))
+        if ((phte[i].v) && (phte[i].vsid >= (asid << 4)) &&
+            (phte[i].vsid < ((asid << 4) + 16)))
             phte[i].v = 0;
     }
     tlb_invalidate_all();
 ,7 → 581,11
         } \
     } else \
         length = 0; \
-    printf(name ": page=%.*p frame=%.*p length=%d KB (mask=%#x)%s%s\n", sizeof(upper) * 2, upper & 0xffff0000, sizeof(lower) * 2, lower & 0xffff0000, length, mask, ((upper >> 1) & 1) ? " supervisor" : "", (upper & 1) ? " user" : "");
+    printf(name ": page=%.*p frame=%.*p length=%d KB (mask=%#x)%s%s\n", \
+        sizeof(upper) * 2, upper & 0xffff0000, sizeof(lower) * 2, \
+        lower & 0xffff0000, length, mask, \
+        ((upper >> 1) & 1) ? " supervisor" : "", \
+        (upper & 1) ? " user" : "");
 void tlb_print(void)
 ,7 → 599,10
             : "=r" (vsid)
             : "r" (sr << 28)
         );
-        printf("vsid[%d]: VSID=%.*p (ASID=%d)%s%s\n", sr, sizeof(vsid) * 2, vsid & 0xffffff, (vsid & 0xffffff) >> 4, ((vsid >> 30) & 1) ? " supervisor" : "", ((vsid >> 29) & 1) ? " user" : "");
+        printf("sr[%02u]: vsid=%.*p (asid=%u)%s%s\n", sr,
+            sizeof(vsid) * 2, vsid & 0xffffff, (vsid & 0xffffff) >> 4,
+            ((vsid >> 30) & 1) ? " supervisor" : "",
+            ((vsid >> 29) & 1) ? " user" : "");
     }
     uint32_t upper;

 /branches/dd/kernel/arch/ppc32/src/mm/page.c
 ,13 → 47,16
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
-    if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-        panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
+    if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
+        KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
+        panic("Unable to map physical memory %p (%" PRIs " bytes).",
+            physaddr, size)
     uintptr_t virtaddr = PA2KA(last_frame);
     pfn_t i;
     for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
-        page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i),
+            physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
     last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);

 /branches/dd/kernel/arch/ppc32/src/interrupt.c
 ,7 → 73,7
                 ack = true;
             }
-            irq->handler(irq, irq->arg);
+            irq->handler(irq);
             spinlock_unlock(&irq->lock);
         } else {
             /*
 ,7 → 80,7
              * Spurious interrupt.
              */
 #ifdef CONFIG_DEBUG
-            printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, inum);
+            printf("cpu%u: spurious interrupt (inum=%d)\n", CPU->id, inum);
 #endif
         }
 ,8 → 92,8
 static void exception_decrementer(int n, istate_t *istate)
 {
+    start_decrementer();
     clock();
-    start_decrementer();
 }

 /branches/dd/kernel/arch/ppc32/src/drivers/pic.c
 ,7 → 38,7
 #include <byteorder.h>
 #include <bitops.h>
-static volatile uint32_t *pic;
+static volatile uint32_t *pic = NULL;
 void pic_init(uintptr_t base, size_t size)
 {
 ,9 → 47,10
 void pic_enable_interrupt(int intnum)
 {
-    if (intnum < 32) {
+    if (pic) {
+        if (intnum < 32)
         pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum);
-    } else {
+        else
         pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32));
     }
 ,9 → 58,10
 void pic_disable_interrupt(int intnum)
 {
-    if (intnum < 32) {
+    if (pic) {
+        if (intnum < 32)
         pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum));
-    } else {
+        else
         pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32)));
     }
 }
 ,15 → 68,18
 void pic_ack_interrupt(int intnum)
 {
+    if (pic) {
     if (intnum < 32)
         pic[PIC_ACK_LOW] = 1 << intnum;
     else
         pic[PIC_ACK_HIGH] = 1 << (intnum - 32);
 }
+}
 /** Return number of pending interrupt */
 int pic_get_pending(void)
 {
+    if (pic) {
     int pending;
     pending = pic[PIC_PENDING_LOW];
 ,6 → 89,7
     pending = pic[PIC_PENDING_HIGH];
     if (pending)
         return fnzb32(pending) + 32;
+    }
     return -1;
 }

 /branches/dd/kernel/arch/ppc32/src/drivers/cuda.c
 ,7 → 33,6
  */
 #include <arch/drivers/cuda.h>
-#include <ipc/irq.h>
 #include <arch/asm.h>
 #include <console/console.h>
 #include <console/chardev.h>
 ,6 → 235,7
 int cuda_get_scancode(void)
 {
+    if (cuda) {
     uint8_t kind;
     uint8_t data[4];
 ,15 → 243,13
     if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c))
         return data[2];
+    }
     return -1;
 }
-static void cuda_irq_handler(irq_t *irq, void *arg, ...)
+static void cuda_irq_handler(irq_t *irq)
 {
-    if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
-        ipc_irq_send_notif(irq);
-    else {
         int scan_code = cuda_get_scancode();
         if (scan_code != -1) {
 ,37 → 258,12
                 chardev_push_character(&kbrd, lchars[scancode & 0x7f]);
         }
     }
-}
-static irq_ownership_t cuda_claim(void)
+static irq_ownership_t cuda_claim(irq_t *irq)
 {
     return IRQ_ACCEPT;
 }
-/** Initialize keyboard and service interrupts using kernel routine */
-void cuda_grab(void)
-{
-    ipl_t ipl = interrupts_disable();
-    spinlock_lock(&cuda_irq.lock);
-    cuda_irq.notif_cfg.notify = false;
-    spinlock_unlock(&cuda_irq.lock);
-    interrupts_restore(ipl);
-}
-/** Resume the former interrupt vector */
-void cuda_release(void)
-{
-    ipl_t ipl = interrupts_disable();
-    spinlock_lock(&cuda_irq.lock);
-    if (cuda_irq.notif_cfg.answerbox)
-        cuda_irq.notif_cfg.notify = true;
-    spinlock_unlock(&cuda_irq.unlock);
-    interrupts_restore(ipl);
-}
 void cuda_init(devno_t devno, uintptr_t base, size_t size)
 {
     cuda = (uint8_t *) hw_map(base, size);
 ,7 → 318,9
 }
 void arch_reboot(void) {
+    if (cuda)
     send_packet(PACKET_CUDA, 1, CUDA_RESET);
     asm volatile (
         "b 0\n"
     );

Subversion Repositories HelenOS

Compare Revisions

Regard whitespace Rev 3022 → Rev 4055