From 21677c0e664f84ac20ffec33209348c52d00aace Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 26 Jan 2000 14:20:08 +0000 Subject: Patch rtems-rc-20000118-0.diff from Ralf Corsepius that converts the a29k to automake. This patch contains * An initial merger of the libcpu/a29k stuff you sent yesterday. AFAIS, most code inside them seems to be empty stubs. One file even contains a function called mips_*** which might indicate that this part might contain mips code or the code the initial porter used as template for porting. Unfortunately, I don't know anything about the a29k so I can't comment on the details. * A dummy bsp_specs to libbsp/29k/portsw * An update to the automake files related to the a29k. Note: * This patch is completely untested, because I don't have a toolchain for it. * The files in libcpu/a29k include bsp.h => The libbsp vs. libcpu-issue hits again. --- c/src/lib/libcpu/a29k/Makefile.am | 11 ++ c/src/lib/libcpu/a29k/clock/Makefile.am | 35 ++++++ c/src/lib/libcpu/a29k/clock/ckinit.c | 212 ++++++++++++++++++++++++++++++++ c/src/lib/libcpu/a29k/clock/clock.S | 116 +++++++++++++++++ c/src/lib/libcpu/a29k/clock/clock.h | 5 + c/src/lib/libcpu/a29k/configure.in | 35 ++++++ c/src/lib/libcpu/a29k/timer/Makefile.am | 36 ++++++ c/src/lib/libcpu/a29k/timer/gettime.S | 13 ++ c/src/lib/libcpu/a29k/timer/timer.c | 119 ++++++++++++++++++ c/src/lib/libcpu/a29k/timer/timerisr.c | 41 ++++++ 10 files changed, 623 insertions(+) create mode 100644 c/src/lib/libcpu/a29k/Makefile.am create mode 100644 c/src/lib/libcpu/a29k/clock/Makefile.am create mode 100644 c/src/lib/libcpu/a29k/clock/ckinit.c create mode 100644 c/src/lib/libcpu/a29k/clock/clock.S create mode 100644 c/src/lib/libcpu/a29k/clock/clock.h create mode 100644 c/src/lib/libcpu/a29k/configure.in create mode 100644 c/src/lib/libcpu/a29k/timer/Makefile.am create mode 100644 c/src/lib/libcpu/a29k/timer/gettime.S create mode 100644 c/src/lib/libcpu/a29k/timer/timer.c create mode 100644 c/src/lib/libcpu/a29k/timer/timerisr.c (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/a29k/Makefile.am b/c/src/lib/libcpu/a29k/Makefile.am new file mode 100644 index 0000000000..e9046ede08 --- /dev/null +++ b/c/src/lib/libcpu/a29k/Makefile.am @@ -0,0 +1,11 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal + +SUBDIRS = clock timer + +include $(top_srcdir)/../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/a29k/clock/Makefile.am b/c/src/lib/libcpu/a29k/clock/Makefile.am new file mode 100644 index 0000000000..12eab07673 --- /dev/null +++ b/c/src/lib/libcpu/a29k/clock/Makefile.am @@ -0,0 +1,35 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGM=$(ARCH)/clock.rel + +C_FILES = ckinit.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +H_FILES = clock.h + +S_FILES = clock.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +OBJS = $(C_O_FILES) $(S_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +$(PGM): $(SRCS) $(OBJS) + $(make-rel) + +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) + +EXTRA_DIST = Makefile ckinit.c clock.S clock.h + +include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/a29k/clock/ckinit.c b/c/src/lib/libcpu/a29k/clock/ckinit.c new file mode 100644 index 0000000000..7d2ca5fe8e --- /dev/null +++ b/c/src/lib/libcpu/a29k/clock/ckinit.c @@ -0,0 +1,212 @@ +/* ckinit.c + * + * This file provides a template for the clock device driver initialization. + * + * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. + * On-Line Applications Research Corporation (OAR). + * All rights assigned to U.S. Government, 1994. + * + * This material may be reproduced by or for the U.S. Government pursuant + * to the copyright license under the clause at DFARS 252.227-7013. This + * notice must appear in all copies of this file and its derivatives. + * + * ckinit.c,v 1.5 1995/10/30 21:53:23 joel Exp + */ + +#ifndef lint +static char _sccsid[] = "@(#)ckinit.c 03/15/96 1.1\n"; +#endif + +#include + +#include +#include +#include + +#include "clock.h" + +#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */ + +void Clock_exit( void ); +rtems_isr Clock_isr( rtems_vector_number vector ); + + +/* + * The interrupt vector number associated with the clock tick device + * driver. + */ + +#define CLOCK_VECTOR 14 + +/* + * Clock_driver_ticks is a monotonically increasing counter of the + * number of clock ticks since the driver was initialized. + */ + +volatile rtems_unsigned32 Clock_driver_ticks; + + +/* + * These are set by clock driver during its init + */ + +rtems_device_major_number rtems_clock_major = ~0; +rtems_device_minor_number rtems_clock_minor; + +/* + * The previous ISR on this clock tick interrupt vector. + */ + +rtems_isr_entry Old_ticker; + +void Clock_exit( void ); + +static unsigned32 a29k_timer_rate = 0; + +/* + * Isr Handler + */ + +rtems_isr Clock_isr( + rtems_vector_number vector +) +{ +/* + * bump the number of clock driver ticks since initialization + * + * determine if it is time to announce the passing of tick as configured + * to RTEMS through the rtems_clock_tick directive + * + * perform any timer dependent tasks + */ + + a29k_clear_timer(); + + Clock_driver_ticks += 1; + + rtems_clock_tick(); +} + +/* User callback shell (set from Clock_Control) */ +static void (*user_callback)(void); + +rtems_isr User_Clock_isr( + rtems_vector_number vector +) +{ + /* refresh the internal CPU timer */ + a29k_clear_timer(); + + if (user_callback) + user_callback(); +} + +/* + * Install_clock + * + * Install a clock tick handler and reprograms the chip. This + * is used to initially establish the clock tick. + */ + +void Install_clock( + rtems_isr_entry clock_isr +) +{ + /* + * Initialize the clock tick device driver variables + */ + + Clock_driver_ticks = 0; + + /* + * If ticks_per_timeslice is configured as non-zero, then the user + * wants a clock tick. + */ + + if ( BSP_Configuration.ticks_per_timeslice ) { + Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); + /* + * Hardware specific initialize goes here + */ + + a29k_timer_rate = BSP_Configuration.microseconds_per_tick * CLOCKS_PER_MICROSECOND; + a29k_init_timer( a29k_timer_rate ); + } + + /* + * Schedule the clock cleanup routine to execute if the application exits. + */ + + atexit( Clock_exit ); +} + +/* + * Clean up before the application exits + */ + +void Clock_exit( void ) +{ + if ( BSP_Configuration.ticks_per_timeslice ) { + + /* a29k: turn off the timer interrupts */ + a29k_disable_timer(); + + } +} + +/* + * Clock_initialize + * + * Device driver entry point for clock tick driver initialization. + */ + +rtems_device_driver Clock_initialize( + rtems_device_major_number major, + rtems_device_minor_number minor, + void *pargp +) +{ + Install_clock( Clock_isr ); + + /* + * make major/minor avail to others such as shared memory driver + */ + + rtems_clock_major = major; + rtems_clock_minor = minor; + + return RTEMS_SUCCESSFUL; +} + +rtems_device_driver Clock_control( + rtems_device_major_number major, + rtems_device_minor_number minor, + void *pargp +) +{ + rtems_unsigned32 isrlevel; + rtems_libio_ioctl_args_t *args = pargp; + + if (args == 0) + goto done; + + /* + * This is hokey, but until we get a defined interface + * to do this, it will just be this simple... + */ + + if (args->command == rtems_build_name('I', 'S', 'R', ' ')) + { + Clock_isr(CLOCK_VECTOR); + } + else if (args->command == rtems_build_name('N', 'E', 'W', ' ')) + { + rtems_interrupt_disable( isrlevel ); + user_callback = (void (*)(void))args->buffer; + (void) set_vector( User_Clock_isr, CLOCK_VECTOR, 1 ); + rtems_interrupt_enable( isrlevel ); + } + +done: + return RTEMS_SUCCESSFUL; +} diff --git a/c/src/lib/libcpu/a29k/clock/clock.S b/c/src/lib/libcpu/a29k/clock/clock.S new file mode 100644 index 0000000000..b69e8566cf --- /dev/null +++ b/c/src/lib/libcpu/a29k/clock/clock.S @@ -0,0 +1,116 @@ +; +; .include "register.ah" + .include "amd.ah" + .include "pswmacro.ah" + + .text +; .equ IN,0x2000000 + .reg CLOCK,gr78 + .reg SECS,gr79 + .equ CPUCLK,16 + .equ RATE,100 + .reg it0,gr64 + .reg it1,gr65 + .reg v0,gr96 +timer_clear_sup: + const it0,IN + consth it0,IN + mfsr it1,tmr + andn it1,it1,it0 + mtsr tmr,it1 + const it0,RATE + cplt it0,CLOCK,it0 + jmpf it0,carry + add CLOCK,CLOCK,1 + iret +carry: + const CLOCK,0 + add SECS,SECS,1 + iret + + .equ TICKS,(CPUCLK*1000000/RATE) +; .equ IE,0x1000000 +timer_init_sup: + const it0,TICKS + consth it0,TICKS + mtsr tmc,it0 + const it0,(IE|TICKS) + consth it0,(IE|TICKS) + mtsr tmr,it0 + const SECS,0 + const CLOCK,0 + iret + +timer_get_sup: + add gr96,SECS,0 + iret + +timer_disable_sup: + mfsr it0,ops + const it1,TD + consth it1,TD + andn it0,it1,it0 + mtsr ops,it0 + iret + + .global _a29k_init_timer +_a29k_init_timer: + push msp,lr0 + const lr2,INIT_TIMER + consth lr2,INIT_TIMER + const lr3,timer_init_sup + consth lr3,timer_init_sup + const v0,__settrap + consth v0,__settrap + calli lr0,v0 + nop + + const lr2,CLEAR_TIMER + consth lr2,CLEAR_TIMER + const lr3,timer_clear_sup + consth lr3,timer_clear_sup + const v0,__settrap + consth v0,__settrap + calli lr0,v0 + nop + + const lr2,DISABLE_TIMER + consth lr2,DISABLE_TIMER + const lr3,timer_disable_sup + consth lr3,timer_disable_sup + const v0,__settrap + consth v0,__settrap + calli lr0,v0 + nop + + const lr2,GET_TIMER + consth lr2,GET_TIMER + const lr3,timer_get_sup + consth lr3,timer_get_sup + const v0,__settrap + consth v0,__settrap + calli lr0,v0 + nop + + asneq INIT_TIMER,gr1,gr1 + pop lr0,msp + jmpi lr0 + nop + + .global _a29k_clear_timer +_a29k_clear_timer: +; asneq CLEAR_TIMER,gr1,gr1 + jmpi lr0 + nop + + .global _a29k_disable_timer +_a29k_disable_timer: + asneq DISABLE_TIMER,gr1,gr1 + jmpi lr0 + nop + + .global _a29k_get_timer +_a29k_get_timer: + asneq GET_TIMER,gr1,gr1 + jmpi lr0 + nop diff --git a/c/src/lib/libcpu/a29k/clock/clock.h b/c/src/lib/libcpu/a29k/clock/clock.h new file mode 100644 index 0000000000..61b1c5905a --- /dev/null +++ b/c/src/lib/libcpu/a29k/clock/clock.h @@ -0,0 +1,5 @@ +/* @(#)clock.h 03/15/96 1.1 */ + +extern void a29k_init_timer( unsigned32 timer_clock_interval ); +extern void a29k_disable_timer(void); +extern void a29k_clear_timer(void); diff --git a/c/src/lib/libcpu/a29k/configure.in b/c/src/lib/libcpu/a29k/configure.in new file mode 100644 index 0000000000..dabe68edb9 --- /dev/null +++ b/c/src/lib/libcpu/a29k/configure.in @@ -0,0 +1,35 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(clock) +RTEMS_TOP(../../../../..) +AC_CONFIG_AUX_DIR(../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-a29k,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_LIBCDIR + +RTEMS_ENABLE_BARE +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +dnl check target cc +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) + +AC_OUTPUT( +Makefile +clock/Makefile +timer/Makefile) diff --git a/c/src/lib/libcpu/a29k/timer/Makefile.am b/c/src/lib/libcpu/a29k/timer/Makefile.am new file mode 100644 index 0000000000..457e7fa2a6 --- /dev/null +++ b/c/src/lib/libcpu/a29k/timer/Makefile.am @@ -0,0 +1,36 @@ +## +## Makefile,v 1.2 1995/05/31 16:56:37 joel Exp +## +## @(#)Makefile 03/26/96 1.2 + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGM=$(ARCH)/timer.rel + +# NOTE: timerisr is normally an assembly file!!! + +C_FILES = timer.c timerisr.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = gettime.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +OBJS = $(C_O_FILES) $(S_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +$(PGM): $(SRCS) $(OBJS) + $(make-rel) + +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) + +EXTRA_DIST = Makefile gettime.S timer.c timerisr.c + +include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/a29k/timer/gettime.S b/c/src/lib/libcpu/a29k/timer/gettime.S new file mode 100644 index 0000000000..cd429a7725 --- /dev/null +++ b/c/src/lib/libcpu/a29k/timer/gettime.S @@ -0,0 +1,13 @@ +/* @(#)gettime.S 03/26/96 1.1 */ + +#include "iregdef.h" +#include "idtcpu.h" +#include "idtmon.h" + +FRAME(mips_read_timer,sp,0,ra) + .set noreorder + mfc0 v0,C0_COUNT + nop + j ra + .set reorder +ENDFRAME(mips_read_timer) diff --git a/c/src/lib/libcpu/a29k/timer/timer.c b/c/src/lib/libcpu/a29k/timer/timer.c new file mode 100644 index 0000000000..c5911d1fae --- /dev/null +++ b/c/src/lib/libcpu/a29k/timer/timer.c @@ -0,0 +1,119 @@ +/* timer.c + * + * This file manages the benchmark timer used by the RTEMS Timing Test + * Suite. Each measured time period is demarcated by calls to + * Timer_initialize() and Read_timer(). Read_timer() usually returns + * the number of microseconds since Timer_initialize() exitted. + * + * NOTE: It is important that the timer start/stop overhead be + * determined when porting or modifying this code. + * + * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. + * On-Line Applications Research Corporation (OAR). + * All rights assigned to U.S. Government, 1994. + * + * This material may be reproduced by or for the U.S. Government pursuant + * to the copyright license under the clause at DFARS 252.227-7013. This + * notice must appear in all copies of this file and its derivatives. + * + * timer.c,v 1.2 1995/05/31 16:56:39 joel Exp + */ + +#ifndef lint +static char _sccsid[] = "@(#)timer.c 05/07/96 1.4\n"; +#endif + +#include +#include + +#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) +#define TIMER_MAX_VALUE 0xffffffff + +extern unsigned32 mips_read_timer( void ); + +static rtems_boolean Timer_driver_Find_average_overhead; +static unsigned32 Timer_initial_value = 0; + +void Timer_initialize( void ) +{ +/* + Timer_initial_value = mips_read_timer(); + */ + /* + * Somehow start the timer + */ + + /* Timer on 4650 is always running */ +} + +/* + * The following controls the behavior of Read_timer(). + * + * AVG_OVEREHAD is the overhead for starting and stopping the timer. It + * is usually deducted from the number returned. + * + * LEAST_VALID is the lowest number this routine should trust. Numbers + * below this are "noise" and zero is returned. + */ + +#define AVG_OVERHEAD 8 /* It typically takes X.X microseconds */ + /* (Y countdowns) to start/stop the timer. */ + /* This value is in cycles. */ +#define LEAST_VALID 1 /* Don't trust a clicks value lower than this */ + +int Read_timer( void ) +{ + unsigned64 clicks; + unsigned32 total; + + /* + * Read the timer and see how many clicks it has been since we started. + */ + + clicks = mips_read_timer(); /* XXX: read some HW here */ + if (clicks < Timer_initial_value) + { + clicks += TIMER_MAX_VALUE; + } + clicks -= Timer_initial_value; + + /* + * Total is calculated by taking into account the number of timer overflow + * interrupts since the timer was initialized and clicks since the last + * interrupts. + */ +#if 0 /* leave total in number of cycles */ + total = clicks / CLOCKS_PER_MICROSECOND; +#else + total = clicks; +#endif + + if ( Timer_driver_Find_average_overhead == 1 ) + return total; /* in # cycles units */ + else { + if ( total < LEAST_VALID ) + return 0; /* below timer resolution */ + /* + * leave total in cycles + */ + return (total - AVG_OVERHEAD); + } +} + +/* + * Empty function call used in loops to measure basic cost of looping + * in Timing Test Suite. + */ + +rtems_status_code Empty_function( void ) +{ + return RTEMS_SUCCESSFUL; +} + +void Set_find_average_overhead( + rtems_boolean find_flag +) +{ + Timer_driver_Find_average_overhead = find_flag; +} + diff --git a/c/src/lib/libcpu/a29k/timer/timerisr.c b/c/src/lib/libcpu/a29k/timer/timerisr.c new file mode 100644 index 0000000000..82c3c80d9f --- /dev/null +++ b/c/src/lib/libcpu/a29k/timer/timerisr.c @@ -0,0 +1,41 @@ +/* timerisr.s + * + * If required this ISR is used to bump a count of interval "overflow" + * interrupts which have occurred since the timer was started. The + * number of overflows is taken into account in the Read_timer() + * routine if necessary. + * + * To reduce overhead this is best to be the "rawest" hardware interupt + * handler you can write. This should be the only interrupt which can + * occur during the measured time period. + * + * NOTE: This file is USUALLY in assembly and is LEAN AND MEAN. + * Any code in this isr is pure overhead which can perturb + * the accuracy of the Timing Test Suite. + * + * COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994. + * On-Line Applications Research Corporation (OAR). + * All rights assigned to U.S. Government, 1994. + * + * This material may be reproduced by or for the U.S. Government pursuant + * to the copyright license under the clause at DFARS 252.227-7013. This + * notice must appear in all copies of this file and its derivatives. + * + * timerisr.c,v 1.2 1995/05/31 16:56:40 joel Exp + */ + +#ifndef lint +static char _sccsid[] = "@(#)timerisr.c 03/15/96 1.1\n"; +#endif + +#include + +extern rtems_unsigned32 _Timer_interrupts; + +void timerisr( void ) +{ + /* + * _Timer_interrupts += TIMER_BETWEEN_OVERFLOWS (usually in microseconds) + * return from interrupt + */ +} -- cgit v1.2.3