PATCH: v850 updates

Alan Cox (alan@lxorguk.ukuu.org.uk)
Tue, 8 Apr 2003 01:09:12 +0100

Messages sorted by: [ date ][ thread ][ subject ][ author ]
Next message: Alan Cox: "PATCH: compatmac not needed"
Previous message: Daniel Jacobowitz: "Re: correct to set -nostdinc and then include <stdarg.h> ?"

(Miles Bader)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/Kconfig linux-2.5.67-ac1/arch/v850/Kconfig
--- linux-2.5.67/arch/v850/Kconfig 2003-03-18 16:46:46.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/Kconfig 2003-04-04 00:01:04.000000000 +0100
@@ -124,9 +124,11 @@
depends RTE_CB_MA1 || RTE_CB_NB85E
default y

- # Currently, we only support RTE-CB boards using the Multi debugger
config RTE_CB_MULTI
bool
+ # RTE_CB_NB85E can either have multi ROM support or not, but
+ # other platforms (currently only RTE_CB_MA1) require it.
+ prompt "Multi monitor ROM support" if RTE_CB_NB85E
depends RTE_CB
default y

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/entry.S linux-2.5.67-ac1/arch/v850/kernel/entry.S
--- linux-2.5.67/arch/v850/kernel/entry.S 2003-03-03 19:20:08.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/entry.S 2003-04-03 23:58:04.000000000 +0100
@@ -231,7 +231,7 @@
st.b r19, KM; \
GET_CURRENT_TASK(CURRENT_TASK); /* Fetch the current task pointer. */ \
/* Save away the syscall number. */ \
- sst.w syscall_num, PTO+PT_SYSCALL[ep]
+ sst.w syscall_num, PTO+PT_CUR_SYSCALL[ep]

/* Save register state not normally saved by PUSH_STATE for TYPE. */
@@ -438,11 +438,11 @@
LP register should point to the location where the called function
should return. [note that MAKE_SYS_CALL uses label 1] */
#define MAKE_SYS_CALL \
- /* See if the system call number is valid. */ \
- addi -NR_syscalls, r12, r0; \
- bnh 1f; \
/* Figure out which function to use for this system call. */ \
shl 2, r12; \
+ /* See if the system call number is valid. */ \
+ addi lo(CSYM(sys_call_table) - sys_call_table_end), r12, r0; \
+ bnh 1f; \
mov hilo(CSYM(sys_call_table)), r19; \
add r19, r12; \
ld.w 0[r12], r12; \
@@ -511,10 +511,8 @@
(copy_thread makes ret_from_fork the return address in each new thread's
saved context). */
C_ENTRY(ret_from_fork):
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
mov r10, r6 // switch_thread returns the prev task.
jarl CSYM(schedule_tail), lp // ...which is schedule_tail's arg
-#endif
mov r0, r10 // Child's fork call should return 0.
br ret_from_trap // Do normal trap return.
C_END(ret_from_fork)
@@ -982,8 +980,5 @@
.long CSYM(sys_pivot_root) // 200
.long CSYM(sys_gettid)
.long CSYM(sys_tkill)
- .long CSYM(sys_ni_syscall) // sys_mincore
- .long CSYM(sys_ni_syscall) // sys_madvise
-
- .space (NR_syscalls-205)*4
+sys_call_table_end:
C_END(sys_call_table)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/gbus_int.c linux-2.5.67-ac1/arch/v850/kernel/gbus_int.c
--- linux-2.5.67/arch/v850/kernel/gbus_int.c 2003-02-10 18:39:13.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/gbus_int.c 2003-04-04 00:01:04.000000000 +0100
@@ -26,7 +26,9 @@
/* For each GINT interrupt, how many GBUS interrupts are using it. */
static unsigned gint_num_active_irqs[NUM_GINTS] = { 0 };

