Merge ../linux-2.6

11 files changed, 203 insertions, 154 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3e804c736e64..64f5ae0ff96d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -490,16 +490,6 @@ config CPU_SUBTYPE_ST40
        depends on CPU_SUBTYPE_ST40STB1 || CPU_SUBTYPE_ST40GX1
        default y
 
-config ARCH_DISCONTIGMEM_ENABLE
-        bool
-        depends on SH_HP690
-        default y
-        help
-          Say Y to upport efficient handling of discontiguous physical memory,
-          for architectures which are either NUMA (Non-Uniform Memory Access)
-          or have huge holes in the physical address space for other reasons.
-          See <file:Documentation/vm/numa> for more.
-
 source "mm/Kconfig"
 
 config ZERO_PAGE_OFFSET
@@ -770,24 +760,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-menu "SH initrd options"
-        depends on BLK_DEV_INITRD
-
-config EMBEDDED_RAMDISK
-        bool "Embed root filesystem ramdisk into the kernel"
-
-config EMBEDDED_RAMDISK_IMAGE
-        string "Filename of gziped ramdisk image"
-        depends on EMBEDDED_RAMDISK
-        default "ramdisk.gz"
-        help
-          This is the filename of the ramdisk image to be built into the
-          kernel.  Relative pathnames are relative to arch/sh/ramdisk/.
-          The ramdisk image is not part of the kernel distribution; you must
-          provide one yourself.
-
-endmenu
-
 source "net/Kconfig"
 
 source "drivers/Kconfig"
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 4a3049080b41..67192d6b00d8 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -60,14 +60,6 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 core-y                          += arch/sh/kernel/ arch/sh/mm/
 
-#
-# ramdisk/initrd support
-# You need a compressed ramdisk image, named
-# CONFIG_EMBEDDED_RAMDISK_IMAGE. Relative pathnames
-# are relative to arch/sh/ramdisk/.
-#
-core-$(CONFIG_EMBEDDED_RAMDISK) += arch/sh/ramdisk/
-
 # Boards
 machdir-$(CONFIG_SH_SOLUTION_ENGINE)            := se/770x
 machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)       := se/7751
diff --git a/arch/sh/drivers/Makefile b/arch/sh/drivers/Makefile
index bd6726cde398..338c3729d270 100644
--- a/arch/sh/drivers/Makefile
+++ b/arch/sh/drivers/Makefile
@@ -2,6 +2,7 @@
 # Makefile for the Linux SuperH-specific device drivers.
 #
 
-obj-$(CONFIG_PCI)       += pci/
-obj-$(CONFIG_SH_DMA)    += dma/
+obj-$(CONFIG_PCI)               += pci/
+obj-$(CONFIG_SH_DMA)            += dma/
+obj-$(CONFIG_SUPERHYWAY)        += superhyway/
 
