Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
05e34754
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05e34754
编写于
3月 16, 2011
作者:
R
Russell King
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'p2v' into devel
Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S
上级
bd1274dc
b511d75d
变更
86
隐藏空白更改
内联
并排
Showing
86 changed file
with
434 addition
and
189 deletion
+434
-189
arch/arm/Kconfig
arch/arm/Kconfig
+16
-0
arch/arm/include/asm/memory.h
arch/arm/include/asm/memory.h
+61
-14
arch/arm/include/asm/module.h
arch/arm/include/asm/module.h
+25
-2
arch/arm/kernel/armksyms.c
arch/arm/kernel/armksyms.c
+4
-0
arch/arm/kernel/head.S
arch/arm/kernel/head.S
+159
-25
arch/arm/kernel/module.c
arch/arm/kernel/module.c
+7
-1
arch/arm/kernel/setup.c
arch/arm/kernel/setup.c
+39
-34
arch/arm/kernel/tcm.c
arch/arm/kernel/tcm.c
+1
-1
arch/arm/kernel/vmlinux.lds.S
arch/arm/kernel/vmlinux.lds.S
+4
-0
arch/arm/mach-aaec2000/include/mach/memory.h
arch/arm/mach-aaec2000/include/mach/memory.h
+1
-1
arch/arm/mach-at91/include/mach/memory.h
arch/arm/mach-at91/include/mach/memory.h
+1
-1
arch/arm/mach-bcmring/include/mach/hardware.h
arch/arm/mach-bcmring/include/mach/hardware.h
+1
-1
arch/arm/mach-bcmring/include/mach/memory.h
arch/arm/mach-bcmring/include/mach/memory.h
+1
-1
arch/arm/mach-clps711x/include/mach/memory.h
arch/arm/mach-clps711x/include/mach/memory.h
+1
-1
arch/arm/mach-cns3xxx/include/mach/memory.h
arch/arm/mach-cns3xxx/include/mach/memory.h
+1
-1
arch/arm/mach-davinci/include/mach/memory.h
arch/arm/mach-davinci/include/mach/memory.h
+2
-2
arch/arm/mach-dove/include/mach/memory.h
arch/arm/mach-dove/include/mach/memory.h
+1
-1
arch/arm/mach-ebsa110/include/mach/memory.h
arch/arm/mach-ebsa110/include/mach/memory.h
+1
-1
arch/arm/mach-ep93xx/include/mach/memory.h
arch/arm/mach-ep93xx/include/mach/memory.h
+5
-5
arch/arm/mach-footbridge/include/mach/memory.h
arch/arm/mach-footbridge/include/mach/memory.h
+1
-1
arch/arm/mach-gemini/include/mach/memory.h
arch/arm/mach-gemini/include/mach/memory.h
+2
-2
arch/arm/mach-h720x/include/mach/memory.h
arch/arm/mach-h720x/include/mach/memory.h
+1
-1
arch/arm/mach-integrator/include/mach/memory.h
arch/arm/mach-integrator/include/mach/memory.h
+1
-1
arch/arm/mach-iop13xx/include/mach/memory.h
arch/arm/mach-iop13xx/include/mach/memory.h
+1
-1
arch/arm/mach-iop32x/include/mach/memory.h
arch/arm/mach-iop32x/include/mach/memory.h
+1
-1
arch/arm/mach-iop33x/include/mach/memory.h
arch/arm/mach-iop33x/include/mach/memory.h
+1
-1
arch/arm/mach-ixp2000/include/mach/memory.h
arch/arm/mach-ixp2000/include/mach/memory.h
+1
-1
arch/arm/mach-ixp23xx/include/mach/memory.h
arch/arm/mach-ixp23xx/include/mach/memory.h
+1
-1
arch/arm/mach-ixp4xx/include/mach/memory.h
arch/arm/mach-ixp4xx/include/mach/memory.h
+1
-1
arch/arm/mach-kirkwood/include/mach/memory.h
arch/arm/mach-kirkwood/include/mach/memory.h
+1
-1
arch/arm/mach-ks8695/include/mach/memory.h
arch/arm/mach-ks8695/include/mach/memory.h
+1
-1
arch/arm/mach-lh7a40x/include/mach/memory.h
arch/arm/mach-lh7a40x/include/mach/memory.h
+1
-1
arch/arm/mach-loki/include/mach/memory.h
arch/arm/mach-loki/include/mach/memory.h
+1
-1
arch/arm/mach-lpc32xx/include/mach/memory.h
arch/arm/mach-lpc32xx/include/mach/memory.h
+1
-1
arch/arm/mach-mmp/include/mach/memory.h
arch/arm/mach-mmp/include/mach/memory.h
+1
-1
arch/arm/mach-msm/board-msm7x27.c
arch/arm/mach-msm/board-msm7x27.c
+4
-4
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-msm7x30.c
+4
-4
arch/arm/mach-msm/board-qsd8x50.c
arch/arm/mach-msm/board-qsd8x50.c
+2
-2
arch/arm/mach-msm/board-sapphire.c
arch/arm/mach-msm/board-sapphire.c
+1
-1
arch/arm/mach-msm/include/mach/memory.h
arch/arm/mach-msm/include/mach/memory.h
+5
-5
arch/arm/mach-mv78xx0/include/mach/memory.h
arch/arm/mach-mv78xx0/include/mach/memory.h
+1
-1
arch/arm/mach-mx3/mach-kzm_arm11_01.c
arch/arm/mach-mx3/mach-kzm_arm11_01.c
+1
-1
arch/arm/mach-netx/include/mach/memory.h
arch/arm/mach-netx/include/mach/memory.h
+1
-1
arch/arm/mach-nomadik/include/mach/memory.h
arch/arm/mach-nomadik/include/mach/memory.h
+1
-1
arch/arm/mach-ns9xxx/include/mach/memory.h
arch/arm/mach-ns9xxx/include/mach/memory.h
+1
-1
arch/arm/mach-nuc93x/include/mach/memory.h
arch/arm/mach-nuc93x/include/mach/memory.h
+1
-1
arch/arm/mach-omap1/include/mach/debug-macro.S
arch/arm/mach-omap1/include/mach/debug-macro.S
+6
-3
arch/arm/mach-omap2/include/mach/debug-macro.S
arch/arm/mach-omap2/include/mach/debug-macro.S
+8
-5
arch/arm/mach-orion5x/include/mach/memory.h
arch/arm/mach-orion5x/include/mach/memory.h
+1
-1
arch/arm/mach-pnx4008/include/mach/memory.h
arch/arm/mach-pnx4008/include/mach/memory.h
+1
-1
arch/arm/mach-pxa/balloon3.c
arch/arm/mach-pxa/balloon3.c
+1
-1
arch/arm/mach-pxa/include/mach/memory.h
arch/arm/mach-pxa/include/mach/memory.h
+1
-1
arch/arm/mach-realview/include/mach/memory.h
arch/arm/mach-realview/include/mach/memory.h
+2
-2
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_eb.c
+1
-1
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb1176.c
+1
-1
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pb11mp.c
+1
-1
arch/arm/mach-realview/realview_pba8.c
arch/arm/mach-realview/realview_pba8.c
+1
-1
arch/arm/mach-realview/realview_pbx.c
arch/arm/mach-realview/realview_pbx.c
+1
-1
arch/arm/mach-rpc/include/mach/memory.h
arch/arm/mach-rpc/include/mach/memory.h
+1
-1
arch/arm/mach-s3c2400/include/mach/memory.h
arch/arm/mach-s3c2400/include/mach/memory.h
+1
-1
arch/arm/mach-s3c2410/include/mach/memory.h
arch/arm/mach-s3c2410/include/mach/memory.h
+1
-1
arch/arm/mach-s3c24a0/include/mach/memory.h
arch/arm/mach-s3c24a0/include/mach/memory.h
+1
-1
arch/arm/mach-s3c64xx/include/mach/memory.h
arch/arm/mach-s3c64xx/include/mach/memory.h
+1
-1
arch/arm/mach-s5p6442/include/mach/memory.h
arch/arm/mach-s5p6442/include/mach/memory.h
+1
-1
arch/arm/mach-s5p64x0/include/mach/memory.h
arch/arm/mach-s5p64x0/include/mach/memory.h
+1
-1
arch/arm/mach-s5pc100/include/mach/memory.h
arch/arm/mach-s5pc100/include/mach/memory.h
+1
-1
arch/arm/mach-s5pv210/include/mach/memory.h
arch/arm/mach-s5pv210/include/mach/memory.h
+1
-1
arch/arm/mach-s5pv310/include/mach/memory.h
arch/arm/mach-s5pv310/include/mach/memory.h
+1
-1
arch/arm/mach-sa1100/include/mach/memory.h
arch/arm/mach-sa1100/include/mach/memory.h
+1
-1
arch/arm/mach-shark/include/mach/memory.h
arch/arm/mach-shark/include/mach/memory.h
+1
-1
arch/arm/mach-shmobile/include/mach/memory.h
arch/arm/mach-shmobile/include/mach/memory.h
+1
-1
arch/arm/mach-tcc8k/board-tcc8000-sdk.c
arch/arm/mach-tcc8k/board-tcc8000-sdk.c
+1
-1
arch/arm/mach-tegra/include/mach/memory.h
arch/arm/mach-tegra/include/mach/memory.h
+1
-1
arch/arm/mach-u300/include/mach/memory.h
arch/arm/mach-u300/include/mach/memory.h
+3
-3
arch/arm/mach-u300/u300.c
arch/arm/mach-u300/u300.c
+1
-1
arch/arm/mach-ux500/include/mach/memory.h
arch/arm/mach-ux500/include/mach/memory.h
+1
-1
arch/arm/mach-versatile/include/mach/memory.h
arch/arm/mach-versatile/include/mach/memory.h
+1
-1
arch/arm/mach-vexpress/ct-ca9x4.c
arch/arm/mach-vexpress/ct-ca9x4.c
+1
-1
arch/arm/mach-vexpress/include/mach/memory.h
arch/arm/mach-vexpress/include/mach/memory.h
+1
-1
arch/arm/mach-w90x900/include/mach/memory.h
arch/arm/mach-w90x900/include/mach/memory.h
+1
-1
arch/arm/plat-mxc/include/mach/memory.h
arch/arm/plat-mxc/include/mach/memory.h
+9
-9
arch/arm/plat-omap/include/plat/memory.h
arch/arm/plat-omap/include/plat/memory.h
+2
-2
arch/arm/plat-omap/include/plat/serial.h
arch/arm/plat-omap/include/plat/serial.h
+1
-1
arch/arm/plat-spear/include/plat/memory.h
arch/arm/plat-spear/include/plat/memory.h
+1
-1
arch/arm/plat-stmp3xxx/include/mach/memory.h
arch/arm/plat-stmp3xxx/include/mach/memory.h
+1
-1
arch/arm/plat-tcc/include/mach/memory.h
arch/arm/plat-tcc/include/mach/memory.h
+1
-1
未找到文件。
arch/arm/Kconfig
浏览文件 @
05e34754
...
...
@@ -190,6 +190,22 @@ config VECTORS_BASE
help
The base address of exception vectors.
config ARM_PATCH_PHYS_VIRT
bool "Patch physical to virtual translations at runtime (EXPERIMENTAL)"
depends on EXPERIMENTAL
depends on !XIP_KERNEL && MMU
depends on !ARCH_REALVIEW || !SPARSEMEM
help
Patch phys-to-virt translation functions at runtime according to
the position of the kernel in system memory.
This can only be used with non-XIP with MMU kernels where
the base of physical memory is at a 16MB boundary.
config ARM_PATCH_PHYS_VIRT_16BIT
def_bool y
depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
source "init/Kconfig"
source "kernel/Kconfig.freezer"
...
...
arch/arm/include/asm/memory.h
浏览文件 @
05e34754
...
...
@@ -15,6 +15,7 @@
#include <linux/compiler.h>
#include <linux/const.h>
#include <linux/types.h>
#include <mach/memory.h>
#include <asm/sizes.h>
...
...
@@ -132,21 +133,11 @@
#define DTCM_OFFSET UL(0xfffe8000)
#endif
/*
* Physical vs virtual RAM address space conversion. These are
* private definitions which should NOT be used outside memory.h
* files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
*/
#ifndef __virt_to_phys
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
#endif
/*
* Convert a physical address to a Page Frame Number and back
*/
#define __phys_to_pfn(paddr) ((
paddr) >> PAGE_SHIFT
)
#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT)
#define __phys_to_pfn(paddr) ((
unsigned long)((paddr) >> PAGE_SHIFT)
)
#define __pfn_to_phys(pfn) ((p
hys_addr_t)(p
fn) << PAGE_SHIFT)
/*
* Convert a page to/from a physical address
...
...
@@ -156,6 +147,62 @@
#ifndef __ASSEMBLY__
/*
* Physical vs virtual RAM address space conversion. These are
* private definitions which should NOT be used outside memory.h
* files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
*/
#ifndef __virt_to_phys
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
/*
* Constants used to force the right instruction encodings and shifts
* so that all we need to do is modify the 8-bit constant field.
*/
#define __PV_BITS_31_24 0x81000000
#define __PV_BITS_23_16 0x00810000
extern
unsigned
long
__pv_phys_offset
;
#define PHYS_OFFSET __pv_phys_offset
#define __pv_stub(from,to,instr,type) \
__asm__("@ __pv_stub\n" \
"1: " instr " %0, %1, %2\n" \
" .pushsection .pv_table,\"a\"\n" \
" .long 1b\n" \
" .popsection\n" \
: "=r" (to) \
: "r" (from), "I" (type))
static
inline
unsigned
long
__virt_to_phys
(
unsigned
long
x
)
{
unsigned
long
t
;
__pv_stub
(
x
,
t
,
"add"
,
__PV_BITS_31_24
);
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
__pv_stub
(
t
,
t
,
"add"
,
__PV_BITS_23_16
);
#endif
return
t
;
}
static
inline
unsigned
long
__phys_to_virt
(
unsigned
long
x
)
{
unsigned
long
t
;
__pv_stub
(
x
,
t
,
"sub"
,
__PV_BITS_31_24
);
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
__pv_stub
(
t
,
t
,
"sub"
,
__PV_BITS_23_16
);
#endif
return
t
;
}
#else
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
#endif
#endif
#ifndef PHYS_OFFSET
#define PHYS_OFFSET PLAT_PHYS_OFFSET
#endif
/*
* The DMA mask corresponding to the maximum bus address allocatable
* using GFP_DMA. The default here places no restriction on DMA
...
...
@@ -188,12 +235,12 @@
* translation for translating DMA addresses. Use the driver
* DMA support - see dma-mapping.h.
*/
static
inline
unsigned
long
virt_to_phys
(
const
volatile
void
*
x
)
static
inline
phys_addr_t
virt_to_phys
(
const
volatile
void
*
x
)
{
return
__virt_to_phys
((
unsigned
long
)(
x
));
}
static
inline
void
*
phys_to_virt
(
unsigned
long
x
)
static
inline
void
*
phys_to_virt
(
phys_addr_t
x
)
{
return
(
void
*
)(
__phys_to_virt
((
unsigned
long
)(
x
)));
}
...
...
arch/arm/include/asm/module.h
浏览文件 @
05e34754
...
...
@@ -25,8 +25,31 @@ struct mod_arch_specific {
};
/*
*
Include the ARM architecture version.
*
Add the ARM architecture version to the version magic string
*/
#define MODULE_ARCH_VERMAGIC "ARMv" __stringify(__LINUX_ARM_ARCH__) " "
#define MODULE_ARCH_VERMAGIC_ARMVSN "ARMv" __stringify(__LINUX_ARM_ARCH__) " "
/* Add __virt_to_phys patching state as well */
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
#define MODULE_ARCH_VERMAGIC_P2V "p2v16 "
#else
#define MODULE_ARCH_VERMAGIC_P2V "p2v8 "
#endif
#else
#define MODULE_ARCH_VERMAGIC_P2V ""
#endif
/* Add instruction set architecture tag to distinguish ARM/Thumb kernels */
#ifdef CONFIG_THUMB2_KERNEL
#define MODULE_ARCH_VERMAGIC_ARMTHUMB "thumb2 "
#else
#define MODULE_ARCH_VERMAGIC_ARMTHUMB ""
#endif
#define MODULE_ARCH_VERMAGIC \
MODULE_ARCH_VERMAGIC_ARMVSN \
MODULE_ARCH_VERMAGIC_ARMTHUMB \
MODULE_ARCH_VERMAGIC_P2V
#endif
/* _ASM_ARM_MODULE_H */
arch/arm/kernel/armksyms.c
浏览文件 @
05e34754
...
...
@@ -164,3 +164,7 @@ EXPORT_SYMBOL(mcount);
#endif
EXPORT_SYMBOL
(
__gnu_mcount_nc
);
#endif
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
EXPORT_SYMBOL
(
__pv_phys_offset
);
#endif
arch/arm/kernel/head.S
浏览文件 @
05e34754
...
...
@@ -26,14 +26,6 @@
#include <mach/debug-macro.S>
#endif
#if (PHYS_OFFSET & 0x001fffff)
#error "PHYS_OFFSET must be at an even 2MiB boundary!"
#endif
#define KERNEL_RAM_VADDR (PAGE_OFFSET + TEXT_OFFSET)
#define KERNEL_RAM_PADDR (PHYS_OFFSET + TEXT_OFFSET)
/*
*
swapper_pg_dir
is
the
virtual
address
of
the
initial
page
table
.
*
We
place
the
page
tables
16
K
below
KERNEL_RAM_VADDR
.
Therefore
,
we
must
...
...
@@ -41,6 +33,7 @@
*
the
least
significant
16
bits
to
be
0x8000
,
but
we
could
probably
*
relax
this
restriction
to
KERNEL_RAM_VADDR
>=
PAGE_OFFSET
+
0x4000
.
*/
#define KERNEL_RAM_VADDR (PAGE_OFFSET + TEXT_OFFSET)
#if (KERNEL_RAM_VADDR & 0xffff) != 0x8000
#error KERNEL_RAM_VADDR must start at 0xXXXX8000
#endif
...
...
@@ -48,8 +41,8 @@
.
globl
swapper_pg_dir
.
equ
swapper_pg_dir
,
KERNEL_RAM_VADDR
-
0x4000
.
macro
pgtbl
,
rd
ldr
\
rd
,
=(
KERNEL_RAM_PADDR
-
0x4000
)
.
macro
pgtbl
,
rd
,
phys
add
\
rd
,
\
phys
,
#
TEXT_OFFSET
-
0x4000
.
endm
#ifdef CONFIG_XIP_KERNEL
...
...
@@ -88,13 +81,25 @@ ENTRY(stext)
THUMB
(
it
eq
)
@
force
fixup
-
able
long
branch
encoding
beq
__error_p
@
yes
,
error
'p'
#ifndef CONFIG_XIP_KERNEL
adr
r3
,
2
f
ldmia
r3
,
{
r4
,
r8
}
sub
r4
,
r3
,
r4
@
(
PHYS_OFFSET
-
PAGE_OFFSET
)
add
r8
,
r8
,
r4
@
PHYS_OFFSET
#else
ldr
r8
,
=
PLAT_PHYS_OFFSET
#endif
/
*
*
r1
=
machine
no
,
r2
=
atags
,
*
r9
=
cpuid
,
r10
=
procinfo
*
r
8
=
phys_offset
,
r
9
=
cpuid
,
r10
=
procinfo
*/
bl
__vet_atags
#ifdef CONFIG_SMP_ON_UP
bl
__fixup_smp
#endif
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
bl
__fixup_pv_table
#endif
bl
__create_page_tables
...
...
@@ -114,21 +119,24 @@ ENTRY(stext)
1
:
b
__enable_mmu
ENDPROC
(
stext
)
.
ltorg
#ifndef CONFIG_XIP_KERNEL
2
:
.
long
.
.
long
PAGE_OFFSET
#endif
/*
*
Setup
the
initial
page
tables
.
We
only
setup
the
barest
*
amount
which
are
required
to
get
the
kernel
running
,
which
*
generally
means
mapping
in
the
kernel
code
.
*
*
r9
=
cpuid
*
r10
=
procinfo
*
r8
=
phys_offset
,
r9
=
cpuid
,
r10
=
procinfo
*
*
Returns
:
*
r0
,
r3
,
r5
-
r7
corrupted
*
r4
=
physical
page
table
address
*/
__create_page_tables
:
pgtbl
r4
@
page
table
address
pgtbl
r4
,
r8
@
page
table
address
/
*
*
Clear
the
16
K
level
1
swapper
page
table
...
...
@@ -184,10 +192,8 @@ __create_page_tables:
/
*
*
Map
some
ram
to
cover
our
.
data
and
.
bss
areas
.
*/
orr
r3
,
r7
,
#(
KERNEL_RAM_PADDR
&
0xff000000
)
.
if
(
KERNEL_RAM_PADDR
&
0x00f00000
)
orr
r3
,
r3
,
#(
KERNEL_RAM_PADDR
&
0x00f00000
)
.
endif
add
r3
,
r8
,
#
TEXT_OFFSET
orr
r3
,
r3
,
r7
add
r0
,
r4
,
#(
KERNEL_RAM_VADDR
&
0xff000000
)
>>
18
str
r3
,
[
r0
,
#(
KERNEL_RAM_VADDR
&
0x00f00000
)
>>
18
]!
ldr
r6
,
=(
_end
-
1
)
...
...
@@ -200,14 +206,17 @@ __create_page_tables:
#endif
/
*
*
Then
map
first
1
MB
of
ram
in
case
it
contains
our
boot
params
.
*
Then
map
boot
params
address
in
r2
or
*
the
first
1
MB
of
ram
if
boot
params
address
is
not
specified
.
*/
add
r0
,
r4
,
#
PAGE_OFFSET
>>
18
orr
r6
,
r7
,
#(
PHYS_OFFSET
&
0xff000000
)
.
if
(
PHYS_OFFSET
&
0x00f00000
)
orr
r6
,
r6
,
#(
PHYS_OFFSET
&
0x00f00000
)
.
endif
str
r6
,
[
r0
]
mov
r0
,
r2
,
lsr
#
20
movs
r0
,
r0
,
lsl
#
20
moveq
r0
,
r8
sub
r3
,
r0
,
r8
add
r3
,
r3
,
#
PAGE_OFFSET
add
r3
,
r4
,
r3
,
lsr
#
18
orr
r6
,
r7
,
r0
str
r6
,
[
r3
]
#ifdef CONFIG_DEBUG_LL
#ifndef CONFIG_DEBUG_ICEDCC
...
...
@@ -452,4 +461,129 @@ ENTRY(fixup_smp)
ldmfd
sp
!,
{
r4
-
r6
,
pc
}
ENDPROC
(
fixup_smp
)
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
/*
__fixup_pv_table
-
patch
the
stub
instructions
with
the
delta
between
*
PHYS_OFFSET
and
PAGE_OFFSET
,
which
is
assumed
to
be
16
MiB
aligned
and
*
can
be
expressed
by
an
immediate
shifter
operand
.
The
stub
instruction
*
has
a
form
of
'(add|sub) rd, rn, #imm'
.
*/
__HEAD
__fixup_pv_table
:
adr
r0
,
1
f
ldmia
r0
,
{
r3
-
r5
,
r7
}
sub
r3
,
r0
,
r3
@
PHYS_OFFSET
-
PAGE_OFFSET
add
r4
,
r4
,
r3
@
adjust
table
start
address
add
r5
,
r5
,
r3
@
adjust
table
end
address
add
r7
,
r7
,
r3
@
adjust
__pv_phys_offset
address
str
r8
,
[
r7
]
@
save
computed
PHYS_OFFSET
to
__pv_phys_offset
#ifndef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
mov
r6
,
r3
,
lsr
#
24
@
constant
for
add
/
sub
instructions
teq
r3
,
r6
,
lsl
#
24
@
must
be
16
MiB
aligned
#else
mov
r6
,
r3
,
lsr
#
16
@
constant
for
add
/
sub
instructions
teq
r3
,
r6
,
lsl
#
16
@
must
be
64
kiB
aligned
#endif
THUMB
(
it
ne
@
cross
section
branch
)
bne
__error
str
r6
,
[
r7
,
#
4
]
@
save
to
__pv_offset
b
__fixup_a_pv_table
ENDPROC
(
__fixup_pv_table
)
.
align
1
:
.
long
.
.
long
__pv_table_begin
.
long
__pv_table_end
2
:
.
long
__pv_phys_offset
.
text
__fixup_a_pv_table
:
#ifdef CONFIG_THUMB2_KERNEL
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
lsls
r0
,
r6
,
#
24
lsr
r6
,
#
8
beq
1
f
clz
r7
,
r0
lsr
r0
,
#
24
lsl
r0
,
r7
bic
r0
,
0x0080
lsrs
r7
,
#
1
orrcs
r0
,
#
0x0080
orr
r0
,
r0
,
r7
,
lsl
#
12
#endif
1
:
lsls
r6
,
#
24
beq
4
f
clz
r7
,
r6
lsr
r6
,
#
24
lsl
r6
,
r7
bic
r6
,
#
0x0080
lsrs
r7
,
#
1
orrcs
r6
,
#
0x0080
orr
r6
,
r6
,
r7
,
lsl
#
12
orr
r6
,
#
0x4000
b
4
f
2
:
@
at
this
point
the
C
flag
is
always
clear
add
r7
,
r3
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
ldrh
ip
,
[
r7
]
tst
ip
,
0x0400
@
the
i
bit
tells
us
LS
or
MS
byte
beq
3
f
cmp
r0
,
#
0
@
set
C
flag
,
and
...
biceq
ip
,
0x0400
@
immediate
zero
value
has
a
special
encoding
streqh
ip
,
[
r7
]
@
that
requires
the
i
bit
cleared
#endif
3
:
ldrh
ip
,
[
r7
,
#
2
]
and
ip
,
0x8f00
orrcc
ip
,
r6
@
mask
in
offset
bits
31
-
24
orrcs
ip
,
r0
@
mask
in
offset
bits
23
-
16
strh
ip
,
[
r7
,
#
2
]
4
:
cmp
r4
,
r5
ldrcc
r7
,
[
r4
],
#
4
@
use
branch
for
delay
slot
bcc
2
b
bx
lr
#else
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
and
r0
,
r6
,
#
255
@
offset
bits
23
-
16
mov
r6
,
r6
,
lsr
#
8
@
offset
bits
31
-
24
#else
mov
r0
,
#
0
@
just
in
case
...
#endif
b
3
f
2
:
ldr
ip
,
[
r7
,
r3
]
bic
ip
,
ip
,
#
0x000000ff
tst
ip
,
#
0x400
@
rotate
shift
tells
us
LS
or
MS
byte
orrne
ip
,
ip
,
r6
@
mask
in
offset
bits
31
-
24
orreq
ip
,
ip
,
r0
@
mask
in
offset
bits
23
-
16
str
ip
,
[
r7
,
r3
]
3
:
cmp
r4
,
r5
ldrcc
r7
,
[
r4
],
#
4
@
use
branch
for
delay
slot
bcc
2
b
mov
pc
,
lr
#endif
ENDPROC
(
__fixup_a_pv_table
)
ENTRY
(
fixup_pv_table
)
stmfd
sp
!,
{
r4
-
r7
,
lr
}
ldr
r2
,
2
f
@
get
address
of
__pv_phys_offset
mov
r3
,
#
0
@
no
offset
mov
r4
,
r0
@
r0
=
table
start
add
r5
,
r0
,
r1
@
r1
=
table
size
ldr
r6
,
[
r2
,
#
4
]
@
get
__pv_offset
bl
__fixup_a_pv_table
ldmfd
sp
!,
{
r4
-
r7
,
pc
}
ENDPROC
(
fixup_pv_table
)
.
align
2
:
.
long
__pv_phys_offset
.
data
.
globl
__pv_phys_offset
.
type
__pv_phys_offset
,
%
object
__pv_phys_offset
:
.
long
0
.
size
__pv_phys_offset
,
.
-
__pv_phys_offset
__pv_offset
:
.
long
0
#endif
#include "head-common.S"
arch/arm/kernel/module.c
浏览文件 @
05e34754
...
...
@@ -283,12 +283,13 @@ static const Elf_Shdr *find_mod_section(const Elf32_Ehdr *hdr,
return
NULL
;
}
extern
void
fixup_pv_table
(
const
void
*
,
unsigned
long
);
extern
void
fixup_smp
(
const
void
*
,
unsigned
long
);
int
module_finalize
(
const
Elf32_Ehdr
*
hdr
,
const
Elf_Shdr
*
sechdrs
,
struct
module
*
mod
)
{
const
Elf_Shdr
*
__maybe_unused
s
=
NULL
;
const
Elf_Shdr
*
s
=
NULL
;
#ifdef CONFIG_ARM_UNWIND
const
char
*
secstrs
=
(
void
*
)
hdr
+
sechdrs
[
hdr
->
e_shstrndx
].
sh_offset
;
const
Elf_Shdr
*
sechdrs_end
=
sechdrs
+
hdr
->
e_shnum
;
...
...
@@ -332,6 +333,11 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
maps
[
i
].
unw_sec
->
sh_size
,
maps
[
i
].
txt_sec
->
sh_addr
,
maps
[
i
].
txt_sec
->
sh_size
);
#endif
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
s
=
find_mod_section
(
hdr
,
sechdrs
,
".pv_table"
);
if
(
s
)
fixup_pv_table
((
void
*
)
s
->
sh_addr
,
s
->
sh_size
);
#endif
s
=
find_mod_section
(
hdr
,
sechdrs
,
".alt.smp.init"
);
if
(
s
&&
!
is_smp
())
...
...
arch/arm/kernel/setup.c
浏览文件 @
05e34754
...
...
@@ -325,28 +325,6 @@ static void __init early_print(const char *str, ...)
printk
(
"%s"
,
buf
);
}
static
struct
machine_desc
*
__init
lookup_machine_type
(
unsigned
int
type
)
{
extern
struct
machine_desc
__arch_info_begin
[],
__arch_info_end
[];
struct
machine_desc
*
p
;
for
(
p
=
__arch_info_begin
;
p
<
__arch_info_end
;
p
++
)
if
(
type
==
p
->
nr
)
return
p
;
early_print
(
"
\n
"
"Error: unrecognized/unsupported machine ID (r1 = 0x%08x).
\n\n
"
"Available machine support:
\n\n
ID (hex)
\t
NAME
\n
"
,
type
);
for
(
p
=
__arch_info_begin
;
p
<
__arch_info_end
;
p
++
)
early_print
(
"%08x
\t
%s
\n
"
,
p
->
nr
,
p
->
name
);
early_print
(
"
\n
Please check your kernel config and/or bootloader.
\n
"
);
while
(
true
)
/* can't use cpu_relax() here as it may require MMU setup */
;
}
static
void
__init
feat_v6_fixup
(
void
)
{
int
id
=
read_cpuid_id
();
...
...
@@ -463,21 +441,29 @@ void cpu_init(void)
static
struct
machine_desc
*
__init
setup_machine
(
unsigned
int
nr
)
{
struct
machine_desc
*
list
;
extern
struct
machine_desc
__arch_info_begin
[],
__arch_info_end
[];
struct
machine_desc
*
p
;
/*
* locate machine in the list of supported machines.
*/
list
=
lookup_machine_type
(
nr
);
if
(
!
list
)
{
printk
(
"Machine configuration botched (nr %d), unable "
"to continue.
\n
"
,
nr
);
while
(
1
);
}
for
(
p
=
__arch_info_begin
;
p
<
__arch_info_end
;
p
++
)
if
(
nr
==
p
->
nr
)
{
printk
(
"Machine: %s
\n
"
,
p
->
name
);
return
p
;
}
printk
(
"Machine: %s
\n
"
,
list
->
name
);
early_print
(
"
\n
"
"Error: unrecognized/unsupported machine ID (r1 = 0x%08x).
\n\n
"
"Available machine support:
\n\n
ID (hex)
\t
NAME
\n
"
,
nr
);
return
list
;
for
(
p
=
__arch_info_begin
;
p
<
__arch_info_end
;
p
++
)
early_print
(
"%08x
\t
%s
\n
"
,
p
->
nr
,
p
->
name
);
early_print
(
"
\n
Please check your kernel config and/or bootloader.
\n
"
);
while
(
true
)
/* can't use cpu_relax() here as it may require MMU setup */
;
}
static
int
__init
arm_add_memory
(
unsigned
long
start
,
unsigned
long
size
)
...
...
@@ -740,7 +726,7 @@ static struct init_tags {
{
tag_size
(
tag_core
),
ATAG_CORE
},
{
1
,
PAGE_SIZE
,
0xff
},
{
tag_size
(
tag_mem32
),
ATAG_MEM
},
{
MEM_SIZE
,
PHYS_OFFSET
},
{
MEM_SIZE
},
{
0
,
ATAG_NONE
}
};
...
...
@@ -839,6 +825,8 @@ void __init setup_arch(char **cmdline_p)
struct
machine_desc
*
mdesc
;
char
*
from
=
default_command_line
;
init_tags
.
mem
.
start
=
PHYS_OFFSET
;
unwind_init
();
setup_processor
();
...
...
@@ -851,8 +839,25 @@ void __init setup_arch(char **cmdline_p)
if
(
__atags_pointer
)
tags
=
phys_to_virt
(
__atags_pointer
);
else
if
(
mdesc
->
boot_params
)
tags
=
phys_to_virt
(
mdesc
->
boot_params
);
else
if
(
mdesc
->
boot_params
)
{
#ifdef CONFIG_MMU
/*
* We still are executing with a minimal MMU mapping created
* with the presumption that the machine default for this
* is located in the first MB of RAM. Anything else will
* fault and silently hang the kernel at this point.
*/
if
(
mdesc
->
boot_params
<
PHYS_OFFSET
||
mdesc
->
boot_params
>=
PHYS_OFFSET
+
SZ_1M
)
{
printk
(
KERN_WARNING
"Default boot params at physical 0x%08lx out of reach
\n
"
,
mdesc
->
boot_params
);
}
else
#endif
{
tags
=
phys_to_virt
(
mdesc
->
boot_params
);
}
}
#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
/*
...
...
arch/arm/kernel/tcm.c
浏览文件 @
05e34754
...
...
@@ -15,7 +15,7 @@
#include <linux/string.h>
/* memcpy */
#include <asm/cputype.h>
#include <asm/mach/map.h>
#include <
mach
/memory.h>
#include <
asm
/memory.h>
#include "tcm.h"
static
struct
gen_pool
*
tcm_pool
;
...
...
arch/arm/kernel/vmlinux.lds.S
浏览文件 @
05e34754
...
...
@@ -64,6 +64,10 @@ SECTIONS
__smpalt_end
=
.
;
#endif
__pv_table_begin
=
.
;
*(.
pv_table
)
__pv_table_end
=
.
;
INIT_SETUP
(16)
INIT_CALLS
...
...
arch/arm/mach-aaec2000/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -12,6 +12,6 @@
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0xf0000000)
#define P
LAT_P
HYS_OFFSET UL(0xf0000000)
#endif
/* __ASM_ARCH_MEMORY_H */
arch/arm/mach-at91/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -23,6 +23,6 @@
#include <mach/hardware.h>
#define PHYS_OFFSET (AT91_SDRAM_BASE)
#define P
LAT_P
HYS_OFFSET (AT91_SDRAM_BASE)
#endif
arch/arm/mach-bcmring/include/mach/hardware.h
浏览文件 @
05e34754
...
...
@@ -31,7 +31,7 @@
* *_SIZE is the size of the region
* *_BASE is the virtual address
*/
#define RAM_START PHYS_OFFSET
#define RAM_START P
LAT_P
HYS_OFFSET
#define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED)
#define RAM_BASE PAGE_OFFSET
...
...
arch/arm/mach-bcmring/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -23,7 +23,7 @@
* files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
*/
#define PHYS_OFFSET CFG_GLOBAL_RAM_BASE
#define P
LAT_P
HYS_OFFSET CFG_GLOBAL_RAM_BASE
/*
* Maximum DMA memory allowed is 14M
...
...
arch/arm/mach-clps711x/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -23,7 +23,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0xc0000000)
#define P
LAT_P
HYS_OFFSET UL(0xc0000000)
#if !defined(CONFIG_ARCH_CDB89712) && !defined (CONFIG_ARCH_AUTCPU12)
...
...
arch/arm/mach-cns3xxx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,7 +13,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#define __phys_to_bus(x) ((x) + PHYS_OFFSET)
#define __bus_to_phys(x) ((x) - PHYS_OFFSET)
...
...
arch/arm/mach-davinci/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -26,9 +26,9 @@
#if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx)
#error Cannot enable DaVinci and DA8XX platforms concurrently
#elif defined(CONFIG_ARCH_DAVINCI_DA8XX)
#define PHYS_OFFSET DA8XX_DDR_BASE
#define P
LAT_P
HYS_OFFSET DA8XX_DDR_BASE
#else
#define PHYS_OFFSET DAVINCI_DDR_BASE
#define P
LAT_P
HYS_OFFSET DAVINCI_DDR_BASE
#endif
#define DDR2_SDRCR_OFFSET 0xc
...
...
arch/arm/mach-dove/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -5,6 +5,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-ebsa110/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -19,7 +19,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
/*
* Cache flushing area - SRAM
...
...
arch/arm/mach-ep93xx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -6,15 +6,15 @@
#define __ASM_ARCH_MEMORY_H
#if defined(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET)
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#elif defined(CONFIG_EP93XX_SDCE0_PHYS_OFFSET)
#define PHYS_OFFSET UL(0xc0000000)
#define P
LAT_P
HYS_OFFSET UL(0xc0000000)
#elif defined(CONFIG_EP93XX_SDCE1_PHYS_OFFSET)
#define PHYS_OFFSET UL(0xd0000000)
#define P
LAT_P
HYS_OFFSET UL(0xd0000000)
#elif defined(CONFIG_EP93XX_SDCE2_PHYS_OFFSET)
#define PHYS_OFFSET UL(0xe0000000)
#define P
LAT_P
HYS_OFFSET UL(0xe0000000)
#elif defined(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET)
#define PHYS_OFFSET UL(0xf0000000)
#define P
LAT_P
HYS_OFFSET UL(0xf0000000)
#else
#error "Kconfig bug: No EP93xx PHYS_OFFSET set"
#endif
...
...
arch/arm/mach-footbridge/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -62,7 +62,7 @@ extern unsigned long __bus_to_pfn(unsigned long);
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#define FLUSH_BASE_PHYS 0x50000000
...
...
arch/arm/mach-gemini/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -11,9 +11,9 @@
#define __MACH_MEMORY_H
#ifdef CONFIG_GEMINI_MEM_SWAP
# define PHYS_OFFSET UL(0x00000000)
# define P
LAT_P
HYS_OFFSET UL(0x00000000)
#else
# define PHYS_OFFSET UL(0x10000000)
# define P
LAT_P
HYS_OFFSET UL(0x10000000)
#endif
#endif
/* __MACH_MEMORY_H */
arch/arm/mach-h720x/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -7,7 +7,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x40000000)
#define P
LAT_P
HYS_OFFSET UL(0x40000000)
/*
* This is the maximum DMA address that can be DMAd to.
* There should not be more than (0xd0000000 - 0xc0000000)
...
...
arch/arm/mach-integrator/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -23,7 +23,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#define BUS_OFFSET UL(0x80000000)
#define __virt_to_bus(x) ((x) - PAGE_OFFSET + BUS_OFFSET)
...
...
arch/arm/mach-iop13xx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -6,7 +6,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#ifndef __ASSEMBLY__
...
...
arch/arm/mach-iop32x/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -8,6 +8,6 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0xa0000000)
#define P
LAT_P
HYS_OFFSET UL(0xa0000000)
#endif
arch/arm/mach-iop33x/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -8,6 +8,6 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-ixp2000/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,7 +13,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#include <mach/ixp2000-regs.h>
...
...
arch/arm/mach-ixp23xx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -17,7 +17,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET (0x00000000)
#define P
LAT_P
HYS_OFFSET (0x00000000)
#define IXP23XX_PCI_SDRAM_OFFSET (*((volatile int *)IXP23XX_PCI_SDRAM_BAR) & 0xfffffff0)
...
...
arch/arm/mach-ixp4xx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -12,7 +12,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#if !defined(__ASSEMBLY__) && defined(CONFIG_PCI)
...
...
arch/arm/mach-kirkwood/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -5,6 +5,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-ks8695/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -18,7 +18,7 @@
/*
* Physical SRAM offset.
*/
#define PHYS_OFFSET KS8695_SDRAM_PA
#define P
LAT_P
HYS_OFFSET KS8695_SDRAM_PA
#ifndef __ASSEMBLY__
...
...
arch/arm/mach-lh7a40x/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -17,7 +17,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0xc0000000)
#define P
LAT_P
HYS_OFFSET UL(0xc0000000)
/*
* Sparsemem version of the above
...
...
arch/arm/mach-loki/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -5,6 +5,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-lpc32xx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -22,6 +22,6 @@
/*
* Physical DRAM offset of bank 0
*/
#define PHYS_OFFSET UL(0x80000000)
#define P
LAT_P
HYS_OFFSET UL(0x80000000)
#endif
arch/arm/mach-mmp/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -9,6 +9,6 @@
#ifndef __ASM_MACH_MEMORY_H
#define __ASM_MACH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
/* __ASM_MACH_MEMORY_H */
arch/arm/mach-msm/board-msm7x27.c
浏览文件 @
05e34754
...
...
@@ -132,7 +132,7 @@ static void __init msm7x2x_map_io(void)
MACHINE_START
(
MSM7X27_SURF
,
"QCT MSM7x27 SURF"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
msm7x2x_map_io
,
.
init_irq
=
msm7x2x_init_irq
,
.
init_machine
=
msm7x2x_init
,
...
...
@@ -142,7 +142,7 @@ MACHINE_END
MACHINE_START
(
MSM7X27_FFA
,
"QCT MSM7x27 FFA"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
msm7x2x_map_io
,
.
init_irq
=
msm7x2x_init_irq
,
.
init_machine
=
msm7x2x_init
,
...
...
@@ -152,7 +152,7 @@ MACHINE_END
MACHINE_START
(
MSM7X25_SURF
,
"QCT MSM7x25 SURF"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
msm7x2x_map_io
,
.
init_irq
=
msm7x2x_init_irq
,
.
init_machine
=
msm7x2x_init
,
...
...
@@ -162,7 +162,7 @@ MACHINE_END
MACHINE_START
(
MSM7X25_FFA
,
"QCT MSM7x25 FFA"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
msm7x2x_map_io
,
.
init_irq
=
msm7x2x_init_irq
,
.
init_machine
=
msm7x2x_init
,
...
...
arch/arm/mach-msm/board-msm7x30.c
浏览文件 @
05e34754
...
...
@@ -26,11 +26,11 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/memory.h>
#include <asm/setup.h>
#include <mach/gpio.h>
#include <mach/board.h>
#include <mach/memory.h>
#include <mach/msm_iomap.h>
#include <mach/dma.h>
...
...
@@ -85,7 +85,7 @@ static void __init msm7x30_map_io(void)
MACHINE_START
(
MSM7X30_SURF
,
"QCT MSM7X30 SURF"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
msm7x30_map_io
,
.
init_irq
=
msm7x30_init_irq
,
.
init_machine
=
msm7x30_init
,
...
...
@@ -95,7 +95,7 @@ MACHINE_END
MACHINE_START
(
MSM7X30_FFA
,
"QCT MSM7X30 FFA"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
msm7x30_map_io
,
.
init_irq
=
msm7x30_init_irq
,
.
init_machine
=
msm7x30_init
,
...
...
@@ -105,7 +105,7 @@ MACHINE_END
MACHINE_START
(
MSM7X30_FLUID
,
"QCT MSM7X30 FLUID"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
msm7x30_map_io
,
.
init_irq
=
msm7x30_init_irq
,
.
init_machine
=
msm7x30_init
,
...
...
arch/arm/mach-msm/board-qsd8x50.c
浏览文件 @
05e34754
...
...
@@ -118,7 +118,7 @@ static void __init qsd8x50_init(void)
MACHINE_START
(
QSD8X50_SURF
,
"QCT QSD8X50 SURF"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
qsd8x50_map_io
,
.
init_irq
=
qsd8x50_init_irq
,
.
init_machine
=
qsd8x50_init
,
...
...
@@ -128,7 +128,7 @@ MACHINE_END
MACHINE_START
(
QSD8X50A_ST1_5
,
"QCT QSD8X50A ST1.5"
)
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
map_io
=
qsd8x50_map_io
,
.
init_irq
=
qsd8x50_init_irq
,
.
init_machine
=
qsd8x50_init
,
...
...
arch/arm/mach-msm/board-sapphire.c
浏览文件 @
05e34754
...
...
@@ -107,7 +107,7 @@ MACHINE_START(SAPPHIRE, "sapphire")
/* Maintainer: Brian Swetland <swetland@google.com> */
#ifdef CONFIG_MSM_DEBUG_UART
#endif
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
.
fixup
=
sapphire_fixup
,
.
map_io
=
sapphire_map_io
,
.
init_irq
=
sapphire_init_irq
,
...
...
arch/arm/mach-msm/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -18,15 +18,15 @@
/* physical offset of RAM */
#if defined(CONFIG_ARCH_QSD8X50) && defined(CONFIG_MSM_SOC_REV_A)
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#elif defined(CONFIG_ARCH_QSD8X50)
#define PHYS_OFFSET UL(0x20000000)
#define P
LAT_P
HYS_OFFSET UL(0x20000000)
#elif defined(CONFIG_ARCH_MSM7X30)
#define PHYS_OFFSET UL(0x00200000)
#define P
LAT_P
HYS_OFFSET UL(0x00200000)
#elif defined(CONFIG_ARCH_MSM8X60)
#define PHYS_OFFSET UL(0x40200000)
#define P
LAT_P
HYS_OFFSET UL(0x40200000)
#else
#define PHYS_OFFSET UL(0x10000000)
#define P
LAT_P
HYS_OFFSET UL(0x10000000)
#endif
#endif
...
...
arch/arm/mach-mv78xx0/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -5,6 +5,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-mx3/mach-kzm_arm11_01.c
浏览文件 @
05e34754
...
...
@@ -27,6 +27,7 @@
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/memory.h>
#include <asm/setup.h>
#include <asm/mach/arch.h>
#include <asm/mach/irq.h>
...
...
@@ -36,7 +37,6 @@
#include <mach/clock.h>
#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <mach/memory.h>
#include "devices-imx31.h"
#include "devices.h"
...
...
arch/arm/mach-netx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -20,7 +20,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x80000000)
#define P
LAT_P
HYS_OFFSET UL(0x80000000)
#endif
arch/arm/mach-nomadik/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -23,6 +23,6 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-ns9xxx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -19,6 +19,6 @@
#define NS9XXX_CS2STAT_LENGTH UL(0x1000)
#define NS9XXX_CS3STAT_LENGTH UL(0x1000)
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-nuc93x/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -16,6 +16,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-omap1/include/mach/debug-macro.S
浏览文件 @
05e34754
...
...
@@ -17,6 +17,9 @@
#include <plat/serial.h>
#define omap_uart_v2p(x) ((x) - PAGE_OFFSET + PLAT_PHYS_OFFSET)
#define omap_uart_p2v(x) ((x) - PLAT_PHYS_OFFSET + PAGE_OFFSET)
.
pushsection
.
data
omap_uart_phys
:
.
word
0x0
omap_uart_virt
:
.
word
0x0
...
...
@@ -33,7 +36,7 @@ omap_uart_virt: .word 0x0
/
*
Use
omap_uart_phys
/
virt
if
already
configured
*/
9
:
mrc
p15
,
0
,
\
rp
,
c1
,
c0
tst
\
rp
,
#
1
@
MMU
enabled
?
ldreq
\
rp
,
=
__virt_to_phys
(
omap_uart_phys
)
@
MMU
not
en
abled
ldreq
\
rp
,
=
omap_uart_v2p
(
omap_uart_phys
)
@
MMU
dis
abled
ldrne
\
rp
,
=
omap_uart_phys
@
MMU
enabled
add
\
rv
,
\
rp
,
#
4
@
omap_uart_virt
ldr
\
rp
,
[
\
rp
,
#
0
]
...
...
@@ -46,7 +49,7 @@ omap_uart_virt: .word 0x0
mrc
p15
,
0
,
\
rp
,
c1
,
c0
tst
\
rp
,
#
1
@
MMU
enabled
?
ldreq
\
rp
,
=
OMAP_UART_INFO
@
MMU
not
enabled
ldrne
\
rp
,
=
__phys_to_virt
(
OMAP_UART_INFO
)
@
MMU
enabled
ldrne
\
rp
,
=
omap_uart_p2v
(
OMAP_UART_INFO
)
@
MMU
enabled
ldr
\
rp
,
[
\
rp
,
#
0
]
/
*
Select
the
UART
to
use
based
on
the
UART1
scratchpad
value
*/
...
...
@@ -73,7 +76,7 @@ omap_uart_virt: .word 0x0
98
:
add
\
rp
,
\
rp
,
#
0xff000000
@
phys
base
mrc
p15
,
0
,
\
rv
,
c1
,
c0
tst
\
rv
,
#
1
@
MMU
enabled
?
ldreq
\
rv
,
=
__virt_to_phys
(
omap_uart_phys
)
@
MMU
not
en
abled
ldreq
\
rv
,
=
omap_uart_v2p
(
omap_uart_phys
)
@
MMU
dis
abled
ldrne
\
rv
,
=
omap_uart_phys
@
MMU
enabled
str
\
rp
,
[
\
rv
,
#
0
]
sub
\
rp
,
\
rp
,
#
0xff000000
@
phys
base
...
...
arch/arm/mach-omap2/include/mach/debug-macro.S
浏览文件 @
05e34754
...
...
@@ -19,6 +19,9 @@
#define UART_OFFSET(addr) ((addr) & 0x00ffffff)
#define omap_uart_v2p(x) ((x) - PAGE_OFFSET + PLAT_PHYS_OFFSET)
#define omap_uart_p2v(x) ((x) - PLAT_PHYS_OFFSET + PAGE_OFFSET)
.
pushsection
.
data
omap_uart_phys
:
.
word
0
omap_uart_virt
:
.
word
0
...
...
@@ -36,7 +39,7 @@ omap_uart_lsr: .word 0
/
*
Use
omap_uart_phys
/
virt
if
already
configured
*/
10
:
mrc
p15
,
0
,
\
rp
,
c1
,
c0
tst
\
rp
,
#
1
@
MMU
enabled
?
ldreq
\
rp
,
=
__virt_to_phys
(
omap_uart_phys
)
@
MMU
not
en
abled
ldreq
\
rp
,
=
omap_uart_v2p
(
omap_uart_phys
)
@
MMU
dis
abled
ldrne
\
rp
,
=
omap_uart_phys
@
MMU
enabled
add
\
rv
,
\
rp
,
#
4
@
omap_uart_virt
ldr
\
rp
,
[
\
rp
,
#
0
]
...
...
@@ -49,7 +52,7 @@ omap_uart_lsr: .word 0
mrc
p15
,
0
,
\
rp
,
c1
,
c0
tst
\
rp
,
#
1
@
MMU
enabled
?
ldreq
\
rp
,
=
OMAP_UART_INFO
@
MMU
not
enabled
ldrne
\
rp
,
=
__phys_to_virt
(
OMAP_UART_INFO
)
@
MMU
enabled
ldrne
\
rp
,
=
omap_uart_p2v
(
OMAP_UART_INFO
)
@
MMU
enabled
ldr
\
rp
,
[
\
rp
,
#
0
]
/
*
Select
the
UART
to
use
based
on
the
UART1
scratchpad
value
*/
...
...
@@ -94,7 +97,7 @@ omap_uart_lsr: .word 0
95
:
ldr
\
rp
,
=
ZOOM_UART_BASE
mrc
p15
,
0
,
\
rv
,
c1
,
c0
tst
\
rv
,
#
1
@
MMU
enabled
?
ldreq
\
rv
,
=
__virt_to_phys
(
omap_uart_phys
)
@
MMU
not
en
abled
ldreq
\
rv
,
=
omap_uart_v2p
(
omap_uart_phys
)
@
MMU
dis
abled
ldrne
\
rv
,
=
omap_uart_phys
@
MMU
enabled
str
\
rp
,
[
\
rv
,
#
0
]
ldr
\
rp
,
=
ZOOM_UART_VIRT
...
...
@@ -109,7 +112,7 @@ omap_uart_lsr: .word 0
98
:
add
\
rp
,
\
rp
,
#
0x48000000
@
phys
base
mrc
p15
,
0
,
\
rv
,
c1
,
c0
tst
\
rv
,
#
1
@
MMU
enabled
?
ldreq
\
rv
,
=
__virt_to_phys
(
omap_uart_phys
)
@
MMU
not
en
abled
ldreq
\
rv
,
=
omap_uart_v2p
(
omap_uart_phys
)
@
MMU
dis
abled
ldrne
\
rv
,
=
omap_uart_phys
@
MMU
enabled
str
\
rp
,
[
\
rv
,
#
0
]
sub
\
rp
,
\
rp
,
#
0x48000000
@
phys
base
...
...
@@ -131,7 +134,7 @@ omap_uart_lsr: .word 0
.
macro
busyuart
,
rd
,
rx
1001
:
mrc
p15
,
0
,
\
rd
,
c1
,
c0
tst
\
rd
,
#
1
@
MMU
enabled
?
ldreq
\
rd
,
=
__virt_to_phys
(
omap_uart_lsr
)
@
MMU
not
en
abled
ldreq
\
rd
,
=
omap_uart_v2p
(
omap_uart_lsr
)
@
MMU
dis
abled
ldrne
\
rd
,
=
omap_uart_lsr
@
MMU
enabled
ldr
\
rd
,
[
\
rd
,
#
0
]
ldrb
\
rd
,
[
\
rx
,
\
rd
]
...
...
arch/arm/mach-orion5x/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -7,6 +7,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-pnx4008/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -16,6 +16,6 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x80000000)
#define P
LAT_P
HYS_OFFSET UL(0x80000000)
#endif
arch/arm/mach-pxa/balloon3.c
浏览文件 @
05e34754
...
...
@@ -829,5 +829,5 @@ MACHINE_START(BALLOON3, "Balloon3")
.
init_irq
=
balloon3_init_irq
,
.
timer
=
&
pxa_timer
,
.
init_machine
=
balloon3_init
,
.
boot_params
=
PHYS_OFFSET
+
0x100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x100
,
MACHINE_END
arch/arm/mach-pxa/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -15,7 +15,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0xa0000000)
#define P
LAT_P
HYS_OFFSET UL(0xa0000000)
#if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
void
cmx2xx_pci_adjust_zones
(
unsigned
long
*
size
,
unsigned
long
*
holes
);
...
...
arch/arm/mach-realview/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -24,9 +24,9 @@
* Physical DRAM offset.
*/
#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
#define PHYS_OFFSET UL(0x70000000)
#define P
LAT_P
HYS_OFFSET UL(0x70000000)
#else
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
#if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA)
...
...
arch/arm/mach-realview/realview_eb.c
浏览文件 @
05e34754
...
...
@@ -484,7 +484,7 @@ static void __init realview_eb_init(void)
MACHINE_START
(
REALVIEW_EB
,
"ARM-RealView EB"
)
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.
boot_params
=
PHYS_OFFSET
+
0x00000100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x00000100
,
.
fixup
=
realview_fixup
,
.
map_io
=
realview_eb_map_io
,
.
init_irq
=
gic_init_irq
,
...
...
arch/arm/mach-realview/realview_pb1176.c
浏览文件 @
05e34754
...
...
@@ -379,7 +379,7 @@ static void __init realview_pb1176_init(void)
MACHINE_START
(
REALVIEW_PB1176
,
"ARM-RealView PB1176"
)
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.
boot_params
=
PHYS_OFFSET
+
0x00000100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x00000100
,
.
fixup
=
realview_pb1176_fixup
,
.
map_io
=
realview_pb1176_map_io
,
.
init_irq
=
gic_init_irq
,
...
...
arch/arm/mach-realview/realview_pb11mp.c
浏览文件 @
05e34754
...
...
@@ -381,7 +381,7 @@ static void __init realview_pb11mp_init(void)
MACHINE_START
(
REALVIEW_PB11MP
,
"ARM-RealView PB11MPCore"
)
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.
boot_params
=
PHYS_OFFSET
+
0x00000100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x00000100
,
.
fixup
=
realview_fixup
,
.
map_io
=
realview_pb11mp_map_io
,
.
init_irq
=
gic_init_irq
,
...
...
arch/arm/mach-realview/realview_pba8.c
浏览文件 @
05e34754
...
...
@@ -331,7 +331,7 @@ static void __init realview_pba8_init(void)
MACHINE_START
(
REALVIEW_PBA8
,
"ARM-RealView PB-A8"
)
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.
boot_params
=
PHYS_OFFSET
+
0x00000100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x00000100
,
.
fixup
=
realview_fixup
,
.
map_io
=
realview_pba8_map_io
,
.
init_irq
=
gic_init_irq
,
...
...
arch/arm/mach-realview/realview_pbx.c
浏览文件 @
05e34754
...
...
@@ -414,7 +414,7 @@ static void __init realview_pbx_init(void)
MACHINE_START
(
REALVIEW_PBX
,
"ARM-RealView PBX"
)
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.
boot_params
=
PHYS_OFFSET
+
0x00000100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x00000100
,
.
fixup
=
realview_pbx_fixup
,
.
map_io
=
realview_pbx_map_io
,
.
init_irq
=
gic_init_irq
,
...
...
arch/arm/mach-rpc/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -21,7 +21,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x10000000)
#define P
LAT_P
HYS_OFFSET UL(0x10000000)
/*
* Cache flushing area - ROM
...
...
arch/arm/mach-s3c2400/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -15,6 +15,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x0C000000)
#define P
LAT_P
HYS_OFFSET UL(0x0C000000)
#endif
arch/arm/mach-s3c2410/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -11,6 +11,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x30000000)
#define P
LAT_P
HYS_OFFSET UL(0x30000000)
#endif
arch/arm/mach-s3c24a0/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -11,7 +11,7 @@
#ifndef __ASM_ARCH_24A0_MEMORY_H
#define __ASM_ARCH_24A0_MEMORY_H __FILE__
#define PHYS_OFFSET UL(0x10000000)
#define P
LAT_P
HYS_OFFSET UL(0x10000000)
#define __virt_to_bus(x) __virt_to_phys(x)
#define __bus_to_virt(x) __phys_to_virt(x)
...
...
arch/arm/mach-s3c64xx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,7 +13,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x50000000)
#define P
LAT_P
HYS_OFFSET UL(0x50000000)
#define CONSISTENT_DMA_SIZE SZ_8M
...
...
arch/arm/mach-s5p6442/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,7 +13,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x20000000)
#define P
LAT_P
HYS_OFFSET UL(0x20000000)
#define CONSISTENT_DMA_SIZE SZ_8M
#endif
/* __ASM_ARCH_MEMORY_H */
arch/arm/mach-s5p64x0/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,7 +13,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H __FILE__
#define PHYS_OFFSET UL(0x20000000)
#define P
LAT_P
HYS_OFFSET UL(0x20000000)
#define CONSISTENT_DMA_SIZE SZ_8M
#endif
/* __ASM_ARCH_MEMORY_H */
arch/arm/mach-s5pc100/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,6 +13,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x20000000)
#define P
LAT_P
HYS_OFFSET UL(0x20000000)
#endif
arch/arm/mach-s5pv210/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,7 +13,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x20000000)
#define P
LAT_P
HYS_OFFSET UL(0x20000000)
#define CONSISTENT_DMA_SIZE (SZ_8M + SZ_4M + SZ_2M)
/*
...
...
arch/arm/mach-s5pv310/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,7 +13,7 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H __FILE__
#define PHYS_OFFSET UL(0x40000000)
#define P
LAT_P
HYS_OFFSET UL(0x40000000)
/* Maximum of 256MiB in one bank */
#define MAX_PHYSMEM_BITS 32
...
...
arch/arm/mach-sa1100/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -12,7 +12,7 @@
/*
* Physical DRAM offset is 0xc0000000 on the SA1100
*/
#define PHYS_OFFSET UL(0xc0000000)
#define P
LAT_P
HYS_OFFSET UL(0xc0000000)
#ifndef __ASSEMBLY__
...
...
arch/arm/mach-shark/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -15,7 +15,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x08000000)
#define P
LAT_P
HYS_OFFSET UL(0x08000000)
#ifndef __ASSEMBLY__
...
...
arch/arm/mach-shmobile/include/mach/memory.h
浏览文件 @
05e34754
#ifndef __ASM_MACH_MEMORY_H
#define __ASM_MACH_MEMORY_H
#define PHYS_OFFSET UL(CONFIG_MEMORY_START)
#define P
LAT_P
HYS_OFFSET UL(CONFIG_MEMORY_START)
#define MEM_SIZE UL(CONFIG_MEMORY_SIZE)
/* DMA memory at 0xf6000000 - 0xffdfffff */
...
...
arch/arm/mach-tcc8k/board-tcc8000-sdk.c
浏览文件 @
05e34754
...
...
@@ -54,7 +54,7 @@ static void __init tcc8k_map_io(void)
}
MACHINE_START
(
TCC8000_SDK
,
"Telechips TCC8000-SDK Demo Board"
)
.
boot_params
=
PHYS_OFFSET
+
0x00000100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x00000100
,
.
map_io
=
tcc8k_map_io
,
.
init_irq
=
tcc8k_init_irq
,
.
init_machine
=
tcc8k_init
,
...
...
arch/arm/mach-tegra/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -22,7 +22,7 @@
#define __MACH_TEGRA_MEMORY_H
/* physical offset of RAM */
#define PHYS_OFFSET UL(0)
#define P
LAT_P
HYS_OFFSET UL(0)
#endif
arch/arm/mach-u300/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -15,17 +15,17 @@
#ifdef CONFIG_MACH_U300_DUAL_RAM
#define PHYS_OFFSET UL(0x48000000)
#define P
LAT_P
HYS_OFFSET UL(0x48000000)
#define BOOT_PARAMS_OFFSET (PHYS_OFFSET + 0x100)
#else
#ifdef CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
#define PHYS_OFFSET (0x28000000 + \
#define P
LAT_P
HYS_OFFSET (0x28000000 + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE - \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
#else
#define PHYS_OFFSET (0x28000000 + \
#define P
LAT_P
HYS_OFFSET (0x28000000 + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE + \
(CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
#endif
...
...
arch/arm/mach-u300/u300.c
浏览文件 @
05e34754
...
...
@@ -19,9 +19,9 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <mach/memory.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/memory.h>
static
void
__init
u300_reserve
(
void
)
{
...
...
arch/arm/mach-ux500/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -12,7 +12,7 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#define BUS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-versatile/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -23,6 +23,6 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/mach-vexpress/ct-ca9x4.c
浏览文件 @
05e34754
...
...
@@ -243,7 +243,7 @@ static void __init ct_ca9x4_init(void)
}
MACHINE_START
(
VEXPRESS
,
"ARM-Versatile Express CA9x4"
)
.
boot_params
=
PHYS_OFFSET
+
0x00000100
,
.
boot_params
=
P
LAT_P
HYS_OFFSET
+
0x00000100
,
.
map_io
=
ct_ca9x4_map_io
,
.
init_irq
=
ct_ca9x4_init_irq
,
#if 0
...
...
arch/arm/mach-vexpress/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -20,6 +20,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x60000000)
#define P
LAT_P
HYS_OFFSET UL(0x60000000)
#endif
arch/arm/mach-w90x900/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -18,6 +18,6 @@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
arch/arm/plat-mxc/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -23,23 +23,23 @@
#if !defined(CONFIG_RUNTIME_PHYS_OFFSET)
# if defined CONFIG_ARCH_MX1
# define PHYS_OFFSET MX1_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX1_PHYS_OFFSET
# elif defined CONFIG_MACH_MX21
# define PHYS_OFFSET MX21_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX21_PHYS_OFFSET
# elif defined CONFIG_ARCH_MX25
# define PHYS_OFFSET MX25_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX25_PHYS_OFFSET
# elif defined CONFIG_MACH_MX27
# define PHYS_OFFSET MX27_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX27_PHYS_OFFSET
# elif defined CONFIG_ARCH_MX3
# define PHYS_OFFSET MX3x_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX3x_PHYS_OFFSET
# elif defined CONFIG_ARCH_MXC91231
# define PHYS_OFFSET MXC91231_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MXC91231_PHYS_OFFSET
# elif defined CONFIG_ARCH_MX50
# define PHYS_OFFSET MX50_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX50_PHYS_OFFSET
# elif defined CONFIG_ARCH_MX51
# define PHYS_OFFSET MX51_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX51_PHYS_OFFSET
# elif defined CONFIG_ARCH_MX53
# define PHYS_OFFSET MX53_PHYS_OFFSET
# define P
LAT_P
HYS_OFFSET MX53_PHYS_OFFSET
# endif
#endif
...
...
arch/arm/plat-omap/include/plat/memory.h
浏览文件 @
05e34754
...
...
@@ -37,9 +37,9 @@
* Physical DRAM offset.
*/
#if defined(CONFIG_ARCH_OMAP1)
#define PHYS_OFFSET UL(0x10000000)
#define P
LAT_P
HYS_OFFSET UL(0x10000000)
#else
#define PHYS_OFFSET UL(0x80000000)
#define P
LAT_P
HYS_OFFSET UL(0x80000000)
#endif
/*
...
...
arch/arm/plat-omap/include/plat/serial.h
浏览文件 @
05e34754
...
...
@@ -27,7 +27,7 @@
* 2. We assume printascii is called at least once before paging_init,
* and addruart has a chance to read OMAP_UART_INFO
*/
#define OMAP_UART_INFO (PHYS_OFFSET + 0x3ffc)
#define OMAP_UART_INFO (P
LAT_P
HYS_OFFSET + 0x3ffc)
/* OMAP1 serial ports */
#define OMAP1_UART1_BASE 0xfffb0000
...
...
arch/arm/plat-spear/include/plat/memory.h
浏览文件 @
05e34754
...
...
@@ -15,6 +15,6 @@
#define __PLAT_MEMORY_H
/* Physical DRAM offset */
#define PHYS_OFFSET UL(0x00000000)
#define P
LAT_P
HYS_OFFSET UL(0x00000000)
#endif
/* __PLAT_MEMORY_H */
arch/arm/plat-stmp3xxx/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -17,6 +17,6 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x40000000)
#define P
LAT_P
HYS_OFFSET UL(0x40000000)
#endif
arch/arm/plat-tcc/include/mach/memory.h
浏览文件 @
05e34754
...
...
@@ -13,6 +13,6 @@
/*
* Physical DRAM offset.
*/
#define PHYS_OFFSET UL(0x20000000)
#define P
LAT_P
HYS_OFFSET UL(0x20000000)
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录