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

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: LCDC dcache flush for deferred io sh: Fix compiler error and include the definition of IS_ERR_VALUE sh: re-add LCDC fbdev support to the Migo-R defconfig sh: fix se7724 ceu names sh: ms7724se: Enable sh_eth in defconfig. arch/sh/boards/mach-se/7206/io.c: Remove unnecessary semicolons sh: ms7724se: Add sh_eth support nommu: provide follow_pfn(). sh: Kill off unused DEBUG_BOOTMEM symbol. perf_counter tools: add cpu_relax()/rmb() definitions for sh. sh64: Hook up page fault events for software perf counters. sh: Hook up page fault events for software perf counters. sh: make set_perf_counter_pending() static inline. clocksource: sh_tmu: Make undefined TCOR behaviour less undefined.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: LCDC dcache flush for deferred io sh: Fix compiler error and include the definition of IS_ERR_VALUE sh: re-add LCDC fbdev support to the Migo-R defconfig sh: fix se7724 ceu names sh: ms7724se: Enable sh_eth in defconfig. arch/sh/boards/mach-se/7206/io.c: Remove unnecessary semicolons sh: ms7724se: Add sh_eth support nommu: provide follow_pfn(). sh: Kill off unused DEBUG_BOOTMEM symbol. perf_counter tools: add cpu_relax()/rmb() definitions for sh. sh64: Hook up page fault events for software perf counters. sh: Hook up page fault events for software perf counters. sh: make set_perf_counter_pending() static inline. clocksource: sh_tmu: Make undefined TCOR behaviour less undefined.
Linus Torvalds
2 parents d960eea974 1c6a307a54
Showing 14 changed files Side-by-side Diff
arch/sh/Kconfig.debug
arch/sh/boards/mach-se/7206/io.c
arch/sh/boards/mach-se/7724/setup.c
arch/sh/configs/migor_defconfig
arch/sh/configs/se7724_defconfig
arch/sh/include/asm/perf_counter.h
arch/sh/include/asm/syscall_32.h
arch/sh/include/mach-se/mach/se7724.h
arch/sh/mm/fault_32.c
arch/sh/mm/tlbflush_64.c
drivers/clocksource/sh_tmu.c
drivers/video/sh_mobile_lcdcfb.c
mm/nommu.c
tools/perf/perf.h
@@ -61,10 +61,6 @@
 	  select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
 	  the kernel command line option to toggle back and forth.
  
-config DEBUG_BOOTMEM
-	depends on DEBUG_KERNEL
-	bool "Debug BOOTMEM initialization"
-
 config DEBUG_STACKOVERFLOW
 	bool "Check for stack overflows"
 	depends on DEBUG_KERNEL && SUPERH32
@@ -50,7 +50,7 @@
  
 unsigned short se7206_inw(unsigned long port)
 {
-	return *port2adr(port);;
+	return *port2adr(port);
 }
  
 void se7206_outb(unsigned char value, unsigned long port)
@@ -23,6 +23,8 @@
 #include <media/sh_mobile_ceu.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
+#include <asm/sh_eth.h>
+#include <asm/clock.h>
 #include <asm/sh_keysc.h>
 #include <cpu/sh7724.h>
 #include <mach-se/mach/se7724.h>
@@ -272,6 +274,34 @@
 	},
 };
  
+/* SH Eth */
+static struct resource sh_eth_resources[] = {
+	[0] = {
+		.start = SH_ETH_ADDR,
+		.end   = SH_ETH_ADDR + 0x1FC,
+		.flags = IORESOURCE_MEM,
+	},
+	[1] = {
+		.start = 91,
+		.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
+	},
+};
+
+struct sh_eth_plat_data sh_eth_plat = {
+	.phy = 0x1f, /* SMSC LAN8187 */
+	.edmac_endian = EDMAC_LITTLE_ENDIAN,
+};
+
+static struct platform_device sh_eth_device = {
+	.name = "sh-eth",
+	.id	= 0,
+	.dev = {
+		.platform_data = &sh_eth_plat,
+	},
+	.num_resources = ARRAY_SIZE(sh_eth_resources),
+	.resource = sh_eth_resources,
+};
+
 static struct platform_device *ms7724se_devices[] __initdata = {
 	&heartbeat_device,
 	&smc91x_eth_device,
  
@@ -280,8 +310,57 @@
 	&ceu0_device,
 	&ceu1_device,
 	&keysc_device,
+	&sh_eth_device,
 };
  
+#define EEPROM_OP   0xBA206000
+#define EEPROM_ADR  0xBA206004
+#define EEPROM_DATA 0xBA20600C
+#define EEPROM_STAT 0xBA206010
+#define EEPROM_STRT 0xBA206014
+static int __init sh_eth_is_eeprom_ready(void)
+{
+	int t = 10000;
+
+	while (t--) {
+		if (!ctrl_inw(EEPROM_STAT))
+			return 1;
+		cpu_relax();
+	}
+
+	printk(KERN_ERR "ms7724se can not access to eeprom\n");
+	return 0;
+}
+
+static void __init sh_eth_init(void)
+{
+	int i;
+	u16 mac[3];
+
+	/* check EEPROM status */
+	if (!sh_eth_is_eeprom_ready())
+		return;
+
+	/* read MAC addr from EEPROM */
+	for (i = 0 ; i < 3 ; i++) {
+		ctrl_outw(0x0, EEPROM_OP); /* read */
+		ctrl_outw(i*2, EEPROM_ADR);
+		ctrl_outw(0x1, EEPROM_STRT);
+		if (!sh_eth_is_eeprom_ready())
+			return;
+
+		mac[i] = ctrl_inw(EEPROM_DATA);
+		mac[i] = ((mac[i] & 0xFF) << 8) | (mac[i] >> 8); /* swap */
+	}
+
+	/* reset sh-eth */
+	ctrl_outl(0x1, SH_ETH_ADDR + 0x0);
+
+	/* set MAC addr */
+	ctrl_outl(((mac[0] << 16) | (mac[1])), SH_ETH_MAHR);
+	ctrl_outl((mac[2]), SH_ETH_MALR);
+}
+
 #define SW4140    0xBA201000
 #define FPGA_OUT  0xBA200400
 #define PORT_HIZA 0xA4050158
