[MTD] XIP cleanup
Move the architecture dependend code into include/asm/mtd-xip.h Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
b9c86d595d
commit
97f927a4d7
6 changed files with 104 additions and 20 deletions
|
@ -845,7 +845,7 @@ static void __xipram xip_enable(struct map_info *map, struct flchip *chip,
|
|||
chip->state = FL_READY;
|
||||
}
|
||||
(void) map_read(map, adr);
|
||||
asm volatile (".rep 8; nop; .endr"); /* fill instruction prefetch */
|
||||
xip_iprefetch();
|
||||
local_irq_enable();
|
||||
}
|
||||
|
||||
|
|
|
@ -600,7 +600,7 @@ static void __xipram xip_enable(struct map_info *map, struct flchip *chip,
|
|||
chip->state = FL_READY;
|
||||
}
|
||||
(void) map_read(map, adr);
|
||||
asm volatile (".rep 8; nop; .endr"); /* fill instruction prefetch */
|
||||
xip_iprefetch();
|
||||
local_irq_enable();
|
||||
}
|
||||
|
||||
|
|
37
include/asm-arm/arch-pxa/mtd-xip.h
Normal file
37
include/asm-arm/arch-pxa/mtd-xip.h
Normal file
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* MTD primitives for XIP support. Architecture specific functions
|
||||
*
|
||||
* Do not include this file directly. It's included from linux/mtd/xip.h
|
||||
*
|
||||
* Author: Nicolas Pitre
|
||||
* Created: Nov 2, 2004
|
||||
* Copyright: (C) 2004 MontaVista Software, Inc.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $
|
||||
*/
|
||||
|
||||
#ifndef __ARCH_PXA_MTD_XIP_H__
|
||||
#define __ARCH_PXA_MTD_XIP_H__
|
||||
|
||||
#include <asm/arch/pxa-regs.h>
|
||||
|
||||
#define xip_irqpending() (ICIP & ICMR)
|
||||
|
||||
/* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */
|
||||
#define xip_currtime() (OSCR)
|
||||
#define xip_elapsed_since(x) (signed)((OSCR - (x)) / 4)
|
||||
|
||||
/*
|
||||
* xip_cpu_idle() is used when waiting for a delay equal or larger than
|
||||
* the system timer tick period. This should put the CPU into idle mode
|
||||
* to save power and to be woken up only when some interrupts are pending.
|
||||
* As above, this should not rely upon standard kernel code.
|
||||
*/
|
||||
|
||||
#define xip_cpu_idle() asm volatile ("mcr p14, 0, %0, c7, c0, 0" :: "r" (1))
|
||||
|
||||
#endif /* __ARCH_PXA_MTD_XIP_H__ */
|
26
include/asm-arm/arch-sa1100/mtd-xip.h
Normal file
26
include/asm-arm/arch-sa1100/mtd-xip.h
Normal file
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* MTD primitives for XIP support. Architecture specific functions
|
||||
*
|
||||
* Do not include this file directly. It's included from linux/mtd/xip.h
|
||||
*
|
||||
* Author: Nicolas Pitre
|
||||
* Created: Nov 2, 2004
|
||||
* Copyright: (C) 2004 MontaVista Software, Inc.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $
|
||||
*/
|
||||
|
||||
#ifndef __ARCH_SA1100_MTD_XIP_H__
|
||||
#define __ARCH_SA1100_MTD_XIP_H__
|
||||
|
||||
#define xip_irqpending() (ICIP & ICMR)
|
||||
|
||||
/* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */
|
||||
#define xip_currtime() (OSCR)
|
||||
#define xip_elapsed_since(x) (signed)((OSCR - (x)) / 4)
|
||||
|
||||
#endif /* __ARCH_SA1100_MTD_XIP_H__ */
|
26
include/asm-arm/mtd-xip.h
Normal file
26
include/asm-arm/mtd-xip.h
Normal file
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* MTD primitives for XIP support. Architecture specific functions
|
||||
*
|
||||
* Do not include this file directly. It's included from linux/mtd/xip.h
|
||||
*
|
||||
* Author: Nicolas Pitre
|
||||
* Created: Nov 2, 2004
|
||||
* Copyright: (C) 2004 MontaVista Software, Inc.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* $Id: xip.h,v 1.2 2004/12/01 15:49:10 nico Exp $
|
||||
*/
|
||||
|
||||
#ifndef __ARM_MTD_XIP_H__
|
||||
#define __ARM_MTD_XIP_H__
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/arch/mtd-xip.h>
|
||||
|
||||
/* fill instruction prefetch */
|
||||
#define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0)
|
||||
|
||||
#endif /* __ARM_MTD_XIP_H__ */
|
|
@ -58,22 +58,16 @@
|
|||
* returned value is <= the real elapsed time.
|
||||
* note 2: this should be able to cope with a few seconds without
|
||||
* overflowing.
|
||||
*
|
||||
* xip_iprefetch()
|
||||
*
|
||||
* Macro to fill instruction prefetch
|
||||
* e.g. a series of nops: asm volatile (".rep 8; nop; .endr");
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_ARCH_SA1100) || defined(CONFIG_ARCH_PXA)
|
||||
#include <asm/mtd-xip.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#ifdef CONFIG_ARCH_PXA
|
||||
#include <asm/arch/pxa-regs.h>
|
||||
#endif
|
||||
|
||||
#define xip_irqpending() (ICIP & ICMR)
|
||||
|
||||
/* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */
|
||||
#define xip_currtime() (OSCR)
|
||||
#define xip_elapsed_since(x) (signed)((OSCR - (x)) / 4)
|
||||
|
||||
#else
|
||||
#ifndef xip_irqpending
|
||||
|
||||
#warning "missing IRQ and timer primitives for XIP MTD support"
|
||||
#warning "some of the XIP MTD support code will be disabled"
|
||||
|
@ -85,16 +79,17 @@
|
|||
|
||||
#endif
|
||||
|
||||
#ifndef xip_iprefetch
|
||||
#define xip_iprefetch() do { } while (0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* xip_cpu_idle() is used when waiting for a delay equal or larger than
|
||||
* the system timer tick period. This should put the CPU into idle mode
|
||||
* to save power and to be woken up only when some interrupts are pending.
|
||||
* As above, this should not rely upon standard kernel code.
|
||||
* This should not rely upon standard kernel code.
|
||||
*/
|
||||
|
||||
#if defined(CONFIG_CPU_XSCALE)
|
||||
#define xip_cpu_idle() asm volatile ("mcr p14, 0, %0, c7, c0, 0" :: "r" (1))
|
||||
#else
|
||||
#ifndef xip_cpu_idle
|
||||
#define xip_cpu_idle() do { } while (0)
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue