Changeset 973ef9fc in mainline for kernel/arch/sparc64/src


Ignore:
Timestamp:
2010-12-25T21:20:28Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
631ee0c
Parents:
1bfd3d3 (diff), 09178b7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
kernel/arch/sparc64/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/src/console.c

    r1bfd3d3 r973ef9fc  
    7070        ofw_tree_node_t *screen = ofw_tree_lookup(prop_scr->value);
    7171        if (!screen)
    72                 panic("Cannot find %s.", prop_scr->value);
     72                panic("Cannot find %s.", (char *) prop_scr->value);
    7373       
    7474        scr_init(screen);
    … …  
    8383        ofw_tree_node_t *keyboard = ofw_tree_lookup(prop_kbd->value);
    8484        if (!keyboard)
    85                 panic("Cannot find %s.", prop_kbd->value);
     85                panic("Cannot find %s.", (char *) prop_kbd->value);
    8686       
    8787        kbd_init(keyboard);

  • kernel/arch/sparc64/src/drivers/pci.c

    r1bfd3d3 r973ef9fc  
    211211                 * Unsupported model.
    212212                 */
    213                 printf("Unsupported PCI controller model (%s).\n", prop->value);
     213                printf("Unsupported PCI controller model (%s).\n",
     214                    (char *) prop->value);
    214215        }
    215216

  • kernel/arch/sparc64/src/mm/sun4u/frame.c

    r1bfd3d3 r973ef9fc  
    4141#include <macros.h>
    4242
    43 uintptr_t last_frame = NULL;
     43uintptr_t last_frame = (uintptr_t) NULL;
    4444
    4545/** Create memory zones according to information stored in memmap.

  • kernel/arch/sparc64/src/mm/sun4u/tlb.c

    r1bfd3d3 r973ef9fc  
    200200
    201201/** ITLB miss handler. */
    202 void fast_instruction_access_mmu_miss(unative_t unused, istate_t *istate)
     202void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
    203203{
    204204        uintptr_t page_16k = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
    … …  
    360360static void print_tlb_entry(int i, tlb_tag_read_reg_t t, tlb_data_t d)
    361361{
    362         printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
    363             "ie=%d, soft2=%#x, pfn=%#x, soft=%#x, l=%d, "
    364             "cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n", i, t.vpn,
     362        printf("%u: vpn=%#" PRIx64 ", context=%u, v=%u, size=%u, nfo=%u, "
     363            "ie=%u, soft2=%#x, pfn=%#x, soft=%#x, l=%u, "
     364            "cp=%u, cv=%u, e=%u, p=%u, w=%u, g=%u\n", i, (uint64_t) t.vpn,
    365365            t.context, d.v, d.size, d.nfo, d.ie, d.soft2,
    366366            d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
    … …  
    441441    uintptr_t va, const char *str)
    442442{
    443         fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
     443        fault_if_from_uspace(istate, "%s, address=%p.", str, (void *) va);
    444444        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
    445445}
    … …  
    451451
    452452        va = tag.vpn << MMU_PAGE_WIDTH;
    453         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
    454             tag.context);
     453        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
     454            (void *) va, tag.context);
    455455        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
    456456}
    … …  
    462462
    463463        va = tag.vpn << MMU_PAGE_WIDTH;
    464         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
    465             tag.context);
     464        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
     465            (void *) va, tag.context);
    466466        panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
    467467}
    … …  
    484484            sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
    485485#endif
    486            
    487         printf("DTLB SFAR: address=%p\n", sfar);
     486       
     487        printf("DTLB SFAR: address=%p\n", (void *) sfar);
    488488       
    489489        dtlb_sfsr_write(0);
    … …  
    508508#endif
    509509           
    510         printf("DTLB SFAR: address=%p\n", sfar);
     510        printf("DTLB SFAR: address=%p\n", (void *) sfar);
    511511       
    512512        dtlb_sfsr_write(0);

  • kernel/arch/sparc64/src/mm/sun4v/tlb.c

    r1bfd3d3 r973ef9fc  
    213213
    214214/** ITLB miss handler. */
    215 void fast_instruction_access_mmu_miss(unative_t unused, istate_t *istate)
     215void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
    216216{
    217217        uintptr_t va = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
    … …  
    358358    const char *str)
    359359{
    360         fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
     360        fault_if_from_uspace(istate, "%s, address=%p.", str,
     361            (void *) va);
    361362        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
    362363}
    … …  
    365366    uint64_t page_and_ctx, const char *str)
    366367{
    367         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
    368             DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
     368        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
     369            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
    369370        panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
    370371            str);
    … …  
    374375    uint64_t page_and_ctx, const char *str)
    375376{
    376         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str,
    377             DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
     377        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
     378            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
    378379        panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
    379380            str);
    … …  
    399400        uint64_t errno =  __hypercall_fast3(MMU_DEMAP_ALL, 0, 0,
    400401                MMU_FLAG_DTLB | MMU_FLAG_ITLB);
    401         if (errno != HV_EOK) {
    402                 panic("Error code = %d.\n", errno);
    403         }
     402        if (errno != HV_EOK)
     403                panic("Error code = %" PRIu64 ".\n", errno);
    404404}
    405405

  • kernel/arch/sparc64/src/sun4u/sparc64.c

    r1bfd3d3 r973ef9fc  
    5050#include <ddi/irq.h>
    5151#include <str.h>
     52#include <sysinfo/sysinfo.h>
    5253
    5354memmap_t memmap;
    … …  
    111112void arch_post_smp_init(void)
    112113{
     114        /* Currently the only supported platform for sparc64/sun4u is 'sun4u'. */
     115        static const char *platform = "sun4u";
     116
     117        sysinfo_set_item_data("platform", NULL, (void *) platform,
     118            str_size(platform));
     119
    113120        standalone_sparc64_console_init();
    114121}

  • kernel/arch/sparc64/src/sun4v/md.c

    r1bfd3d3 r973ef9fc  
    310310        retval = retval;
    311311        if (retval != HV_EOK) {
    312                 printf("Could not retrieve machine description, error = %d.\n",
    313                     retval);
     312                printf("Could not retrieve machine description, "
     313                    "error=%" PRIu64 ".\n", retval);
    314314        }
    315315}

  • kernel/arch/sparc64/src/sun4v/sparc64.c

    r1bfd3d3 r973ef9fc  
    5252#include <str.h>
    5353#include <arch/drivers/niagara.h>
     54#include <sysinfo/sysinfo.h>
    5455
    5556memmap_t memmap;
    … …  
    109110void arch_post_smp_init(void)
    110111{
     112        /* Currently the only supported platform for sparc64/sun4v is 'sun4v'. */
     113        static const char *platform = "sun4v";
     114
     115        sysinfo_set_item_data("platform", NULL, (void *) platform,
     116            str_size(platform));
     117
    111118        niagarain_init();
    112119}

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

    r1bfd3d3 r973ef9fc  
    8787                KA2PA(cpu_mondo_queues[CPU->id]),
    8888                CPU_MONDO_NENTRIES) != HV_EOK)
    89                         panic("Initializing mondo queue failed on CPU %d.\n",
     89                        panic("Initializing mondo queue failed on CPU %" PRIu64 ".\n",
    9090                            CPU->arch.id);
    9191}
Note: See TracChangeset for help on using the changeset viewer.