Commit d694c16b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Kill off I/O cruft for R7780RP.
  sh: Revert lazy dcache writeback changes.
  sh: Enable SM501 support for RTS7751R2D.
  sh: Use L1_CACHE_BYTES for .data.cacheline_aligned.
  sysctl: Support vdso_enabled sysctl on SH.
  sh: Fix kernel thread stack corruption with preempt.
  doc: Add SH to vdso and earlyprintk in kernel-parameters.txt
  sh: Fix sigmask trampling in signal delivery.
  sh: Clear UBC when not in use.
parents d04f41e3 ccd45ad4

Documentation/kernel-parameters.txt

+3 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ parameter is applicable: 
			Documentation/scsi/.

	SELINUX SELinux support is enabled.

	SERIAL	Serial support is enabled.

	SH	SuperH architecture is enabled.

	SMP	The kernel is an SMP kernel.

	SPARC	Sparc architecture is enabled.

	SWSUSP	Software suspend is enabled.
@@ -485,7 +486,7 @@ and is between 256 and 4096 characters. It is defined in the file 


	dtc3181e=	[HW,SCSI]



	earlyprintk=	[IA-32,X86-64]

	earlyprintk=	[IA-32,X86-64,SH]

			earlyprintk=vga

			earlyprintk=serial[,ttySn[,baudrate]]
@@ -1784,7 +1785,7 @@ and is between 256 and 4096 characters. It is defined in the file 
	usbhid.mousepoll=

			[USBHID] The interval which mice are to be polled at.



	vdso=		[IA-32]

	vdso=		[IA-32,SH]

			vdso=1: enable VDSO (default)

			vdso=0: disable VDSO mapping

arch/sh/boards/renesas/r7780rp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 
# Makefile for the R7780RP-1 specific parts of the kernel

#



obj-y	 := setup.o io.o irq.o

obj-y	 := setup.o irq.o



obj-$(CONFIG_PUSH_SWITCH)	+= psw.o

arch/sh/boards/renesas/r7780rp/io.c

deleted100644 → 0
+0 −233
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2001  Ian da Silva, Jeremy Siegel

 * Based largely on io_se.c.

 *

 * I/O routine for Renesas Solutions Highlander R7780RP-1

 *

 * Initial version only to support LAN access; some

 * placeholder code from io_r7780rp.c left in with the

 * expectation of later SuperIO and PCMCIA access.

 */

#include <linux/pci.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/io.h>

#include <asm/r7780rp.h>

#include <asm/addrspace.h>



static inline unsigned long port88796l(unsigned int port, int flag)

{

	unsigned long addr;



	if (flag)

		addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1);

	else

		addr = PA_AX88796L + ((port - AX88796L_IO_BASE) << 1) + 0x1000;



	return addr;

}



#if defined(CONFIG_NE2000) || defined(CONFIG_NE2000_MODULE)

#define CHECK_AX88796L_PORT(port) \

  ((port >= AX88796L_IO_BASE) && (port < (AX88796L_IO_BASE+0x20)))

#else

#define CHECK_AX88796L_PORT(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.

 */

u8 r7780rp_inb(unsigned long port)

{

	if (CHECK_AX88796L_PORT(port))

		return ctrl_inw(port88796l(port, 0)) & 0xff;

	else if (is_pci_ioaddr(port))

		return ctrl_inb(pci_ioaddr(port));



	return ctrl_inw(port) & 0xff;

}



u8 r7780rp_inb_p(unsigned long port)

{

	u8 v;



	if (CHECK_AX88796L_PORT(port))

		v = ctrl_inw(port88796l(port, 0)) & 0xff;

	else if (is_pci_ioaddr(port))

		v = ctrl_inb(pci_ioaddr(port));

	else

		v = ctrl_inw(port) & 0xff;



	ctrl_delay();



	return v;

}



u16 r7780rp_inw(unsigned long port)

{

	if (is_pci_ioaddr(port))

		return ctrl_inw(pci_ioaddr(port));



	return ctrl_inw(port);

}



u32 r7780rp_inl(unsigned long port)

{

	if (is_pci_ioaddr(port))

		return ctrl_inl(pci_ioaddr(port));



	return ctrl_inl(port);

}



void r7780rp_outb(u8 value, unsigned long port)

