Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mellanox
Bluefield Linux
提交
b1515af2
B
Bluefield Linux
项目概览
mellanox
/
Bluefield Linux
12 个月 前同步成功
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
Bluefield Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b1515af2
编写于
8月 24, 2010
作者:
B
Benjamin Herrenschmidt
浏览文件
操作
浏览文件
下载
差异文件
Merge remote branch 'jwb/merge' into merge
上级
d1b113bb
32412aa2
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
27 addition
and
12 deletion
+27
-12
arch/powerpc/boot/dts/canyonlands.dts
arch/powerpc/boot/dts/canyonlands.dts
+8
-0
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/cputable.c
+0
-1
arch/powerpc/kernel/head_44x.S
arch/powerpc/kernel/head_44x.S
+4
-0
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/irq.c
+9
-7
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/setup_32.c
+5
-4
arch/powerpc/mm/tlb_nohash_low.S
arch/powerpc/mm/tlb_nohash_low.S
+1
-0
未找到文件。
arch/powerpc/boot/dts/canyonlands.dts
浏览文件 @
b1515af2
...
...
@@ -163,6 +163,14 @@
interrupts
=
<
0x1e
4
>;
};
SATA0
:
sata
@
bffd1000
{
compatible
=
"amcc,sata-460ex"
;
reg
=
<
4
0xbffd1000
0x800
4
0xbffd0800
0x400
>;
interrupt
-
parent
=
<&
UIC3
>;
interrupts
=
<
0x0
0x4
/*
SATA
*/
0x5
0x4
>;
/*
AHBDMA
*/
};
POB0
:
opb
{
compatible
=
"ibm,opb-460ex"
,
"ibm,opb"
;
#
address
-
cells
=
<
1
>;
...
...
arch/powerpc/kernel/cputable.c
浏览文件 @
b1515af2
...
...
@@ -1826,7 +1826,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
.
cpu_features
=
CPU_FTRS_47X
,
.
cpu_user_features
=
COMMON_USER_BOOKE
|
PPC_FEATURE_HAS_FPU
,
.
cpu_user_features
=
COMMON_USER_BOOKE
,
.
mmu_features
=
MMU_FTR_TYPE_47x
|
MMU_FTR_USE_TLBIVAX_BCAST
|
MMU_FTR_LOCK_BCAST_INVAL
,
.
icache_bsize
=
32
,
...
...
arch/powerpc/kernel/head_44x.S
浏览文件 @
b1515af2
...
...
@@ -113,6 +113,10 @@ _ENTRY(_start);
stw
r5
,
0
(
r4
)
/*
Save
abatron_pteptrs
at
a
fixed
location
*/
stw
r6
,
0
(
r5
)
/
*
Clear
the
Machine
Check
Syndrome
Register
*/
li
r0
,
0
mtspr
SPRN_MCSR
,
r0
/
*
Let
's move on */
lis
r4
,
start_kernel
@
h
ori
r4
,
r4
,
start_kernel
@
l
...
...
arch/powerpc/kernel/irq.c
浏览文件 @
b1515af2
...
...
@@ -67,6 +67,7 @@
#include <asm/machdep.h>
#include <asm/udbg.h>
#include <asm/dbell.h>
#include <asm/smp.h>
#ifdef CONFIG_PPC64
#include <asm/paca.h>
...
...
@@ -446,22 +447,23 @@ struct thread_info *mcheckirq_ctx[NR_CPUS] __read_mostly;
void
exc_lvl_ctx_init
(
void
)
{
struct
thread_info
*
tp
;
int
i
;
int
i
,
hw_cpu
;
for_each_possible_cpu
(
i
)
{
memset
((
void
*
)
critirq_ctx
[
i
],
0
,
THREAD_SIZE
);
tp
=
critirq_ctx
[
i
];
hw_cpu
=
get_hard_smp_processor_id
(
i
);
memset
((
void
*
)
critirq_ctx
[
hw_cpu
],
0
,
THREAD_SIZE
);
tp
=
critirq_ctx
[
hw_cpu
];
tp
->
cpu
=
i
;
tp
->
preempt_count
=
0
;
#ifdef CONFIG_BOOKE
memset
((
void
*
)
dbgirq_ctx
[
i
],
0
,
THREAD_SIZE
);
tp
=
dbgirq_ctx
[
i
];
memset
((
void
*
)
dbgirq_ctx
[
hw_cpu
],
0
,
THREAD_SIZE
);
tp
=
dbgirq_ctx
[
hw_cpu
];
tp
->
cpu
=
i
;
tp
->
preempt_count
=
0
;
memset
((
void
*
)
mcheckirq_ctx
[
i
],
0
,
THREAD_SIZE
);
tp
=
mcheckirq_ctx
[
i
];
memset
((
void
*
)
mcheckirq_ctx
[
hw_cpu
],
0
,
THREAD_SIZE
);
tp
=
mcheckirq_ctx
[
hw_cpu
];
tp
->
cpu
=
i
;
tp
->
preempt_count
=
HARDIRQ_OFFSET
;
#endif
...
...
arch/powerpc/kernel/setup_32.c
浏览文件 @
b1515af2
...
...
@@ -258,17 +258,18 @@ static void __init irqstack_early_init(void)
#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
static
void
__init
exc_lvl_early_init
(
void
)
{
unsigned
int
i
;
unsigned
int
i
,
hw_cpu
;
/* interrupt stacks must be in lowmem, we get that for free on ppc32
* as the memblock is limited to lowmem by MEMBLOCK_REAL_LIMIT */
for_each_possible_cpu
(
i
)
{
critirq_ctx
[
i
]
=
(
struct
thread_info
*
)
hw_cpu
=
get_hard_smp_processor_id
(
i
);
critirq_ctx
[
hw_cpu
]
=
(
struct
thread_info
*
)
__va
(
memblock_alloc
(
THREAD_SIZE
,
THREAD_SIZE
));
#ifdef CONFIG_BOOKE
dbgirq_ctx
[
i
]
=
(
struct
thread_info
*
)
dbgirq_ctx
[
hw_cpu
]
=
(
struct
thread_info
*
)
__va
(
memblock_alloc
(
THREAD_SIZE
,
THREAD_SIZE
));
mcheckirq_ctx
[
i
]
=
(
struct
thread_info
*
)
mcheckirq_ctx
[
hw_cpu
]
=
(
struct
thread_info
*
)
__va
(
memblock_alloc
(
THREAD_SIZE
,
THREAD_SIZE
));
#endif
}
...
...
arch/powerpc/mm/tlb_nohash_low.S
浏览文件 @
b1515af2
...
...
@@ -200,6 +200,7 @@ _GLOBAL(_tlbivax_bcast)
rlwimi
r5
,
r4
,
0
,
16
,
31
wrteei
0
mtspr
SPRN_MMUCR
,
r5
isync
/*
tlbivax
0
,
r3
-
use
.
long
to
avoid
binutils
deps
*/
.
long
0x7c000624
|
(
r3
<<
11
)
isync
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录