diff --git a/arch/sh/drivers/superhyway/Makefile b/arch/sh/drivers/superhyway/Makefile
new file mode 100644
index 000000000000..5b8e0c7ca3a5
--- /dev/null
+++ b/arch/sh/drivers/superhyway/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the SuperHyway specific kernel interface routines under Linux.
+#
+
+obj-$(CONFIG_CPU_SUBTYPE_SH4_202)       += ops-sh4-202.o
+
diff --git a/arch/sh/drivers/superhyway/ops-sh4-202.c b/arch/sh/drivers/superhyway/ops-sh4-202.c
new file mode 100644
index 000000000000..a55c98a9052b
--- /dev/null
+++ b/arch/sh/drivers/superhyway/ops-sh4-202.c
@@ -0,0 +1,171 @@
+/*
+ * arch/sh/drivers/superhyway/ops-sh4-202.c
+ *
+ * SuperHyway bus support for SH4-202
+ *
+ * Copyright (C) 2005  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 for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/superhyway.h>
+#include <linux/string.h>
+#include <asm/addrspace.h>
+#include <asm/io.h>
+
+#define PHYS_EMI_CBLOCK         P4SEGADDR(0x1ec00000)
+#define PHYS_EMI_DBLOCK         P4SEGADDR(0x08000000)
+#define PHYS_FEMI_CBLOCK        P4SEGADDR(0x1f800000)
+#define PHYS_FEMI_DBLOCK        P4SEGADDR(0x00000000)
+
+#define PHYS_EPBR_BLOCK         P4SEGADDR(0x1de00000)
+#define PHYS_DMAC_BLOCK         P4SEGADDR(0x1fa00000)
+#define PHYS_PBR_BLOCK          P4SEGADDR(0x1fc00000)
+
+static struct resource emi_resources[] = {
+        [0] = {
+                .start  = PHYS_EMI_CBLOCK,
+                .end    = PHYS_EMI_CBLOCK + 0x00300000 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = PHYS_EMI_DBLOCK,
+                .end    = PHYS_EMI_DBLOCK + 0x08000000 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct superhyway_device emi_device = {
+        .name           = "emi",
+        .num_resources  = ARRAY_SIZE(emi_resources),
+        .resource       = emi_resources,
+};
+
+static struct resource femi_resources[] = {
+        [0] = {
+                .start  = PHYS_FEMI_CBLOCK,
+                .end    = PHYS_FEMI_CBLOCK + 0x00100000 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = PHYS_FEMI_DBLOCK,
+                .end    = PHYS_FEMI_DBLOCK + 0x08000000 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct superhyway_device femi_device = {
+        .name           = "femi",
+        .num_resources  = ARRAY_SIZE(femi_resources),
+        .resource       = femi_resources,
+};
+
+static struct resource epbr_resources[] = {
+        [0] = {
+                .start  = P4SEGADDR(0x1e7ffff8),
+                .end    = P4SEGADDR(0x1e7ffff8 + (sizeof(u32) * 2) - 1),
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = PHYS_EPBR_BLOCK,
+                .end    = PHYS_EPBR_BLOCK + 0x00a00000 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct superhyway_device epbr_device = {
+        .name           = "epbr",
+        .num_resources  = ARRAY_SIZE(epbr_resources),
+        .resource       = epbr_resources,
+};
+
+static struct resource dmac_resource = {
+        .start  = PHYS_DMAC_BLOCK,
+        .end    = PHYS_DMAC_BLOCK + 0x00100000 - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct superhyway_device dmac_device = {
+        .name           = "dmac",
+        .num_resources  = 1,
+        .resource       = &dmac_resource,
+};
+
+static struct resource pbr_resources[] = {
+        [0] = {
+                .start  = P4SEGADDR(0x1ffffff8),
+                .end    = P4SEGADDR(0x1ffffff8 + (sizeof(u32) * 2) - 1),
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = PHYS_PBR_BLOCK,
+                .end    = PHYS_PBR_BLOCK + 0x00400000 - (sizeof(u32) * 2) - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct superhyway_device pbr_device = {
+        .name           = "pbr",
+        .num_resources  = ARRAY_SIZE(pbr_resources),
+        .resource       = pbr_resources,
+};
+
+static struct superhyway_device *sh4202_devices[] __initdata = {
+        &emi_device, &femi_device, &epbr_device, &dmac_device, &pbr_device,
+};
+
+static int sh4202_read_vcr(unsigned long base, struct superhyway_vcr_info *vcr)
+{
+        u32 vcrh, vcrl;
+        u64 tmp;
+
+        /*
+         * XXX: Even though the SH4-202 Evaluation Device documentation
+         * indicates that VCRL is mapped first with VCRH at a + 0x04
+         * offset, the opposite seems to be true.
+         *
+         * Some modules (PBR and ePBR for instance) also appear to have
+         * VCRL/VCRH flipped in the documentation, but on the SH4-202
+         * itself it appears that these are all consistently mapped with
+         * VCRH preceeding VCRL.
+         *
+         * Do not trust the documentation, for it is evil.
+         */
+        vcrh = ctrl_inl(base);
+        vcrl = ctrl_inl(base + sizeof(u32));
+
+        tmp = ((u64)vcrh << 32) | vcrl;
+        memcpy(vcr, &tmp, sizeof(u64));
+
+        return 0;
+}
+
+static int sh4202_write_vcr(unsigned long base, struct superhyway_vcr_info vcr)
+{
+        u64 tmp = *(u64 *)&vcr;
+
+        ctrl_outl((tmp >> 32) & 0xffffffff, base);
+        ctrl_outl(tmp & 0xffffffff, base + sizeof(u32));
+
+        return 0;
+}
+
+static struct superhyway_ops sh4202_superhyway_ops = {
+        .read_vcr       = sh4202_read_vcr,
+        .write_vcr      = sh4202_write_vcr,
+};
+
+struct superhyway_bus superhyway_channels[] = {
+        { &sh4202_superhyway_ops, },
+        { 0, },
+};
+
+int __init superhyway_scan_bus(struct superhyway_bus *bus)
+{
+        return superhyway_add_devices(bus, sh4202_devices,
+                                      ARRAY_SIZE(sh4202_devices));
+}
+
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index 1fbe5a428e31..1a8be06519ec 100644
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -80,48 +80,11 @@ void ptrace_disable(struct task_struct *child)
         /* nothing to do.. */
 }
 
-asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
-        struct task_struct *child;
         struct user * dummy = NULL;
         int ret;
 