-/* A table of GINTn interrupts we actually use. */
+/* A table of GINTn interrupts we actually use.
+ Note that we don't use GINT0 because all the boards we support treat it
+ specially. */
struct used_gint {
unsigned gint;
unsigned priority;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/Makefile linux-2.5.67-ac1/arch/v850/kernel/Makefile
--- linux-2.5.67/arch/v850/kernel/Makefile 2003-03-18 16:46:46.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/Makefile 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
#
# arch/v850/kernel/Makefile
#
-# Copyright (C) 2001,02 NEC Corporation
-# Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+# Copyright (C) 2001,02,03 NEC Electronics Corporation
+# Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
#
# This file is subject to the terms and conditions of the GNU General Public
# License. See the file "COPYING" in the main directory of this archive
@@ -15,10 +15,14 @@
signal.o irq.o mach.o ptrace.o bug.o
obj-$(CONFIG_MODULES) += module.o v850_ksyms.o
# chip-specific code
-obj-$(CONFIG_V850E_MA1) += ma.o nb85e_utils.o nb85e_timer_d.o
obj-$(CONFIG_V850E_NB85E) += nb85e_intc.o
-obj-$(CONFIG_V850E2_ANNA) += anna.o nb85e_intc.o nb85e_utils.o nb85e_timer_d.o
-obj-$(CONFIG_V850E_AS85EP1) += as85ep1.o nb85e_intc.o nb85e_utils.o nb85e_timer_d.o
+obj-$(CONFIG_V850E_MA1) += ma.o nb85e_utils.o nb85e_timer_d.o
+obj-$(CONFIG_V850E_TEG) += teg.o nb85e_utils.o nb85e_cache.o \
+ nb85e_timer_d.o
+obj-$(CONFIG_V850E2_ANNA) += anna.o nb85e_intc.o nb85e_utils.o \
+ nb85e_timer_d.o
+obj-$(CONFIG_V850E_AS85EP1) += as85ep1.o nb85e_intc.o nb85e_utils.o \
+ nb85e_timer_d.o
# platform-specific code
obj-$(CONFIG_V850E_SIM) += sim.o simcons.o
obj-$(CONFIG_V850E2_SIM85E2C) += sim85e2c.o nb85e_intc.o memcons.o
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/nb85e_cache.c linux-2.5.67-ac1/arch/v850/kernel/nb85e_cache.c
--- linux-2.5.67/arch/v850/kernel/nb85e_cache.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.5.67-ac1/arch/v850/kernel/nb85e_cache.c 2003-04-04 00:01:04.000000000 +0100
@@ -0,0 +1,178 @@
+/*
+ * arch/v850/kernel/nb85e_cache.c -- Cache control for NB85E_CACHE212 and
+ * NB85E_CACHE213 cache memories
+ *
+ * Copyright (C) 2003 NEC Electronics Corporation
+ * Copyright (C) 2003 Miles Bader <miles@gnu.org>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License. See the file COPYING in the main directory of this
+ * archive for more details.
+ *
+ * Written by Miles Bader <miles@gnu.org>
+ */
+
+#include <asm/entry.h>
+#include <asm/nb85e_cache.h>
+
+#define WAIT_UNTIL_CLEAR(value) while (value) {}
+
+/* Set caching params via the BHC and DCC registers. */
+void nb85e_cache_enable (u16 bhc, u16 dcc)
+{
+ unsigned long *r0_ram = (unsigned long *)R0_RAM_ADDR;
+ register u16 bhc_val asm ("r6") = bhc;
+
+ /* Configure data-cache. */
+ NB85E_CACHE_DCC = dcc;
+
+ /* Configure caching for various memory regions by writing the BHC
+ register. The documentation says that an instruction _cannot_
+ enable/disable caching for the memory region in which the
+ instruction itself exists; to work around this, we store
+ appropriate instructions into the on-chip RAM area (which is never
+ cached), and briefly jump there to do the work. */
+ r0_ram[0] = 0xf0720760; /* st.h r0, 0xfffff072[r0] */
+ r0_ram[1] = 0xf06a3760; /* st.h r6, 0xfffff06a[r0] */
+ r0_ram[2] = 0x5640006b; /* jmp [r11] */
+ asm ("mov hilo(1f), r11; jmp [%1]; 1:;"
+ :: "r" (bhc_val), "r" (R0_RAM_ADDR) : "r11");
+}
+
+static void clear_icache (void)
+{
+ /* 1. Read the instruction cache control register (ICC) and confirm
+ that bits 0 and 1 (TCLR0, TCLR1) are all cleared. */
+ WAIT_UNTIL_CLEAR (NB85E_CACHE_ICC & 0x3);
+
+ /* 2. Read the ICC register and confirm that bit 12 (LOCK0) is
+ cleared. Bit 13 of the ICC register is always cleared. */
+ WAIT_UNTIL_CLEAR (NB85E_CACHE_ICC & 0x1000);
+
+ /* 3. Set the TCLR0 and TCLR1 bits of the ICC register as follows,
+ when clearing way 0 and way 1 at the same time:
+ (a) Set the TCLR0 and TCLR1 bits.
+ (b) Read the TCLR0 and TCLR1 bits to confirm that these bits
+ are cleared.
+ (c) Perform (a) and (b) above again. */
+ NB85E_CACHE_ICC |= 0x3;
+ WAIT_UNTIL_CLEAR (NB85E_CACHE_ICC & 0x3);
+ /* Do it again. */
+ NB85E_CACHE_ICC |= 0x3;
+ WAIT_UNTIL_CLEAR (NB85E_CACHE_ICC & 0x3);
+}
+
+/* Flush or clear (or both) the data cache, depending on the value of FLAGS;
+ the procedure is the same for both, just the control bits used differ (and
+ both may be performed simultaneously). */
+static void dcache_op (unsigned short flags)
+{
+ /* 1. Read the data cache control register (DCC) and confirm that bits
+ 0, 1, 4, and 5 (DC00, DC01, DC04, DC05) are all cleared. */
+ WAIT_UNTIL_CLEAR (NB85E_CACHE_DCC & 0x33);
+
+ /* 2. Clear DCC register bit 12 (DC12), bit 13 (DC13), or both
+ depending on the way for which tags are to be cleared. */
+ NB85E_CACHE_DCC &= ~0xC000;
+
+ /* 3. Set DCC register bit 0 (DC00), bit 1 (DC01) or both depending on
+ the way for which tags are to be cleared.
+ ...
+ Set DCC register bit 4 (DC04), bit 5 (DC05), or both depending
+ on the way to be data flushed. */
+ NB85E_CACHE_DCC |= flags;
+
+ /* 4. Read DCC register bit DC00, DC01 [DC04, DC05], or both depending
+ on the way for which tags were cleared [flushed] and confirm
+ that that bit is cleared. */
+ WAIT_UNTIL_CLEAR (NB85E_CACHE_DCC & flags);
+}
+
+/* Flushes the contents of the dcache to memory. */
+static inline void flush_dcache (void)
+{
+ /* We only need to do something if in write-back mode. */
+ if (NB85E_CACHE_DCC & 0x0400)
+ dcache_op (0x30);
+}
+
+/* Flushes the contents of the dcache to memory, and then clears it. */
+static inline void clear_dcache (void)
+{
+ /* We only need to do something if the dcache is enabled. */
+ if (NB85E_CACHE_DCC & 0x0C00)
+ dcache_op (0x33);
+}
+
+/* Clears the dcache without flushing to memory first. */
+static inline void clear_dcache_no_flush (void)
+{
+ /* We only need to do something if the dcache is enabled. */
+ if (NB85E_CACHE_DCC & 0x0C00)
+ dcache_op (0x3);
+}
+
+static inline void cache_exec_after_store (void)
+{
+ flush_dcache ();
+ clear_icache ();
+}
+
+
+/* Exported functions. */
+
+void inline nb85e_cache_flush_all (void)
+{
+ clear_icache ();
+ clear_dcache ();
+}
+
+void nb85e_cache_flush_mm (struct mm_struct *mm)
+{
+ /* nothing */
+}
+
+void nb85e_cache_flush_range (struct mm_struct *mm,
+ unsigned long start, unsigned long end)
+{
+ /* nothing */
+}
+
+void nb85e_cache_flush_page (struct vm_area_struct *vma,
+ unsigned long page_addr)
+{
+ /* nothing */
+}
+
+void nb85e_cache_flush_dcache_page (struct page *page)
+{
+ /* nothing */
+}
+
+void nb85e_cache_flush_icache (void)
+{
+ cache_exec_after_store ();
+}
+
+void nb85e_cache_flush_icache_range (unsigned long start, unsigned long end)
+{
+ cache_exec_after_store ();
+}
+
+void nb85e_cache_flush_icache_page (struct vm_area_struct *vma,
+ struct page *page)
+{
+ cache_exec_after_store ();
+}
+
+void nb85e_cache_flush_icache_user_range (struct vm_area_struct *vma,
+ struct page *page,
+ unsigned long adr, int len)
+{
+ cache_exec_after_store ();
+}
+
+void nb85e_cache_flush_sigtramp (unsigned long addr)
+{
+ cache_exec_after_store ();
+}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/process.c linux-2.5.67-ac1/arch/v850/kernel/process.c
--- linux-2.5.67/arch/v850/kernel/process.c 2003-03-03 19:20:08.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/process.c 2003-04-03 23:56:44.000000000 +0100
@@ -226,7 +226,7 @@
if (!p || p == current || p->state == TASK_RUNNING)
return 0;

- pc = thread_saved_pc (&p->thread);
+ pc = thread_saved_pc (p);

/* This quite disgusting function walks up the stack, following
saved return address, until it something that's out of bounds
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/rte_cb.c linux-2.5.67-ac1/arch/v850/kernel/rte_cb.c
--- linux-2.5.67/arch/v850/kernel/rte_cb.c 2003-02-10 18:37:58.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/rte_cb.c 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/rte_cb.c -- Midas lab RTE-CB series of evaluation boards
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -32,28 +32,11 @@
#endif

-#ifdef CONFIG_ROM_KERNEL
-/* Initialization for kernel in ROM. */
-static inline rom_kernel_init (void)
-{
- /* If the kernel is in ROM, we have to copy any initialized data
- from ROM into RAM. */
- extern unsigned long _data_load_start, _sdata, _edata;
- register unsigned long *src = &_data_load_start;
- register unsigned long *dst = &_sdata, *end = &_edata;
-
- while (dst != end)
- *dst++ = *src++;
-}
-#endif /* CONFIG_ROM_KERNEL */
-
-void __init mach_early_init (void)
+void __init rte_cb_early_init (void)
{
nb85e_intc_disable_irqs ();

-#if defined (CONFIG_ROM_KERNEL)
- rom_kernel_init ();
-#elif defined (CONFIG_RTE_CB_MULTI)
+#ifdef CONFIG_RTE_CB_MULTI
multi_init ();
#endif
}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/rte_cb_multi.c linux-2.5.67-ac1/arch/v850/kernel/rte_cb_multi.c
--- linux-2.5.67/arch/v850/kernel/rte_cb_multi.c 2003-03-06 17:04:25.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/rte_cb_multi.c 2003-04-04 00:01:04.000000000 +0100
@@ -16,22 +16,55 @@

#include <asm/machdep.h>

+#define IRQ_ADDR(irq) (0x80 + (irq) * 0x10)
+
/* A table of which interrupt vectors to install, since blindly
installing all of them makes the debugger stop working. This is a
list of offsets in the interrupt vector area; each entry means to
copy that particular 16-byte vector. An entry less than zero ends
the table. */
static long multi_intv_install_table[] = {
- 0x40, 0x50, /* trap vectors */
+ /* Trap vectors */
+ 0x40, 0x50,
+
#ifdef CONFIG_RTE_CB_MULTI_DBTRAP
- 0x60, /* illegal insn / dbtrap */
+ /* Illegal insn / dbtrap. These are used by multi, so only handle
+ them if configured to do so. */
+ 0x60,
+#endif
+
+ /* GINT1 - GINT3 (note, not GINT0!) */
+ IRQ_ADDR (IRQ_GINT(1)),
+ IRQ_ADDR (IRQ_GINT(2)),
+ IRQ_ADDR (IRQ_GINT(3)),
+
+ /* Timer D interrupts (up to 4 timers) */
+ IRQ_ADDR (IRQ_INTCMD(0)),
+#if IRQ_INTCMD_NUM > 1
+ IRQ_ADDR (IRQ_INTCMD(1)),
+#if IRQ_INTCMD_NUM > 2
+ IRQ_ADDR (IRQ_INTCMD(2)),
+#if IRQ_INTCMD_NUM > 3
+ IRQ_ADDR (IRQ_INTCMD(3)),
+#endif
#endif
- /* Note -- illegal insn trap is used by the debugger. */
- 0xD0, 0xE0, 0xF0, /* GINT1 - GINT3 */
- 0x240, 0x250, 0x260, 0x270, /* timer D interrupts */
- 0x2D0, 0x2E0, 0x2F0, /* UART channel 0 */
- 0x310, 0x320, 0x330, /* UART channel 1 */
- 0x350, 0x360, 0x370, /* UART channel 2 */
+#endif
+
+ /* UART interrupts (up to 3 channels) */
+ IRQ_ADDR (IRQ_INTSER (0)), /* err */
+ IRQ_ADDR (IRQ_INTSR (0)), /* rx */
+ IRQ_ADDR (IRQ_INTST (0)), /* tx */
+#if IRQ_INTSR_NUM > 1
+ IRQ_ADDR (IRQ_INTSER (1)), /* err */
+ IRQ_ADDR (IRQ_INTSR (1)), /* rx */
+ IRQ_ADDR (IRQ_INTST (1)), /* tx */
+#if IRQ_INTSR_NUM > 2
+ IRQ_ADDR (IRQ_INTSER (2)), /* err */
+ IRQ_ADDR (IRQ_INTSR (2)), /* rx */
+ IRQ_ADDR (IRQ_INTST (2)), /* tx */
+#endif
+#endif
+
-1
};

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/rte_ma1_cb.c linux-2.5.67-ac1/arch/v850/kernel/rte_ma1_cb.c
--- linux-2.5.67/arch/v850/kernel/rte_ma1_cb.c 2003-03-06 17:04:25.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/rte_ma1_cb.c 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* arch/v850/kernel/rte_ma1_cb.c -- Midas labs RTE-V850E/MA1-CB board
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -31,6 +31,11 @@
#define RAM_END (SDRAM_ADDR + SDRAM_SIZE)

+void __init mach_early_init (void)
+{
+ rte_cb_early_init ();
+}
+
void __init mach_get_physical_ram (unsigned long *ram_start,
unsigned long *ram_len)
{
@@ -67,7 +72,7 @@
if (chan == 0) {
/* Put P42 & P43 in I/O port mode. */
MA_PORT4_PMC &= ~0xC;
- /* Make P42 and output, and P43 an input. */
+ /* Make P42 an output, and P43 an input. */
MA_PORT4_PM = (MA_PORT4_PM & ~0xC) | 0x8;
}

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/rte_mb_a_pci.c linux-2.5.67-ac1/arch/v850/kernel/rte_mb_a_pci.c
--- linux-2.5.67/arch/v850/kernel/rte_mb_a_pci.c 2003-03-18 16:46:47.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/rte_mb_a_pci.c 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* arch/v850/kernel/mb_a_pci.c -- PCI support for Midas lab RTE-MOTHER-A board
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -165,7 +165,6 @@
"PCI: PLX Technology PCI9080 HOST/PCI bridge\n");

MB_A_PCI_PCICR = 0x147;
- MB_A_PCI_DMLBAM = 0x0;

MB_A_PCI_PCIBAR0 = 0x007FFF00;
MB_A_PCI_PCIBAR1 = 0x0000FF00;
@@ -179,12 +178,29 @@

/* Reprogram the motherboard's IO/config address space,
as we don't support the GCS7 address space that the
- default uses. Note that we have to give the address
- from the motherboard's point of view, which is
- different than the CPU's. */
- MB_A_PCI_DMLBAI = MB_A_PCI_IO_ADDR - GCS5_ADDR;
+ default uses. */
+
+ /* Significant address bits used for decoding PCI GCS5 space
+ accessess. */
MB_A_PCI_DMRR = ~(MB_A_PCI_MEM_SIZE - 1);

+ /* I don't understand this, but the SolutionGear example code
+ uses such an offset, and it doesn't work without it. XXX */
+#if GCS5_SIZE == 0x00800000
+#define GCS5_CFG_OFFS 0x00800000
+#else
+#define GCS5_CFG_OFFS 0
+#endif
+
+ /* Address bit values for matching. Note that we have to give
+ the address from the motherboard's point of view, which is
+ different than the CPU's. */
+ /* PCI memory space. */
+ MB_A_PCI_DMLBAM = GCS5_CFG_OFFS + 0x0;
+ /* PCI I/O space. */
+ MB_A_PCI_DMLBAI =
+ GCS5_CFG_OFFS + (MB_A_PCI_IO_ADDR - GCS5_ADDR);
+
mb_pci_bus = pci_scan_bus (0, &mb_pci_config_ops, 0);

pcibios_assign_resources ();
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/rte_nb85e_cb.c linux-2.5.67-ac1/arch/v850/kernel/rte_nb85e_cb.c
--- linux-2.5.67/arch/v850/kernel/rte_nb85e_cb.c 2003-02-10 18:38:54.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/rte_nb85e_cb.c 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* arch/v850/kernel/rte_nb85e_cb.c -- Midas labs RTE-V850E/NB85E-CB board
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -26,10 +26,30 @@

#include "mach.h"

+void __init mach_early_init (void)
+{
+ /* Configure caching; some possible settings:
+
+ BHC = 0x0000, DCC = 0x0000 -- all caching disabled
+ BHC = 0x0040, DCC = 0x0000 -- SDRAM: icache only
+ BHC = 0x0080, DCC = 0x0C00 -- SDRAM: write-back dcache only
+ BHC = 0x00C0, DCC = 0x0C00 -- SDRAM: icache + write-back dcache
+ BHC = 0x00C0, DCC = 0x0800 -- SDRAM: icache + write-thru dcache
+
+ We can only cache SDRAM (we can't use cache SRAM because it's in
+ the same memory region as the on-chip RAM and I/O space).
+
+ Unfortunately, the dcache seems to be buggy, so we only use the
+ icache for now. */
+ nb85e_cache_enable (0x0040 /* BHC */, 0x0000 /* DCC */);
+
+ rte_cb_early_init ();
+}
+
void __init mach_get_physical_ram (unsigned long *ram_start,
unsigned long *ram_len)
{
- /* We just use SDRAM here; the kernel itself is in SRAM. */
+ /* We just use SDRAM here. */
*ram_start = SDRAM_ADDR;
*ram_len = SDRAM_SIZE;
}
@@ -41,8 +61,10 @@
u32 root_fs_image_end = (u32)&_root_fs_image_end;

/* Reserve the memory used by the root filesystem image if it's
- in RAM. */
- if (root_fs_image_start >= RAM_START && root_fs_image_start < RAM_END)
+ in SDRAM. */
+ if (root_fs_image_end > root_fs_image_start
+ && root_fs_image_start >= SDRAM_ADDR
+ && root_fs_image_start < (SDRAM_ADDR + SDRAM_SIZE))
reserve_bootmem (root_fs_image_start,
root_fs_image_end - root_fs_image_start);
}
@@ -52,3 +74,24 @@
tv->tv_sec = 0;
tv->tv_nsec = 0;
}
+
+/* Called before configuring an on-chip UART. */
+void rte_nb85e_cb_uart_pre_configure (unsigned chan,
+ unsigned cflags, unsigned baud)
+{
+ /* The RTE-NB85E-CB connects some general-purpose I/O pins on the
+ CPU to the RTS/CTS lines the UART's serial connection, as follows:
+ P00 = CTS (in), P01 = DSR (in), P02 = RTS (out), P03 = DTR (out). */
+
+ TEG_PORT0_PM = 0x03; /* P00 and P01 inputs, P02 and P03 outputs */
+ TEG_PORT0_IO = 0x03; /* Accept input */
+
+ /* Do pre-configuration for the actual UART. */
+ teg_uart_pre_configure (chan, cflags, baud);
+}
+
+void __init mach_init_irqs (void)
+{
+ teg_init_irqs ();
+ rte_cb_init_irqs ();
+}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/simcons.c linux-2.5.67-ac1/arch/v850/kernel/simcons.c
--- linux-2.5.67/arch/v850/kernel/simcons.c 2003-02-10 18:38:49.000000000 +0000
+++ linux-2.5.67-ac1/arch/v850/kernel/simcons.c 2003-04-03 23:57:47.000000000 +0100
@@ -1,8 +1,8 @@
/*
* arch/v850/kernel/simcons.c -- Console I/O for GDB v850e simulator
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -19,6 +19,7 @@
#include <linux/init.h>

#include <asm/poll.h>
+#include <asm/string.h>
#include <asm/simsyscall.h>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/kernel/teg.c linux-2.5.67-ac1/arch/v850/kernel/teg.c
--- linux-2.5.67/arch/v850/kernel/teg.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.5.67-ac1/arch/v850/kernel/teg.c 2003-04-04 00:01:04.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * arch/v850/kernel/teg.c -- NB85E-TEG cpu chip
+ *
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License. See the file COPYING in the main directory of this
+ * archive for more details.
+ *
+ * Written by Miles Bader <miles@gnu.org>
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/swap.h>
+#include <linux/bootmem.h>
+#include <linux/irq.h>
+
+#include <asm/atomic.h>
+#include <asm/page.h>
+#include <asm/machdep.h>
+#include <asm/nb85e_timer_d.h>
+
+#include "mach.h"
+
+void __init mach_sched_init (struct irqaction *timer_action)
+{
+ /* Select timer interrupt instead of external pin. */
+ TEG_ISS |= 0x1;
+ /* Start hardware timer. */
+ nb85e_timer_d_configure (0, HZ);
+ /* Install timer interrupt handler. */
+ setup_irq (IRQ_INTCMD(0), timer_action);
+}
+
+static struct nb85e_intc_irq_init irq_inits[] = {
+ { "IRQ", 0, NUM_CPU_IRQS, 1, 7 },
+ { "CMD", IRQ_INTCMD(0), IRQ_INTCMD_NUM, 1, 5 },
+ { "SER", IRQ_INTSER(0), IRQ_INTSER_NUM, 1, 3 },
+ { "SR", IRQ_INTSR(0), IRQ_INTSR_NUM, 1, 4 },
+ { "ST", IRQ_INTST(0), IRQ_INTST_NUM, 1, 5 },
+ { 0 }
+};
+#define NUM_IRQ_INITS ((sizeof irq_inits / sizeof irq_inits[0]) - 1)
+
+static struct hw_interrupt_type hw_itypes[NUM_IRQ_INITS];
+
+/* Initialize MA chip interrupts. */
+void __init teg_init_irqs (void)
+{
+ nb85e_intc_init_irq_types (irq_inits, hw_itypes);
+}
+
+/* Called before configuring an on-chip UART. */
+void teg_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud)
+{
+ /* Enable UART I/O pins instead of external interrupt pins, and
+ UART interrupts instead of external pin interrupts. */
+ TEG_ISS |= 0x4E;
+}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/rte_nb85e_cb.ld linux-2.5.67-ac1/arch/v850/rte_nb85e_cb.ld
--- linux-2.5.67/arch/v850/rte_nb85e_cb.ld 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.5.67-ac1/arch/v850/rte_nb85e_cb.ld 2003-04-04 00:01:04.000000000 +0100
@@ -0,0 +1,25 @@
+/* Linker script for the Midas labs RTE-NB85E-CB evaluation board
+ (CONFIG_RTE_CB_NB85E). */
+
+MEMORY {
+ LOW : ORIGIN = 0x0, LENGTH = 0x00100000
+ /* 1MB of SRAM; we can't use the last 96KB, because it's used by
+ the monitor scratch-RAM. This memory is mirrored 4 times. */
+ SRAM : ORIGIN = 0x03C00000, LENGTH = 0x000E8000
+ /* Monitor scratch RAM; only the interrupt vectors should go here. */
+ MRAM : ORIGIN = 0x03CE8000, LENGTH = 0x00018000
+ /* 16MB of SDRAM. */
+ SDRAM : ORIGIN = 0x01000000, LENGTH = 0x01000000
+}
+
+#ifdef CONFIG_RTE_CB_NB85E_KSRAM
+# define KRAM SRAM
+#else
+# define KRAM SDRAM
+#endif
+
+SECTIONS {
+ .intv : { INTV_CONTENTS } > LOW
+ .sram : { RAMK_KRAM_CONTENTS } > KRAM
+ .root : { ROOT_FS_CONTENTS } > SDRAM
+}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/arch/v850/rte_nb85e_cb-multi.ld linux-2.5.67-ac1/arch/v850/rte_nb85e_cb-multi.ld
--- linux-2.5.67/arch/v850/rte_nb85e_cb-multi.ld 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.5.67-ac1/arch/v850/rte_nb85e_cb-multi.ld 2003-04-04 00:01:04.000000000 +0100
@@ -0,0 +1,57 @@
+/* Linker script for the Midas labs RTE-NB85E-CB evaluation board
+ (CONFIG_RTE_CB_NB85E), with the Multi debugger ROM monitor . */
+
+MEMORY {
+ /* 1MB of SRAM; we can't use the last 96KB, because it's used by
+ the monitor scratch-RAM. This memory is mirrored 4 times. */
+ SRAM : ORIGIN = 0x03C00000, LENGTH = 0x000E8000
+ /* Monitor scratch RAM; only the interrupt vectors should go here. */
+ MRAM : ORIGIN = 0x03CE8000, LENGTH = 0x00018000
+ /* 16MB of SDRAM. */
+ SDRAM : ORIGIN = 0x01000000, LENGTH = 0x01000000
+}
+
+#ifdef CONFIG_RTE_CB_NB85E_KSRAM
+# define KRAM SRAM
+#else
+# define KRAM SDRAM
+#endif
+
+SECTIONS {
+ /* We can't use RAMK_KRAM_CONTENTS because that puts the whole
+ kernel in a single ELF segment, and the Multi debugger (which
+ we use to load the kernel) appears to have bizarre problems
+ dealing with it. */
+
+ .text : {
+ __kram_start = . ;
+ TEXT_CONTENTS
+ } > KRAM
+
+ .data : {
+ DATA_CONTENTS
+ BSS_CONTENTS
+ RAMK_INIT_CONTENTS
+ __kram_end = . ;
+ BOOTMAP_CONTENTS
+
+ /* The address at which the interrupt vectors are initially
+ loaded by the loader. We can't load the interrupt vectors
+ directly into their target location, because the monitor
+ ROM for the GHS Multi debugger barfs if we try.
+ Unfortunately, Multi also doesn't deal correctly with ELF
+ sections where the LMA and VMA differ (it just ignores the
+ LMA), so we can't use that feature to work around the
+ problem! What we do instead is just put the interrupt
+ vectors into a normal section, and have the
+ `mach_early_init' function for Midas boards do the
+ necessary copying and relocation at runtime (this section
+ basically only contains `jr' instructions, so it's not
+ that hard). */
+ . = ALIGN (0x10) ;
+ __intv_load_start = . ;
+ INTV_CONTENTS
+ } > KRAM
+
+ .root ALIGN (4096) : { ROOT_FS_CONTENTS } > SDRAM
+}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/nb85e_cache.h linux-2.5.67-ac1/include/asm-v850/nb85e_cache.h
--- linux-2.5.67/include/asm-v850/nb85e_cache.h 2003-02-10 18:38:37.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/nb85e_cache.h 2003-04-04 00:01:04.000000000 +0100
@@ -2,8 +2,8 @@
* include/asm-v850/nb85e_cache_cache.h -- Cache control for NB85E_CACHE212 and
* NB85E_CACHE213 cache memories
*
- * Copyright (C) 2001 NEC Corporation
- * Copyright (C) 2001 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,03 NEC Electronics Corporation
+ * Copyright (C) 2001,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -15,92 +15,65 @@
#ifndef __V850_NB85E_CACHE_H__
#define __V850_NB85E_CACHE_H__