@@ -302,7 +381,8 @@
 	ctrl_outw(ctrl_inw(FPGA_OUT) &
 		  ~((1 << 1)  | /* LAN */
 		    (1 << 6)  | /* VIDEO DAC */
-		    (1 << 12)), /* USB0 */
+		    (1 << 12) | /* USB0 */
+		    (1 << 14)), /* RMII */
 		  FPGA_OUT);
  
 	/* enable IRQ 0,1,2 */
@@ -374,7 +454,7 @@
 	gpio_request(GPIO_FN_VIO0_CLK, NULL);
 	gpio_request(GPIO_FN_VIO0_FLD, NULL);
 	gpio_request(GPIO_FN_VIO0_HD,  NULL);
-	platform_resource_setup_memory(&ceu0_device, "ceu", 4 << 20);
+	platform_resource_setup_memory(&ceu0_device, "ceu0", 4 << 20);
  
 	/* enable CEU1 */
 	gpio_request(GPIO_FN_VIO1_D7,  NULL);
@@ -389,7 +469,7 @@
 	gpio_request(GPIO_FN_VIO1_HD,  NULL);
 	gpio_request(GPIO_FN_VIO1_VD,  NULL);
 	gpio_request(GPIO_FN_VIO1_CLK, NULL);
-	platform_resource_setup_memory(&ceu1_device, "ceu", 4 << 20);
+	platform_resource_setup_memory(&ceu1_device, "ceu1", 4 << 20);
  
 	/* KEYSC */
 	gpio_request(GPIO_FN_KEYOUT5_IN5, NULL);
@@ -404,6 +484,28 @@
 	gpio_request(GPIO_FN_KEYOUT1,     NULL);
 	gpio_request(GPIO_FN_KEYOUT0,     NULL);
  
+	/*
+	 * enable SH-Eth
+	 *
+	 * please remove J33 pin from your board !!
+	 *
+	 * ms7724 board should not use GPIO_FN_LNKSTA pin
+	 * So, This time PTX5 is set to input pin
+	 */
+	gpio_request(GPIO_FN_RMII_RXD0,    NULL);
+	gpio_request(GPIO_FN_RMII_RXD1,    NULL);
+	gpio_request(GPIO_FN_RMII_TXD0,    NULL);
+	gpio_request(GPIO_FN_RMII_TXD1,    NULL);
+	gpio_request(GPIO_FN_RMII_REF_CLK, NULL);
+	gpio_request(GPIO_FN_RMII_TX_EN,   NULL);
+	gpio_request(GPIO_FN_RMII_RX_ER,   NULL);
+	gpio_request(GPIO_FN_RMII_CRS_DV,  NULL);
+	gpio_request(GPIO_FN_MDIO,         NULL);
+	gpio_request(GPIO_FN_MDC,          NULL);
+	gpio_request(GPIO_PTX5, NULL);
+	gpio_direction_input(GPIO_PTX5);
+	sh_eth_init();
+
 	if (sw & SW41_B) {
 		/* SVGA */
 		lcdc_info.ch[0].lcd_cfg.xres         = 800;
@@ -437,7 +539,7 @@
 	}
  
 	return platform_add_devices(ms7724se_devices,
-				ARRAY_SIZE(ms7724se_devices));
+				    ARRAY_SIZE(ms7724se_devices));
 }
 device_initcall(devices_setup);
  
@@ -309,7 +309,7 @@
 CONFIG_BOOT_LINK_OFFSET=0x00800000
 CONFIG_ENTRY_OFFSET=0x00001000
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"
+CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"
  
 #
 # Bus options
@@ -858,7 +858,35 @@
 #
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+# CONFIG_FB_CFB_FILLRECT is not set
+# CONFIG_FB_CFB_COPYAREA is not set
+# CONFIG_FB_CFB_IMAGEBLIT is not set
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_SH_MOBILE_LCDC=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
  
 #
@@ -870,6 +898,27 @@
 # Console display driver support
 #
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# CONFIG_LOGO_SUPERH_MONO is not set
+CONFIG_LOGO_SUPERH_VGA16=y
+# CONFIG_LOGO_SUPERH_CLUT224 is not set
 # CONFIG_SOUND is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.30
-# Thu Jun 18 16:09:05 2009
+# Mon Jun 29 16:28:43 2009
 #
 CONFIG_SUPERH=y
 CONFIG_SUPERH32=y
@@ -14,6 +14,7 @@
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_IRQ_PER_CPU=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
  
@@ -28,7 +29,9 @@
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_NO_VIRT_TO_BUS=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
  
 #
 # General setup
  
@@ -88,10 +91,12 @@
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_HAVE_PERF_COUNTERS=y
  
 #
 # Performance Counters
 #
+# CONFIG_PERF_COUNTERS is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_COMPAT_BRK=y
@@ -107,6 +112,10 @@
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+
+#
+# GCOV-based kernel profiling
+#
 # CONFIG_SLOW_WORK is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
@@ -119,7 +128,7 @@
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
+CONFIG_LBDAF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
  
@@ -584,7 +593,6 @@
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -624,7 +632,7 @@
 CONFIG_MII=y
 # CONFIG_AX88796 is not set
 # CONFIG_STNIC is not set
-# CONFIG_SH_ETH is not set
+CONFIG_SH_ETH=y
 CONFIG_SMC91X=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ETHOC is not set