-        lock_kernel();
-        ret = -EPERM;
-        if (request == PTRACE_TRACEME) {
-                /* are we already being traced? */
-                if (current->ptrace & PT_PTRACED)
-                        goto out;
-                ret = security_ptrace(current->parent, current);
-                if (ret)
-                        goto out;
-                /* set the ptrace bit in the process flags. */
-                current->ptrace |= PT_PTRACED;
-                ret = 0;
-                goto out;
-        }
-        ret = -ESRCH;
-        read_lock(&tasklist_lock);
-        child = find_task_by_pid(pid);
-        if (child)
-                get_task_struct(child);
-        read_unlock(&tasklist_lock);
-        if (!child)
-                goto out;
-
-        ret = -EPERM;
-        if (pid == 1)           /* you may not mess with init */
-                goto out_tsk;
-
-        if (request == PTRACE_ATTACH) {
-                ret = ptrace_attach(child);
-                goto out_tsk;
-        }
-
-        ret = ptrace_check_attach(child, request == PTRACE_KILL);
-        if (ret < 0)
-                goto out_tsk;
-
         switch (request) {
         /* when I and D space are separate, these will need to be fixed. */
         case PTRACE_PEEKTEXT: /* read word at location addr. */ 
@@ -289,10 +252,7 @@ asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
                 ret = ptrace_request(child, request, addr, data);
                 break;
         }
-out_tsk:
-        put_task_struct(child);
-out:
-        unlock_kernel();
+
         return ret;
 }
 
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 25b9d9ebe858..036050b377cd 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -83,9 +83,9 @@ static struct sh_machine_vector* __init get_mv_byname(const char* name);
 /* ... */
 #define COMMAND_LINE ((char *) (PARAM+0x100))
 
-#define RAMDISK_IMAGE_START_MASK        0x07FF
+#define RAMDISK_IMAGE_START_MASK        0x07FF
 #define RAMDISK_PROMPT_FLAG             0x8000
-#define RAMDISK_LOAD_FLAG               0x4000  
+#define RAMDISK_LOAD_FLAG               0x4000
 
 static char command_line[COMMAND_LINE_SIZE] = { 0, };
 
@@ -284,18 +284,6 @@ void __init setup_arch(char **cmdline_p)
 #define PFN_DOWN(x)     ((x) >> PAGE_SHIFT)
 #define PFN_PHYS(x)     ((x) << PAGE_SHIFT)
 
-#ifdef CONFIG_DISCONTIGMEM
-        NODE_DATA(0)->bdata = &discontig_node_bdata[0];
-        NODE_DATA(1)->bdata = &discontig_node_bdata[1];
-
-        bootmap_size = init_bootmem_node(NODE_DATA(1), 
-                                         PFN_UP(__MEMORY_START_2ND),
-                                         PFN_UP(__MEMORY_START_2ND),
-                                         PFN_DOWN(__MEMORY_START_2ND+__MEMORY_SIZE_2ND));
-        free_bootmem_node(NODE_DATA(1), __MEMORY_START_2ND, __MEMORY_SIZE_2ND);
-        reserve_bootmem_node(NODE_DATA(1), __MEMORY_START_2ND, bootmap_size);
-#endif
-
         /*
          * Find the highest page frame number we have available
          */
@@ -306,10 +294,10 @@ void __init setup_arch(char **cmdline_p)
          */
         max_low_pfn = max_pfn;
 
-        /*
+        /*
          * Partially used pages are not usable - thus
          * we are rounding upwards:
-         */
+         */
         start_pfn = PFN_UP(__pa(_end));
 
         /*
@@ -360,12 +348,12 @@ void __init setup_arch(char **cmdline_p)
         reserve_bootmem_node(NODE_DATA(0), __MEMORY_START, PAGE_SIZE);
 
 #ifdef CONFIG_BLK_DEV_INITRD
-        ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
-        if (&__rd_start != &__rd_end) {
+        ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+        if (&__rd_start != &__rd_end) {
                 LOADER_TYPE = 1;
                 INITRD_START = PHYSADDR((unsigned long)&__rd_start) - __MEMORY_START;
                 INITRD_SIZE = (unsigned long)&__rd_end - (unsigned long)&__rd_start;
-        }
+        }
 
         if (LOADER_TYPE && INITRD_START) {
                 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 4e9c854845a4..e342565f75fb 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -51,11 +51,6 @@ unsigned long mmu_context_cache = NO_CONTEXT;
 #define MAX_LOW_PFN     (NODE_DATA(0)->bdata->node_low_pfn)
 #endif
 
-#ifdef CONFIG_DISCONTIGMEM
-pg_data_t discontig_page_data[MAX_NUMNODES];
-bootmem_data_t discontig_node_bdata[MAX_NUMNODES];
-#endif
-
 void (*copy_page)(void *from, void *to);
 void (*clear_page)(void *to);
 
@@ -216,15 +211,6 @@ void __init paging_init(void)
 #endif
         NODE_DATA(0)->node_mem_map = NULL;
         free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
-
-#ifdef CONFIG_DISCONTIGMEM
-        /*
-         * And for discontig, do some more fixups on the zone sizes..
-         */
-        zones_size[ZONE_DMA] = __MEMORY_SIZE_2ND >> PAGE_SHIFT;
-        zones_size[ZONE_NORMAL] = 0;
-        free_area_init_node(1, NODE_DATA(1), zones_size, __MEMORY_START_2ND >> PAGE_SHIFT, 0);
-#endif
 }
 
 void __init mem_init(void)