+#include <asm/types.h>
+
+
/* Cache control registers. */
-#define NB85E_CACHE_ICC_ADDR 0xFFFFF070
-#define NB85E_CACHE_DCC_ADDR 0xFFFFF078
+#define NB85E_CACHE_BHC_ADDR 0xFFFFF06A
+#define NB85E_CACHE_BHC (*(volatile u16 *)NB85E_CACHE_BHC_ADDR)
+#define NB85E_CACHE_ICC_ADDR 0xFFFFF070
+#define NB85E_CACHE_ICC (*(volatile u16 *)NB85E_CACHE_ICC_ADDR)
+#define NB85E_CACHE_ISI_ADDR 0xFFFFF072
+#define NB85E_CACHE_ISI (*(volatile u16 *)NB85E_CACHE_ISI_ADDR)
+#define NB85E_CACHE_DCC_ADDR 0xFFFFF078
+#define NB85E_CACHE_DCC (*(volatile u16 *)NB85E_CACHE_DCC_ADDR)

/* Size of a cache line in bytes. */
-#define NB85E_CACHE_LINE_SIZE 16
-
+#define NB85E_CACHE_LINE_SIZE 16

-#ifndef __ASSEMBLY__
+/* For <asm/cache.h> */
+#define L1_CACHE_BYTES NB85E_CACHE_LINE_SIZE

