Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
kernel_linux
提交
eecba334
K
kernel_linux
项目概览
OpenHarmony
/
kernel_linux
上一次同步 3 年多
通知
13
Star
8
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kernel_linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
eecba334
编写于
9月 25, 2006
作者:
S
Stephen Rothwell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[POWERPC] modify PCI code for a merged kernel
Signed-off-by:
N
Stephen Rothwell
<
sfr@canb.auug.org.au
>
上级
de0138da
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
32 deletion
+30
-32
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/pci_64.c
+30
-28
arch/powerpc/platforms/iseries/pci.c
arch/powerpc/platforms/iseries/pci.c
+0
-4
未找到文件。
arch/powerpc/kernel/pci_64.c
浏览文件 @
eecba334
...
...
@@ -30,6 +30,7 @@
#include <asm/byteorder.h>
#include <asm/machdep.h>
#include <asm/ppc-pci.h>
#include <asm/firmware.h>
#ifdef DEBUG
#include <asm/udbg.h>
...
...
@@ -209,7 +210,6 @@ void pcibios_free_controller(struct pci_controller *phb)
kfree
(
phb
);
}
#ifndef CONFIG_PPC_ISERIES
void
__devinit
pcibios_claim_one_bus
(
struct
pci_bus
*
b
)
{
struct
pci_dev
*
dev
;
...
...
@@ -238,10 +238,12 @@ static void __init pcibios_claim_of_setup(void)
{
struct
pci_bus
*
b
;
if
(
firmware_has_feature
(
FW_FEATURE_ISERIES
))
return
;
list_for_each_entry
(
b
,
&
pci_root_buses
,
node
)
pcibios_claim_one_bus
(
b
);
}
#endif
#ifdef CONFIG_PPC_MULTIPLATFORM
static
u32
get_int_prop
(
struct
device_node
*
np
,
const
char
*
name
,
u32
def
)
...
...
@@ -554,9 +556,8 @@ static int __init pcibios_init(void)
*/
ppc_md
.
phys_mem_access_prot
=
pci_phys_mem_access_prot
;
#ifdef CONFIG_PPC_ISERIES
iSeries_pcibios_init
();
#endif
if
(
firmware_has_feature
(
FW_FEATURE_ISERIES
))
iSeries_pcibios_init
();
printk
(
KERN_DEBUG
"PCI: Probing PCI hardware
\n
"
);
...
...
@@ -566,15 +567,15 @@ static int __init pcibios_init(void)
pci_bus_add_devices
(
hose
->
bus
);
}
#ifndef CONFIG_PPC_ISERIES
if
(
pci_probe_only
)
pcibios_claim_of_setup
();
else
/* FIXME: `else' will be removed when
pci_assign_unassigned_resources() is able to work
correctly with [partially] allocated PCI tree. */
pci_assign_unassigned_resources
();
#endif
/* !CONFIG_PPC_ISERIES */
if
(
!
firmware_has_feature
(
FW_FEATURE_ISERIES
))
{
if
(
pci_probe_only
)
pcibios_claim_of_setup
();
else
/* FIXME: `else' will be removed when
pci_assign_unassigned_resources() is able to work
correctly with [partially] allocated PCI tree. */
pci_assign_unassigned_resources
();
}
/* Call machine dependent final fixup */
if
(
ppc_md
.
pcibios_fixup
)
...
...
@@ -586,8 +587,9 @@ static int __init pcibios_init(void)
printk
(
KERN_DEBUG
"ISA bridge at %s
\n
"
,
pci_name
(
ppc64_isabridge_dev
));
#ifdef CONFIG_PPC_MULTIPLATFORM
/* map in PCI I/O space */
phbs_remap_io
();
if
(
!
firmware_has_feature
(
FW_FEATURE_ISERIES
))
/* map in PCI I/O space */
phbs_remap_io
();
#endif
printk
(
KERN_DEBUG
"PCI: Probing PCI hardware done
\n
"
);
...
...
@@ -637,13 +639,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
*/
int
pci_domain_nr
(
struct
pci_bus
*
bus
)
{
#ifdef CONFIG_PPC_ISERIES
return
0
;
#else
struct
pci_controller
*
hose
=
pci_bus_to_host
(
bus
);
if
(
firmware_has_feature
(
FW_FEATURE_ISERIES
))
return
0
;
else
{
struct
pci_controller
*
hose
=
pci_bus_to_host
(
bus
);
return
hose
->
global_number
;
#endif
return
hose
->
global_number
;
}
}
EXPORT_SYMBOL
(
pci_domain_nr
);
...
...
@@ -651,12 +653,12 @@ EXPORT_SYMBOL(pci_domain_nr);
/* Decide whether to display the domain number in /proc */
int
pci_proc_domain
(
struct
pci_bus
*
bus
)
{
#ifdef CONFIG_PPC_ISERIES
return
0
;
#else
struct
pci_controller
*
hose
=
pci_bus_to_host
(
bus
);
return
hose
->
buid
;
#endif
if
(
firmware_has_feature
(
FW_FEATURE_ISERIES
))
return
0
;
else
{
struct
pci_controller
*
hose
=
pci_bus_to_host
(
bus
);
return
hose
->
buid
;
}
}
/*
...
...
arch/powerpc/platforms/iseries/pci.c
浏览文件 @
eecba334
...
...
@@ -262,10 +262,6 @@ void __init iSeries_pci_final_fixup(void)
mf_display_src
(
0xC9000200
);
}
void
pcibios_fixup_bus
(
struct
pci_bus
*
PciBus
)
{
}
void
pcibios_fixup_resources
(
struct
pci_dev
*
pdev
)
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录