{

	if (CHECK_AX88796L_PORT(port))

		ctrl_outw(value, port88796l(port, 0));

	else if (is_pci_ioaddr(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outb(value, port);

}



void r7780rp_outb_p(u8 value, unsigned long port)

{

	if (CHECK_AX88796L_PORT(port))

		ctrl_outw(value, port88796l(port, 0));

	else if (is_pci_ioaddr(port))

		ctrl_outb(value, pci_ioaddr(port));

	else

		ctrl_outb(value, port);



	ctrl_delay();

}



void r7780rp_outw(u16 value, unsigned long port)

{

	if (is_pci_ioaddr(port))

		ctrl_outw(value, pci_ioaddr(port));

	else

		ctrl_outw(value, port);

}



void r7780rp_outl(u32 value, unsigned long port)

{

	if (is_pci_ioaddr(port))

		ctrl_outl(value, pci_ioaddr(port));

	else

		ctrl_outl(value, port);

}



void r7780rp_insb(unsigned long port, void *dst, unsigned long count)

{

	volatile u16 *p;

	u8 *buf = dst;



	if (CHECK_AX88796L_PORT(port)) {

		p = (volatile u16 *)port88796l(port, 0);

		while (count--)

			*buf++ = *p & 0xff;

	} else if (is_pci_ioaddr(port)) {

		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



		while (count--)

			*buf++ = *bp;

	} else {

		p = (volatile u16 *)port;

		while (count--)

			*buf++ = *p & 0xff;

	}

}



void r7780rp_insw(unsigned long port, void *dst, unsigned long count)

{

	volatile u16 *p;

	u16 *buf = dst;



	if (CHECK_AX88796L_PORT(port))

		p = (volatile u16 *)port88796l(port, 1);

	else if (is_pci_ioaddr(port))

		p = (volatile u16 *)pci_ioaddr(port);

	else

		p = (volatile u16 *)port;



	while (count--)

		*buf++ = *p;



	flush_dcache_all();

}



void r7780rp_insl(unsigned long port, void *dst, unsigned long count)

{

	if (is_pci_ioaddr(port)) {

		volatile u32 *p = (volatile u32 *)pci_ioaddr(port);

		u32 *buf = dst;



		while (count--)

			*buf++ = *p;

	}

}



void r7780rp_outsb(unsigned long port, const void *src, unsigned long count)

{

	volatile u16 *p;

	const u8 *buf = src;



	if (CHECK_AX88796L_PORT(port)) {

		p = (volatile u16 *)port88796l(port, 0);

		while (count--)

			*p = *buf++;

	} else if (is_pci_ioaddr(port)) {

		volatile u8 *bp = (volatile u8 *)pci_ioaddr(port);



		while (count--)

			*bp = *buf++;

	} else

		while (count--)

			ctrl_outb(*buf++, port);

}



void r7780rp_outsw(unsigned long port, const void *src, unsigned long count)

{

	volatile u16 *p;

	const u16 *buf = src;



	if (CHECK_AX88796L_PORT(port))

		p = (volatile u16 *)port88796l(port, 1);

	else if (is_pci_ioaddr(port))

		p = (volatile u16 *)pci_ioaddr(port);

	else

		p = (volatile u16 *)port;



	while (count--)

		*p = *buf++;



	flush_dcache_all();

}



void r7780rp_outsl(unsigned long port, const void *src, unsigned long count)

{

	const u32 *buf = src;

	u32 *p;



	if (is_pci_ioaddr(port))

		p = (u32 *)pci_ioaddr(port);

	else

		p = (u32 *)port;



	while (count--)

		ctrl_outl(*buf++, (unsigned long)p);

}



void __iomem *r7780rp_ioport_map(unsigned long port, unsigned int size)

{

	if (CHECK_AX88796L_PORT(port))

		return (void __iomem *)port88796l(port, size > 1);

	else if (is_pci_ioaddr(port))

		return (void __iomem *)pci_ioaddr(port);



	return (void __iomem *)port;

}

arch/sh/boards/renesas/r7780rp/setup.c

+0 −24
Original line number Diff line number Diff line
@@ -187,31 +187,7 @@ static void __init r7780rp_setup(char **cmdline_p) 
struct sh_machine_vector mv_r7780rp __initmv = {

	.mv_name		= "Highlander R7780RP-1",

	.mv_setup		= r7780rp_setup,



	.mv_nr_irqs		= 109,



	.mv_inb			= r7780rp_inb,

	.mv_inw			= r7780rp_inw,

	.mv_inl			= r7780rp_inl,

	.mv_outb		= r7780rp_outb,

	.mv_outw		= r7780rp_outw,

	.mv_outl		= r7780rp_outl,



	.mv_inb_p		= r7780rp_inb_p,

	.mv_inw_p		= r7780rp_inw,

	.mv_inl_p		= r7780rp_inl,

	.mv_outb_p		= r7780rp_outb_p,

	.mv_outw_p		= r7780rp_outw,

	.mv_outl_p		= r7780rp_outl,



	.mv_insb		= r7780rp_insb,

	.mv_insw		= r7780rp_insw,

	.mv_insl		= r7780rp_insl,

	.mv_outsb		= r7780rp_outsb,

	.mv_outsw		= r7780rp_outsw,

	.mv_outsl		= r7780rp_outsl,



	.mv_ioport_map		= r7780rp_ioport_map,

	.mv_init_irq		= init_r7780rp_IRQ,

};

ALIAS_MV(r7780rp)

arch/sh/boards/renesas/rts7751r2d/setup.c

+26 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/platform_device.h>

#include <linux/pata_platform.h>

#include <linux/serial_8250.h>

#include <linux/sm501.h>

#include <linux/pm.h>

#include <asm/machvec.h>

#include <asm/rts7751r2d.h>
@@ -111,10 +112,35 @@ static struct platform_device heartbeat_device = { 
	.resource	= heartbeat_resources,

};



static struct resource sm501_resources[] = {

	[0]	= {

		.start	= 0x10000000,

		.end	= 0x13e00000 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1]	= {

		.start	= 0x13e00000,

		.end	= 0x13ffffff,

		.flags	= IORESOURCE_MEM,

	},

	[2]	= {

		.start	= 32,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device sm501_device = {

	.name		= "sm501",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(sm501_resources),

	.resource	= sm501_resources,

};



static struct platform_device *rts7751r2d_devices[] __initdata = {

	&uart_device,

	&heartbeat_device,

	&cf_ide_device,

	&sm501_device,

};



static int __init rts7751r2d_devices_setup(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE