Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
77ae174d
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,发现更多精彩内容 >>
提交
77ae174d
编写于
7月 03, 2014
作者:
J
James Bottomley
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
上级
5616b0a4
8faeb529
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
75 addition
and
32 deletion
+75
-32
MAINTAINERS
MAINTAINERS
+5
-4
drivers/scsi/be2iscsi/be_main.c
drivers/scsi/be2iscsi/be_main.c
+2
-0
drivers/scsi/be2iscsi/be_mgmt.c
drivers/scsi/be2iscsi/be_mgmt.c
+1
-3
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+4
-12
drivers/scsi/bnx2fc/bnx2fc_io.c
drivers/scsi/bnx2fc/bnx2fc_io.c
+2
-0
drivers/scsi/ibmvscsi/ibmvscsi.c
drivers/scsi/ibmvscsi/ibmvscsi.c
+12
-1
drivers/scsi/pm8001/pm8001_init.c
drivers/scsi/pm8001/pm8001_init.c
+10
-3
drivers/scsi/qla2xxx/qla_target.c
drivers/scsi/qla2xxx/qla_target.c
+11
-6
drivers/scsi/qla2xxx/qla_target.h
drivers/scsi/qla2xxx/qla_target.h
+2
-2
drivers/scsi/scsi_transport_fc.c
drivers/scsi/scsi_transport_fc.c
+1
-0
drivers/scsi/virtio_scsi.c
drivers/scsi/virtio_scsi.c
+25
-1
未找到文件。
MAINTAINERS
浏览文件 @
77ae174d
...
...
@@ -5517,10 +5517,11 @@ S: Maintained
F: arch/arm/mach-lpc32xx/
LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
M: Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
M: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
M: support@lsi.com
L: DL-MPTFusionLinux@lsi.com
M: Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>
M: Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>
M: Sreekanth Reddy <sreekanth.reddy@avagotech.com>
M: Abhijit Mahajan <abhijit.mahajan@avagotech.com>
L: MPT-FusionLinux.pdl@avagotech.com
L: linux-scsi@vger.kernel.org
W: http://www.lsilogic.com/support
S: Supported
...
...
drivers/scsi/be2iscsi/be_main.c
浏览文件 @
77ae174d
...
...
@@ -4198,6 +4198,8 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)
kfree
(
phba
->
ep_array
);
phba
->
ep_array
=
NULL
;
ret
=
-
ENOMEM
;
goto
free_memory
;
}
for
(
i
=
0
;
i
<
phba
->
params
.
cxns_per_ctrl
;
i
++
)
{
...
...
drivers/scsi/be2iscsi/be_mgmt.c
浏览文件 @
77ae174d
...
...
@@ -1008,10 +1008,8 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
BE2_IPV6
:
BE2_IPV4
;
rc
=
mgmt_get_if_info
(
phba
,
ip_type
,
&
if_info
);
if
(
rc
)
{
kfree
(
if_info
);
if
(
rc
)
return
rc
;
}
if
(
boot_proto
==
ISCSI_BOOTPROTO_DHCP
)
{
if
(
if_info
->
dhcp_state
)
{
...
...
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
浏览文件 @
77ae174d
...
...
@@ -516,23 +516,17 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
skb_pull
(
skb
,
sizeof
(
struct
fcoe_hdr
));
fr_len
=
skb
->
len
-
sizeof
(
struct
fcoe_crc_eof
);
stats
=
per_cpu_ptr
(
lport
->
stats
,
get_cpu
());
stats
->
RxFrames
++
;
stats
->
RxWords
+=
fr_len
/
FCOE_WORD_TO_BYTE
;
fp
=
(
struct
fc_frame
*
)
skb
;
fc_frame_init
(
fp
);
fr_dev
(
fp
)
=
lport
;
fr_sof
(
fp
)
=
hp
->
fcoe_sof
;
if
(
skb_copy_bits
(
skb
,
fr_len
,
&
crc_eof
,
sizeof
(
crc_eof
)))
{
put_cpu
();
kfree_skb
(
skb
);
return
;
}
fr_eof
(
fp
)
=
crc_eof
.
fcoe_eof
;
fr_crc
(
fp
)
=
crc_eof
.
fcoe_crc32
;
if
(
pskb_trim
(
skb
,
fr_len
))
{
put_cpu
();
kfree_skb
(
skb
);
return
;
}
...
...
@@ -544,7 +538,6 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
port
=
lport_priv
(
vn_port
);
if
(
!
ether_addr_equal
(
port
->
data_src_addr
,
dest_mac
))
{
BNX2FC_HBA_DBG
(
lport
,
"fpma mismatch
\n
"
);
put_cpu
();
kfree_skb
(
skb
);
return
;
}
...
...
@@ -552,7 +545,6 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
if
(
fh
->
fh_r_ctl
==
FC_RCTL_DD_SOL_DATA
&&
fh
->
fh_type
==
FC_TYPE_FCP
)
{
/* Drop FCP data. We dont this in L2 path */
put_cpu
();
kfree_skb
(
skb
);
return
;
}
...
...
@@ -562,7 +554,6 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
case
ELS_LOGO
:
if
(
ntoh24
(
fh
->
fh_s_id
)
==
FC_FID_FLOGI
)
{
/* drop non-FIP LOGO */
put_cpu
();
kfree_skb
(
skb
);
return
;
}
...
...
@@ -572,22 +563,23 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
if
(
fh
->
fh_r_ctl
==
FC_RCTL_BA_ABTS
)
{
/* Drop incoming ABTS */
put_cpu
();
kfree_skb
(
skb
);
return
;
}
stats
=
per_cpu_ptr
(
lport
->
stats
,
smp_processor_id
());
stats
->
RxFrames
++
;
stats
->
RxWords
+=
fr_len
/
FCOE_WORD_TO_BYTE
;
if
(
le32_to_cpu
(
fr_crc
(
fp
))
!=
~
crc32
(
~
0
,
skb
->
data
,
fr_len
))
{
if
(
stats
->
InvalidCRCCount
<
5
)
printk
(
KERN_WARNING
PFX
"dropping frame with "
"CRC error
\n
"
);
stats
->
InvalidCRCCount
++
;
put_cpu
();
kfree_skb
(
skb
);
return
;
}
put_cpu
();
fc_exch_recv
(
lport
,
fp
);
}
...
...
drivers/scsi/bnx2fc/bnx2fc_io.c
浏览文件 @
77ae174d
...
...
@@ -282,6 +282,8 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)
arr_sz
,
GFP_KERNEL
);
if
(
!
cmgr
->
free_list_lock
)
{
printk
(
KERN_ERR
PFX
"failed to alloc free_list_lock
\n
"
);
kfree
(
cmgr
->
free_list
);
cmgr
->
free_list
=
NULL
;
goto
mem_err
;
}
...
...
drivers/scsi/ibmvscsi/ibmvscsi.c
浏览文件 @
77ae174d
...
...
@@ -185,6 +185,11 @@ static struct viosrp_crq *crq_queue_next_crq(struct crq_queue *queue)
if
(
crq
->
valid
&
0x80
)
{
if
(
++
queue
->
cur
==
queue
->
size
)
queue
->
cur
=
0
;
/* Ensure the read of the valid bit occurs before reading any
* other bits of the CRQ entry
*/
rmb
();
}
else
crq
=
NULL
;
spin_unlock_irqrestore
(
&
queue
->
lock
,
flags
);
...
...
@@ -203,6 +208,11 @@ static int ibmvscsi_send_crq(struct ibmvscsi_host_data *hostdata,
{
struct
vio_dev
*
vdev
=
to_vio_dev
(
hostdata
->
dev
);
/*
* Ensure the command buffer is flushed to memory before handing it
* over to the VIOS to prevent it from fetching any stale data.
*/
mb
();
return
plpar_hcall_norets
(
H_SEND_CRQ
,
vdev
->
unit_address
,
word1
,
word2
);
}
...
...
@@ -797,7 +807,8 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata, int error_code)
evt
->
hostdata
->
dev
);
if
(
evt
->
cmnd_done
)
evt
->
cmnd_done
(
evt
->
cmnd
);
}
else
if
(
evt
->
done
)
}
else
if
(
evt
->
done
&&
evt
->
crq
.
format
!=
VIOSRP_MAD_FORMAT
&&
evt
->
iu
.
srp
.
login_req
.
opcode
!=
SRP_LOGIN_REQ
)
evt
->
done
(
evt
);
free_event_struct
(
&
evt
->
hostdata
->
pool
,
evt
);
spin_lock_irqsave
(
hostdata
->
host
->
host_lock
,
flags
);
...
...
drivers/scsi/pm8001/pm8001_init.c
浏览文件 @
77ae174d
...
...
@@ -677,7 +677,7 @@ static void pm8001_init_sas_add(struct pm8001_hba_info *pm8001_ha)
* pm8001_get_phy_settings_info : Read phy setting values.
* @pm8001_ha : our hba.
*/
void
pm8001_get_phy_settings_info
(
struct
pm8001_hba_info
*
pm8001_ha
)
static
int
pm8001_get_phy_settings_info
(
struct
pm8001_hba_info
*
pm8001_ha
)
{
#ifdef PM8001_READ_VPD
...
...
@@ -691,11 +691,15 @@ void pm8001_get_phy_settings_info(struct pm8001_hba_info *pm8001_ha)
payload
.
offset
=
0
;
payload
.
length
=
4096
;
payload
.
func_specific
=
kzalloc
(
4096
,
GFP_KERNEL
);
if
(
!
payload
.
func_specific
)
return
-
ENOMEM
;
/* Read phy setting values from flash */
PM8001_CHIP_DISP
->
get_nvmd_req
(
pm8001_ha
,
&
payload
);
wait_for_completion
(
&
completion
);
pm8001_set_phy_profile
(
pm8001_ha
,
sizeof
(
u8
),
payload
.
func_specific
);
kfree
(
payload
.
func_specific
);
#endif
return
0
;
}
#ifdef PM8001_USE_MSIX
...
...
@@ -879,8 +883,11 @@ static int pm8001_pci_probe(struct pci_dev *pdev,
pm8001_init_sas_add
(
pm8001_ha
);
/* phy setting support for motherboard controller */
if
(
pdev
->
subsystem_vendor
!=
PCI_VENDOR_ID_ADAPTEC2
&&
pdev
->
subsystem_vendor
!=
0
)
pm8001_get_phy_settings_info
(
pm8001_ha
);
pdev
->
subsystem_vendor
!=
0
)
{
rc
=
pm8001_get_phy_settings_info
(
pm8001_ha
);
if
(
rc
)
goto
err_out_shost
;
}
pm8001_post_sas_ha_init
(
shost
,
chip
);
rc
=
sas_register_ha
(
SHOST_TO_SAS_HA
(
shost
));
if
(
rc
)
...
...
drivers/scsi/qla2xxx/qla_target.c
浏览文件 @
77ae174d
...
...
@@ -1128,7 +1128,7 @@ static void qlt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
ctio
->
u
.
status1
.
flags
=
__constant_cpu_to_le16
(
CTIO7_FLAGS_STATUS_MODE_1
|
CTIO7_FLAGS_TERMINATE
);
ctio
->
u
.
status1
.
ox_id
=
entry
->
fcp_hdr_le
.
ox_id
;
ctio
->
u
.
status1
.
ox_id
=
cpu_to_le16
(
entry
->
fcp_hdr_le
.
ox_id
)
;
qla2x00_start_iocbs
(
vha
,
vha
->
req
);
...
...
@@ -1262,6 +1262,7 @@ static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
{
struct
atio_from_isp
*
atio
=
&
mcmd
->
orig_iocb
.
atio
;
struct
ctio7_to_24xx
*
ctio
;
uint16_t
temp
;
ql_dbg
(
ql_dbg_tgt
,
ha
,
0xe008
,
"Sending task mgmt CTIO7 (ha=%p, atio=%p, resp_code=%x
\n
"
,
...
...
@@ -1292,7 +1293,8 @@ static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
ctio
->
u
.
status1
.
flags
=
(
atio
->
u
.
isp24
.
attr
<<
9
)
|
__constant_cpu_to_le16
(
CTIO7_FLAGS_STATUS_MODE_1
|
CTIO7_FLAGS_SEND_STATUS
);
ctio
->
u
.
status1
.
ox_id
=
swab16
(
atio
->
u
.
isp24
.
fcp_hdr
.
ox_id
);
temp
=
be16_to_cpu
(
atio
->
u
.
isp24
.
fcp_hdr
.
ox_id
);
ctio
->
u
.
status1
.
ox_id
=
cpu_to_le16
(
temp
);
ctio
->
u
.
status1
.
scsi_status
=
__constant_cpu_to_le16
(
SS_RESPONSE_INFO_LEN_VALID
);
ctio
->
u
.
status1
.
response_len
=
__constant_cpu_to_le16
(
8
);
...
...
@@ -1513,6 +1515,7 @@ static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm,
struct
ctio7_to_24xx
*
pkt
;
struct
qla_hw_data
*
ha
=
vha
->
hw
;
struct
atio_from_isp
*
atio
=
&
prm
->
cmd
->
atio
;
uint16_t
temp
;
pkt
=
(
struct
ctio7_to_24xx
*
)
vha
->
req
->
ring_ptr
;
prm
->
pkt
=
pkt
;
...
...
@@ -1541,13 +1544,13 @@ static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm,
pkt
->
initiator_id
[
2
]
=
atio
->
u
.
isp24
.
fcp_hdr
.
s_id
[
0
];
pkt
->
exchange_addr
=
atio
->
u
.
isp24
.
exchange_addr
;
pkt
->
u
.
status0
.
flags
|=
(
atio
->
u
.
isp24
.
attr
<<
9
);
pkt
->
u
.
status0
.
ox_id
=
swab16
(
atio
->
u
.
isp24
.
fcp_hdr
.
ox_id
);
temp
=
be16_to_cpu
(
atio
->
u
.
isp24
.
fcp_hdr
.
ox_id
);
pkt
->
u
.
status0
.
ox_id
=
cpu_to_le16
(
temp
);
pkt
->
u
.
status0
.
relative_offset
=
cpu_to_le32
(
prm
->
cmd
->
offset
);
ql_dbg
(
ql_dbg_tgt
,
vha
,
0xe00c
,
"qla_target(%d): handle(cmd) -> %08x, timeout %d, ox_id %#x
\n
"
,
vha
->
vp_idx
,
pkt
->
handle
,
QLA_TGT_TIMEOUT
,
le16_to_cpu
(
pkt
->
u
.
status0
.
ox_id
));
vha
->
vp_idx
,
pkt
->
handle
,
QLA_TGT_TIMEOUT
,
temp
);
return
0
;
}
...
...
@@ -2619,6 +2622,7 @@ static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
struct
qla_hw_data
*
ha
=
vha
->
hw
;
request_t
*
pkt
;
int
ret
=
0
;
uint16_t
temp
;
ql_dbg
(
ql_dbg_tgt
,
vha
,
0xe01c
,
"Sending TERM EXCH CTIO (ha=%p)
\n
"
,
ha
);
...
...
@@ -2655,7 +2659,8 @@ static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
ctio24
->
u
.
status1
.
flags
=
(
atio
->
u
.
isp24
.
attr
<<
9
)
|
__constant_cpu_to_le16
(
CTIO7_FLAGS_STATUS_MODE_1
|
CTIO7_FLAGS_TERMINATE
);
ctio24
->
u
.
status1
.
ox_id
=
swab16
(
atio
->
u
.
isp24
.
fcp_hdr
.
ox_id
);
temp
=
be16_to_cpu
(
atio
->
u
.
isp24
.
fcp_hdr
.
ox_id
);
ctio24
->
u
.
status1
.
ox_id
=
cpu_to_le16
(
temp
);
/* Most likely, it isn't needed */
ctio24
->
u
.
status1
.
residual
=
get_unaligned
((
uint32_t
*
)
...
...
drivers/scsi/qla2xxx/qla_target.h
浏览文件 @
77ae174d
...
...
@@ -443,7 +443,7 @@ struct ctio7_to_24xx {
uint16_t
reserved1
;
__le16
flags
;
uint32_t
residual
;
uint16_t
ox_id
;
__le16
ox_id
;
uint16_t
scsi_status
;
uint32_t
relative_offset
;
uint32_t
reserved2
;
...
...
@@ -458,7 +458,7 @@ struct ctio7_to_24xx {
uint16_t
sense_length
;
uint16_t
flags
;
uint32_t
residual
;
uint16_t
ox_id
;
__le16
ox_id
;
uint16_t
scsi_status
;
uint16_t
response_len
;
uint16_t
reserved
;
...
...
drivers/scsi/scsi_transport_fc.c
浏览文件 @
77ae174d
...
...
@@ -2549,6 +2549,7 @@ fc_rport_final_delete(struct work_struct *work)
fc_flush_devloss
(
shost
);
if
(
!
cancel_delayed_work
(
&
rport
->
dev_loss_work
))
fc_flush_devloss
(
shost
);
cancel_work_sync
(
&
rport
->
scan_work
);
spin_lock_irqsave
(
shost
->
host_lock
,
flags
);
rport
->
flags
&=
~
FC_RPORT_DEVLOSS_PENDING
;
}
...
...
drivers/scsi/virtio_scsi.c
浏览文件 @
77ae174d
...
...
@@ -237,6 +237,16 @@ static void virtscsi_req_done(struct virtqueue *vq)
virtscsi_vq_done
(
vscsi
,
req_vq
,
virtscsi_complete_cmd
);
};
static
void
virtscsi_poll_requests
(
struct
virtio_scsi
*
vscsi
)
{
int
i
,
num_vqs
;
num_vqs
=
vscsi
->
num_queues
;
for
(
i
=
0
;
i
<
num_vqs
;
i
++
)
virtscsi_vq_done
(
vscsi
,
&
vscsi
->
req_vqs
[
i
],
virtscsi_complete_cmd
);
}
static
void
virtscsi_complete_free
(
struct
virtio_scsi
*
vscsi
,
void
*
buf
)
{
struct
virtio_scsi_cmd
*
cmd
=
buf
;
...
...
@@ -253,6 +263,8 @@ static void virtscsi_ctrl_done(struct virtqueue *vq)
virtscsi_vq_done
(
vscsi
,
&
vscsi
->
ctrl_vq
,
virtscsi_complete_free
);
};
static
void
virtscsi_handle_event
(
struct
work_struct
*
work
);
static
int
virtscsi_kick_event
(
struct
virtio_scsi
*
vscsi
,
struct
virtio_scsi_event_node
*
event_node
)
{
...
...
@@ -260,6 +272,7 @@ static int virtscsi_kick_event(struct virtio_scsi *vscsi,
struct
scatterlist
sg
;
unsigned
long
flags
;
INIT_WORK
(
&
event_node
->
work
,
virtscsi_handle_event
);
sg_init_one
(
&
sg
,
&
event_node
->
event
,
sizeof
(
struct
virtio_scsi_event
));
spin_lock_irqsave
(
&
vscsi
->
event_vq
.
vq_lock
,
flags
);
...
...
@@ -377,7 +390,6 @@ static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf)
{
struct
virtio_scsi_event_node
*
event_node
=
buf
;
INIT_WORK
(
&
event_node
->
work
,
virtscsi_handle_event
);
schedule_work
(
&
event_node
->
work
);
}
...
...
@@ -589,6 +601,18 @@ static int virtscsi_tmf(struct virtio_scsi *vscsi, struct virtio_scsi_cmd *cmd)
cmd
->
resp
.
tmf
.
response
==
VIRTIO_SCSI_S_FUNCTION_SUCCEEDED
)
ret
=
SUCCESS
;
/*
* The spec guarantees that all requests related to the TMF have
* been completed, but the callback might not have run yet if
* we're using independent interrupts (e.g. MSI). Poll the
* virtqueues once.
*
* In the abort case, sc->scsi_done will do nothing, because
* the block layer must have detected a timeout and as a result
* REQ_ATOM_COMPLETE has been set.
*/
virtscsi_poll_requests
(
vscsi
);
out:
mempool_free
(
cmd
,
virtscsi_cmd_pool
);
return
ret
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录