Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e11611a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 5965/1: Fix soft lockup in at91 udc driver
  ARM: 6006/1: ARM: Use the correct NOP size in memmove for Thumb-2 kernel builds
  ARM: 6005/1: arm: kprobes: fix register corruption with jprobes
  ARM: 6003/1: removing compilation warning from pl061.h
  ARM: 6001/1: removing compilation warning comming from clkdev.h
  ARM: 6000/1: removing compilation warning comming from <asm/irq.h>
  ARM: 5999/1: Including device.h and resource.h header files in linux/amba/bus.h
  ARM: 5997/1: ARM: Correct the VFPv3 detection
  ARM: 5996/1: ARM: Change the mandatory barriers implementation (4/4)
  ARM: 5995/1: ARM: Add L2x0 outer_sync() support (3/4)
  ARM: 5994/1: ARM: Add outer_cache_fns.sync function pointer (2/4)
  ARM: 5993/1: ARM: Move the outer_cache definitions into a separate file (1/4)
parents d4509e5a c6c35237

arch/arm/include/asm/cacheflush.h

+1 −37
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <asm/glue.h>

#include <asm/shmparam.h>

#include <asm/cachetype.h>

#include <asm/outercache.h>



#define CACHE_COLOUR(vaddr)	((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
@@ -219,12 +220,6 @@ struct cpu_cache_fns { 
	void (*dma_flush_range)(const void *, const void *);

};



struct outer_cache_fns {

	void (*inv_range)(unsigned long, unsigned long);

	void (*clean_range)(unsigned long, unsigned long);

	void (*flush_range)(unsigned long, unsigned long);

};



/*

 * Select the calling method

 */
@@ -281,37 +276,6 @@ extern void dmac_flush_range(const void *, const void *); 


#endif



#ifdef CONFIG_OUTER_CACHE



extern struct outer_cache_fns outer_cache;



static inline void outer_inv_range(unsigned long start, unsigned long end)

{

	if (outer_cache.inv_range)

		outer_cache.inv_range(start, end);

}

static inline void outer_clean_range(unsigned long start, unsigned long end)

{

	if (outer_cache.clean_range)

		outer_cache.clean_range(start, end);

}

static inline void outer_flush_range(unsigned long start, unsigned long end)

{

	if (outer_cache.flush_range)

		outer_cache.flush_range(start, end);

}



#else



static inline void outer_inv_range(unsigned long start, unsigned long end)

{ }

static inline void outer_clean_range(unsigned long start, unsigned long end)

{ }

static inline void outer_flush_range(unsigned long start, unsigned long end)

{ }



#endif



/*

 * Copy user data from/to a page which is mapped into a different

 * processes address space.  Really, we want to allow our "user

arch/arm/include/asm/clkdev.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define __ASM_CLKDEV_H



struct clk;

struct device;



struct clk_lookup {

	struct list_head	node;

arch/arm/include/asm/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#ifndef __ASSEMBLY__

struct irqaction;

struct pt_regs;

extern void migrate_irqs(void);



extern void asm_do_IRQ(unsigned int, struct pt_regs *);

arch/arm/include/asm/outercache.h

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/include/asm/outercache.h

 *

 * Copyright (C) 2010 ARM Ltd.

 * Written by Catalin Marinas <catalin.marinas@arm.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */



#ifndef __ASM_OUTERCACHE_H

#define __ASM_OUTERCACHE_H



struct outer_cache_fns {

	void (*inv_range)(unsigned long, unsigned long);

	void (*clean_range)(unsigned long, unsigned long);

	void (*flush_range)(unsigned long, unsigned long);

#ifdef CONFIG_OUTER_CACHE_SYNC

	void (*sync)(void);

#endif

};



#ifdef CONFIG_OUTER_CACHE



extern struct outer_cache_fns outer_cache;



static inline void outer_inv_range(unsigned long start, unsigned long end)

{

	if (outer_cache.inv_range)

		outer_cache.inv_range(start, end);

}

static inline void outer_clean_range(unsigned long start, unsigned long end)

{

	if (outer_cache.clean_range)

		outer_cache.clean_range(start, end);

}

static inline void outer_flush_range(unsigned long start, unsigned long end)

{

	if (outer_cache.flush_range)

		outer_cache.flush_range(start, end);

}



#else



static inline void outer_inv_range(unsigned long start, unsigned long end)

{ }

static inline void outer_clean_range(unsigned long start, unsigned long end)

{ }

static inline void outer_flush_range(unsigned long start, unsigned long end)

{ }



#endif



#ifdef CONFIG_OUTER_CACHE_SYNC

static inline void outer_sync(void)

{

	if (outer_cache.sync)

		outer_cache.sync();

}

#else

static inline void outer_sync(void)

{ }

#endif



#endif	/* __ASM_OUTERCACHE_H */

arch/arm/include/asm/system.h

+10 −6
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#include <linux/linkage.h>

#include <linux/irqflags.h>



#include <asm/outercache.h>



#define __exception	__attribute__((section(".exception.text")))



struct thread_info;
@@ -137,10 +139,12 @@ extern unsigned int user_debug; 
#define dmb() __asm__ __volatile__ ("" : : : "memory")

#endif



#if __LINUX_ARM_ARCH__ >= 7 || defined(CONFIG_SMP)

#define mb()		dmb()

#ifdef CONFIG_ARCH_HAS_BARRIERS

#include <mach/barriers.h>

#elif __LINUX_ARM_ARCH__ >= 7 || defined(CONFIG_SMP)

#define mb()		do { dsb(); outer_sync(); } while (0)

#define rmb()		dmb()

#define wmb()		dmb()

#define wmb()		mb()

#else

#define mb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)

#define rmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
@@ -152,9 +156,9 @@ extern unsigned int user_debug; 
#define smp_rmb()	barrier()

#define smp_wmb()	barrier()

#else

#define smp_mb()	mb()

#define smp_rmb()	rmb()

#define smp_wmb()	wmb()

#define smp_mb()	dmb()

#define smp_rmb()	dmb()

#define smp_wmb()	dmb()

#endif



#define read_barrier_depends()		do { } while(0)