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

Commit 33f663ff authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

ARM: 5993/1: ARM: Move the outer_cache definitions into a separate file (1/4) 



To avoid #include collisions with subsequent patches in the series, this
patch moves the outer_cache definitions to a separate asm/outercache.h
file.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 01e77706

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/outercache.h

0 → 100644
+61 −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



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



#endif	/* __ASM_OUTERCACHE_H */