mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 00:17:44 +00:00
c6f54a9b39
The platforms selecting NEED_MACH_MEMORY_H defined the start address of their physical memory in the respective <mach/memory.h>. With ARM_PATCH_PHYS_VIRT=y (which is quite common today) this is useless though because the definition isn't used but determined dynamically. So remove the definitions from all <mach/memory.h> and provide the Kconfig symbol PHYS_OFFSET with the respective defaults in case ARM_PATCH_PHYS_VIRT isn't enabled. This allows to drop the dependency of PHYS_OFFSET on !NEED_MACH_MEMORY_H which prevents compiling an integrator nommu-kernel. (CONFIG_PAGE_OFFSET which has "default PHYS_OFFSET if !MMU" expanded to "0x" because CONFIG_PHYS_OFFSET doesn't exist as INTEGRATOR selects NEED_MACH_MEMORY_H.) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
51 lines
1.4 KiB
C
51 lines
1.4 KiB
C
/*
|
|
* arch/arm/mach-ks8695/include/mach/memory.h
|
|
*
|
|
* Copyright (C) 2006 Andrew Victor
|
|
*
|
|
* KS8695 Memory definitions
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_MEMORY_H
|
|
#define __ASM_ARCH_MEMORY_H
|
|
|
|
#include <mach/hardware.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#ifdef CONFIG_PCI
|
|
|
|
/* PCI mappings */
|
|
#define __virt_to_bus(x) ((x) - PAGE_OFFSET + KS8695_PCIMEM_PA)
|
|
#define __bus_to_virt(x) ((x) - KS8695_PCIMEM_PA + PAGE_OFFSET)
|
|
|
|
/* Platform-bus mapping */
|
|
extern struct bus_type platform_bus_type;
|
|
#define is_lbus_device(dev) (dev && dev->bus == &platform_bus_type)
|
|
#define __arch_dma_to_virt(dev, x) ({ (void *) (is_lbus_device(dev) ? \
|
|
__phys_to_virt(x) : __bus_to_virt(x)); })
|
|
#define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \
|
|
(dma_addr_t)__virt_to_phys((unsigned long)x) \
|
|
: (dma_addr_t)__virt_to_bus(x); })
|
|
#define __arch_pfn_to_dma(dev, pfn) \
|
|
({ dma_addr_t __dma = __pfn_to_phys(pfn); \
|
|
if (!is_lbus_device(dev)) \
|
|
__dma = __dma - PHYS_OFFSET + KS8695_PCIMEM_PA; \
|
|
__dma; })
|
|
|
|
#define __arch_dma_to_pfn(dev, x) \
|
|
({ dma_addr_t __dma = x; \
|
|
if (!is_lbus_device(dev)) \
|
|
__dma += PHYS_OFFSET - KS8695_PCIMEM_PA; \
|
|
__phys_to_pfn(__dma); \
|
|
})
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|