@@ -801,6 +809,11 @@
 #
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_SYSFS is not set
@@ -851,6 +864,8 @@
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_PCF50633 is not set
+# CONFIG_AB3100_CORE is not set
+# CONFIG_EZX_PCAP is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=y
  
@@ -1196,6 +1211,7 @@
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
  
 #
 # SPI RTC drivers
@@ -1260,6 +1276,7 @@
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
 CONFIG_FILE_LOCKING=y
@@ -2,7 +2,7 @@
 #define __ASM_SH_PERF_COUNTER_H
  
 /* SH only supports software counters through this interface. */
-#define set_perf_counter_pending()	do { } while (0)
+static inline void set_perf_counter_pending(void) {}
  
 #endif /* __ASM_SH_PERF_COUNTER_H */
@@ -3,6 +3,7 @@
  
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/err.h>
 #include <asm/ptrace.h>
  
 /* The system call number is given by the user in R3 */
@@ -20,6 +20,11 @@
  */
 #include <asm/addrspace.h>
  
+/* SH Eth */
+#define SH_ETH_ADDR	(0xA4600000)
+#define SH_ETH_MAHR	(SH_ETH_ADDR + 0x1C0)
+#define SH_ETH_MALR	(SH_ETH_ADDR + 0x1C8)
+
 #define PA_LED		(0xba203000)	/* 8bit LED */
 #define IRQ_MODE	(0xba200010)
 #define IRQ0_SR		(0xba200014)
@@ -15,12 +15,28 @@
 #include <linux/mm.h>
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
-#include <linux/marker.h>
+#include <linux/perf_counter.h>
 #include <asm/io_trapped.h>
 #include <asm/system.h>
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
  
+static inline int notify_page_fault(struct pt_regs *regs, int trap)
+{
+	int ret = 0;
+
+#ifdef CONFIG_KPROBES
+	if (!user_mode(regs)) {
+		preempt_disable();
+		if (kprobe_running() && kprobe_fault_handler(regs, trap))
+			ret = 1;
+		preempt_enable();
+	}
+#endif
+
+	return ret;
+}
+
 /*
  * This routine handles page faults.  It determines the address,
  * and the problem, and then passes it off to one of the appropriate
  
  
  
@@ -87,13 +103,16 @@
 		return;
 	}
  
+	mm = tsk->mm;
+
+	if (unlikely(notify_page_fault(regs, lookup_exception_vector())))
+		return;
+
 	/* Only enable interrupts if they were on before the fault */
-	if ((regs->sr & SR_IMASK) != SR_IMASK) {
-		trace_hardirqs_on();
+	if ((regs->sr & SR_IMASK) != SR_IMASK)
 		local_irq_enable();
-	}
  
-	mm = tsk->mm;
+	perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
  
 	/*
 	 * If we're in an interrupt or have no user
  
  
@@ -141,10 +160,15 @@
 			goto do_sigbus;
 		BUG();
 	}
-	if (fault & VM_FAULT_MAJOR)
+	if (fault & VM_FAULT_MAJOR) {
 		tsk->maj_flt++;
-	else
+		perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+				     regs, address);
+	} else {
 		tsk->min_flt++;
+		perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+				     regs, address);
+	}
  
 	up_read(&mm->mmap_sem);
 	return;
@@ -245,22 +269,6 @@
 		goto no_context;
 }
  
-static inline int notify_page_fault(struct pt_regs *regs, int trap)
-{
-	int ret = 0;
-
-#ifdef CONFIG_KPROBES
-	if (!user_mode(regs)) {
-		preempt_disable();
-		if (kprobe_running() && kprobe_fault_handler(regs, trap))
-			ret = 1;
-		preempt_enable();
-	}
-#endif
-
-	return ret;
-}
-
 /*
  * Called with interrupts disabled.
  */
@@ -273,12 +281,7 @@
 	pmd_t *pmd;
 	pte_t *pte;
 	pte_t entry;
-	int ret = 0;
-
-	if (notify_page_fault(regs, lookup_exception_vector()))
-		goto out;
-
-	ret = 1;
+	int ret = 1;
  
 	/*
 	 * We don't take page faults for P1, P2, and parts of P4, these
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003  Richard Curnow (/proc/tlb, bug fixes)
- * Copyright (C) 2003  Paul Mundt
+ * Copyright (C) 2003 - 2009 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
@@ -20,6 +20,7 @@
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
+#include <linux/perf_counter.h>
 #include <linux/interrupt.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -115,6 +116,8 @@
 	/* Not an IO address, so reenable interrupts */
 	local_irq_enable();
  
+	perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+
 	/*
 	 * If we're in an interrupt or have no user
 	 * context, we must not take the fault..
  
  
@@ -195,10 +198,16 @@
 			goto do_sigbus;
 		BUG();
 	}
-	if (fault & VM_FAULT_MAJOR)
+
+	if (fault & VM_FAULT_MAJOR) {
 		tsk->maj_flt++;
-	else
+		perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+				     regs, address);
+	} else {
 		tsk->min_flt++;
+		perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+				     regs, address);
+	}
  
 	/* If we get here, the page fault has been handled.  Do the TLB refill
 	   now from the newly-setup PTE, to avoid having to fault again right
@@ -161,7 +161,7 @@
 	if (periodic)
 		sh_tmu_write(p, TCOR, delta);
 	else
-		sh_tmu_write(p, TCOR, 0);
+		sh_tmu_write(p, TCOR, 0xffffffff);
  
 	sh_tmu_write(p, TCNT, delta);
  
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/vmalloc.h>
 #include <video/sh_mobile_lcdc.h>
 #include <asm/atomic.h>
  
@@ -33,6 +34,7 @@
 	struct fb_info info;
 	dma_addr_t dma_handle;
 	struct fb_deferred_io defio;
+	struct scatterlist *sglist;
 	unsigned long frame_end;
 	wait_queue_head_t frame_end_wait;
 };
  
  
  
@@ -206,16 +208,38 @@
 static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) {}
 #endif
  
+static int sh_mobile_lcdc_sginit(struct fb_info *info,
+				  struct list_head *pagelist)
+{
+	struct sh_mobile_lcdc_chan *ch = info->par;
+	unsigned int nr_pages_max = info->fix.smem_len >> PAGE_SHIFT;
+	struct page *page;
+	int nr_pages = 0;
+
+	sg_init_table(ch->sglist, nr_pages_max);
+
+	list_for_each_entry(page, pagelist, lru)
+		sg_set_page(&ch->sglist[nr_pages++], page, PAGE_SIZE, 0);
+
+	return nr_pages;
+}
+
 static void sh_mobile_lcdc_deferred_io(struct fb_info *info,
 				       struct list_head *pagelist)
 {
 	struct sh_mobile_lcdc_chan *ch = info->par;
+	unsigned int nr_pages;
  
 	/* enable clocks before accessing hardware */
 	sh_mobile_lcdc_clk_on(ch->lcdc);
  
