Changeset 730376d in mainline for kernel/arch


Ignore:
Timestamp:
2006-12-20T22:07:25Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0af7a09
Parents:
deada67
Message:

Fix important comment in kernel/arch/sparc64/src/proc/scheduler.c.

Improve framebuffer code.

Formatting and indentation fixes.

Location:
kernel/arch/sparc64
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/include/mm/tlb.h

    rdeada67 r730376d  
    6666/* TLB Tag Access shifts */
    6767#define TLB_TAG_ACCESS_CONTEXT_SHIFT    0
    68 #define TLB_TAG_ACCESS_CONTEXT_MASK     ((1<<13)-1)
     68#define TLB_TAG_ACCESS_CONTEXT_MASK     ((1 << 13) - 1)
    6969#define TLB_TAG_ACCESS_VPN_SHIFT        13
    7070
    … …  
    107107        uint64_t value;
    108108        struct {
    109                 uint64_t vpn : 51;              /**< Virtual Address bits 63:13. */
    110                 unsigned context : 13;          /**< Context identifier. */
     109                uint64_t vpn : 51;      /**< Virtual Address bits 63:13. */
     110                unsigned context : 13;  /**< Context identifier. */
    111111        } __attribute__ ((packed));
    112112};
    … …  
    383383 *
    384384 * @param type Selects between context and page demap.
    385  * @param context_encoding Specifies which Context register has Context ID for demap.
     385 * @param context_encoding Specifies which Context register has Context ID for
     386 *      demap.
    386387 * @param page Address which is on the page to be demapped.
    387388 */
    … …  
    398399        da.vpn = pg.vpn;
    399400       
    400         asi_u64_write(ASI_IMMU_DEMAP, da.value, 0);     /* da.value is the address within the ASI */
     401        asi_u64_write(ASI_IMMU_DEMAP, da.value, 0);     /* da.value is the
     402                                                         * address within the
     403                                                         * ASI */
    401404        flush();
    402405}
    … …  
    405408 *
    406409 * @param type Selects between context and page demap.
    407  * @param context_encoding Specifies which Context register has Context ID for demap.
     410 * @param context_encoding Specifies which Context register has Context ID for
     411 *       demap.
    408412 * @param page Address which is on the page to be demapped.
    409413 */
    … …  
    420424        da.vpn = pg.vpn;
    421425       
    422         asi_u64_write(ASI_DMMU_DEMAP, da.value, 0); /* da.value is the address within the ASI */
     426        asi_u64_write(ASI_DMMU_DEMAP, da.value, 0);     /* da.value is the
     427                                                         * address within the
     428                                                         * ASI */
    423429        membar();
    424430}

  • kernel/arch/sparc64/src/proc/scheduler.c

    rdeada67 r730376d  
    9595               
    9696                /*
    97                  * Write kernel stack address to %g6 and a pointer to the last
    98                  * item in the userspace window buffer to %g7 in the alternate
    99                  * and interrupt sets.
     97                 * Write kernel stack address to %g6 of the alternate and
     98                 * interrupt global sets.
     99                 *
     100                 * Write pointer to the last item in the userspace window buffer
     101                 * to %g7 in the alternate set. Write to the interrupt %g7 is
     102                 * not necessary because:
     103                 * - spill traps operate only in the alternate global set,
     104                 * - preemptible trap handler switches to alternate globals
     105                 *   before it explicitly uses %g7.
    100106                 */
    101107                uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE
    … …  
    110116/** Perform sparc64 specific steps before a thread stops running.
    111117 *
    112  * Demap any locked DTLB entries isntalled by the thread (i.e. kernel stack
     118 * Demap any locked DTLB entries installed by the thread (i.e. kernel stack
    113119 * and userspace window buffer).
    114120 */

  • kernel/arch/sparc64/src/smp/ipi.c

    rdeada67 r730376d  
    7474       
    7575        do {
    76                 asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_0, (uintptr_t) func);
     76                asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_0, (uintptr_t)
     77                        func);
    7778                asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_1, 0);
    7879                asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_2, 0);
    79                 asi_u64_write(ASI_UDB_INTR_W, (mid << INTR_VEC_DISPATCH_MID_SHIFT) | ASI_UDB_INTR_W_DISPATCH, 0);
     80                asi_u64_write(ASI_UDB_INTR_W, (mid <<
     81                        INTR_VEC_DISPATCH_MID_SHIFT) | ASI_UDB_INTR_W_DISPATCH,
     82                        0);
    8083       
    8184                membar();

  • kernel/arch/sparc64/src/trap/interrupt.c

    rdeada67 r730376d  
    9898                 */
    9999#ifdef CONFIG_DEBUG
    100                 printf("cpu%d: spurious interrupt (intrcv=%#llx, data0=%#llx)\n", CPU->id, intrcv, data0);
     100                printf("cpu%d: spurious interrupt (intrcv=%#llx, "
     101                        "data0=%#llx)\n", CPU->id, intrcv, data0);
    101102#endif
    102103        }
Note: See TracChangeset for help on using the changeset viewer.