[PATCH 1/5] MIPS: fix cobalt I/O resource range

[PATCH 1/5] MIPS: fix cobalt I/O resource range

[Yoichi Yuasa]

Hi Ralf,

This patch has fixed cobalt I/O reource range.
The cobalt real I/O resource range from 0x0 to 0xffff.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c
--- mips-orig/arch/mips/cobalt/setup.c	2006-10-12 01:03:18.055569000 +0900
+++ mips/arch/mips/cobalt/setup.c	2006-10-12 01:01:59.973744750 +0900
@@ -130,8 +130,7 @@ void __init plat_mem_setup(void)
 
 	set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
 
-	/* I/O port resource must include UART and LCD/buttons */
-	ioport_resource.end = 0x0fffffff;
+	ioport_resource.end = 0xffff;
 
 	/* request I/O space for devices used on all i[345]86 PCs */
 	for (i = 0; i < COBALT_IO_RESOURCES; i++)
@@ -149,24 +148,24 @@ void __init plat_mem_setup(void)
 	register_pci_controller(&cobalt_pci_controller);
 #endif
 
-#ifdef CONFIG_SERIAL_8250
 	if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
-
 #ifdef CONFIG_EARLY_PRINTK
 		cobalt_early_console();
 #endif
 
+#ifdef CONFIG_SERIAL_8250
 		uart.line	= 0;
 		uart.type	= PORT_UNKNOWN;
 		uart.uartclk	= 18432000;
 		uart.irq	= COBALT_SERIAL_IRQ;
-		uart.flags	= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
-		uart.iobase	= 0xc800000;
-		uart.iotype	= UPIO_PORT;
+		uart.flags	= UPF_IOREMAP | UPF_BOOT_AUTOCONF |
+				  UPF_SKIP_TEST;
+		uart.iotype	= UPIO_MEM;
+		uart.mapbase	= 0x1c800000;
 
 		early_serial_setup(&uart);
-	}
 #endif
+	}
 }
 
 /*

[PATCH 2/5] MIPS: remove unused resources for cobalt

[Yoichi Yuasa]

Hi Ralf,

This patch has removed unused resources for cobalt.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c
--- mips-orig/arch/mips/cobalt/setup.c	2006-10-12 01:03:59.401472250 +0900
+++ mips/arch/mips/cobalt/setup.c	2006-10-12 01:05:36.454992750 +0900
@@ -79,37 +79,19 @@ static struct resource cobalt_io_resourc
 	.flags	= IORESOURCE_IO
 };
 
-static struct resource cobalt_io_resources[] = {
-	{
-		.start	= 0x00,
-		.end	= 0x1f,
-		.name	= "dma1",
-		.flags	= IORESOURCE_BUSY
-	}, {
-		.start	= 0x40,
-		.end	= 0x5f,
-		.name	= "timer",
-		.flags	= IORESOURCE_BUSY
-	}, {
+/*
+ * Cobalt doesn't have PS/2 keyboard/mouse interfaces,
+ * keyboard conntroller is never used.
+ */
+static struct resource cobalt_reserved_resources[] = {
+	{	/* keyboard */
 		.start	= 0x60,
 		.end	= 0x6f,
-		.name	= "keyboard",
-		.flags	= IORESOURCE_BUSY
-	}, {
-		.start	= 0x80,
-		.end	= 0x8f,
-		.name	= "dma page reg",
-		.flags	= IORESOURCE_BUSY
-	}, {
-		.start	= 0xc0,
-		.end	= 0xdf,
-		.name	= "dma2",
-		.flags	= IORESOURCE_BUSY
+		.name	= "reserved",
+		.flags	= IORESOURCE_BUSY,
 	},
 };
 
-#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))
-
 static struct pci_controller cobalt_pci_controller = {
 	.pci_ops	= &gt64111_pci_ops,
 	.mem_resource	= &cobalt_mem_resource,
@@ -132,9 +114,9 @@ void __init plat_mem_setup(void)
 
 	ioport_resource.end = 0xffff;
 
-	/* request I/O space for devices used on all i[345]86 PCs */
-	for (i = 0; i < COBALT_IO_RESOURCES; i++)
-		request_resource(&ioport_resource, cobalt_io_resources + i);
+	/* These resources have been reserved by VIA SuperI/O chip. */
+	for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++)
+		request_resource(&ioport_resource, cobalt_reserved_resources + i);
 
         /* Read the cobalt id register out of the PCI config space */
         PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3));

