Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27

13 files changed, 89 insertions, 63 deletions

diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c
index de45c6a3e33b..79baa47af977 100644
--- a/arch/sh/kernel/cpu/irq/intc-sh5.c
+++ b/arch/sh/kernel/cpu/irq/intc-sh5.c
@@ -242,6 +242,7 @@ void __init plat_irq_setup(void)
                                 reg += 8;
                         }
                 }
+        }
 #endif
 
         /*
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index ebceb0dadff5..be4926969181 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -132,6 +132,7 @@ int __init detect_cpu_and_cache_system(void)
 
                 switch (prr) {
                 case 0x50:
+                case 0x51:
                         boot_cpu_data.type = CPU_SH7723;
                         boot_cpu_data.flags |= CPU_HAS_FPU | CPU_HAS_L2_CACHE;
                         break;
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index 805535aa505e..27fa81bef6a0 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -26,7 +26,7 @@ static int pfc_divisors[] = { 1, 1, 1, 1, 1, 1, 1, 18,
 
 static void master_clk_init(struct clk *clk)
 {
-        clk->rate *= 36;
+        clk->rate *= pfc_divisors[ctrl_inl(FRQMR1) & 0x000f];
 }
 
 static struct clk_ops sh7785_master_clk_ops = {
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 069314037049..62ebccf18b3c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -16,7 +16,7 @@
 
 static struct resource usbf_resources[] = {
         [0] = {
-                .name   = "USBF",
+                .name   = "m66592_udc",
                 .start  = 0x04480000,
                 .end    = 0x044800FF,
                 .flags  = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index 16925cf28db8..a0470f2f5479 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -16,6 +16,21 @@
 
 static struct plat_sci_port sci_platform_data[] = {
         {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 80, 80, 80, 80 },
+        },{
+                .mapbase        = 0xffe10000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 81, 81, 81, 81 },
+        },{
+                .mapbase        = 0xffe20000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 82, 82, 82, 82 },
+        },{
                 .mapbase        = 0xa4e30000,
                 .flags          = UPF_BOOT_AUTOCONF,
                 .type           = PORT_SCI,
@@ -73,9 +88,35 @@ static struct platform_device rtc_device = {
         .resource       = rtc_resources,
 };
 
+static struct resource sh7723_usb_host_resources[] = {
+        [0] = {
+                .name   = "r8a66597_hcd",
+                .start  = 0xa4d80000,
+                .end    = 0xa4d800ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 65,
+                .end    = 65,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device sh7723_usb_host_device = {
+        .name           = "r8a66597_hcd",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = NULL,         /*  not use dma */
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(sh7723_usb_host_resources),
+        .resource       = sh7723_usb_host_resources,
+};
+
 static struct platform_device *sh7723_devices[] __initdata = {
         &sci_device,
         &rtc_device,
+        &sh7723_usb_host_device,
 };
 
 static int __init sh7723_devices_setup(void)
@@ -153,7 +194,7 @@ static struct intc_vect vectors[] __initdata = {
         INTC_VECT(VIO_VOUI,0x8E0),
 
         INTC_VECT(SCIFA_SCIFA0,0x900),
-        INTC_VECT(VPU_VPUI,0x920),
+        INTC_VECT(VPU_VPUI,0x980),
         INTC_VECT(TPU_TPUI,0x9A0),
         INTC_VECT(ADC_ADI,0x9E0),
         INTC_VECT(USB_USI0,0xA20),
@@ -292,9 +333,3 @@ void __init plat_irq_setup(void)
 {
         register_intc_controller(&intc_desc);
 }
-
-void __init plat_mem_setup(void)
-{
-        /* Register the URAM space as Node 1 */
-        setup_bootmem_node(1, 0x055f0000, 0x05610000);
-}
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index ae2b22219f02..f189a559462b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -291,8 +291,9 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors,
-                         NULL, NULL, irq_mask_registers, irq_prio_registers,
-                         irq_sense_registers);
+                        NULL, irq_mask_registers, irq_prio_registers,
+                        irq_sense_registers);
+
 
 /* External interrupt pins in IRL mode */
 static struct intc_vect irl_vectors[] __initdata = {
@@ -324,10 +325,10 @@ static struct intc_mask_reg irl7654_mask_registers[] __initdata = {
 };
 
 static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors,
-                         NULL, NULL, irl7654_mask_registers, NULL, NULL);
+                        NULL, irl7654_mask_registers, NULL, NULL);
 
 static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors,