+	nr_pages = sh_mobile_lcdc_sginit(info, pagelist);
+	dma_map_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
+
 	/* trigger panel update */
 	lcdc_write_chan(ch, LDSM2R, 1);
+
+	dma_unmap_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
 }
  
 static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info)
  
  
  
  
@@ -846,21 +870,31 @@
 	}
  
 	for (i = 0; i < j; i++) {
-		error = register_framebuffer(&priv->ch[i].info);
+		struct sh_mobile_lcdc_chan *ch = priv->ch + i;
+
+		info = &ch->info;
+
+		if (info->fbdefio) {
+			priv->ch->sglist = vmalloc(sizeof(struct scatterlist) *
+					info->fix.smem_len >> PAGE_SHIFT);
+			if (!priv->ch->sglist) {
+				dev_err(&pdev->dev, "cannot allocate sglist\n");
+				goto err1;
+			}
+		}
+
+		error = register_framebuffer(info);
 		if (error < 0)
 			goto err1;
-	}
  
-	for (i = 0; i < j; i++) {
-		info = &priv->ch[i].info;
 		dev_info(info->dev,
 			 "registered %s/%s as %dx%d %dbpp.\n",
 			 pdev->name,
-			 (priv->ch[i].cfg.chan == LCDC_CHAN_MAINLCD) ?
+			 (ch->cfg.chan == LCDC_CHAN_MAINLCD) ?
 			 "mainlcd" : "sublcd",
-			 (int) priv->ch[i].cfg.lcd_cfg.xres,
-			 (int) priv->ch[i].cfg.lcd_cfg.yres,
-			 priv->ch[i].cfg.bpp);
+			 (int) ch->cfg.lcd_cfg.xres,
+			 (int) ch->cfg.lcd_cfg.yres,
+			 ch->cfg.bpp);
  
 		/* deferred io mode: disable clock to save power */
 		if (info->fbdefio)
@@ -891,6 +925,9 @@
  
 		if (!info->device)
 			continue;
+
+		if (priv->ch[i].sglist)
+			vfree(priv->ch[i].sglist);
  
 		dma_free_coherent(&pdev->dev, info->fix.smem_len,
 				  info->screen_base, priv->ch[i].dma_handle);
@@ -238,6 +238,27 @@
 }
 EXPORT_SYMBOL(get_user_pages);
  
+/**
+ * follow_pfn - look up PFN at a user virtual address
+ * @vma: memory mapping
+ * @address: user virtual address
+ * @pfn: location to store found PFN
+ *
+ * Only IO mappings and raw PFN mappings are allowed.
+ *
+ * Returns zero and the pfn at @pfn on success, -ve otherwise.
+ */
+int follow_pfn(struct vm_area_struct *vma, unsigned long address,
+	unsigned long *pfn)
+{
+	if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))
+		return -EINVAL;
+
+	*pfn = address >> PAGE_SHIFT;
+	return 0;
+}
+EXPORT_SYMBOL(follow_pfn);
+
 DEFINE_RWLOCK(vmlist_lock);
 struct vm_struct *vmlist;
  
@@ -19,6 +19,16 @@
 #define cpu_relax()	asm volatile("" ::: "memory");
 #endif
  
+#ifdef __sh__
+#include "../../arch/sh/include/asm/unistd.h"
+#if defined(__SH4A__) || defined(__SH5__)
+# define rmb()		asm volatile("synco" ::: "memory")
+#else
+# define rmb()		asm volatile("" ::: "memory")
+#endif
+#define cpu_relax()	asm volatile("" ::: "memory")
+#endif
+
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
...	...	@@ -61,10 +61,6 @@
61	61	select both the EARLY_SCIF_CONSOLE and SH_STANDARD_BIOS, using
62	62	the kernel command line option to toggle back and forth.
63	63
64		-config DEBUG_BOOTMEM
65		- depends on DEBUG_KERNEL
66		- bool "Debug BOOTMEM initialization"
67		-
68	64	config DEBUG_STACKOVERFLOW
69	65	bool "Check for stack overflows"
70	66	depends on DEBUG_KERNEL && SUPERH32
...	...	@@ -50,7 +50,7 @@
50	50
51	51	unsigned short se7206_inw(unsigned long port)
52	52	{
53		- return *port2adr(port);;
	53	+ return *port2adr(port);
54	54	}
55	55
56	56	void se7206_outb(unsigned char value, unsigned long port)
...	...	@@ -23,6 +23,8 @@
23	23	#include <media/sh_mobile_ceu.h>
24	24	#include <asm/io.h>
25	25	#include <asm/heartbeat.h>
	26	+#include <asm/sh_eth.h>
	27	+#include <asm/clock.h>