-extern inline void nb85e_cache_flush_cache (unsigned long cache_control_addr)
-{
- /*
- From the NB85E Instruction/Data Cache manual, how to flush
- the instruction cache (ICC is the `Instruction Cache Control
- Register'):
-
- mov 0x3, r2
- LOP0:
- ld.h ICC[r0], r1
- cmp r0, r1
- bnz LOP0
- st.h r2, ICC[r0]
- LOP1: - First TAG clear
- ld.h ICC[r0], r1
- cmp r0, r1
- bnz LOP1
- st.h r2, ICC[r0]
- LOP2: - Second TAG clear
- ld.h ICC[r0], r1
- cmp r0, r1
- bnz LOP2
- */
- int cache_flush_bits, ccr_contents;
- __asm__ __volatile__ (
- " mov 0x3, %1;"
- "1: ld.h 0[%2], %0;"
- " cmp r0, %0;"
- " bnz 1b;"
- " st.h %1, 0[%2];"
- "2: ld.h 0[%2], %0;"
- " cmp r0, %0;"
- " bnz 2b;"
- " st.h %1, 0[%2];"
- "3: ld.h 0[%2], %0;"
- " cmp r0, %0;"
- " bnz 3b"
- : "=&r" (ccr_contents), "=&r" (cache_flush_bits)
- : "r" (cache_control_addr)
- : "memory");
-}
-
-extern inline void nb85e_cache_flush_icache (void)
-{
- nb85e_cache_flush_cache (NB85E_CACHE_ICC_ADDR);
-}
-
-extern inline void nb85e_cache_flush_dcache (void)
-{
- nb85e_cache_flush_cache (NB85E_CACHE_DCC_ADDR);
-}
-
-extern inline void nb85e_cache_flush (void)
-{
- nb85e_cache_flush_icache ();
- nb85e_cache_flush_dcache ();
-}

