Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Update sh timer function

Browse Source 
Change to write/readX function and fix timer problem.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
master
Nobuhiro Iwamatsu 16 years ago committed by Nobuhiro Iwamatsu
parent b81786cff4
commit e9d5f35497
8 changed files with 74 additions and 222 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      cpu/sh2/Makefile
  2. 2
      cpu/sh3/Makefile
  3. 103
      cpu/sh3/time.c
  4. 2
      cpu/sh4/Makefile
  5. 98
      cpu/sh4/time.c
  6. 6
      lib_sh/Makefile
  7. 83
      lib_sh/time.c
  8. 0
      lib_sh/time_sh2.c

2
cpu/sh2/Makefile
Unescape View File

@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
START = start.o START = start.o
OBJS = cpu.o interrupts.o watchdog.o time.o # cache.o OBJS = cpu.o interrupts.o watchdog.o
all: .depend $(START) $(LIB) all: .depend $(START) $(LIB)

2
cpu/sh3/Makefile
Unescape View File

@ -32,7 +32,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
SOBJS = start.o SOBJS = start.o
COBJS = cpu.o interrupts.o watchdog.o time.o cache.o COBJS = cpu.o interrupts.o watchdog.o cache.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS))

103
cpu/sh3/time.c
Unescape View File

@ -1,103 +0,0 @@
/*
* (C) Copyright 2007
* Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
*
* (C) Copyright 2007
* Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <common.h>
#include <asm/processor.h>
#include <asm/io.h>
#define TMU_MAX_COUNTER (~0UL)
static void tmu_timer_start(unsigned int timer)
{
if (timer > 2)
return;
outb(inb(TSTR) | (1 << timer), TSTR);
}
static void tmu_timer_stop(unsigned int timer)
{
u8 val = inb(TSTR);
if (timer > 2)
return;
outb(val & ~(1 << timer), TSTR);
}
int timer_init(void)
{
/* Divide clock by 4 */
outw(0, TCR0);
tmu_timer_stop(0);
tmu_timer_start(0);
return 0;
}
/*
In theory we should return a true 64bit value (ie something that doesn't
overflow). However, we don't. Therefore if TMU runs at fastest rate of
6.75 MHz this value will wrap after u-boot has been running for approx
10 minutes.
*/
unsigned long long get_ticks(void)
{
return (0 - inl(TCNT0));
}
unsigned long get_timer(unsigned long base)
{
return ((0 - inl(TCNT0)) - base);
}
void set_timer(unsigned long t)
{
outl(0 - t, TCNT0);
}
void reset_timer(void)
{
tmu_timer_stop(0);
set_timer(0);
tmu_timer_start(0);
}
void udelay(unsigned long usec)
{
unsigned int start = get_timer(0);
unsigned int end = start + (usec * ((CONFIG_SYS_HZ + 500000) / 1000000));
while (get_timer(0) < end)
continue;
}
unsigned long get_tbclk(void)
{
return CONFIG_SYS_HZ;
}

2
cpu/sh4/Makefile
Unescape View File

@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
SOBJS = start.o SOBJS = start.o
COBJS = cpu.o interrupts.o watchdog.o time.o cache.o COBJS = cpu.o interrupts.o watchdog.o cache.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS))

98
cpu/sh4/time.c
Unescape View File

@ -1,98 +0,0 @@
/*
* (C) Copyright 2007
* Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <common.h>
#include <asm/processor.h>
#define TMU_MAX_COUNTER (~0UL)
static void tmu_timer_start (unsigned int timer)
{
if (timer > 2)
return;
*((volatile unsigned char *) TSTR) |= (1 << timer);
}
static void tmu_timer_stop (unsigned int timer)
{
u8 val = *((volatile u8 *)TSTR);
if (timer > 2)
return;
*((volatile unsigned char *)TSTR) = val &~(1 << timer);
}
int timer_init (void)
{
/* Divide clock by 4 */
*(volatile u16 *)TCR0 = 0;
tmu_timer_stop(0);
tmu_timer_start(0);
return 0;
}
/*
In theory we should return a true 64bit value (ie something that doesn't
overflow). However, we don't. Therefore if TMU runs at fastest rate of
6.75 MHz this value will wrap after u-boot has been running for approx
10 minutes.
*/
unsigned long long get_ticks (void)
{
return (0 - *((volatile u32 *) TCNT0));
}
unsigned long get_timer (unsigned long base)
{
return ((0 - *((volatile u32 *) TCNT0)) - base);
}
void set_timer (unsigned long t)
{
*((volatile unsigned int *) TCNT0) = (0 - t);
}
void reset_timer (void)
{
tmu_timer_stop(0);
set_timer (0);
tmu_timer_start(0);
}
void udelay (unsigned long usec)
{
unsigned int start = get_timer (0);
unsigned int end = start + (usec * ((CONFIG_SYS_HZ + 500000) / 1000000));
while (get_timer (0) < end)
continue;
}
unsigned long get_tbclk (void)
{
return CONFIG_SYS_HZ;
}