26	28	#include <asm/sh_keysc.h>
27	29	#include <cpu/sh7724.h>
28	30	#include <mach-se/mach/se7724.h>
...	...	@@ -272,6 +274,34 @@
272	274	},
273	275	};
274	276
	277	+/* SH Eth */
	278	+static struct resource sh_eth_resources[] = {
	279	+ [0] = {
	280	+ .start = SH_ETH_ADDR,
	281	+ .end = SH_ETH_ADDR + 0x1FC,
	282	+ .flags = IORESOURCE_MEM,
	283	+ },
	284	+ [1] = {
	285	+ .start = 91,
	286	+ .flags = IORESOURCE_IRQ \| IORESOURCE_IRQ_HIGHLEVEL,
	287	+ },
	288	+};
	289	+
	290	+struct sh_eth_plat_data sh_eth_plat = {
	291	+ .phy = 0x1f, /* SMSC LAN8187 */
	292	+ .edmac_endian = EDMAC_LITTLE_ENDIAN,
	293	+};
	294	+
	295	+static struct platform_device sh_eth_device = {
	296	+ .name = "sh-eth",
	297	+ .id = 0,
	298	+ .dev = {
	299	+ .platform_data = &sh_eth_plat,
	300	+ },
	301	+ .num_resources = ARRAY_SIZE(sh_eth_resources),
	302	+ .resource = sh_eth_resources,
	303	+};
	304	+
275	305	static struct platform_device *ms7724se_devices[] __initdata = {
276	306	&heartbeat_device,
277	307	&smc91x_eth_device,
278	308
...	...	@@ -280,8 +310,57 @@
280	310	&ceu0_device,
281	311	&ceu1_device,
282	312	&keysc_device,
	313	+ &sh_eth_device,
283	314	};
284	315
	316	+#define EEPROM_OP 0xBA206000
	317	+#define EEPROM_ADR 0xBA206004
	318	+#define EEPROM_DATA 0xBA20600C
	319	+#define EEPROM_STAT 0xBA206010
	320	+#define EEPROM_STRT 0xBA206014
	321	+static int __init sh_eth_is_eeprom_ready(void)
	322	+{
	323	+ int t = 10000;
	324	+
	325	+ while (t--) {
	326	+ if (!ctrl_inw(EEPROM_STAT))
	327	+ return 1;
	328	+ cpu_relax();
	329	+ }
	330	+
	331	+ printk(KERN_ERR "ms7724se can not access to eeprom\n");
	332	+ return 0;
	333	+}
	334	+
	335	+static void __init sh_eth_init(void)
	336	+{
	337	+ int i;
	338	+ u16 mac[3];
	339	+
	340	+ /* check EEPROM status */
	341	+ if (!sh_eth_is_eeprom_ready())
	342	+ return;
	343	+
	344	+ /* read MAC addr from EEPROM */
	345	+ for (i = 0 ; i < 3 ; i++) {
	346	+ ctrl_outw(0x0, EEPROM_OP); /* read */
	347	+ ctrl_outw(i*2, EEPROM_ADR);
	348	+ ctrl_outw(0x1, EEPROM_STRT);
	349	+ if (!sh_eth_is_eeprom_ready())
	350	+ return;
	351	+
	352	+ mac[i] = ctrl_inw(EEPROM_DATA);
	353	+ mac[i] = ((mac[i] & 0xFF) << 8) \| (mac[i] >> 8); /* swap */
	354	+ }
	355	+
	356	+ /* reset sh-eth */
	357	+ ctrl_outl(0x1, SH_ETH_ADDR + 0x0);
	358	+
	359	+ /* set MAC addr */
	360	+ ctrl_outl(((mac[0] << 16) \| (mac[1])), SH_ETH_MAHR);
	361	+ ctrl_outl((mac[2]), SH_ETH_MALR);
	362	+}
	363	+
285	364	#define SW4140 0xBA201000
286	365	#define FPGA_OUT 0xBA200400
287	366	#define PORT_HIZA 0xA4050158
...	...	@@ -302,7 +381,8 @@
302	381	ctrl_outw(ctrl_inw(FPGA_OUT) &
303	382	~((1 << 1) \| /* LAN */
304	383	(1 << 6) \| /* VIDEO DAC */
305		- (1 << 12)), /* USB0 */
	384	+ (1 << 12) \| /* USB0 */
	385	+ (1 << 14)), /* RMII */
306	386	FPGA_OUT);
307	387
308	388	/* enable IRQ 0,1,2 */
...	...	@@ -374,7 +454,7 @@
374	454	gpio_request(GPIO_FN_VIO0_CLK, NULL);
375	455	gpio_request(GPIO_FN_VIO0_FLD, NULL);
376	456	gpio_request(GPIO_FN_VIO0_HD, NULL);
377		- platform_resource_setup_memory(&ceu0_device, "ceu", 4 << 20);
	457	+ platform_resource_setup_memory(&ceu0_device, "ceu0", 4 << 20);
378	458
379	459	/* enable CEU1 */
380	460	gpio_request(GPIO_FN_VIO1_D7, NULL);
...	...	@@ -389,7 +469,7 @@
389	469	gpio_request(GPIO_FN_VIO1_HD, NULL);
390	470	gpio_request(GPIO_FN_VIO1_VD, NULL);
391	471	gpio_request(GPIO_FN_VIO1_CLK, NULL);
392		- platform_resource_setup_memory(&ceu1_device, "ceu", 4 << 20);
	472	+ platform_resource_setup_memory(&ceu1_device, "ceu1", 4 << 20);
