dd94d35589
Commit b713aa0b15 "ARM: fix asm/memory.h build error" broke some
configurations on mach-realview with sparsemem enabled, which
is missing a definition of PHYS_OFFSET:
arch/arm/include/asm/memory.h:268:42: error: 'PHYS_OFFSET' undeclared (first use in this function)
#define PHYS_PFN_OFFSET ((unsigned long)(PHYS_OFFSET >> PAGE_SHIFT))
arch/arm/include/asm/dma-mapping.h:104:9: note: in expansion of macro 'PHYS_PFN_OFFSET'
return PHYS_PFN_OFFSET + dma_to_pfn(dev, *dev->dma_mask);
An easy workaround is for realview to define PHYS_OFFSET itself,
in the same way we define it for platforms that don't have a private
__virt_to_phys function.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
74 lines
2.2 KiB
C
74 lines
2.2 KiB
C
/*
|
|
* arch/arm/mach-realview/include/mach/memory.h
|
|
*
|
|
* Copyright (C) 2003 ARM Limited
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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_ARCH_MEMORY_H
|
|
#define __ASM_ARCH_MEMORY_H
|
|
|
|
/*
|
|
* Physical DRAM offset.
|
|
*/
|
|
#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
|
|
#define PLAT_PHYS_OFFSET UL(0x70000000)
|
|
#else
|
|
#define PLAT_PHYS_OFFSET UL(0x00000000)
|
|
#endif
|
|
|
|
#ifdef CONFIG_SPARSEMEM
|
|
|
|
/*
|
|
* Sparsemem definitions for RealView PBX.
|
|
*
|
|
* The RealView PBX board has another block of 512MB of RAM at 0x20000000,
|
|
* however only the block at 0x70000000 (or the 256MB mirror at 0x00000000)
|
|
* may be used for DMA.
|
|
*
|
|
* The macros below define a section size of 256MB and a non-linear virtual to
|
|
* physical mapping:
|
|
*
|
|
* 256MB @ 0x00000000 -> PAGE_OFFSET
|
|
* 512MB @ 0x20000000 -> PAGE_OFFSET + 0x10000000
|
|
* 256MB @ 0x80000000 -> PAGE_OFFSET + 0x30000000
|
|
*/
|
|
#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
|
|
#error "SPARSEMEM not available with REALVIEW_HIGH_PHYS_OFFSET"
|
|
#endif
|
|
|
|
#define MAX_PHYSMEM_BITS 32
|
|
#define SECTION_SIZE_BITS 28
|
|
|
|
/* bank page offsets */
|
|
#define PAGE_OFFSET1 (PAGE_OFFSET + 0x10000000)
|
|
#define PAGE_OFFSET2 (PAGE_OFFSET + 0x30000000)
|
|
|
|
#define PHYS_OFFSET PLAT_PHYS_OFFSET
|
|
|
|
#define __phys_to_virt(phys) \
|
|
((phys) >= 0x80000000 ? (phys) - 0x80000000 + PAGE_OFFSET2 : \
|
|
(phys) >= 0x20000000 ? (phys) - 0x20000000 + PAGE_OFFSET1 : \
|
|
(phys) + PAGE_OFFSET)
|
|
|
|
#define __virt_to_phys(virt) \
|
|
((virt) >= PAGE_OFFSET2 ? (virt) - PAGE_OFFSET2 + 0x80000000 : \
|
|
(virt) >= PAGE_OFFSET1 ? (virt) - PAGE_OFFSET1 + 0x20000000 : \
|
|
(virt) - PAGE_OFFSET)
|
|
|
|
#endif /* CONFIG_SPARSEMEM */
|
|
|
|
#endif
|