kernel: implement reboot for am335x/dm37xx

Change-Id: Ied288326b9af8f31223b2dd76a064e32c9a03c45
This commit is contained in:
Thomas Cort 2013-08-03 08:40:59 -04:00
parent 1b95bbbfe9
commit 6c6123d857
5 changed files with 85 additions and 3 deletions

View file

@ -53,6 +53,7 @@ CPPFLAGS.findfp.c+= -I ${NETBSDSRCDIR}/lib/libc/include
# #
.for unpaged_obj in head.o pre_init.o direct_tty_utils.o \ .for unpaged_obj in head.o pre_init.o direct_tty_utils.o \
pg_utils.o klib.o omap_serial.o omap_rtc.o utility.o arch_reset.o \ pg_utils.o klib.o omap_serial.o omap_rtc.o utility.o arch_reset.o \
omap_reset.o \
${MINLIB_OBJS_UNPAGED} ${MINC_OBJS_UNPAGED} ${SYS_OBJS_UNPAGED} ${MINLIB_OBJS_UNPAGED} ${MINC_OBJS_UNPAGED} ${SYS_OBJS_UNPAGED}
unpaged_${unpaged_obj}: ${unpaged_obj} unpaged_${unpaged_obj}: ${unpaged_obj}
${OBJCOPY} --prefix-symbols=__k_unpaged_ ${.OBJDIR}/${unpaged_obj} $@ ${OBJCOPY} --prefix-symbols=__k_unpaged_ ${.OBJDIR}/${unpaged_obj} $@
@ -64,7 +65,7 @@ CLEANFILES+= ${ORIG_UNPAGED_OBJS}
SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \ SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \
omap_serial.c omap_timer.c omap_padconf.c omap_intr.c omap_rtc.c \ omap_serial.c omap_timer.c omap_padconf.c omap_intr.c omap_rtc.c \
exception.c klib.S memory.c \ omap_reset.c exception.c klib.S memory.c \
protect.c direct_tty_utils.c arch_reset.c \ protect.c direct_tty_utils.c arch_reset.c \
pg_utils.c phys_copy.S phys_memset.S exc.S pg_utils.c phys_copy.S phys_memset.S exc.S
OBJS.kernel+= ${UNPAGED_OBJS} OBJS.kernel+= ${UNPAGED_OBJS}

View file

@ -34,7 +34,9 @@ halt_cpu(void)
void void
reset(void) reset(void)
{ {
while (1); omap3_reset();
direct_print("Reset not supported.");
while (1);
} }
void void
@ -70,6 +72,10 @@ __dead void
arch_shutdown(int how) arch_shutdown(int how)
{ {
switch (how) { switch (how) {
case RBT_HALT:
/* Hang */
for (; ; ) halt_cpu();
NOT_REACHABLE;
case RBT_POWEROFF: case RBT_POWEROFF:
/* Power off if possible, hang otherwise */ /* Power off if possible, hang otherwise */
@ -77,7 +83,12 @@ arch_shutdown(int how)
NOT_REACHABLE; NOT_REACHABLE;
default: default:
break; case RBT_DEFAULT:
case RBT_REBOOT:
case RBT_RESET:
/* Reset the system */
reset();
NOT_REACHABLE;
} }
while (1); while (1);
} }

View file

@ -131,6 +131,9 @@ void arch_init(void)
/* map memory for rtc */ /* map memory for rtc */
omap3_rtc_init(); omap3_rtc_init();
/* map memory for reset control */
omap3_reset_init();
} }
/*===========================================================================* /*===========================================================================*

View file

@ -0,0 +1,60 @@
#include <assert.h>
#include <sys/types.h>
#include <machine/cpu.h>
#include <minix/type.h>
#include <io.h>
#include "kernel/kernel.h"
#include "kernel/proc.h"
#include "kernel/vm.h"
#include "kernel/proto.h"
#include "arch_proto.h"
#include "omap_reset.h"
#ifdef AM335X
#define CM_BASE 0x44E00000
#define CM_SIZE 0x1000
#define PRM_DEVICE_OFFSET 0xf00
#define PRM_RSTCTRL_REG 0x00
#define RST_GLOBAL_WARM_SW_BIT 0
#elif DM37XX
#define CM_BASE 0x48307000
#define CM_SIZE 0x1000
#define PRM_RSTCTRL_REG 0x250
#define RST_DPLL3_BIT 2
#else
#define CM_BASE 0x00000000
#define CM_SIZE 0x1000
#endif
struct omap_reset
{
vir_bytes base;
vir_bytes size;
};
static struct omap_reset omap_reset = {
.base = CM_BASE,
.size = CM_SIZE
};
static kern_phys_map reset_phys_map;
void
omap3_reset_init(void)
{
#if defined(AM335X) || defined(DM37XX)
kern_phys_map_ptr(omap_reset.base, omap_reset.size, &reset_phys_map,
&omap_reset.base);
#endif /* AM335X || DM37XX */
}
void
omap3_reset(void)
{
#ifdef AM335X
mmio_set((omap_reset.base + PRM_DEVICE_OFFSET + PRM_RSTCTRL_REG), (1 << RST_GLOBAL_WARM_SW_BIT));
#elif DM37XX
mmio_set((omap_reset.base + PRM_RSTCTRL_REG), (1 << RST_DPLL3_BIT));
#endif
}

View file

@ -0,0 +1,7 @@
#ifndef __OMAP_RESET_H
#define __OMAP_RESET_H
void omap3_reset_init(void);
void omap3_reset(void);
#endif /* __OMAP_RESET_H */