Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

4 files changed, 487 insertions, 0 deletions

diff --git a/arch/sh/boards/renesas/systemh/Makefile b/arch/sh/boards/renesas/systemh/Makefile
new file mode 100644
index 000000000000..2cc6a23d9d39
--- /dev/null
+++ b/arch/sh/boards/renesas/systemh/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the SystemH specific parts of the kernel
+#
+
+obj-y    := setup.o irq.o io.o
+
+# XXX: This wants to be consolidated in arch/sh/drivers/pci, and more
+# importantly, with the generic sh7751_pcic_init() code. For now, we'll
+# just abuse the hell out of kbuild, because we can..
+
+obj-$(CONFIG_PCI) += pci.o
+pci-y := ../../se/7751/pci.o
+
diff --git a/arch/sh/boards/renesas/systemh/io.c b/arch/sh/boards/renesas/systemh/io.c
new file mode 100644
index 000000000000..cf979011aa94
--- /dev/null
+++ b/arch/sh/boards/renesas/systemh/io.c
@@ -0,0 +1,283 @@
+/*
+ * linux/arch/sh/boards/systemh/io.c
+ *
+ * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
+ * Based largely on io_se.c.
+ *
+ * I/O routine for Hitachi 7751 Systemh.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <asm/systemh/7751systemh.h>
+#include <asm/addrspace.h>
+#include <asm/io.h>
+
+#include <linux/pci.h>
+#include "../../drivers/pci/pci-sh7751.h"
+
+/*
+ * The 7751 SystemH Engine uses the built-in PCI controller (PCIC)
+ * of the 7751 processor, and has a SuperIO accessible on its memory
+ * bus.
+ */
+
+#define PCIIOBR         (volatile long *)PCI_REG(SH7751_PCIIOBR)
+#define PCIMBR          (volatile long *)PCI_REG(SH7751_PCIMBR)
+#define PCI_IO_AREA     SH7751_PCI_IO_BASE
+#define PCI_MEM_AREA    SH7751_PCI_CONFIG_BASE
+
+#define PCI_IOMAP(adr)  (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
+#define ETHER_IOMAP(adr) (0xB3000000 + (adr)) /*map to 16bits access area
+                                                of smc lan chip*/
+
+#define maybebadio(name,port) \
+  printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
+         #name, (port), (__u32) __builtin_return_address(0))
+
+static inline void delay(void)
+{
+        ctrl_inw(0xa0000000);
+}
+
+static inline volatile __u16 *
+port2adr(unsigned int port)
+{
+        if (port >= 0x2000)
+                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
+#if 0
+        else
+                return (volatile __u16 *) (PA_SUPERIO + (port << 1));
+#endif
+        maybebadio(name,(unsigned long)port);
+        return (volatile __u16*)port;
+}
+
+/* In case someone configures the kernel w/o PCI support: in that */
+/* scenario, don't ever bother to check for PCI-window addresses */
+
+/* NOTE: WINDOW CHECK MAY BE A BIT OFF, HIGH PCIBIOS_MIN_IO WRAPS? */
+#if defined(CONFIG_PCI)
+#define CHECK_SH7751_PCIIO(port) \
+  ((port >= PCIBIOS_MIN_IO) && (port < (PCIBIOS_MIN_IO + SH7751_PCI_IO_SIZE)))
+#else
+#define CHECK_SH7751_PCIIO(port) (0)
+#endif
+
+/*
+ * General outline: remap really low stuff [eventually] to SuperIO,
+ * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
+ * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
+ * should be way beyond the window, and is used  w/o translation for
+ * compatibility.
+ */
+unsigned char sh7751systemh_inb(unsigned long port)
+{
+        if (PXSEG(port))
+                return *(volatile unsigned char *)port;
+        else if (CHECK_SH7751_PCIIO(port))
+                return *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (port <= 0x3F1)
+                return *(volatile unsigned char *)ETHER_IOMAP(port);
+        else
+                return (*port2adr(port))&0xff;
+}
+
+unsigned char sh7751systemh_inb_p(unsigned long port)
+{
+        unsigned char v;
+
+        if (PXSEG(port))
+                v = *(volatile unsigned char *)port;
+        else if (CHECK_SH7751_PCIIO(port))
+                v = *(volatile unsigned char *)PCI_IOMAP(port);
+        else if (port <= 0x3F1)
+                v = *(volatile unsigned char *)ETHER_IOMAP(port);
+        else
+                v = (*port2adr(port))&0xff;
+        delay();
+        return v;
+}
+
+unsigned short sh7751systemh_inw(unsigned long port)
+{
+        if (PXSEG(port))
+                return *(volatile unsigned short *)port;
+        else if (CHECK_SH7751_PCIIO(port))
+                return *(volatile unsigned short *)PCI_IOMAP(port);
+        else if (port >= 0x2000)
+                return *port2adr(port);
+        else if (port <= 0x3F1)
+                return *(volatile unsigned int *)ETHER_IOMAP(port);
+        else
+                maybebadio(inw, port);
+        return 0;
+}
+
+unsigned int sh7751systemh_inl(unsigned long port)
+{
+        if (PXSEG(port))
+                return *(volatile unsigned long *)port;
+        else if (CHECK_SH7751_PCIIO(port))
+                return *(volatile unsigned int *)PCI_IOMAP(port);
+        else if (port >= 0x2000)
+                return *port2adr(port);
+        else if (port <= 0x3F1)
+                return *(volatile unsigned int *)ETHER_IOMAP(port);
+        else
+                maybebadio(inl, port);
+        return 0;
+}
+
+void sh7751systemh_outb(unsigned char value, unsigned long port)
+{
+
+        if (PXSEG(port))
+                *(volatile unsigned char *)port = value;
+        else if (CHECK_SH7751_PCIIO(port))
+                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (port <= 0x3F1)
+                *(volatile unsigned char *)ETHER_IOMAP(port) = value;
+        else
+                *(port2adr(port)) = value;
+}
+
+void sh7751systemh_outb_p(unsigned char value, unsigned long port)
+{
+        if (PXSEG(port))
+                *(volatile unsigned char *)port = value;
+        else if (CHECK_SH7751_PCIIO(port))
+                *((unsigned char*)PCI_IOMAP(port)) = value;
+        else if (port <= 0x3F1)
+                *(volatile unsigned char *)ETHER_IOMAP(port) = value;
+        else
+                *(port2adr(port)) = value;
+        delay();
+}
+
+void sh7751systemh_outw(unsigned short value, unsigned long port)
+{
+        if (PXSEG(port))
+                *(volatile unsigned short *)port = value;
+        else if (CHECK_SH7751_PCIIO(port))
+                *((unsigned short *)PCI_IOMAP(port)) = value;
+        else if (port >= 0x2000)
+                *port2adr(port) = value;
+        else if (port <= 0x3F1)
+                *(volatile unsigned short *)ETHER_IOMAP(port) = value;
+        else
+                maybebadio(outw, port);
+}
+
+void sh7751systemh_outl(unsigned int value, unsigned long port)
+{
+        if (PXSEG(port))
+                *(volatile unsigned long *)port = value;
+        else if (CHECK_SH7751_PCIIO(port))
+                *((unsigned long*)PCI_IOMAP(port)) = value;
+        else
+                maybebadio(outl, port);
+}
+
+void sh7751systemh_insb(unsigned long port, void *addr, unsigned long count)
+{
+        unsigned char *p = addr;
+        while (count--) *p++ = sh7751systemh_inb(port);
+}
+
+void sh7751systemh_insw(unsigned long port, void *addr, unsigned long count)
+{
+        unsigned short *p = addr;
+        while (count--) *p++ = sh7751systemh_inw(port);
+}
+
+void sh7751systemh_insl(unsigned long port, void *addr, unsigned long count)
+{
+        maybebadio(insl, port);
+}
+
+void sh7751systemh_outsb(unsigned long port, const void *addr, unsigned long count)
+{
+        unsigned char *p = (unsigned char*)addr;
+        while (count--) sh7751systemh_outb(*p++, port);
+}
+
+void sh7751systemh_outsw(unsigned long port, const void *addr, unsigned long count)
+{
+        unsigned short *p = (unsigned short*)addr;
+        while (count--) sh7751systemh_outw(*p++, port);
+}
+
+void sh7751systemh_outsl(unsigned long port, const void *addr, unsigned long count)
+{
+        maybebadio(outsw, port);
+}
+
+/* For read/write calls, just copy generic (pass-thru); PCIMBR is  */
+/* already set up.  For a larger memory space, these would need to */
+/* reset PCIMBR as needed on a per-call basis...                   */
+
+unsigned char sh7751systemh_readb(unsigned long addr)
+{
+        return *(volatile unsigned char*)addr;
+}
+
+unsigned short sh7751systemh_readw(unsigned long addr)
+{
+        return *(volatile unsigned short*)addr;
+}
+
+unsigned int sh7751systemh_readl(unsigned long addr)
+{
+        return *(volatile unsigned long*)addr;
+}
+
+void sh7751systemh_writeb(unsigned char b, unsigned long addr)
+{
+        *(volatile unsigned char*)addr = b;
+}
+
+void sh7751systemh_writew(unsigned short b, unsigned long addr)
+{
+        *(volatile unsigned short*)addr = b;
+}
+
+void sh7751systemh_writel(unsigned int b, unsigned long addr)
+{
+        *(volatile unsigned long*)addr = b;
+}
+
+
+
+/* Map ISA bus address to the real address. Only for PCMCIA.  */
+
+/* ISA page descriptor.  */
+static __u32 sh_isa_memmap[256];
+
+#if 0
+static int
+sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
+{
+        int idx;
+
+        if (start >= 0x100000 || (start & 0xfff) || (length != 0x1000))
+                return -1;
+
+        idx = start >> 12;
+        sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
+        printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
+               start, length, offset, idx, sh_isa_memmap[idx]);
+        return 0;
+}
+#endif
+
+unsigned long
+sh7751systemh_isa_port2addr(unsigned long offset)
+{
+        int idx;
+
+        idx = (offset >> 12) & 0xff;
+        offset &= 0xfff;
+        return sh_isa_memmap[idx] + offset;
+}
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c
new file mode 100644
index 000000000000..5675a4134eee
--- /dev/null
+++ b/arch/sh/boards/renesas/systemh/irq.c
@@ -0,0 +1,111 @@
+/*
+ * linux/arch/sh/boards/systemh/irq.c
+ *
+ * Copyright (C) 2000  Kazumoto Kojima
+ *
+ * Hitachi SystemH Support.
+ *
+ * Modified for 7751 SystemH by
+ * Jonathan Short.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+
+#include <linux/hdreg.h>
+#include <linux/ide.h>
+#include <asm/io.h>
+#include <asm/mach/7751systemh.h>
+#include <asm/smc37c93x.h>
+
+/* address of external interrupt mask register
+ * address must be set prior to use these (maybe in init_XXX_irq())
+ * XXX : is it better to use .config than specifying it in code? */
+static unsigned long *systemh_irq_mask_register = (unsigned long *)0xB3F10004;
+static unsigned long *systemh_irq_request_register = (unsigned long *)0xB3F10000;
+
+/* forward declaration */
+static unsigned int startup_systemh_irq(unsigned int irq);
+static void shutdown_systemh_irq(unsigned int irq);
+static void enable_systemh_irq(unsigned int irq);
+static void disable_systemh_irq(unsigned int irq);
+static void mask_and_ack_systemh(unsigned int);
+static void end_systemh_irq(unsigned int irq);
+
+/* hw_interrupt_type */
+static struct hw_interrupt_type systemh_irq_type = {
+        " SystemH Register",
+        startup_systemh_irq,
+        shutdown_systemh_irq,
+        enable_systemh_irq,
+        disable_systemh_irq,
+        mask_and_ack_systemh,
+        end_systemh_irq
+};
+
+static unsigned int startup_systemh_irq(unsigned int irq)
+{
+        enable_systemh_irq(irq);
+        return 0; /* never anything pending */
+}
+
+static void shutdown_systemh_irq(unsigned int irq)
+{
+        disable_systemh_irq(irq);
+}
+
+static void disable_systemh_irq(unsigned int irq)
+{
+        if (systemh_irq_mask_register) {
+                unsigned long flags;
+                unsigned long val, mask = 0x01 << 1;
+
+                /* Clear the "irq"th bit in the mask and set it in the request */
+                local_irq_save(flags);
+
+                val = ctrl_inl((unsigned long)systemh_irq_mask_register);
+                val &= ~mask;
+                ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
+
+                val = ctrl_inl((unsigned long)systemh_irq_request_register);
+                val |= mask;
+                ctrl_outl(val, (unsigned long)systemh_irq_request_register);
+
+                local_irq_restore(flags);
+        }
+}
+
+static void enable_systemh_irq(unsigned int irq)
+{
+        if (systemh_irq_mask_register) {
+                unsigned long flags;
+                unsigned long val, mask = 0x01 << 1;
+
+                /* Set "irq"th bit in the mask register */
+                local_irq_save(flags);
+                val = ctrl_inl((unsigned long)systemh_irq_mask_register);
+                val |= mask;
+                ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
+                local_irq_restore(flags);
+        }
+}
+
+static void mask_and_ack_systemh(unsigned int irq)
+{
+        disable_systemh_irq(irq);
+}
+
+static void end_systemh_irq(unsigned int irq)
+{
+        if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+                enable_systemh_irq(irq);
+}
+
+void make_systemh_irq(unsigned int irq)
+{
+        disable_irq_nosync(irq);
+        irq_desc[irq].handler = &systemh_irq_type;
+        disable_systemh_irq(irq);
+}
+
diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c
new file mode 100644
index 000000000000..826fa3d7669c
--- /dev/null
+++ b/arch/sh/boards/renesas/systemh/setup.c
@@ -0,0 +1,80 @@
+/*
+ * linux/arch/sh/boards/systemh/setup.c
+ *
+ * Copyright (C) 2000  Kazumoto Kojima
+ * Copyright (C) 2003  Paul Mundt
+ *
+ * Hitachi SystemH Support.
+ *
+ * Modified for 7751 SystemH by Jonathan Short.
+ *
+ * Rewritten for 2.6 by 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/init.h>
+#include <asm/mach/7751systemh.h>
+#include <asm/mach/io.h>
+#include <asm/machvec.h>
+
+extern void make_systemh_irq(unsigned int irq);
+
+const char *get_system_type(void)
+{
+        return "7751 SystemH";
+}
+
+/*
+ * Initialize IRQ setting
+ */
+void __init init_7751systemh_IRQ(void)
+{
+/*      make_ipr_irq(10, BCR_ILCRD, 1, 0x0f-10); LAN */
+/*      make_ipr_irq(14, BCR_ILCRA, 2, 0x0f-4); */
+        make_systemh_irq(0xb);  /* Ethernet interrupt */
+}
+
+struct sh_machine_vector mv_7751systemh __initmv = {
+        .mv_nr_irqs             = 72,
+
+        .mv_inb                 = sh7751systemh_inb,
+        .mv_inw                 = sh7751systemh_inw,
+        .mv_inl                 = sh7751systemh_inl,
+        .mv_outb                = sh7751systemh_outb,
+        .mv_outw                = sh7751systemh_outw,
+        .mv_outl                = sh7751systemh_outl,
+
+        .mv_inb_p               = sh7751systemh_inb_p,
+        .mv_inw_p               = sh7751systemh_inw,
+        .mv_inl_p               = sh7751systemh_inl,
+        .mv_outb_p              = sh7751systemh_outb_p,
+        .mv_outw_p              = sh7751systemh_outw,
+        .mv_outl_p              = sh7751systemh_outl,
+
+        .mv_insb                = sh7751systemh_insb,
+        .mv_insw                = sh7751systemh_insw,
+        .mv_insl                = sh7751systemh_insl,
+        .mv_outsb               = sh7751systemh_outsb,
+        .mv_outsw               = sh7751systemh_outsw,
+        .mv_outsl               = sh7751systemh_outsl,
+
+        .mv_readb               = sh7751systemh_readb,
+        .mv_readw               = sh7751systemh_readw,
+        .mv_readl               = sh7751systemh_readl,
+        .mv_writeb              = sh7751systemh_writeb,
+        .mv_writew              = sh7751systemh_writew,
+        .mv_writel              = sh7751systemh_writel,
+
+        .mv_isa_port2addr       = sh7751systemh_isa_port2addr,
+
+        .mv_init_irq            = init_7751systemh_IRQ,
+};
+ALIAS_MV(7751systemh)
+
+int __init platform_setup(void)
+{
+        return 0;
+}
+