Date: Tue, 18 Nov 2008 13:49:10 GMT From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153133 for review Message-ID: <200811181349.mAIDnAAs048861@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=153133 Change 153133 by nwhitehorn@nwhitehorn_trantor on 2008/11/18 13:48:55 Update sun4v to pluggable Open Firmware as well. Fix a style(9) breakage in sparc64/machdep.c. Affected files ... .. //depot/projects/ppc-g5/sys/sparc64/sparc64/machdep.c#5 edit .. //depot/projects/ppc-g5/sys/sun4v/include/ofw_machdep.h#2 edit .. //depot/projects/ppc-g5/sys/sun4v/sun4v/machdep.c#2 edit .. //depot/projects/ppc-g5/sys/sun4v/sun4v/mp_machdep.c#2 edit .. //depot/projects/ppc-g5/sys/sun4v/sun4v/support.S#2 edit .. //depot/projects/ppc-g5/sys/sun4v/sun4v/trap.c#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/sparc64/sparc64/machdep.c#5 (text+ko) ==== @@ -275,7 +275,9 @@ */ tick_stop(); - /* Set up Open Firmware entry points */ + /* + * Set up Open Firmware entry points + */ ofw_tba = rdpr(tba); ofw_vec = (u_long)vec; ==== //depot/projects/ppc-g5/sys/sun4v/include/ofw_machdep.h#2 (text+ko) ==== ==== //depot/projects/ppc-g5/sys/sun4v/sun4v/machdep.c#2 (text+ko) ==== @@ -310,18 +310,18 @@ end = 0; kmdp = NULL; - /* - * Initialize Open Firmware (needed for console). - */ - OF_init(vec); - - /* * XXX */ bootverbose = 1; /* + * Set up Open Firmware entry points + */ + ofw_tba = rdpr(tba); + ofw_vec = (u_long)vec; + + /* * Parse metadata if present and fetch parameters. Must be before the * console is inited so cninit gets the right value of boothowto. */ @@ -344,6 +344,12 @@ init_param1(); + /* + * Initialize Open Firmware (needed for console). + */ + OF_install(OFW_STD_DIRECT, 0); + OF_init(ofw_entry); + root = OF_peer(0); for (child = OF_child(root); child != 0; child = OF_peer(child)) { OF_getprop(child, "device_type", type, sizeof(type)); @@ -516,13 +522,6 @@ } void -set_openfirm_callback(ofw_vec_t *vec) -{ - ofw_tba = rdpr(tba); - ofw_vec = (u_long)vec; -} - -void sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct trapframe *tf; ==== //depot/projects/ppc-g5/sys/sun4v/sun4v/mp_machdep.c#2 (text+ko) ==== @@ -272,7 +272,7 @@ args.cpuid = cpuid; args.func = (cell_t)func; args.arg = (cell_t)arg; - openfirmware(&args); + ofw_entry(&args); return (int)args.result; } ==== //depot/projects/ppc-g5/sys/sun4v/sun4v/support.S#2 (text+ko) ==== @@ -622,9 +622,9 @@ END(setjmp) /* - * void openfirmware(cell_t args[]) + * void ofw_entry(cell_t args[]) */ -ENTRY(openfirmware) +ENTRY(ofw_entry) save %sp, -CCFSZ, %sp SET(ofw_vec, %l7, %l6) ldx [%l6], %l6 @@ -635,14 +635,14 @@ wrpr %l7, 0, %pil ret restore %o0, %g0, %o0 -END(openfirmware) +END(ofw_entry) #ifdef notyet /* SUN4V_FIXME - uses a now illegal ASI */ /* * void ofw_exit(cell_t args[]) */ -ENTRY(openfirmware_exit) +ENTRY(ofw_exit) save %sp, -CCFSZ, %sp flushw wrpr %g0, PIL_TICK, %pil @@ -661,7 +661,7 @@ call %l6 mov %i0, %o0 ! never to return -END(openfirmware_exit) +END(ofw_exit) #endif ENTRY(set_mmfsa_scratchpad) ==== //depot/projects/ppc-g5/sys/sun4v/sun4v/trap.c#2 (text+ko) ==== @@ -261,7 +261,7 @@ args.tba_addr = (cell_t)tba_addr; args.mmfsa_ra = mmfsa_ra; - openfirmware(&args); + ofw_entry(&args); } void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811181349.mAIDnAAs048861>