Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
6fb0caa4
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,发现更多精彩内容 >>
提交
6fb0caa4
编写于
8月 04, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
上级
7cfa132c
fdd0edf2
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
41 addition
and
42 deletion
+41
-42
drivers/fc4/fc.c
drivers/fc4/fc.c
+1
-1
drivers/scsi/aic7xxx/aic7xxx_osm.c
drivers/scsi/aic7xxx/aic7xxx_osm.c
+11
-13
drivers/scsi/ibmvscsi/srp.h
drivers/scsi/ibmvscsi/srp.h
+1
-1
drivers/scsi/ips.c
drivers/scsi/ips.c
+5
-3
drivers/scsi/ips.h
drivers/scsi/ips.h
+21
-18
drivers/scsi/st.c
drivers/scsi/st.c
+2
-6
未找到文件。
drivers/fc4/fc.c
浏览文件 @
6fb0caa4
...
...
@@ -1004,8 +1004,8 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
return FAILED;
}
fc->rst_pkt->eh_state = SCSI_STATE_UNUSED;
return SUCCESS;
#endif
return
SUCCESS
;
}
static
int
__fcp_scsi_host_reset
(
Scsi_Cmnd
*
SCpnt
)
...
...
drivers/scsi/aic7xxx/aic7xxx_osm.c
浏览文件 @
6fb0caa4
...
...
@@ -1264,14 +1264,12 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
}
switch
((
dev
->
flags
&
(
AHC_DEV_Q_BASIC
|
AHC_DEV_Q_TAGGED
)))
{
case
AHC_DEV_Q_BASIC
:
scsi_adjust_queue_depth
(
sdev
,
MSG_SIMPLE_TASK
,
dev
->
openings
+
dev
->
active
);
scsi_set_tag_type
(
sdev
,
MSG_SIMPLE_TAG
);
scsi_activate_tcq
(
sdev
,
dev
->
openings
+
dev
->
active
);
break
;
case
AHC_DEV_Q_TAGGED
:
scsi_adjust_queue_depth
(
sdev
,
MSG_ORDERED_TASK
,
dev
->
openings
+
dev
->
active
);
scsi_set_tag_type
(
sdev
,
MSG_ORDERED_TAG
);
scsi_activate_tcq
(
sdev
,
dev
->
openings
+
dev
->
active
);
break
;
default:
/*
...
...
@@ -1280,9 +1278,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
* serially on the controller/device. This should
* remove some latency.
*/
scsi_adjust_queue_depth
(
sdev
,
/*NON-TAGGED*/
0
,
/*queue depth*/
2
);
scsi_deactivate_tcq
(
sdev
,
2
);
break
;
}
}
...
...
@@ -1635,9 +1631,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
spi_period
(
starget
)
=
tinfo
->
curr
.
period
;
spi_width
(
starget
)
=
tinfo
->
curr
.
width
;
spi_offset
(
starget
)
=
tinfo
->
curr
.
offset
;
spi_dt
(
starget
)
=
tinfo
->
curr
.
ppr_options
&
MSG_EXT_PPR_DT_REQ
;
spi_qas
(
starget
)
=
tinfo
->
curr
.
ppr_options
&
MSG_EXT_PPR_QAS_REQ
;
spi_iu
(
starget
)
=
tinfo
->
curr
.
ppr_options
&
MSG_EXT_PPR_IU_REQ
;
spi_dt
(
starget
)
=
tinfo
->
curr
.
ppr_options
&
MSG_EXT_PPR_DT_REQ
?
1
:
0
;
spi_qas
(
starget
)
=
tinfo
->
curr
.
ppr_options
&
MSG_EXT_PPR_QAS_REQ
?
1
:
0
;
spi_iu
(
starget
)
=
tinfo
->
curr
.
ppr_options
&
MSG_EXT_PPR_IU_REQ
?
1
:
0
;
spi_display_xfer_agreement
(
starget
);
break
;
}
...
...
@@ -2429,12 +2425,14 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
unsigned
int
ppr_options
=
tinfo
->
goal
.
ppr_options
&
~
MSG_EXT_PPR_DT_REQ
;
unsigned
int
period
=
tinfo
->
goal
.
period
;
unsigned
int
width
=
tinfo
->
goal
.
width
;
unsigned
long
flags
;
struct
ahc_syncrate
*
syncrate
;
if
(
dt
)
{
period
=
9
;
/* 12.5ns is the only period valid for DT */
ppr_options
|=
MSG_EXT_PPR_DT_REQ
;
if
(
!
width
)
ahc_linux_set_width
(
starget
,
1
);
}
else
if
(
period
==
9
)
period
=
10
;
/* if resetting DT, period must be >= 25ns */
...
...
drivers/scsi/ibmvscsi/srp.h
浏览文件 @
6fb0caa4
...
...
@@ -35,7 +35,7 @@
enum
srp_types
{
SRP_LOGIN_REQ_TYPE
=
0x00
,
SRP_LOGIN_RSP_TYPE
=
0xC0
,
SRP_LOGIN_REJ_TYPE
=
0x
80
,
SRP_LOGIN_REJ_TYPE
=
0x
C2
,
SRP_I_LOGOUT_TYPE
=
0x03
,
SRP_T_LOGOUT_TYPE
=
0x80
,
SRP_TSK_MGMT_TYPE
=
0x01
,
...
...
drivers/scsi/ips.c
浏览文件 @
6fb0caa4
...
...
@@ -133,10 +133,12 @@
/* 6.10.00 - Remove 1G Addressing Limitations */
/* 6.11.xx - Get VersionInfo buffer off the stack ! DDTS 60401 */
/* 6.11.xx - Make Logical Drive Info structure safe for DMA DDTS 60639 */
/* 7.10.
xx
- Add highmem_io flag in SCSI Templete for 2.4 kernels */
/* 7.10.
18
- Add highmem_io flag in SCSI Templete for 2.4 kernels */
/* - Fix path/name for scsi_hosts.h include for 2.6 kernels */
/* - Fix sort order of 7k */
/* - Remove 3 unused "inline" functions */
/* 7.12.xx - Use STATIC functions whereever possible */
/* - Clean up deprecated MODULE_PARM calls */
/*****************************************************************************/
/*
...
...
@@ -207,8 +209,8 @@ module_param(ips, charp, 0);
/*
* DRIVER_VER
*/
#define IPS_VERSION_HIGH "7.1
0
"
#define IPS_VERSION_LOW ".
18
"
#define IPS_VERSION_HIGH "7.1
2
"
#define IPS_VERSION_LOW ".
02
"
#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
#warning "This driver has only been tested on the x86/ia64/x86_64 platforms"
...
...
drivers/scsi/ips.h
浏览文件 @
6fb0caa4
...
...
@@ -87,15 +87,14 @@
#define scsi_set_pci_device(sh,dev) (0)
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#ifndef irqreturn_t
typedef
void
irqreturn_t
;
#endif
#ifndef IRQ_NONE
typedef
void
irqreturn_t
;
#define IRQ_NONE
#define IRQ_HANDLED
#define IRQ_RETVAL(x)
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#define IPS_REGISTER_HOSTS(SHT) scsi_register_module(MODULE_SCSI_HA,SHT)
#define IPS_UNREGISTER_HOSTS(SHT) scsi_unregister_module(MODULE_SCSI_HA,SHT)
#define IPS_ADD_HOST(shost,device)
...
...
@@ -123,6 +122,10 @@
#ifndef min
#define min(x,y) ((x) < (y) ? x : y)
#endif
#ifndef __iomem
/* For clean compiles in earlier kernels without __iomem annotations */
#define __iomem
#endif
#define pci_dma_hi32(a) ((a >> 16) >> 16)
#define pci_dma_lo32(a) (a & 0xffffffff)
...
...
@@ -1206,13 +1209,13 @@ typedef struct {
#define IPS_VER_MAJOR 7
#define IPS_VER_MAJOR_STRING "7"
#define IPS_VER_MINOR 1
0
#define IPS_VER_MINOR_STRING "1
0
"
#define IPS_VER_BUILD
18
#define IPS_VER_BUILD_STRING "
18
"
#define IPS_VER_STRING "7.1
0.18
"
#define IPS_VER_MINOR 1
2
#define IPS_VER_MINOR_STRING "1
2
"
#define IPS_VER_BUILD
02
#define IPS_VER_BUILD_STRING "
02
"
#define IPS_VER_STRING "7.1
2.02
"
#define IPS_RELEASE_ID 0x00020000
#define IPS_BUILD_IDENT 7
3
1
#define IPS_BUILD_IDENT 7
6
1
#define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All Rights Reserved."
#define IPS_ADAPTECCOPYRIGHT_STRING "(c) Copyright Adaptec, Inc. 2002 to 2004. All Rights Reserved."
#define IPS_DELLCOPYRIGHT_STRING "(c) Copyright Dell 2004. All Rights Reserved."
...
...
@@ -1223,12 +1226,12 @@ typedef struct {
#define IPS_VER_SERVERAID2 "2.88.13"
#define IPS_VER_NAVAJO "2.88.13"
#define IPS_VER_SERVERAID3 "6.10.24"
#define IPS_VER_SERVERAID4H "7.1
0.11
"
#define IPS_VER_SERVERAID4MLx "7.1
0.18
"
#define IPS_VER_SARASOTA "7.1
0.18
"
#define IPS_VER_MARCO "7.1
0.18
"
#define IPS_VER_SEBRING "7.1
0.18
"
#define IPS_VER_KEYWEST "7.1
0.18
"
#define IPS_VER_SERVERAID4H "7.1
2.02
"
#define IPS_VER_SERVERAID4MLx "7.1
2.02
"
#define IPS_VER_SARASOTA "7.1
2.02
"
#define IPS_VER_MARCO "7.1
2.02
"
#define IPS_VER_SEBRING "7.1
2.02
"
#define IPS_VER_KEYWEST "7.1
2.02
"
/* Compatability IDs for various adapters */
#define IPS_COMPAT_UNKNOWN ""
...
...
drivers/scsi/st.c
浏览文件 @
6fb0caa4
...
...
@@ -4149,12 +4149,10 @@ static int __init init_st(void)
do_create_driverfs_files
();
return
0
;
}
if
(
st_sysfs_class
)
class_destroy
(
st_sysfs_class
);
unregister_chrdev_region
(
MKDEV
(
SCSI_TAPE_MAJOR
,
0
),
ST_MAX_TAPE_ENTRIES
);
}
class_destroy
(
st_sysfs_class
);
printk
(
KERN_ERR
"Unable to get major %d for SCSI tapes
\n
"
,
SCSI_TAPE_MAJOR
);
return
1
;
...
...
@@ -4162,13 +4160,11 @@ static int __init init_st(void)
static
void
__exit
exit_st
(
void
)
{
if
(
st_sysfs_class
)
class_destroy
(
st_sysfs_class
);
st_sysfs_class
=
NULL
;
do_remove_driverfs_files
();
scsi_unregister_driver
(
&
st_template
.
gendrv
);
unregister_chrdev_region
(
MKDEV
(
SCSI_TAPE_MAJOR
,
0
),
ST_MAX_TAPE_ENTRIES
);
class_destroy
(
st_sysfs_class
);
kfree
(
scsi_tapes
);
printk
(
KERN_INFO
"st: Unloaded.
\n
"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录