6
lib_sh/Makefile
Unescape View File

@ -26,7 +26,11 @@ SOBJS-y +=
COBJS-y += board.o COBJS-y += board.o
COBJS-y += bootm.o COBJS-y += bootm.o
# COBJS-y += time.o ifeq ($(CONFIG_SH2),y)
COBJS-y += time_sh2.o
else
COBJS-y += time.o
endif
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))

83
lib_sh/time.c
Unescape View File

@ -1,6 +1,9 @@
/* /*
* Copyright (c) 2007 * (C) Copyright 2007-2008
* Nobuhiro Iwamatsu <iwamatsu@nigauri.org> * Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
@ -23,50 +26,96 @@
#include <common.h> #include <common.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h>
#define TMU_MAX_COUNTER (~0UL)
static int clk_adj = 1;
static void tmu_timer_start (unsigned int timer) static void tmu_timer_start (unsigned int timer)
{ {
if (timer > 2) if (timer > 2)
return; return;
writeb(readb(TSTR) | (1 << timer), TSTR);
}
*((volatile unsigned char *) TSTR0) |= (1 << timer); static void tmu_timer_stop (unsigned int timer)
{
if (timer > 2)
return;
writeb(readb(TSTR) & ~(1 << timer), TSTR);
} }
int timer_init (void) int timer_init (void)
{ {
*(volatile u16 *)TCR0 = 0; /* Divide clock by TMU_CLK_DIVIDER */
u16 bit = 0;
switch( TMU_CLK_DIVIDER ){
case 4:
bit = 0;
break;
case 16:
bit = 1;
break;
case 64: bit = 2;
break;
case 256:
bit = 3;
break;
case 1024:
bit = 4;
break;
default:
bit = 0;
break;
}
writew(readw(TCR0) | bit, TCR0);
/* Clock adjustment calc */
clk_adj = (int)(1.0/((1.0/CONFIG_SYS_HZ)*1000000));
if (clk_adj < 1)
clk_adj = 1;
tmu_timer_stop(0);
tmu_timer_start(0);
tmu_timer_start (0);
return 0; return 0;
} }
unsigned long long get_ticks (void) unsigned long long get_ticks (void)
{ {
return (0 - *((volatile unsigned int *) TCNT0)); return 0 - readl(TCNT0);
} }
unsigned long get_timer (unsigned long base) static unsigned long get_usec (void)
{ {
return ((0 - *((volatile unsigned int *) TCNT0)) - base); return (0 - readl(TCNT0));
} }
void set_timer (unsigned long t) void udelay (unsigned long usec)
{ {
*((volatile unsigned int *) TCNT0) = (0 - t); unsigned int start = get_usec();
unsigned int end = start + (usec * clk_adj);
while (get_usec() < end)
continue;
} }
void reset_timer (void) unsigned long get_timer (unsigned long base)
{ {
set_timer (0); /* return msec */
return ((get_usec()/clk_adj)/1000) - base;
} }
void udelay (unsigned long usec) void set_timer (unsigned long t)
{ {
unsigned int start = get_timer (0); writel((0 - t), TCNT0);
unsigned int end = start + (usec * ((CONFIG_SYS_HZ + 500000) / 1000000)); }
while (get_timer (0) < end) void reset_timer (void)
continue; {
tmu_timer_stop(0);
set_timer (0);
tmu_timer_start(0);
} }
unsigned long get_tbclk (void) unsigned long get_tbclk (void)

0
cpu/sh2/time.c → lib_sh/time_sh2.c
Unescape View File

Write Preview
Loading…
Cancel
Save