[PATCH 3/5] MIPS: separate cobalt PCI codes from setup.c

[Yoichi Yuasa]

Hi Ralf,

This patch has separated cobalt PCI codes from setup.c .
It's removed #ifdef CONFIG_PCI/#endif from cobalt setup.c .

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/Makefile mips/arch/mips/cobalt/Makefile
--- mips-orig/arch/mips/cobalt/Makefile	2006-10-12 10:19:25.000465500 +0900
+++ mips/arch/mips/cobalt/Makefile	2006-10-12 10:19:58.502559250 +0900
@@ -4,6 +4,7 @@
 
 obj-y	 := irq.o reset.o setup.o
 
+obj-$(CONFIG_PCI)		+= pci.o
 obj-$(CONFIG_EARLY_PRINTK)	+= console.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/pci.c mips/arch/mips/cobalt/pci.c
--- mips-orig/arch/mips/cobalt/pci.c	1970-01-01 09:00:00.000000000 +0900
+++ mips/arch/mips/cobalt/pci.c	2006-10-12 10:19:58.502559250 +0900
@@ -0,0 +1,47 @@
+/*
+ * Register PCI controller.
+ *
+ * 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.
+ *
+ * Copyright (C) 1996, 1997, 2004, 05 by Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
+ *
+ */
+#include <linux/init.h>
+#include <linux/pci.h>
+
+#include <asm/gt64120.h>
+
+extern struct pci_ops gt64111_pci_ops;
+
+static struct resource cobalt_mem_resource = {
+	.start	= GT_DEF_PCI0_MEM0_BASE,
+	.end	= GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1,
+	.name	= "PCI memory",
+	.flags	= IORESOURCE_MEM,
+};
+
+static struct resource cobalt_io_resource = {
+	.start	= 0x1000,
+	.end	= 0xffff,
+	.name	= "PCI I/O",
+	.flags	= IORESOURCE_IO,
+};
+
+static struct pci_controller cobalt_pci_controller = {
+	.pci_ops	= &gt64111_pci_ops,
+	.mem_resource	= &cobalt_mem_resource,
+	.io_resource	= &cobalt_io_resource,
+	.io_offset	= 0 - GT_DEF_PCI0_IO_BASE,
+};
+
+static int __init cobalt_pci_init(void)
+{
+	register_pci_controller(&cobalt_pci_controller);
+
+	return 0;
+}
+
+arch_initcall(cobalt_pci_init);
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c
--- mips-orig/arch/mips/cobalt/setup.c	2006-10-12 10:20:53.049968250 +0900
+++ mips/arch/mips/cobalt/setup.c	2006-10-12 10:22:31.464118750 +0900
@@ -63,22 +63,6 @@ void __init plat_timer_setup(struct irqa
 	GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS));
 }
 