393	473
394	474	/* KEYSC */
395	475	gpio_request(GPIO_FN_KEYOUT5_IN5, NULL);
...	...	@@ -404,6 +484,28 @@
404	484	gpio_request(GPIO_FN_KEYOUT1, NULL);
405	485	gpio_request(GPIO_FN_KEYOUT0, NULL);
406	486
	487	+ /*
	488	+ * enable SH-Eth
	489	+ *
	490	+ * please remove J33 pin from your board !!
	491	+ *
	492	+ * ms7724 board should not use GPIO_FN_LNKSTA pin
	493	+ * So, This time PTX5 is set to input pin
	494	+ */
	495	+ gpio_request(GPIO_FN_RMII_RXD0, NULL);
	496	+ gpio_request(GPIO_FN_RMII_RXD1, NULL);
	497	+ gpio_request(GPIO_FN_RMII_TXD0, NULL);
	498	+ gpio_request(GPIO_FN_RMII_TXD1, NULL);
	499	+ gpio_request(GPIO_FN_RMII_REF_CLK, NULL);
	500	+ gpio_request(GPIO_FN_RMII_TX_EN, NULL);
	501	+ gpio_request(GPIO_FN_RMII_RX_ER, NULL);
	502	+ gpio_request(GPIO_FN_RMII_CRS_DV, NULL);
	503	+ gpio_request(GPIO_FN_MDIO, NULL);
	504	+ gpio_request(GPIO_FN_MDC, NULL);
	505	+ gpio_request(GPIO_PTX5, NULL);
	506	+ gpio_direction_input(GPIO_PTX5);
	507	+ sh_eth_init();
	508	+
407	509	if (sw & SW41_B) {
408	510	/* SVGA */
409	511	lcdc_info.ch[0].lcd_cfg.xres = 800;
...	...	@@ -437,7 +539,7 @@
437	539	}
438	540
439	541	return platform_add_devices(ms7724se_devices,
440		- ARRAY_SIZE(ms7724se_devices));
	542	+ ARRAY_SIZE(ms7724se_devices));
441	543	}
442	544	device_initcall(devices_setup);
443	545
...	...	@@ -309,7 +309,7 @@
309	309	CONFIG_BOOT_LINK_OFFSET=0x00800000
310	310	CONFIG_ENTRY_OFFSET=0x00001000
311	311	CONFIG_CMDLINE_BOOL=y
312		-CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"
	312	+CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"
313	313
314	314	#
315	315	# Bus options
...	...	@@ -858,7 +858,35 @@
858	858	#
859	859	# CONFIG_VGASTATE is not set
860	860	# CONFIG_VIDEO_OUTPUT_CONTROL is not set
861		-# CONFIG_FB is not set
	861	+CONFIG_FB=y
	862	+# CONFIG_FIRMWARE_EDID is not set
	863	+# CONFIG_FB_DDC is not set
	864	+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
	865	+# CONFIG_FB_CFB_FILLRECT is not set
	866	+# CONFIG_FB_CFB_COPYAREA is not set
	867	+# CONFIG_FB_CFB_IMAGEBLIT is not set
	868	+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
	869	+CONFIG_FB_SYS_FILLRECT=y
	870	+CONFIG_FB_SYS_COPYAREA=y
	871	+CONFIG_FB_SYS_IMAGEBLIT=y
	872	+# CONFIG_FB_FOREIGN_ENDIAN is not set
	873	+CONFIG_FB_SYS_FOPS=y
	874	+CONFIG_FB_DEFERRED_IO=y
	875	+# CONFIG_FB_SVGALIB is not set
	876	+# CONFIG_FB_MACMODES is not set
	877	+# CONFIG_FB_BACKLIGHT is not set
	878	+# CONFIG_FB_MODE_HELPERS is not set
	879	+# CONFIG_FB_TILEBLITTING is not set
	880	+
	881	+#
	882	+# Frame buffer hardware drivers
	883	+#
	884	+# CONFIG_FB_S1D13XXX is not set
	885	+CONFIG_FB_SH_MOBILE_LCDC=y
	886	+# CONFIG_FB_VIRTUAL is not set
	887	+# CONFIG_FB_METRONOME is not set
	888	+# CONFIG_FB_MB862XX is not set
	889	+# CONFIG_FB_BROADSHEET is not set
862	890	# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
863	891
864	892	#
...	...	@@ -870,6 +898,27 @@
870	898	# Console display driver support
871	899	#
872	900	CONFIG_DUMMY_CONSOLE=y
	901	+CONFIG_FRAMEBUFFER_CONSOLE=y
	902	+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
	903	+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
	904	+CONFIG_FONTS=y
	905	+# CONFIG_FONT_8x8 is not set
	906	+# CONFIG_FONT_8x16 is not set
	907	+# CONFIG_FONT_6x11 is not set
	908	+# CONFIG_FONT_7x14 is not set
	909	+# CONFIG_FONT_PEARL_8x8 is not set
	910	+# CONFIG_FONT_ACORN_8x8 is not set
	911	+CONFIG_FONT_MINI_4x6=y
	912	+# CONFIG_FONT_SUN8x16 is not set
	913	+# CONFIG_FONT_SUN12x22 is not set
	914	+# CONFIG_FONT_10x18 is not set
	915	+CONFIG_LOGO=y
	916	+# CONFIG_LOGO_LINUX_MONO is not set
	917	+# CONFIG_LOGO_LINUX_VGA16 is not set
	918	+# CONFIG_LOGO_LINUX_CLUT224 is not set
	919	+# CONFIG_LOGO_SUPERH_MONO is not set
	920	+CONFIG_LOGO_SUPERH_VGA16=y
	921	+# CONFIG_LOGO_SUPERH_CLUT224 is not set
873	922	# CONFIG_SOUND is not set
874	923	CONFIG_HID_SUPPORT=y
875	924	CONFIG_HID=y
1	1	#
2	2	# Automatically generated make config: don't edit
3	3	# Linux kernel version: 2.6.30
4		-# Thu Jun 18 16:09:05 2009
	4	+# Mon Jun 29 16:28:43 2009
5	5	#
6	6	CONFIG_SUPERH=y
7	7	CONFIG_SUPERH32=y
...	...	@@ -14,6 +14,7 @@
14	14	CONFIG_GENERIC_HARDIRQS=y
15	15	CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16	16	CONFIG_GENERIC_IRQ_PROBE=y
	17	+CONFIG_IRQ_PER_CPU=y