@@ -248,7 +234,7 @@ void __init mem_init(void)
         memset(empty_zero_page, 0, PAGE_SIZE);
         __flush_wback_region(empty_zero_page, PAGE_SIZE);
 
-        /* 
+        /*
          * Setup wrappers for copy/clear_page(), these will get overridden
          * later in the boot process if a better method is available.
          */
@@ -257,9 +243,6 @@ void __init mem_init(void)
 
         /* this will put all low memory onto the freelists */
         totalram_pages += free_all_bootmem_node(NODE_DATA(0));
-#ifdef CONFIG_DISCONTIGMEM
-        totalram_pages += free_all_bootmem_node(NODE_DATA(1));
-#endif
         reservedpages = 0;
         for (tmp = 0; tmp < num_physpages; tmp++)
                 /*
@@ -286,7 +269,7 @@ void __init mem_init(void)
 void free_initmem(void)
 {
         unsigned long addr;
-        
+
         addr = (unsigned long)(&__init_begin);
         for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(addr));
diff --git a/arch/sh/mm/tlb-sh3.c b/arch/sh/mm/tlb-sh3.c
index 7a0d5c10bf20..46b09e26e082 100644
--- a/arch/sh/mm/tlb-sh3.c
+++ b/arch/sh/mm/tlb-sh3.c
@@ -40,12 +40,17 @@ void update_mmu_cache(struct vm_area_struct * vma,
                 return;
 
 #if defined(CONFIG_SH7705_CACHE_32KB)
-        struct page *page;
-        page = pte_page(pte);
-        if (VALID_PAGE(page) && !test_bit(PG_mapped, &page->flags)) {
-                unsigned long phys = pte_val(pte) & PTE_PHYS_MASK;
-                __flush_wback_region((void *)P1SEGADDR(phys), PAGE_SIZE);
-                __set_bit(PG_mapped, &page->flags);
+        {
+                struct page *page = pte_page(pte);
+                unsigned long pfn = pte_pfn(pte);
+
+                if (pfn_valid(pfn) && !test_bit(PG_mapped, &page->flags)) {
+                        unsigned long phys = pte_val(pte) & PTE_PHYS_MASK;
+
+                        __flush_wback_region((void *)P1SEGADDR(phys),
+                                             PAGE_SIZE);
+                        __set_bit(PG_mapped, &page->flags);
+                }
         }
 #endif
 
@@ -80,7 +85,7 @@ void __flush_tlb_page(unsigned long asid, unsigned long page)
          */
         addr = MMU_TLB_ADDRESS_ARRAY | (page & 0x1F000);
         data = (page & 0xfffe0000) | asid; /* VALID bit is off */
-        
+
         if ((cpu_data->flags & CPU_HAS_MMU_PAGE_ASSOC)) {
                 addr |= MMU_PAGE_ASSOC_BIT;
                 ways = 1;       /* we already know the way .. */
diff --git a/arch/sh/ramdisk/Makefile b/arch/sh/ramdisk/Makefile
deleted file mode 100644
index 99e1c68673cf..000000000000
--- a/arch/sh/ramdisk/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Makefile for a ramdisk image
-#
-
-obj-y += ramdisk.o
-
-
-O_FORMAT = $(shell $(OBJDUMP) -i | head -n 2 | grep elf32)
-img := $(subst ",,$(CONFIG_EMBEDDED_RAMDISK_IMAGE))
-# add $(src) when $(img) is relative
-img := $(subst $(src)//,/,$(src)/$(img))
-
-quiet_cmd_ramdisk = LD      $@
-define cmd_ramdisk
-        $(LD) -T $(srctree)/$(src)/ld.script -b binary --oformat $(O_FORMAT) \
-                -o $@ $(img)
-endef
-
-$(obj)/ramdisk.o: $(img) $(srctree)/$(src)/ld.script
-        $(call cmd,ramdisk)
diff --git a/arch/sh/ramdisk/ld.script b/arch/sh/ramdisk/ld.script
deleted file mode 100644
index 94beee248c04..000000000000
--- a/arch/sh/ramdisk/ld.script
+++ /dev/null
@@ -1,9 +0,0 @@
-OUTPUT_ARCH(sh)
-SECTIONS
-{
-  .initrd :
-  {
-       *(.data)
-  }
-}
-