-extern struct pci_ops gt64111_pci_ops;
-
-static struct resource cobalt_mem_resource = {
-	.start	= GT_DEF_PCI0_MEM0_BASE,
-	.end	= GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1,
-	.name	= "PCI memory",
-	.flags	= IORESOURCE_MEM
-};
-
-static struct resource cobalt_io_resource = {
-	.start	= 0x1000,
-	.end	= 0xffff,
-	.name	= "PCI I/O",
-	.flags	= IORESOURCE_IO
-};
-
 /*
  * Cobalt doesn't have PS/2 keyboard/mouse interfaces,
  * keyboard conntroller is never used.
@@ -92,14 +76,6 @@ static struct resource cobalt_reserved_r
 	},
 };
 
-static struct pci_controller cobalt_pci_controller = {
-	.pci_ops	= &gt64111_pci_ops,
-	.mem_resource	= &cobalt_mem_resource,
-	.mem_offset	= 0,
-	.io_resource	= &cobalt_io_resource,
-	.io_offset	= 0 - GT_DEF_PCI0_IO_BASE,
-};
-
 void __init plat_mem_setup(void)
 {
 	static struct uart_port uart;
@@ -126,10 +102,6 @@ void __init plat_mem_setup(void)
 
 	printk("Cobalt board ID: %d\n", cobalt_board_id);
 
-#ifdef CONFIG_PCI
-	register_pci_controller(&cobalt_pci_controller);
-#endif
-
 	if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
 #ifdef CONFIG_EARLY_PRINTK
 		cobalt_early_console();

[PATCH 4/5] MIPS: update reset operations for cobalt

[Yoichi Yuasa]

Hi Ralf,

This patch has updated reset operations for cobalt.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/reset.c mips/arch/mips/cobalt/reset.c
--- mips-orig/arch/mips/cobalt/reset.c	2006-10-12 10:28:55.612126500 +0900
+++ mips/arch/mips/cobalt/reset.c	2006-10-12 10:32:39.698131000 +0900
@@ -8,17 +8,33 @@
  * Copyright (C) 1995, 1996, 1997 by Ralf Baechle
  * Copyright (C) 2001 by Liam Davies (ldavies@agile.tv)
  */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/cacheflush.h>
+#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/pm.h>
+
 #include <asm/io.h>
-#include <asm/processor.h>
 #include <asm/reboot.h>
-#include <asm/system.h>
-#include <asm/mipsregs.h>
-#include <asm/mach-cobalt/cobalt.h>
 
-void cobalt_machine_halt(void)
+#define COBALT_LED_PORT		(void __iomem *)CKSEG1ADDR(0x1c000000)
+# define COBALT_LED_BAR_LEFT	(1 << 0)	/* Qube */
+# define COBALT_LED_BAR_RIGHT	(1 << 1)	/* Qube */
+# define COBALT_LED_WEB		(1 << 2)	/* RaQ */
+# define COBALT_LED_POWER_OFF	(1 << 3)	/* RaQ */
+# define COBALT_LED_RESET	0x0f
+
+#define COBALT_KEY_PORT							\
+	((~readl((void __iomem *)CKSEG1ADDR(0x1d000000)) >> 24) &	\
+	COBALT_KEY_MASK)
+# define COBALT_KEY_CLEAR	(1 << 1)
+# define COBALT_KEY_LEFT	(1 << 2)
+# define COBALT_KEY_UP		(1 << 3)
+# define COBALT_KEY_DOWN	(1 << 4)
+# define COBALT_KEY_RIGHT	(1 << 5)
+# define COBALT_KEY_ENTER	(1 << 6)
+# define COBALT_KEY_SELECT	(1 << 7)
+# define COBALT_KEY_MASK	0xfe
+
+static void cobalt_machine_halt(void)
 {
 	int state, last, diff;
 	unsigned long mark;
@@ -34,22 +50,23 @@ void cobalt_machine_halt(void)
 	for (state = 0;;) {
 
 		state ^= COBALT_LED_POWER_OFF;
-		COBALT_LED_PORT = state;
+		writeb(state, COBALT_LED_PORT);
 
 		diff = COBALT_KEY_PORT ^ last;
 		last ^= diff;
 
-		if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) && !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)))
-			COBALT_LED_PORT = COBALT_LED_RESET;
+		if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) &&
+		   !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)))
+			writeb(COBALT_LED_RESET, COBALT_LED_PORT);
 
 		for (mark = jiffies; jiffies - mark < HZ;)
 			;
 	}
 }
 