-#endif /* !__ASSEMBLY__ */
+#ifndef __ASSEMBLY__

-
-/* Define standard definitions in terms of processor-specific ones. */
+/* Set caching params via the BHC and DCC registers. */
+void nb85e_cache_enable (u16 bhc, u16 dcc);

-/* For <asm/cache.h> */
-#define L1_CACHE_BYTES NB85E_CACHE_LINE_SIZE
+struct page;
+struct mm_struct;
+struct vm_area_struct;
+
+extern void nb85e_cache_flush_all (void);
+extern void nb85e_cache_flush_mm (struct mm_struct *mm);
+extern void nb85e_cache_flush_range (struct mm_struct *mm,
+ unsigned long start,
+ unsigned long end);
+extern void nb85e_cache_flush_page (struct vm_area_struct *vma,
+ unsigned long page_addr);
+extern void nb85e_cache_flush_dcache_page (struct page *page);
+extern void nb85e_cache_flush_icache (void);
+extern void nb85e_cache_flush_icache_range (unsigned long start,
+ unsigned long end);
+extern void nb85e_cache_flush_icache_page (struct vm_area_struct *vma,
+ struct page *page);
+extern void nb85e_cache_flush_icache_user_range (struct vm_area_struct *vma,
+ struct page *page,
+ unsigned long adr, int len);
+extern void nb85e_cache_flush_sigtramp (unsigned long addr);
+
+#define flush_page_to_ram(x) ((void)0)
+#define flush_cache_all nb85e_cache_flush_all
+#define flush_cache_mm nb85e_cache_flush_mm
+#define flush_cache_range nb85e_cache_flush_range
+#define flush_cache_page nb85e_cache_flush_page
+#define flush_dcache_page nb85e_cache_flush_dcache_page
+#define flush_icache nb85e_cache_flush_icache
+#define flush_icache_range nb85e_cache_flush_icache_range
+#define flush_icache_page nb85e_cache_flush_icache_page
+#define flush_icache_user_range nb85e_cache_flush_icache_user_range
+#define flush_cache_sigtramp nb85e_cache_flush_sigtramp