17	18	CONFIG_GENERIC_GPIO=y
18	19	CONFIG_GENERIC_TIME=y
19	20	CONFIG_GENERIC_CLOCKEVENTS=y
20	21
...	...	@@ -28,7 +29,9 @@
28	29	# CONFIG_ARCH_HAS_ILOG2_U64 is not set
29	30	CONFIG_ARCH_NO_VIRT_TO_BUS=y
30	31	CONFIG_ARCH_HAS_DEFAULT_IDLE=y
	32	+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31	33	CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
	34	+CONFIG_CONSTRUCTORS=y
32	35
33	36	#
34	37	# General setup
35	38
...	...	@@ -88,10 +91,12 @@
88	91	CONFIG_EVENTFD=y
89	92	CONFIG_SHMEM=y
90	93	CONFIG_AIO=y
	94	+CONFIG_HAVE_PERF_COUNTERS=y
91	95
92	96	#
93	97	# Performance Counters
94	98	#
	99	+# CONFIG_PERF_COUNTERS is not set
95	100	CONFIG_VM_EVENT_COUNTERS=y
96	101	# CONFIG_STRIP_ASM_SYMS is not set
97	102	CONFIG_COMPAT_BRK=y
...	...	@@ -107,6 +112,10 @@
107	112	CONFIG_HAVE_ARCH_TRACEHOOK=y
108	113	CONFIG_HAVE_CLK=y
109	114	CONFIG_HAVE_DMA_API_DEBUG=y
	115	+
	116	+#
	117	+# GCOV-based kernel profiling
	118	+#
110	119	# CONFIG_SLOW_WORK is not set
111	120	CONFIG_HAVE_GENERIC_DMA_COHERENT=y
112	121	CONFIG_SLABINFO=y
...	...	@@ -119,7 +128,7 @@
119	128	# CONFIG_MODVERSIONS is not set
120	129	# CONFIG_MODULE_SRCVERSION_ALL is not set
121	130	CONFIG_BLOCK=y
122		-# CONFIG_LBD is not set
	131	+CONFIG_LBDAF=y
123	132	# CONFIG_BLK_DEV_BSG is not set
124	133	# CONFIG_BLK_DEV_INTEGRITY is not set
125	134
...	...	@@ -584,7 +593,6 @@
584	593	# CONFIG_SCSI_SRP_ATTRS is not set
585	594	CONFIG_SCSI_LOWLEVEL=y
586	595	# CONFIG_ISCSI_TCP is not set
587		-# CONFIG_SCSI_BNX2_ISCSI is not set
588	596	# CONFIG_LIBFC is not set
589	597	# CONFIG_LIBFCOE is not set
590	598	# CONFIG_SCSI_DEBUG is not set
...	...	@@ -624,7 +632,7 @@
624	632	CONFIG_MII=y
625	633	# CONFIG_AX88796 is not set
626	634	# CONFIG_STNIC is not set
627		-# CONFIG_SH_ETH is not set
	635	+CONFIG_SH_ETH=y
628	636	CONFIG_SMC91X=y
629	637	# CONFIG_ENC28J60 is not set
630	638	# CONFIG_ETHOC is not set
...	...	@@ -801,6 +809,11 @@
801	809	#
802	810	# CONFIG_SPI_SPIDEV is not set
803	811	# CONFIG_SPI_TLE62X0 is not set
	812	+
	813	+#
	814	+# PPS support
	815	+#
	816	+# CONFIG_PPS is not set
804	817	CONFIG_ARCH_REQUIRE_GPIOLIB=y
805	818	CONFIG_GPIOLIB=y
806	819	# CONFIG_GPIO_SYSFS is not set
...	...	@@ -851,6 +864,8 @@
851	864	# CONFIG_MFD_WM8400 is not set
852	865	# CONFIG_MFD_WM8350_I2C is not set
853	866	# CONFIG_MFD_PCF50633 is not set
	867	+# CONFIG_AB3100_CORE is not set
	868	+# CONFIG_EZX_PCAP is not set
854	869	# CONFIG_REGULATOR is not set
855	870	CONFIG_MEDIA_SUPPORT=y
856	871
...	...	@@ -1196,6 +1211,7 @@
1196	1211	# CONFIG_RTC_DRV_S35390A is not set
1197	1212	# CONFIG_RTC_DRV_FM3130 is not set
1198	1213	# CONFIG_RTC_DRV_RX8581 is not set
	1214	+# CONFIG_RTC_DRV_RX8025 is not set
1199	1215
1200	1216	#
1201	1217	# SPI RTC drivers
...	...	@@ -1260,6 +1276,7 @@
1260	1276	# CONFIG_JFS_FS is not set
1261	1277	CONFIG_FS_POSIX_ACL=y
1262	1278	# CONFIG_XFS_FS is not set
	1279	+# CONFIG_GFS2_FS is not set
1263	1280	# CONFIG_OCFS2_FS is not set
1264	1281	# CONFIG_BTRFS_FS is not set
1265	1282	CONFIG_FILE_LOCKING=y
...	...	@@ -2,7 +2,7 @@
2	2	#define __ASM_SH_PERF_COUNTER_H
3	3
4	4	/* SH only supports software counters through this interface. */
5		-#define set_perf_counter_pending() do { } while (0)
	5	+static inline void set_perf_counter_pending(void) {}
6	6
7	7	#endif /* __ASM_SH_PERF_COUNTER_H */
...	...	@@ -3,6 +3,7 @@
3	3
4	4	#include <linux/kernel.h>
5	5	#include <linux/sched.h>
	6	+#include <linux/err.h>