-void cobalt_machine_restart(char *command)
+static void cobalt_machine_restart(char *command)
 {
-	COBALT_LED_PORT = COBALT_LED_RESET;
+	writeb(COBALT_LED_RESET, COBALT_LED_PORT);
 
 	/* we should never get here */
 	cobalt_machine_halt();
@@ -58,8 +75,19 @@ void cobalt_machine_restart(char *comman
 /*
  * This triggers the luser mode device driver for the power switch ;-)
  */
-void cobalt_machine_power_off(void)
+static void cobalt_machine_power_off(void)
 {
 	printk("You can switch the machine off now.\n");
 	cobalt_machine_halt();
 }
+
+static int __init cobalt_reset_init(void)
+{
+	_machine_restart = cobalt_machine_restart;
+	_machine_halt = cobalt_machine_halt;
+	pm_power_off = cobalt_machine_power_off;
+
+	return 0;
+}
+
+arch_initcall(cobalt_reset_init);
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c
--- mips-orig/arch/mips/cobalt/setup.c	2006-10-12 10:32:51.726882750 +0900
+++ mips/arch/mips/cobalt/setup.c	2006-10-12 10:34:09.171722750 +0900
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/pm.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 
@@ -21,14 +20,10 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/processor.h>
-#include <asm/reboot.h>
 #include <asm/gt64120.h>
 
 #include <asm/mach-cobalt/cobalt.h>
 
-extern void cobalt_machine_restart(char *command);
-extern void cobalt_machine_halt(void);
-extern void cobalt_machine_power_off(void);
 extern void cobalt_early_console(void);
 
 int cobalt_board_id;
@@ -82,10 +77,6 @@ void __init plat_mem_setup(void)
 	unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);
 	int i;
 
-	_machine_restart = cobalt_machine_restart;
-	_machine_halt = cobalt_machine_halt;
-	pm_power_off = cobalt_machine_power_off;
-
 	set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
 
 	ioport_resource.end = 0xffff;
diff -pruN -X mips/Documentation/dontdiff mips-orig/include/asm-mips/mach-cobalt/cobalt.h mips/include/asm-mips/mach-cobalt/cobalt.h
--- mips-orig/include/asm-mips/mach-cobalt/cobalt.h	2006-10-12 10:32:50.006775250 +0900
+++ mips/include/asm-mips/mach-cobalt/cobalt.h	2006-10-12 10:32:39.698131000 +0900
@@ -71,23 +71,6 @@
 	GT_WRITE(GT_PCI0_CFGADDR_OFS, (0x80000000 | (PCI_SLOT (devfn) << 11) |		\
 		(PCI_FUNC (devfn) << 8) | (where)))
 
-#define COBALT_LED_PORT		(*(volatile unsigned char *) CKSEG1ADDR(0x1c000000))
-# define COBALT_LED_BAR_LEFT	(1 << 0)	/* Qube */
-# define COBALT_LED_BAR_RIGHT	(1 << 1)	/* Qube */
-# define COBALT_LED_WEB		(1 << 2)	/* RaQ */
-# define COBALT_LED_POWER_OFF	(1 << 3)	/* RaQ */
-# define COBALT_LED_RESET	0x0f
-
-#define COBALT_KEY_PORT		((~*(volatile unsigned int *) CKSEG1ADDR(0x1d000000) >> 24) & COBALT_KEY_MASK)
-# define COBALT_KEY_CLEAR	(1 << 1)
-# define COBALT_KEY_LEFT	(1 << 2)
-# define COBALT_KEY_UP		(1 << 3)
-# define COBALT_KEY_DOWN	(1 << 4)
-# define COBALT_KEY_RIGHT	(1 << 5)
-# define COBALT_KEY_ENTER	(1 << 6)
-# define COBALT_KEY_SELECT	(1 << 7)
-# define COBALT_KEY_MASK	0xfe
-
 #define COBALT_UART		((volatile unsigned char *) CKSEG1ADDR(0x1c800000))
 
 #endif /* __ASM_COBALT_H */

[PATCH 5/5] MIPS: clean up include files for cobalt

[Yoichi Yuasa]

Hi Ralf,

This patch has cleaned up include files for cobalt.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/console.c mips/arch/mips/cobalt/console.c
--- mips-orig/arch/mips/cobalt/console.c	2006-10-12 11:44:59.727188000 +0900
+++ mips/arch/mips/cobalt/console.c	2006-10-12 11:53:43.203903250 +0900
@@ -7,7 +7,7 @@
 #include <linux/console.h>
 #include <linux/serial_reg.h>
 #include <asm/addrspace.h>
-#include <asm/mach-cobalt/cobalt.h>
+#include <cobalt.h>
 
 static void putchar(int c)
 {
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/irq.c mips/arch/mips/cobalt/irq.c
--- mips-orig/arch/mips/cobalt/irq.c	2006-10-12 11:49:45.137025000 +0900
+++ mips/arch/mips/cobalt/irq.c	2006-10-12 11:53:26.330848750 +0900
@@ -17,7 +17,7 @@
 #include <asm/irq_cpu.h>
 #include <asm/gt64120.h>
 
-#include <asm/mach-cobalt/cobalt.h>
+#include <cobalt.h>
 
 /*
  * We have two types of interrupts that we handle, ones that come in through
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c
--- mips-orig/arch/mips/cobalt/setup.c	2006-10-12 11:49:54.681621500 +0900
+++ mips/arch/mips/cobalt/setup.c	2006-10-12 11:56:31.510421750 +0900
@@ -18,11 +18,9 @@
 #include <asm/bootinfo.h>
 #include <asm/time.h>
 #include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/processor.h>
 #include <asm/gt64120.h>
 
-#include <asm/mach-cobalt/cobalt.h>
+#include <cobalt.h>
 
 extern void cobalt_early_console(void);
 

Re: [PATCH 1/5] MIPS: fix cobalt I/O resource range

[Ralf Baechle]

On Fri, Dec 01, 2006 at 10:12:42PM +0900, Yoichi Yuasa wrote:

> This patch has fixed cobalt I/O reource range.
> The cobalt real I/O resource range from 0x0 to 0xffff.
> 
> Yoichi
> 
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
> 
> diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c
> --- mips-orig/arch/mips/cobalt/setup.c	2006-10-12 01:03:18.055569000 +0900
> +++ mips/arch/mips/cobalt/setup.c	2006-10-12 01:01:59.973744750 +0900
> @@ -130,8 +130,7 @@ void __init plat_mem_setup(void)
>  
>  	set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
>  
> -	/* I/O port resource must include UART and LCD/buttons */
> -	ioport_resource.end = 0x0fffffff;
> +	ioport_resource.end = 0xffff;

This is actually the default, so the code can go and anyway then the
code stops making sense, too.

  Ralf

Re: [PATCH 2/5] MIPS: remove unused resources for cobalt

[Ralf Baechle]

On Fri, Dec 01, 2006 at 10:16:01PM +0900, Yoichi Yuasa wrote:

> This patch has removed unused resources for cobalt.

The VIA PCI-to-ISA bridge used in Cobalts contains the DMA controller, so
these resources should be reserved even though nothing is actually using
them.

  Ralf

Re: [PATCH 3/5] MIPS: separate cobalt PCI codes from setup.c

[Ralf Baechle]

On Fri, Dec 01, 2006 at 10:17:46PM +0900, Yoichi Yuasa wrote:

> This patch has separated cobalt PCI codes from setup.c .
> It's removed #ifdef CONFIG_PCI/#endif from cobalt setup.c .

Looks good.

  Ralf

Re: [PATCH 1/5] MIPS: fix cobalt I/O resource range

[Yoichi Yuasa]

Hi Ralf,

Thank you for your comments.
I'll update my patches.

Yoichi

On Mon, 4 Dec 2006 14:10:42 +0000
Ralf Baechle <ralf@linux-mips.org> wrote:

> On Fri, Dec 01, 2006 at 10:12:42PM +0900, Yoichi Yuasa wrote:
> 
> > This patch has fixed cobalt I/O reource range.
> > The cobalt real I/O resource range from 0x0 to 0xffff.
> > 
> > Yoichi
> > 
> > Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
> > 
> > diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/setup.c mips/arch/mips/cobalt/setup.c
> > --- mips-orig/arch/mips/cobalt/setup.c	2006-10-12 01:03:18.055569000 +0900
> > +++ mips/arch/mips/cobalt/setup.c	2006-10-12 01:01:59.973744750 +0900
> > @@ -130,8 +130,7 @@ void __init plat_mem_setup(void)
> >  
> >  	set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
> >  
> > -	/* I/O port resource must include UART and LCD/buttons */
> > -	ioport_resource.end = 0x0fffffff;
> > +	ioport_resource.end = 0xffff;
> 
> This is actually the default, so the code can go and anyway then the
> code stops making sense, too.
> 
>   Ralf
>