-/* For <asm/pgalloc.h> */
-#define flush_cache_all() nb85e_cache_flush ()
-#define flush_cache_mm(mm) nb85e_cache_flush ()
-#define flush_cache_range(mm, start, end) nb85e_cache_flush ()
-#define flush_cache_page(vma, vmaddr) nb85e_cache_flush ()
-#define flush_page_to_ram(page) nb85e_cache_flush ()
-#define flush_dcache_page(page) nb85e_cache_flush_dcache ()
-#define flush_icache_range(start, end) nb85e_cache_flush_icache ()
-#define flush_icache_page(vma,pg) nb85e_cache_flush_icache ()
-#define flush_icache() nb85e_cache_flush_icache ()
-#define flush_cache_sigtramp(vaddr) nb85e_cache_flush_icache ()
+#endif /* !__ASSEMBLY__ */

#endif /* __V850_NB85E_CACHE_H__ */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/nb85e_timer_d.h linux-2.5.67-ac1/include/asm-v850/nb85e_timer_d.h
--- linux-2.5.67/include/asm-v850/nb85e_timer_d.h 2003-02-10 18:38:17.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/nb85e_timer_d.h 2003-04-04 00:01:04.000000000 +0100
@@ -2,8 +2,8 @@
* include/asm-v850/nb85e_timer_d.h -- `Timer D' component often used
* with the NB85E cpu core
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -27,7 +27,7 @@

/* Count compare registers for timer D. */
#define NB85E_TIMER_D_CMD_ADDR(n) (NB85E_TIMER_D_CMD_BASE_ADDR + 0x10 * (n))
-#define NB85E_TIMER_D_CMD(n) (*(u16 *)NB85E_TIMER_D_CMD_ADDR(n))
+#define NB85E_TIMER_D_CMD(n) (*(volatile u16 *)NB85E_TIMER_D_CMD_ADDR(n))

/* Control registers for timer D. */
#define NB85E_TIMER_D_TMCD_ADDR(n) (NB85E_TIMER_D_TMCD_BASE_ADDR + 0x10 * (n))
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/posix_types.h linux-2.5.67-ac1/include/asm-v850/posix_types.h
--- linux-2.5.67/include/asm-v850/posix_types.h 2003-02-10 18:39:17.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/posix_types.h 2003-04-03 23:57:22.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/posix_types.h -- Kernel versions of standard types
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -31,6 +31,8 @@
typedef long __kernel_time_t;
typedef long __kernel_suseconds_t;
typedef long __kernel_clock_t;
+typedef int __kernel_timer_t;
+typedef int __kernel_clockid_t;
typedef int __kernel_daddr_t;
typedef char * __kernel_caddr_t;
typedef unsigned short __kernel_uid16_t;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/processor.h linux-2.5.67-ac1/include/asm-v850/processor.h
--- linux-2.5.67/include/asm-v850/processor.h 2003-03-18 16:46:52.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/processor.h 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/processor.h
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -91,15 +91,17 @@
{
}

-/* Return saved (kernel) PC of a blocked thread. */
-extern inline unsigned long thread_saved_pc (struct thread_struct *t)
-{
- struct pt_regs *r = (struct pt_regs *)(t->ksp + STATE_SAVE_PT_OFFSET);
- /* Actually, we return the LP register, because the thread is
- actually blocked in switch_thread, and we're interested in
- the PC it will _return_ to. */
- return r->gpr[GPR_LP];
-}
+
+/* Return the registers saved during context-switch by the currently
+ not-running thread T. Note that this only includes some registers!
+ See entry.S for details. */
+#define thread_saved_regs(t) \
+ ((struct pt_regs*)((t)->thread.ksp + STATE_SAVE_PT_OFFSET))
+/* Return saved (kernel) PC of a blocked thread. Actually, we return the
+ LP register, because the thread is actually blocked in switch_thread,
+ and we're interested in the PC it will _return_ to. */
+#define thread_saved_pc(t) (thread_saved_regs(t)->gpr[GPR_LP])
+

unsigned long get_wchan (struct task_struct *p);

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/ptrace.h linux-2.5.67-ac1/include/asm-v850/ptrace.h
--- linux-2.5.67/include/asm-v850/ptrace.h 2003-02-10 18:39:16.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/ptrace.h 2003-04-03 23:56:33.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/ptrace.h -- Access to CPU registers
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -102,10 +102,19 @@
#define PT_CTBP ((NUM_GPRS + 4) * _PT_REG_SIZE)
#define PT_KERNEL_MODE ((NUM_GPRS + 5) * _PT_REG_SIZE)

-#define PT_SYSCALL PT_GPR(0)
+/* Where the current syscall number is stashed; obviously only valid in
+ the kernel! */
+#define PT_CUR_SYSCALL PT_GPR(0)

/* Size of struct pt_regs, including alignment. */
#define PT_SIZE ((NUM_GPRS + 6) * _PT_REG_SIZE)

+/* These are `magic' values for PTRACE_PEEKUSR that return info about where
+ a process is located in memory. */
+#define PT_TEXT_ADDR (PT_SIZE + 1)
+#define PT_TEXT_LEN (PT_SIZE + 2)
+#define PT_DATA_ADDR (PT_SIZE + 3)
+
+
#endif /* __V850_PTRACE_H__ */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/rte_cb.h linux-2.5.67-ac1/include/asm-v850/rte_cb.h
--- linux-2.5.67/include/asm-v850/rte_cb.h 2003-02-10 18:38:29.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/rte_cb.h 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/rte_cb.h -- Midas labs RTE-CB series of evaluation boards
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -15,18 +15,6 @@
#define __V850_RTE_CB_H__