-                         NULL, NULL, irl3210_mask_registers, NULL, NULL);
+                        NULL, irl3210_mask_registers, NULL, NULL);
 
 #define INTC_ICR0       0xffd00000
 #define INTC_INTMSK0    0xffd00044
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index 926b2e7b11c1..718bd2356b34 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -1,9 +1,6 @@
-/* $Id: entry.S,v 1.37 2004/06/11 13:02:46 doyu Exp $
- *
- *  linux/arch/sh/entry.S
- *
+/* 
  *  Copyright (C) 1999, 2000, 2002  Niibe Yutaka
- *  Copyright (C) 2003  Paul Mundt
+ *  Copyright (C) 2003 - 2008  Paul Mundt
  *
  * 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
@@ -262,6 +259,7 @@ __restore_all:
 
         .align  2
 syscall_badsys:                 ! Bad syscall number
+        get_current_thread_info r8, r0
         mov     #-ENOSYS, r0
         bra     resume_userspace
          mov.l  r0, @(OFF_R0,r15)       ! Return value
@@ -281,7 +279,9 @@ debug_trap:
         mov.l   1f, r8
         add     r0, r8
         mov.l   @r8, r8
-        jmp     @r8
+        jsr     @r8
+         nop
+        bra     __restore_all
          nop
 
         .align  2
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S
index d67d7ed09f22..ae0a382a82eb 100644
--- a/arch/sh/kernel/head_32.S
+++ b/arch/sh/kernel/head_32.S
@@ -30,8 +30,8 @@ ENTRY(empty_zero_page)
         .long   0               /* RAMDISK_FLAGS */
         .long   0x0200          /* ORIG_ROOT_DEV */
         .long   1               /* LOADER_TYPE */
-        .long   0x00360000      /* INITRD_START */
-        .long   0x000a0000      /* INITRD_SIZE */
+        .long   0x00000000      /* INITRD_START */
+        .long   0x00000000      /* INITRD_SIZE */
 #ifdef CONFIG_32BIT
         .long   0x53453f00 + 32 /* "SE?" = 32 bit */
 #else
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c
index f9bcc606127e..b151a25cb14d 100644
--- a/arch/sh/kernel/init_task.c
+++ b/arch/sh/kernel/init_task.c
@@ -8,7 +8,6 @@
 #include <asm/pgtable.h>
 
 static struct fs_struct init_fs = INIT_FS;
-static struct files_struct init_files = INIT_FILES;
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 struct pt_regs fake_swapper_regs;
diff --git a/arch/sh/kernel/kgdb_stub.c b/arch/sh/kernel/kgdb_stub.c
index 832641bbd47d..bf8ac4c71640 100644
--- a/arch/sh/kernel/kgdb_stub.c
+++ b/arch/sh/kernel/kgdb_stub.c
@@ -274,8 +274,7 @@ static char *mem_to_hex(const char *mem, char *buf, const int count)
         }
         for (i = 0; i < count; i++) {
                 ch = *mem++;
-                *buf++ = highhex(ch);
-                *buf++ = lowhex(ch);
+                buf = pack_hex_byte(buf, ch);
         }
         *buf = 0;
         return (buf);
@@ -427,8 +426,8 @@ static void put_packet(char *buffer)
 
                 /* '#' Separator, put high and low components of checksum */
                 put_debug_char('#');
-                put_debug_char(highhex(checksum));
-                put_debug_char(lowhex(checksum));
+                put_debug_char(hex_asc_hi(checksum));
+                put_debug_char(hex_asc_lo(checksum));
         }
         while ((get_debug_char()) != '+');      /* While no ack */
 }
@@ -650,8 +649,8 @@ static void undo_single_step(void)
 static void send_signal_msg(const int signum)
 {
         out_buffer[0] = 'S';
-        out_buffer[1] = highhex(signum);
-        out_buffer[2] = lowhex(signum);
+        out_buffer[1] = hex_asc_hi(signum);
+        out_buffer[2] = hex_asc_lo(signum);
         out_buffer[3] = 0;
         put_packet(out_buffer);
 }
diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c
index b3d0a03b4c76..5482e65375a9 100644
--- a/arch/sh/kernel/module.c
+++ b/arch/sh/kernel/module.c
@@ -30,6 +30,7 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
+#include <asm/unaligned.h>
 
 void *module_alloc(unsigned long size)
 {
@@ -56,34 +57,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
         return 0;
 }
 
-#ifdef CONFIG_SUPERH32
-#define COPY_UNALIGNED_WORD(sw, tw, align) \
-{ \
-        void *__s = &(sw), *__t = &(tw); \
-        unsigned short *__s2 = __s, *__t2 = __t; \
-        unsigned char *__s1 = __s, *__t1 = __t; \
-        switch ((align)) \
-        { \
-        case 0: \
-                *(unsigned long *) __t = *(unsigned long *) __s; \
-                break; \
-        case 2: \
-                *__t2++ = *__s2++; \
-                *__t2 = *__s2; \
-                break; \
-        default: \
-                *__t1++ = *__s1++; \
-                *__t1++ = *__s1++; \
-                *__t1++ = *__s1++; \
-                *__t1 = *__s1; \
-                break; \
-        } \
-}
-#else
-/* One thing SHmedia doesn't screw up! */
-#define COPY_UNALIGNED_WORD(sw, tw, align)      { (tw) = (sw); }
-#endif
-
 int apply_relocate_add(Elf32_Shdr *sechdrs,
                    const char *strtab,
                    unsigned int symindex,
@@ -96,7 +69,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
         Elf32_Addr relocation;
         uint32_t *location;
         uint32_t value;
-        int align;
 
         pr_debug("Applying relocate section %u to %u\n", relsec,
                  sechdrs[relsec].sh_info);
@@ -109,7 +81,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
                         + ELF32_R_SYM(rel[i].r_info);
                 relocation = sym->st_value + rel[i].r_addend;
-                align = (int)location & 3;
 
 #ifdef CONFIG_SUPERH64
                 /* For text addresses, bit2 of the st_other field indicates
@@ -122,15 +93,15 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
 
                 switch (ELF32_R_TYPE(rel[i].r_info)) {
                 case R_SH_DIR32:
-                        COPY_UNALIGNED_WORD (*location, value, align);
+                        value = get_unaligned(location);
                         value += relocation;
-                        COPY_UNALIGNED_WORD (value, *location, align);
+                        put_unaligned(value, location);
                         break;
                 case R_SH_REL32:
                         relocation = (relocation - (Elf32_Addr) location);
-                        COPY_UNALIGNED_WORD (*location, value, align);
+                        value = get_unaligned(location);
                         value += relocation;
-                        COPY_UNALIGNED_WORD (value, *location, align);
+                        put_unaligned(value, location);
                         break;
                 case R_SH_IMM_LOW16:
                         *location = (*location & ~0x3fffc00) |
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 516bde9c50fa..bca2bbc575db 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -292,6 +292,17 @@ void __init setup_arch(char **cmdline_p)
 
         ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
 
+        printk(KERN_NOTICE "Boot params:\n"
+                           "... MOUNT_ROOT_RDONLY - %08lx\n"
+                           "... RAMDISK_FLAGS     - %08lx\n"
+                           "... ORIG_ROOT_DEV     - %08lx\n"
+                           "... LOADER_TYPE       - %08lx\n"
+                           "... INITRD_START      - %08lx\n"
+                           "... INITRD_SIZE       - %08lx\n",
+                           MOUNT_ROOT_RDONLY, RAMDISK_FLAGS,
+                           ORIG_ROOT_DEV, LOADER_TYPE,
+                           INITRD_START, INITRD_SIZE);
+
 #ifdef CONFIG_BLK_DEV_RAM
         rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
         rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index a3bdc68ef02c..438f1ebcc453 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -4,6 +4,7 @@
 #include <linux/kdebug.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
+#include <linux/uaccess.h>
 #include <asm/system.h>
 
 #ifdef CONFIG_BUG
@@ -21,7 +22,14 @@ static void handle_BUG(struct pt_regs *regs)
 
 int is_valid_bugaddr(unsigned long addr)
 {
-        return addr >= PAGE_OFFSET;
+        unsigned short opcode;
+
+        if (addr < PAGE_OFFSET)
+                return 0;
+        if (probe_kernel_address((u16 *)addr, opcode))
+                return 0;
+
+        return opcode == TRAPA_BUG_OPCODE;
 }
 #endif