6	7	#include <asm/ptrace.h>
7	8
8	9	/* The system call number is given by the user in R3 */
...	...	@@ -20,6 +20,11 @@
20	20	*/
21	21	#include <asm/addrspace.h>
22	22
	23	+/* SH Eth */
	24	+#define SH_ETH_ADDR (0xA4600000)
	25	+#define SH_ETH_MAHR (SH_ETH_ADDR + 0x1C0)
	26	+#define SH_ETH_MALR (SH_ETH_ADDR + 0x1C8)
	27	+
23	28	#define PA_LED (0xba203000) /* 8bit LED */
24	29	#define IRQ_MODE (0xba200010)
25	30	#define IRQ0_SR (0xba200014)
...	...	@@ -15,12 +15,28 @@
15	15	#include <linux/mm.h>
16	16	#include <linux/hardirq.h>
17	17	#include <linux/kprobes.h>
18		-#include <linux/marker.h>
	18	+#include <linux/perf_counter.h>
19	19	#include <asm/io_trapped.h>
20	20	#include <asm/system.h>
21	21	#include <asm/mmu_context.h>
22	22	#include <asm/tlbflush.h>
23	23
	24	+static inline int notify_page_fault(struct pt_regs *regs, int trap)
	25	+{
	26	+ int ret = 0;
	27	+
	28	+#ifdef CONFIG_KPROBES
	29	+ if (!user_mode(regs)) {
	30	+ preempt_disable();
	31	+ if (kprobe_running() && kprobe_fault_handler(regs, trap))
	32	+ ret = 1;
	33	+ preempt_enable();
	34	+ }
	35	+#endif
	36	+
	37	+ return ret;
	38	+}
	39	+
24	40	/*
25	41	* This routine handles page faults. It determines the address,
26	42	* and the problem, and then passes it off to one of the appropriate
27	43
28	44
29	45
...	...	@@ -87,13 +103,16 @@
87	103	return;
88	104	}
89	105
	106	+ mm = tsk->mm;
	107	+
	108	+ if (unlikely(notify_page_fault(regs, lookup_exception_vector())))
	109	+ return;
	110	+
90	111	/* Only enable interrupts if they were on before the fault */
91		- if ((regs->sr & SR_IMASK) != SR_IMASK) {
92		- trace_hardirqs_on();
	112	+ if ((regs->sr & SR_IMASK) != SR_IMASK)
93	113	local_irq_enable();
94		- }
95	114
96		- mm = tsk->mm;
	115	+ perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
97	116
98	117	/*
99	118	* If we're in an interrupt or have no user
100	119
101	120
...	...	@@ -141,10 +160,15 @@
141	160	goto do_sigbus;
142	161	BUG();
143	162	}
144		- if (fault & VM_FAULT_MAJOR)
	163	+ if (fault & VM_FAULT_MAJOR) {
145	164	tsk->maj_flt++;
146		- else
	165	+ perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
	166	+ regs, address);
	167	+ } else {
147	168	tsk->min_flt++;
	169	+ perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
	170	+ regs, address);
	171	+ }
148	172
149	173	up_read(&mm->mmap_sem);
150	174	return;
...	...	@@ -245,22 +269,6 @@
245	269	goto no_context;
246	270	}
247	271
248		-static inline int notify_page_fault(struct pt_regs *regs, int trap)
249		-{
250		- int ret = 0;
251		-
252		-#ifdef CONFIG_KPROBES
253		- if (!user_mode(regs)) {
254		- preempt_disable();
255		- if (kprobe_running() && kprobe_fault_handler(regs, trap))
256		- ret = 1;
257		- preempt_enable();
258		- }
259		-#endif
260		-
261		- return ret;
262		-}
263		-
264	272	/*
265	273	* Called with interrupts disabled.
266	274	*/
...	...	@@ -273,12 +281,7 @@
273	281	pmd_t *pmd;
274	282	pte_t *pte;
275	283	pte_t entry;
276		- int ret = 0;
277		-
278		- if (notify_page_fault(regs, lookup_exception_vector()))
279		- goto out;
280		-
281		- ret = 1;
	284	+ int ret = 1;
282	285
283	286	/*
284	287	* We don't take page faults for P1, P2, and parts of P4, these
...	...	@@ -3,7 +3,7 @@
3	3	*
4	4	* Copyright (C) 2000, 2001 Paolo Alberelli
5	5	* Copyright (C) 2003 Richard Curnow (/proc/tlb, bug fixes)
6		- * Copyright (C) 2003 Paul Mundt
	6	+ * Copyright (C) 2003 - 2009 Paul Mundt
7	7	*
8	8	* This file is subject to the terms and conditions of the GNU General Public
9	9	* License. See the file "COPYING" in the main directory of this archive
...	...	@@ -20,6 +20,7 @@
20	20	#include <linux/mman.h>
21	21	#include <linux/mm.h>
22	22	#include <linux/smp.h>
	23	+#include <linux/perf_counter.h>
23	24	#include <linux/interrupt.h>
24	25	#include <asm/system.h>
25	26	#include <asm/io.h>
...	...	@@ -115,6 +116,8 @@
115	116	/* Not an IO address, so reenable interrupts */
116	117	local_irq_enable();
117	118
	119	+ perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
	120	+
118	121	/*
119	122	* If we're in an interrupt or have no user
120	123	* context, we must not take the fault..
121	124
122	125
...	...	@@ -195,10 +198,16 @@
195	198	goto do_sigbus;
196	199	BUG();
197	200	}
198		- if (fault & VM_FAULT_MAJOR)
	201	+
	202	+ if (fault & VM_FAULT_MAJOR) {
199	203	tsk->maj_flt++;
200		- else
	204	+ perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
	205	+ regs, address);
	206	+ } else {
201	207	tsk->min_flt++;
	208	+ perf_swcounter_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
	209	+ regs, address);
	210	+ }
202	211
203	212	/* If we get here, the page fault has been handled. Do the TLB refill
204	213	now from the newly-setup PTE, to avoid having to fault again right