-/* CPU addresses of GBUS memory spaces. */
-#define GCS0_ADDR 0x05000000 /* GCS0 - Common SRAM (2MB) */
-#define GCS0_SIZE 0x00200000 /* 2MB */
-#define GCS1_ADDR 0x06000000 /* GCS1 - Flash ROM (8MB) */
-#define GCS1_SIZE 0x00800000 /* 8MB */
-#define GCS2_ADDR 0x07900000 /* GCS2 - I/O registers */
-#define GCS2_SIZE 0x00400000 /* 4MB */
-#define GCS5_ADDR 0x04000000 /* GCS5 - PCI bus space */
-#define GCS5_SIZE 0x01000000 /* 16MB */
-#define GCS6_ADDR 0x07980000 /* GCS6 - PCI control registers */
-#define GCS6_SIZE 0x00000200 /* 512B */
-
/* The SRAM on the Mother-A motherboard. */
#define MB_A_SRAM_ADDR GCS0_ADDR
#define MB_A_SRAM_SIZE 0x00200000 /* 2MB */
@@ -78,9 +66,8 @@

#ifndef __ASSEMBLY__
-
+extern void rte_cb_early_init (void);
extern void rte_cb_init_irqs (void);
-
#endif /* !__ASSEMBLY__ */

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/rte_ma1_cb.h linux-2.5.67-ac1/include/asm-v850/rte_ma1_cb.h
--- linux-2.5.67/include/asm-v850/rte_ma1_cb.h 2003-02-10 18:38:00.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/rte_ma1_cb.h 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/rte_ma1_cb.h -- Midas labs RTE-V850/MA1-CB board
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -17,6 +17,19 @@
#include <asm/rte_cb.h> /* Common defs for Midas RTE-CB boards. */

+/* CPU addresses of GBUS memory spaces. */
+#define GCS0_ADDR 0x05000000 /* GCS0 - Common SRAM (2MB) */
+#define GCS0_SIZE 0x00200000 /* 2MB */
+#define GCS1_ADDR 0x06000000 /* GCS1 - Flash ROM (8MB) */
+#define GCS1_SIZE 0x00800000 /* 8MB */
+#define GCS2_ADDR 0x07900000 /* GCS2 - I/O registers */
+#define GCS2_SIZE 0x00400000 /* 4MB */
+#define GCS5_ADDR 0x04000000 /* GCS5 - PCI bus space */
+#define GCS5_SIZE 0x01000000 /* 16MB */
+#define GCS6_ADDR 0x07980000 /* GCS6 - PCI control registers */
+#define GCS6_SIZE 0x00000200 /* 512B */
+
+
/* The GBUS GINT0 - GINT4 interrupts are connected to the INTP000 - INTP011
pins on the CPU. These are shared among the GBUS interrupts. */
#define IRQ_GINT(n) IRQ_INTP(n)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/rte_nb85e_cb.h linux-2.5.67-ac1/include/asm-v850/rte_nb85e_cb.h
--- linux-2.5.67/include/asm-v850/rte_nb85e_cb.h 2003-02-10 18:38:49.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/rte_nb85e_cb.h 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/rte_nb85e_cb.h -- Midas labs RTE-V850/NB85E-CB board
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -16,6 +16,30 @@

#include <asm/rte_cb.h> /* Common defs for Midas RTE-CB boards. */

+
+/* CPU addresses of GBUS memory spaces. */
+#define GCS0_ADDR 0x00400000 /* GCS0 - Common SRAM (2MB) */
+#define GCS0_SIZE 0x00400000 /* 4MB */
+#define GCS1_ADDR 0x02000000 /* GCS1 - Flash ROM (8MB) */
+#define GCS1_SIZE 0x00800000 /* 8MB */
+#define GCS2_ADDR 0x03900000 /* GCS2 - I/O registers */
+#define GCS2_SIZE 0x00080000 /* 512KB */
+#define GCS3_ADDR 0x02800000 /* GCS3 - EXT-bus: memory space */
+#define GCS3_SIZE 0x00800000 /* 8MB */
+#define GCS4_ADDR 0x03A00000 /* GCS4 - EXT-bus: I/O space */
+#define GCS4_SIZE 0x00200000 /* 2MB */
+#define GCS5_ADDR 0x00800000 /* GCS5 - PCI bus space */
+#define GCS5_SIZE 0x00800000 /* 8MB */
+#define GCS6_ADDR 0x03980000 /* GCS6 - PCI control registers */
+#define GCS6_SIZE 0x00010000 /* 64KB */
+
+
+/* The GBUS GINT0 - GINT3 interrupts are connected to CPU interrupts 10-12.
+ These are shared among the GBUS interrupts. */
+#define IRQ_GINT(n) (10 + (n))
+#define IRQ_GINT_NUM 3
+
+
#define PLATFORM "rte-v850e/nb85e-cb"
#define PLATFORM_LONG "Midas lab RTE-V850E/NB85E-CB"

@@ -41,13 +65,13 @@

/* The chip's real interrupt vectors are in ROM, but they jump to a
secondary interrupt vector table in RAM. */
-#define INTV_BASE 0x004F8000
+#define INTV_BASE 0x03CF8000

/* Scratch memory used by the ROM monitor, which shouldn't be used by
linux (except for the alternate interrupt vector area, defined
above). */
#define MON_SCRATCH_ADDR 0x03CE8000
-#define MON_SCRATCH_SIZE 0x00008000 /* 32KB */
+#define MON_SCRATCH_SIZE 0x00018000 /* 96KB */

#endif /* CONFIG_ROM_KERNEL */

@@ -60,4 +84,25 @@
#define LED_NUM_DIGITS 4

+/* Override the basic TEG UART pre-initialization so that we can
+ initialize extra stuff. */
+#undef NB85E_UART_PRE_CONFIGURE /* should be defined by <asm/teg.h> */
+#define NB85E_UART_PRE_CONFIGURE rte_nb85e_cb_uart_pre_configure
+#ifndef __ASSEMBLY__
+extern void rte_nb85e_cb_uart_pre_configure (unsigned chan,
+ unsigned cflags, unsigned baud);
+#endif
+
+/* This board supports RTS/CTS for the on-chip UART. */
+
+/* CTS is pin P00. */
+#define NB85E_UART_CTS(chan) (! (TEG_PORT0_IO & 0x1))
+/* RTS is pin P02. */
+#define NB85E_UART_SET_RTS(chan, val) \
+ do { \
+ unsigned old = TEG_PORT0_IO; \
+ TEG_PORT0_IO = val ? (old & ~0x4) : (old | 0x4); \
+ } while (0)
+
+
#endif /* __V850_RTE_NB85E_CB_H__ */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/system.h linux-2.5.67-ac1/include/asm-v850/system.h
--- linux-2.5.67/include/asm-v850/system.h 2003-02-10 18:38:49.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/system.h 2003-04-03 23:57:06.000000000 +0100
@@ -72,17 +72,10 @@
#define set_mb(var, value) set_rmb (var, value)
#define set_wmb(var, value) do { var = value; wmb (); } while (0)

