Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
d5eebf42
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d5eebf42
编写于
11月 11, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
上级
5643f000
e99f8b5e
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
23 addition
and
15 deletion
+23
-15
drivers/scsi/ahci.c
drivers/scsi/ahci.c
+1
-1
drivers/scsi/ata_piix.c
drivers/scsi/ata_piix.c
+1
-1
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+2
-0
drivers/scsi/libata-scsi.c
drivers/scsi/libata-scsi.c
+2
-0
drivers/scsi/pdc_adma.c
drivers/scsi/pdc_adma.c
+1
-1
drivers/scsi/sata_mv.c
drivers/scsi/sata_mv.c
+3
-1
drivers/scsi/sata_nv.c
drivers/scsi/sata_nv.c
+1
-1
drivers/scsi/sata_promise.c
drivers/scsi/sata_promise.c
+1
-1
drivers/scsi/sata_qstor.c
drivers/scsi/sata_qstor.c
+1
-1
drivers/scsi/sata_sil.c
drivers/scsi/sata_sil.c
+1
-1
drivers/scsi/sata_sil24.c
drivers/scsi/sata_sil24.c
+1
-1
drivers/scsi/sata_sis.c
drivers/scsi/sata_sis.c
+1
-1
drivers/scsi/sata_svw.c
drivers/scsi/sata_svw.c
+1
-1
drivers/scsi/sata_sx4.c
drivers/scsi/sata_sx4.c
+1
-1
drivers/scsi/sata_uli.c
drivers/scsi/sata_uli.c
+1
-1
drivers/scsi/sata_via.c
drivers/scsi/sata_via.c
+1
-1
drivers/scsi/sata_vsc.c
drivers/scsi/sata_vsc.c
+1
-1
include/linux/libata.h
include/linux/libata.h
+2
-0
未找到文件。
drivers/scsi/ahci.c
浏览文件 @
d5eebf42
...
...
@@ -255,7 +255,7 @@ static struct ata_port_info ahci_port_info[] = {
},
};
static
struct
pci_device_id
ahci_pci_tbl
[]
=
{
static
const
struct
pci_device_id
ahci_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_INTEL
,
0x2652
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
board_ahci
},
/* ICH6 */
{
PCI_VENDOR_ID_INTEL
,
0x2653
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
...
...
drivers/scsi/ata_piix.c
浏览文件 @
d5eebf42
...
...
@@ -95,7 +95,7 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
static
unsigned
int
in_module_init
=
1
;
static
struct
pci_device_id
piix_pci_tbl
[]
=
{
static
const
struct
pci_device_id
piix_pci_tbl
[]
=
{
#ifdef ATA_ENABLE_PATA
{
0x8086
,
0x7111
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
piix4_pata
},
{
0x8086
,
0x24db
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
ich5_pata
},
...
...
drivers/scsi/libata-core.c
浏览文件 @
d5eebf42
...
...
@@ -4563,6 +4563,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
probe_ent
->
irq
=
pdev
->
irq
;
probe_ent
->
irq_flags
=
SA_SHIRQ
;
probe_ent
->
private_data
=
port
[
0
]
->
private_data
;
if
(
ports
&
ATA_PORT_PRIMARY
)
{
probe_ent
->
port
[
p
].
cmd_addr
=
pci_resource_start
(
pdev
,
0
);
...
...
@@ -4599,6 +4600,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, stru
probe_ent
->
legacy_mode
=
1
;
probe_ent
->
n_ports
=
1
;
probe_ent
->
hard_port_no
=
port_num
;
probe_ent
->
private_data
=
port
->
private_data
;
switch
(
port_num
)
{
...
...
drivers/scsi/libata-scsi.c
浏览文件 @
d5eebf42
...
...
@@ -1129,6 +1129,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
* length 0 means transfer 0 block of data.
* However, for ATA R/W commands, sector count 0 means
* 256 or 65536 sectors, not 0 sectors as in SCSI.
*
* WARNING: one or two older ATA drives treat 0 as 0...
*/
goto
nothing_to_do
;
...
...
drivers/scsi/pdc_adma.c
浏览文件 @
d5eebf42
...
...
@@ -190,7 +190,7 @@ static struct ata_port_info adma_port_info[] = {
},
};
static
struct
pci_device_id
adma_ata_pci_tbl
[]
=
{
static
const
struct
pci_device_id
adma_ata_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_PDC
,
0x1841
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
board_1841_idx
},
...
...
drivers/scsi/sata_mv.c
浏览文件 @
d5eebf42
...
...
@@ -349,7 +349,7 @@ static struct ata_port_info mv_port_info[] = {
},
};
static
struct
pci_device_id
mv_pci_tbl
[]
=
{
static
const
struct
pci_device_id
mv_pci_tbl
[]
=
{
{
PCI_DEVICE
(
PCI_VENDOR_ID_MARVELL
,
0x5040
),
0
,
0
,
chip_504x
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_MARVELL
,
0x5041
),
0
,
0
,
chip_504x
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_MARVELL
,
0x5080
),
0
,
0
,
chip_508x
},
...
...
@@ -359,6 +359,8 @@ static struct pci_device_id mv_pci_tbl[] = {
{
PCI_DEVICE
(
PCI_VENDOR_ID_MARVELL
,
0x6041
),
0
,
0
,
chip_604x
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_MARVELL
,
0x6080
),
0
,
0
,
chip_608x
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_MARVELL
,
0x6081
),
0
,
0
,
chip_608x
},
{
PCI_DEVICE
(
PCI_VENDOR_ID_ADAPTEC2
,
0x0241
),
0
,
0
,
chip_604x
},
{}
/* terminate list */
};
...
...
drivers/scsi/sata_nv.c
浏览文件 @
d5eebf42
...
...
@@ -137,7 +137,7 @@ enum nv_host_type
CK804
};
static
struct
pci_device_id
nv_pci_tbl
[]
=
{
static
const
struct
pci_device_id
nv_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_NVIDIA
,
PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
NFORCE2
},
{
PCI_VENDOR_ID_NVIDIA
,
PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA
,
...
...
drivers/scsi/sata_promise.c
浏览文件 @
d5eebf42
...
...
@@ -193,7 +193,7 @@ static struct ata_port_info pdc_port_info[] = {
},
};
static
struct
pci_device_id
pdc_ata_pci_tbl
[]
=
{
static
const
struct
pci_device_id
pdc_ata_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_PROMISE
,
0x3371
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
board_2037x
},
{
PCI_VENDOR_ID_PROMISE
,
0x3570
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
...
...
drivers/scsi/sata_qstor.c
浏览文件 @
d5eebf42
...
...
@@ -184,7 +184,7 @@ static struct ata_port_info qs_port_info[] = {
},
};
static
struct
pci_device_id
qs_ata_pci_tbl
[]
=
{
static
const
struct
pci_device_id
qs_ata_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_PDC
,
0x2068
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
board_2068_idx
},
...
...
drivers/scsi/sata_sil.c
浏览文件 @
d5eebf42
...
...
@@ -87,7 +87,7 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
static
void
sil_post_set_mode
(
struct
ata_port
*
ap
);
static
struct
pci_device_id
sil_pci_tbl
[]
=
{
static
const
struct
pci_device_id
sil_pci_tbl
[]
=
{
{
0x1095
,
0x3112
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
sil_3112_m15w
},
{
0x1095
,
0x0240
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
sil_3112_m15w
},
{
0x1095
,
0x3512
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
sil_3112
},
...
...
drivers/scsi/sata_sil24.c
浏览文件 @
d5eebf42
...
...
@@ -240,7 +240,7 @@ static void sil24_port_stop(struct ata_port *ap);
static
void
sil24_host_stop
(
struct
ata_host_set
*
host_set
);
static
int
sil24_init_one
(
struct
pci_dev
*
pdev
,
const
struct
pci_device_id
*
ent
);
static
struct
pci_device_id
sil24_pci_tbl
[]
=
{
static
const
struct
pci_device_id
sil24_pci_tbl
[]
=
{
{
0x1095
,
0x3124
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
BID_SIL3124
},
{
0x1095
,
0x3132
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
BID_SIL3132
},
{
0x1095
,
0x3131
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
BID_SIL3131
},
...
...
drivers/scsi/sata_sis.c
浏览文件 @
d5eebf42
...
...
@@ -67,7 +67,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
static
u32
sis_scr_read
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
);
static
void
sis_scr_write
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
,
u32
val
);
static
struct
pci_device_id
sis_pci_tbl
[]
=
{
static
const
struct
pci_device_id
sis_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_SI
,
0x180
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
sis_180
},
{
PCI_VENDOR_ID_SI
,
0x181
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
sis_180
},
{
PCI_VENDOR_ID_SI
,
0x182
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
sis_180
},
...
...
drivers/scsi/sata_svw.c
浏览文件 @
d5eebf42
...
...
@@ -466,7 +466,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
* 0x24a is device ID for BCM5785 (aka HT1000) HT southbridge integrated SATA
* controller
* */
static
struct
pci_device_id
k2_sata_pci_tbl
[]
=
{
static
const
struct
pci_device_id
k2_sata_pci_tbl
[]
=
{
{
0x1166
,
0x0240
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
4
},
{
0x1166
,
0x0241
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
4
},
{
0x1166
,
0x0242
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
8
},
...
...
drivers/scsi/sata_sx4.c
浏览文件 @
d5eebf42
...
...
@@ -229,7 +229,7 @@ static struct ata_port_info pdc_port_info[] = {
};
static
struct
pci_device_id
pdc_sata_pci_tbl
[]
=
{
static
const
struct
pci_device_id
pdc_sata_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_PROMISE
,
0x6622
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
board_20621
},
{
}
/* terminate list */
...
...
drivers/scsi/sata_uli.c
浏览文件 @
d5eebf42
...
...
@@ -55,7 +55,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
static
u32
uli_scr_read
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
);
static
void
uli_scr_write
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
,
u32
val
);
static
struct
pci_device_id
uli_pci_tbl
[]
=
{
static
const
struct
pci_device_id
uli_pci_tbl
[]
=
{
{
PCI_VENDOR_ID_AL
,
0x5289
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
uli_5289
},
{
PCI_VENDOR_ID_AL
,
0x5287
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
uli_5287
},
{
PCI_VENDOR_ID_AL
,
0x5281
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
uli_5281
},
...
...
drivers/scsi/sata_via.c
浏览文件 @
d5eebf42
...
...
@@ -75,7 +75,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
static
u32
svia_scr_read
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
);
static
void
svia_scr_write
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
,
u32
val
);
static
struct
pci_device_id
svia_pci_tbl
[]
=
{
static
const
struct
pci_device_id
svia_pci_tbl
[]
=
{
{
0x1106
,
0x3149
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
vt6420
},
{
0x1106
,
0x3249
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
vt6421
},
...
...
drivers/scsi/sata_vsc.c
浏览文件 @
d5eebf42
...
...
@@ -400,7 +400,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d
* 0x8086/0x3200 is the Intel 31244, which is supposed to be identical
* compatibility is untested as of yet
*/
static
struct
pci_device_id
vsc_sata_pci_tbl
[]
=
{
static
const
struct
pci_device_id
vsc_sata_pci_tbl
[]
=
{
{
0x1725
,
0x7174
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0x10600
,
0xFFFFFF
,
0
},
{
0x8086
,
0x3200
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0x10600
,
0xFFFFFF
,
0
},
{
}
...
...
include/linux/libata.h
浏览文件 @
d5eebf42
...
...
@@ -29,6 +29,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <linux/ata.h>
#include <linux/workqueue.h>
...
...
@@ -404,6 +405,7 @@ struct ata_port_info {
unsigned
long
mwdma_mask
;
unsigned
long
udma_mask
;
const
struct
ata_port_operations
*
port_ops
;
void
*
private_data
;
};
struct
ata_timing
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录