Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
5f502413
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
5f502413
编写于
9月 08, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
上级
82b7ec75
8add7885
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
25 deletion
+11
-25
drivers/scsi/sata_mv.c
drivers/scsi/sata_mv.c
+0
-16
drivers/scsi/sata_sis.c
drivers/scsi/sata_sis.c
+11
-9
未找到文件。
drivers/scsi/sata_mv.c
浏览文件 @
5f502413
...
...
@@ -699,22 +699,6 @@ static int mv_host_init(struct ata_probe_ent *probe_ent)
return
rc
;
}
/* move to PCI layer, integrate w/ MSI stuff */
static
void
pci_intx
(
struct
pci_dev
*
pdev
,
int
enable
)
{
u16
pci_command
,
new
;
pci_read_config_word
(
pdev
,
PCI_COMMAND
,
&
pci_command
);
if
(
enable
)
new
=
pci_command
&
~
PCI_COMMAND_INTX_DISABLE
;
else
new
=
pci_command
|
PCI_COMMAND_INTX_DISABLE
;
if
(
new
!=
pci_command
)
pci_write_config_word
(
pdev
,
PCI_COMMAND
,
pci_command
);
}
static
int
mv_init_one
(
struct
pci_dev
*
pdev
,
const
struct
pci_device_id
*
ent
)
{
static
int
printed_version
=
0
;
...
...
drivers/scsi/sata_sis.c
浏览文件 @
5f502413
...
...
@@ -55,7 +55,7 @@ enum {
SIS180_SATA1_OFS
=
0x10
,
/* offset from sata0->sata1 phy regs */
SIS182_SATA1_OFS
=
0x20
,
/* offset from sata0->sata1 phy regs */
SIS_PMR
=
0x90
,
/* port mapping register */
SIS_PMR_COMBINED
=
0x30
,
SIS_PMR_COMBINED
=
0x30
,
/* random bits */
SIS_FLAG_CFGSCR
=
(
1
<<
30
),
/* host flag: SCRs via PCI cfg */
...
...
@@ -147,11 +147,13 @@ static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg,
{
unsigned
int
addr
=
SIS_SCR_BASE
+
(
4
*
sc_reg
);
if
(
port_no
)
if
(
port_no
)
{
if
(
device
==
0x182
)
addr
+=
SIS182_SATA1_OFS
;
else
addr
+=
SIS180_SATA1_OFS
;
}
return
addr
;
}
...
...
@@ -166,10 +168,10 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
return
0xffffffff
;
pci_read_config_byte
(
pdev
,
SIS_PMR
,
&
pmr
);
pci_read_config_dword
(
pdev
,
cfg_addr
,
&
val
);
if
((
pdev
->
device
==
0x182
)
||
(
pmr
&
SIS_PMR_COMBINED
))
if
((
pdev
->
device
==
0x182
)
||
(
pmr
&
SIS_PMR_COMBINED
))
pci_read_config_dword
(
pdev
,
cfg_addr
+
0x10
,
&
val2
);
return
val
|
val2
;
...
...
@@ -185,7 +187,7 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
return
;
pci_read_config_byte
(
pdev
,
SIS_PMR
,
&
pmr
);
pci_write_config_dword
(
pdev
,
cfg_addr
,
val
);
if
((
pdev
->
device
==
0x182
)
||
(
pmr
&
SIS_PMR_COMBINED
))
...
...
@@ -195,7 +197,7 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
static
u32
sis_scr_read
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
)
{
struct
pci_dev
*
pdev
=
to_pci_dev
(
ap
->
host_set
->
dev
);
u32
val
,
val2
;
u32
val
,
val2
=
0
;
u8
pmr
;
if
(
sc_reg
>
SCR_CONTROL
)
...
...
@@ -209,9 +211,9 @@ static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
val
=
inl
(
ap
->
ioaddr
.
scr_addr
+
(
sc_reg
*
4
));
if
((
pdev
->
device
==
0x182
)
||
(
pmr
&
SIS_PMR_COMBINED
))
val2
=
inl
(
ap
->
ioaddr
.
scr_addr
+
(
sc_reg
*
4
)
+
0x10
);
val2
=
inl
(
ap
->
ioaddr
.
scr_addr
+
(
sc_reg
*
4
)
+
0x10
);
return
val
|
val2
;
return
val
|
val2
;
}
static
void
sis_scr_write
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
,
u32
val
)
...
...
@@ -223,7 +225,7 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
return
;
pci_read_config_byte
(
pdev
,
SIS_PMR
,
&
pmr
);
if
(
ap
->
flags
&
SIS_FLAG_CFGSCR
)
sis_scr_cfg_write
(
ap
,
sc_reg
,
val
);
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录