-#ifdef CONFIG_SMP
#define smp_mb() mb ()
#define smp_rmb() rmb ()
#define smp_wmb() wmb ()
#define smp_read_barrier_depends() read_barrier_depends()
-#else
-#define smp_mb() barrier ()
-#define smp_rmb() barrier ()
-#define smp_wmb() barrier ()
-#define smp_read_barrier_depends() ((void)0)
-#endif

#define xchg(ptr, with) \
((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr))))
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/teg.h linux-2.5.67-ac1/include/asm-v850/teg.h
--- linux-2.5.67/include/asm-v850/teg.h 2003-02-10 18:37:56.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/teg.h 2003-04-04 00:01:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
- * include/asm-v850/nb85e_teg.h -- NB85E-TEG cpu chip
+ * include/asm-v850/teg.h -- NB85E-TEG cpu chip
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -11,33 +11,44 @@
* Written by Miles Bader <miles@gnu.org>
*/

-#ifndef __V850_NB85E_TEG_H__
-#define __V850_NB85E_TEG_H__
+#ifndef __V850_TEG_H__
+#define __V850_TEG_H__

-/* The NB85E_TEG uses the NB85E cpu core. */
+
+/* The TEG uses the NB85E cpu core. */
#include <asm/nb85e.h>
+#include <asm/nb85e_cache.h>
+
+
+#define CPU_MODEL "v850e/nb85e-teg"
+#define CPU_MODEL_LONG "NEC V850E/NB85E TEG"

-#define CHIP "v850e/nb85e-teg"
-#define CHIP_LONG "NEC V850E/NB85E TEG"

-/* Hardware-specific interrupt numbers (in the kernel IRQ namespace). */
-#define IRQ_INTOV(n) (n) /* 0-3 */
-#define IRQ_INTOV_NUM 4
-#define IRQ_INTCMD(n) (0x1c + (n)) /* interval timer interrupts 0-3 */
-#define IRQ_INTCMD_NUM 4
-#define IRQ_INTDMA(n) (0x20 + (n)) /* DMA interrupts 0-3 */
-#define IRQ_INTDMA_NUM 4
-#define IRQ_INTCSI(n) (0x24 + (n)) /* CSI 0-2 transmit/receive completion */
-#define IRQ_INTCSI_NUM 3
-#define IRQ_INTSER(n) (0x25 + (n)) /* UART 0-2 reception error */
-#define IRQ_INTSER_NUM 3
-#define IRQ_INTSR(n) (0x26 + (n)) /* UART 0-2 reception completion */
-#define IRQ_INTSR_NUM 3
-#define IRQ_INTST(n) (0x27 + (n)) /* UART 0-2 transmission completion */
-#define IRQ_INTST_NUM 3
+/* For <asm/entry.h> */
+/* We use on-chip RAM, for a few miscellaneous variables that must be
+ accessible using a load instruction relative to R0. On the NB85E/TEG,
+ There's 60KB of iRAM starting at 0xFFFF0000, however we need the base
+ address to be addressable by a 16-bit signed offset, so we only use the
+ second half of it starting from 0xFFFF8000. */
+#define R0_RAM_ADDR 0xFFFF8000
+
+
+/* Hardware-specific interrupt numbers (in the kernel IRQ namespace).
+ Some of these are parameterized even though there's only a single
+ interrupt, for compatibility with some generic code that works on other
+ processor models. */
+#define IRQ_INTCMD(n) 6 /* interval timer interrupt */
+#define IRQ_INTCMD_NUM 1
+#define IRQ_INTSER(n) 16 /* UART reception error */
+#define IRQ_INTSER_NUM 1
+#define IRQ_INTSR(n) 17 /* UART reception completion */
+#define IRQ_INTSR_NUM 1
+#define IRQ_INTST(n) 18 /* UART transmission completion */
+#define IRQ_INTST_NUM 1

/* For <asm/irq.h> */
-#define NUM_MACH_IRQS 0x30
+#define NUM_CPU_IRQS 64
+

/* TEG UART details. */
#define NB85E_UART_BASE_ADDR(n) (0xFFFFF600 + 0x10 * (n))
@@ -50,9 +61,41 @@
#define NB85E_UART_RXB_ADDR(n) (NB85E_UART_BASE_ADDR(n) + 0xC)
#define NB85E_UART_NUM_CHANNELS 1
#define NB85E_UART_BASE_FREQ CPU_CLOCK_FREQ
+/* This is a function that gets called before configuring the UART. */
+#define NB85E_UART_PRE_CONFIGURE teg_uart_pre_configure
+#ifndef __ASSEMBLY__
+extern void teg_uart_pre_configure (unsigned chan,
+ unsigned cflags, unsigned baud);
+#endif
+

/* The TEG RTPU. */
#define NB85E_RTPU_BASE_ADDR 0xFFFFF210

-#endif /* __V850_NB85E_TEG_H__ */
+/* TEG series timer D details. */
+#define NB85E_TIMER_D_BASE_ADDR 0xFFFFF210
+#define NB85E_TIMER_D_TMCD_BASE_ADDR (NB85E_TIMER_D_BASE_ADDR + 0x0)
+#define NB85E_TIMER_D_TMD_BASE_ADDR (NB85E_TIMER_D_BASE_ADDR + 0x4)
+#define NB85E_TIMER_D_CMD_BASE_ADDR (NB85E_TIMER_D_BASE_ADDR + 0x8)
+#define NB85E_TIMER_D_BASE_FREQ CPU_CLOCK_FREQ
+
+
+/* `Interrupt Source Select' control register. */
+#define TEG_ISS_ADDR 0xFFFFF7FA
+#define TEG_ISS (*(volatile u8 *)TEG_ISS_ADDR)
+
+/* Port 0 I/O register (bits 0-3 used). */
+#define TEG_PORT0_IO_ADDR 0xFFFFF7F2
+#define TEG_PORT0_IO (*(volatile u8 *)TEG_PORT0_IO_ADDR)
+/* Port 0 control register (bits 0-3 control mode, 0 = output, 1 = input). */
+#define TEG_PORT0_PM_ADDR 0xFFFFF7F4
+#define TEG_PORT0_PM (*(volatile u8 *)TEG_PORT0_PM_ADDR)
+
+
+#ifndef __ASSEMBLY__
+extern void teg_init_irqs (void);
+#endif
+
+
+#endif /* __V850_TEG_H__ */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.67/include/asm-v850/unistd.h linux-2.5.67-ac1/include/asm-v850/unistd.h
--- linux-2.5.67/include/asm-v850/unistd.h 2003-02-10 18:38:54.000000000 +0000
+++ linux-2.5.67-ac1/include/asm-v850/unistd.h 2003-04-03 23:58:04.000000000 +0100
@@ -1,8 +1,8 @@
/*
* include/asm-v850/unistd.h -- System call numbers and invocation mechanism
*
- * Copyright (C) 2001,02 NEC Corporation
- * Copyright (C) 2001,02 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03 NEC Electronics Corporation
+ * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -205,8 +205,6 @@
#define __NR_pivot_root 200
#define __NR_gettid 201
#define __NR_tkill 202
-/* #define __NR_mincore 203 */
-/* #define __NR_madvise 204 */

/* Syscall protocol:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Alan Cox: "PATCH: compatmac not needed"
Previous message: Daniel Jacobowitz: "Re: correct to set -nostdinc and then include <stdarg.h> ?"