Index: kernel/arch/sparc64/include/cpu.h =================================================================== --- kernel/arch/sparc64/include/cpu.h (revision 18baf9c0c35a8ee98eda033f039299251c422462) +++ kernel/arch/sparc64/include/cpu.h (revision eb79d60443133ae1a59f38af667844b1683015c0) @@ -64,31 +64,11 @@ #endif -typedef struct { - uint32_t mid; /**< Processor ID as read from - UPA_CONFIG/FIREPLANE_CONFIG. */ - ver_reg_t ver; - uint32_t clock_frequency; /**< Processor frequency in Hz. */ - uint64_t next_tick_cmpr; /**< Next clock interrupt should be - generated when the TICK register - matches this value. */ -} cpu_arch_t; +#if defined (SUN4U) +#include +#elif defined (SUN4V) +#include +#endif -/** - * Reads the module ID (agent ID/CPUID) of the current CPU. - */ -static inline uint32_t read_mid(void) -{ - uint64_t icbus_config = asi_u64_read(ASI_ICBUS_CONFIG, 0); - icbus_config = icbus_config >> ICBUS_CONFIG_MID_SHIFT; -#if defined (US) - return icbus_config & 0x1f; -#elif defined (US3) - if (((ver_reg_t) ver_read()).impl == IMPL_ULTRASPARCIII_I) - return icbus_config & 0x1f; - else - return icbus_config & 0x3ff; -#endif -} #endif Index: kernel/arch/sparc64/include/sun4u/asm.h =================================================================== --- kernel/arch/sparc64/include/sun4u/asm.h (revision eb79d60443133ae1a59f38af667844b1683015c0) +++ kernel/arch/sparc64/include/sun4u/asm.h (revision eb79d60443133ae1a59f38af667844b1683015c0) @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64 + * @{ + */ +/** @file + */ + +#ifndef KERN_sparc64_sun4u_ASM_H_ +#define KERN_sparc64_sun4u_ASM_H_ + +extern uint64_t read_from_ag_g7(void); +extern void write_to_ag_g6(uint64_t val); +extern void write_to_ag_g7(uint64_t val); +extern void write_to_ig_g6(uint64_t val); + + +/** Read Version Register. + * + * @return Value of VER register. + */ +static inline uint64_t ver_read(void) +{ + uint64_t v; + + asm volatile ("rdpr %%ver, %0\n" : "=r" (v)); + + return v; +} + +#endif + +/** @} + */ Index: kernel/arch/sparc64/include/sun4u/cpu.h =================================================================== --- kernel/arch/sparc64/include/sun4u/cpu.h (revision 18baf9c0c35a8ee98eda033f039299251c422462) +++ kernel/arch/sparc64/include/sun4u/cpu.h (revision eb79d60443133ae1a59f38af667844b1683015c0) @@ -33,6 +33,6 @@ */ -#ifndef KERN_sparc64_CPU_H_ -#define KERN_sparc64_CPU_H_ +#ifndef KERN_sparc64_sun4u_CPU_H_ +#define KERN_sparc64_sun4u_CPU_H_ #define MANUF_FUJITSU 0x04 Index: kernel/arch/sparc64/include/sun4v/cpu.h =================================================================== --- kernel/arch/sparc64/include/sun4v/cpu.h (revision 18baf9c0c35a8ee98eda033f039299251c422462) +++ kernel/arch/sparc64/include/sun4v/cpu.h (revision eb79d60443133ae1a59f38af667844b1683015c0) @@ -46,4 +46,5 @@ struct cpu; +/* typedef struct { uint64_t exec_unit_id; @@ -54,7 +55,6 @@ SPINLOCK_DECLARE(proposed_nrdy_lock); } exec_unit_t; +*/ -// MH -#if 0 typedef struct cpu_arch { uint64_t id; /**< virtual processor ID */ @@ -63,9 +63,8 @@ generated when the TICK register matches this value. */ - exec_unit_t *exec_unit; /**< Physical core. */ - unsigned long proposed_nrdy; /**< Proposed No. of ready threads - so that cores are equally balanced. */ + //exec_unit_t *exec_unit; /**< Physical core. */ + //unsigned long proposed_nrdy; /**< Proposed No. of ready threads + // so that cores are equally balanced. */ } cpu_arch_t; -#endif #endif Index: kernel/arch/sparc64/include/trap/regwin.h =================================================================== --- kernel/arch/sparc64/include/trap/regwin.h (revision 18baf9c0c35a8ee98eda033f039299251c422462) +++ kernel/arch/sparc64/include/trap/regwin.h (revision eb79d60443133ae1a59f38af667844b1683015c0) @@ -131,33 +131,4 @@ /* - * Macro used to spill userspace window to userspace window buffer. - * It can be either triggered from preemptible_handler doing SAVE - * at (TL=1) or from normal kernel code doing SAVE when OTHERWIN>0 - * at (TL=0). - */ -.macro SPILL_TO_USPACE_WINDOW_BUFFER - stx %l0, [%g7 + L0_OFFSET] - stx %l1, [%g7 + L1_OFFSET] - stx %l2, [%g7 + L2_OFFSET] - stx %l3, [%g7 + L3_OFFSET] - stx %l4, [%g7 + L4_OFFSET] - stx %l5, [%g7 + L5_OFFSET] - stx %l6, [%g7 + L6_OFFSET] - stx %l7, [%g7 + L7_OFFSET] - stx %i0, [%g7 + I0_OFFSET] - stx %i1, [%g7 + I1_OFFSET] - stx %i2, [%g7 + I2_OFFSET] - stx %i3, [%g7 + I3_OFFSET] - stx %i4, [%g7 + I4_OFFSET] - stx %i5, [%g7 + I5_OFFSET] - stx %i6, [%g7 + I6_OFFSET] - stx %i7, [%g7 + I7_OFFSET] - add %g7, STACK_WINDOW_SAVE_AREA_SIZE, %g7 - saved - retry -.endm - - -/* * Macro used by the nucleus and the primary context 0 during normal fills. */ @@ -232,6 +203,12 @@ #endif /* __ASM__ */ +#if defined (SUN4U) +#include +#elif defined (SUN4V) +#include #endif +#endif + /** @} */ Index: kernel/arch/sparc64/include/trap/sun4u/regwin.h =================================================================== --- kernel/arch/sparc64/include/trap/sun4u/regwin.h (revision eb79d60443133ae1a59f38af667844b1683015c0) +++ kernel/arch/sparc64/include/trap/sun4u/regwin.h (revision eb79d60443133ae1a59f38af667844b1683015c0) @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64interrupt + * @{ + */ +#ifndef KERN_sparc64_sun4u_REGWIN_H_ +#define KERN_sparc64_sun4u_REGWIN_H_ + +#ifdef __ASM__ + +/* + * Macro used to spill userspace window to userspace window buffer. + * It can be either triggered from preemptible_handler doing SAVE + * at (TL=1) or from normal kernel code doing SAVE when OTHERWIN>0 + * at (TL=0). + */ +.macro SPILL_TO_USPACE_WINDOW_BUFFER + stx %l0, [%g7 + L0_OFFSET] + stx %l1, [%g7 + L1_OFFSET] + stx %l2, [%g7 + L2_OFFSET] + stx %l3, [%g7 + L3_OFFSET] + stx %l4, [%g7 + L4_OFFSET] + stx %l5, [%g7 + L5_OFFSET] + stx %l6, [%g7 + L6_OFFSET] + stx %l7, [%g7 + L7_OFFSET] + stx %i0, [%g7 + I0_OFFSET] + stx %i1, [%g7 + I1_OFFSET] + stx %i2, [%g7 + I2_OFFSET] + stx %i3, [%g7 + I3_OFFSET] + stx %i4, [%g7 + I4_OFFSET] + stx %i5, [%g7 + I5_OFFSET] + stx %i6, [%g7 + I6_OFFSET] + stx %i7, [%g7 + I7_OFFSET] + add %g7, STACK_WINDOW_SAVE_AREA_SIZE, %g7 + saved + retry +.endm + +#endif + +#endif + +/** @} + */ Index: kernel/arch/sparc64/include/trap/sun4v/regwin.h =================================================================== --- kernel/arch/sparc64/include/trap/sun4v/regwin.h (revision eb79d60443133ae1a59f38af667844b1683015c0) +++ kernel/arch/sparc64/include/trap/sun4v/regwin.h (revision eb79d60443133ae1a59f38af667844b1683015c0) @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * Copyright (c) 2009 Pavel Rimsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64interrupt + * @{ + */ +#ifndef KERN_sparc64_sun4v_REGWIN_H_ +#define KERN_sparc64_sun4v_REGWIN_H_ + +#ifdef __ASM__ + +/* + * Saves the contents of the current window to the userspace window buffer. + * Does not modify any register window registers, but updates pointer to the + * top of the userspace window buffer. + * + * Parameters: + * \tmpreg1 global register to be used for scratching purposes + * \tmpreg2 global register to be used for scratching purposes + */ +.macro SAVE_TO_USPACE_WBUF tmpreg1, tmpreg2 + set SCRATCHPAD_WBUF, \tmpreg2 + ldxa [\tmpreg2] ASI_SCRATCHPAD, \tmpreg1 + stx %l0, [\tmpreg1 + L0_OFFSET] + stx %l1, [\tmpreg1 + L1_OFFSET] + stx %l2, [\tmpreg1 + L2_OFFSET] + stx %l3, [\tmpreg1 + L3_OFFSET] + stx %l4, [\tmpreg1 + L4_OFFSET] + stx %l5, [\tmpreg1 + L5_OFFSET] + stx %l6, [\tmpreg1 + L6_OFFSET] + stx %l7, [\tmpreg1 + L7_OFFSET] + stx %i0, [\tmpreg1 + I0_OFFSET] + stx %i1, [\tmpreg1 + I1_OFFSET] + stx %i2, [\tmpreg1 + I2_OFFSET] + stx %i3, [\tmpreg1 + I3_OFFSET] + stx %i4, [\tmpreg1 + I4_OFFSET] + stx %i5, [\tmpreg1 + I5_OFFSET] + stx %i6, [\tmpreg1 + I6_OFFSET] + stx %i7, [\tmpreg1 + I7_OFFSET] + add \tmpreg1, STACK_WINDOW_SAVE_AREA_SIZE, \tmpreg1 + stxa \tmpreg1, [\tmpreg2] ASI_SCRATCHPAD +.endm + +/* + * Macro used to spill userspace window to userspace window buffer. + * It is triggered from normal kernel code doing SAVE when + * OTHERWIN>0 at (TL=0). + */ +.macro SPILL_TO_USPACE_WINDOW_BUFFER + SAVE_TO_USPACE_WBUF %g7, %g4 + saved + retry +.endm + +#endif + +#endif + +/** @} + */