target/tcm_qla2xxx: Add/use target_reverse_dma_direction() in target_core_fabric.h
Reversing the dma_data_direction for pci_map_sg() friends is useful for other drivers, so move it from tcm_qla2xxx into inline code within target_core_fabric.h. Also drop internal usage of equivlient in tcm_qla2xxx fabric code. Reported-by: Christoph Hellwig <hch@lst.de> Cc: Roland Dreier <roland@purestorage.com> Cc: Giridhar Malavali <giridhar.malavali@qlogic.com> Cc: Chad Dupuis <chad.dupuis@qlogic.com> Cc: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Nicholas Bellinger <nab@daterainc.com>
This commit is contained in:
Родитель
cf6d1f0964
Коммит
b3faa2e87c
|
@ -497,38 +497,13 @@ static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* The LIO target core uses DMA_TO_DEVICE to mean that data is going
|
||||
* to the target (eg handling a WRITE) and DMA_FROM_DEVICE to mean
|
||||
* that data is coming from the target (eg handling a READ). However,
|
||||
* this is just the opposite of what we have to tell the DMA mapping
|
||||
* layer -- eg when handling a READ, the HBA will have to DMA the data
|
||||
* out of memory so it can send it to the initiator, which means we
|
||||
* need to use DMA_TO_DEVICE when we map the data.
|
||||
*/
|
||||
static enum dma_data_direction tcm_qla2xxx_mapping_dir(struct se_cmd *se_cmd)
|
||||
{
|
||||
if (se_cmd->se_cmd_flags & SCF_BIDI)
|
||||
return DMA_BIDIRECTIONAL;
|
||||
|
||||
switch (se_cmd->data_direction) {
|
||||
case DMA_TO_DEVICE:
|
||||
return DMA_FROM_DEVICE;
|
||||
case DMA_FROM_DEVICE:
|
||||
return DMA_TO_DEVICE;
|
||||
case DMA_NONE:
|
||||
default:
|
||||
return DMA_NONE;
|
||||
}
|
||||
}
|
||||
|
||||
static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd)
|
||||
{
|
||||
struct qla_tgt_cmd *cmd = container_of(se_cmd,
|
||||
struct qla_tgt_cmd, se_cmd);
|
||||
|
||||
cmd->bufflen = se_cmd->data_length;
|
||||
cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
|
||||
cmd->dma_data_direction = target_reverse_dma_direction(se_cmd);
|
||||
|
||||
cmd->sg_cnt = se_cmd->t_data_nents;
|
||||
cmd->sg = se_cmd->t_data_sg;
|
||||
|
@ -664,7 +639,7 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd)
|
|||
struct qla_tgt_cmd, se_cmd);
|
||||
|
||||
cmd->bufflen = se_cmd->data_length;
|
||||
cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
|
||||
cmd->dma_data_direction = target_reverse_dma_direction(se_cmd);
|
||||
cmd->aborted = (se_cmd->transport_state & CMD_T_ABORTED);
|
||||
|
||||
cmd->sg_cnt = se_cmd->t_data_nents;
|
||||
|
@ -688,7 +663,7 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd)
|
|||
cmd->sg = NULL;
|
||||
cmd->sg_cnt = 0;
|
||||
cmd->offset = 0;
|
||||
cmd->dma_data_direction = tcm_qla2xxx_mapping_dir(se_cmd);
|
||||
cmd->dma_data_direction = target_reverse_dma_direction(se_cmd);
|
||||
cmd->aborted = (se_cmd->transport_state & CMD_T_ABORTED);
|
||||
|
||||
if (se_cmd->data_direction == DMA_FROM_DEVICE) {
|
||||
|
|
|
@ -179,4 +179,30 @@ u32 iscsi_get_pr_transport_id_len(struct se_portal_group *, struct se_node_acl *
|
|||
char *iscsi_parse_pr_out_transport_id(struct se_portal_group *, const char *,
|
||||
u32 *, char **);
|
||||
|
||||
/*
|
||||
* The LIO target core uses DMA_TO_DEVICE to mean that data is going
|
||||
* to the target (eg handling a WRITE) and DMA_FROM_DEVICE to mean
|
||||
* that data is coming from the target (eg handling a READ). However,
|
||||
* this is just the opposite of what we have to tell the DMA mapping
|
||||
* layer -- eg when handling a READ, the HBA will have to DMA the data
|
||||
* out of memory so it can send it to the initiator, which means we
|
||||
* need to use DMA_TO_DEVICE when we map the data.
|
||||
*/
|
||||
static inline enum dma_data_direction
|
||||
target_reverse_dma_direction(struct se_cmd *se_cmd)
|
||||
{
|
||||
if (se_cmd->se_cmd_flags & SCF_BIDI)
|
||||
return DMA_BIDIRECTIONAL;
|
||||
|
||||
switch (se_cmd->data_direction) {
|
||||
case DMA_TO_DEVICE:
|
||||
return DMA_FROM_DEVICE;
|
||||
case DMA_FROM_DEVICE:
|
||||
return DMA_TO_DEVICE;
|
||||
case DMA_NONE:
|
||||
default:
|
||||
return DMA_NONE;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* TARGET_CORE_FABRICH */
|
||||
|
|
Загрузка…
Ссылка в новой задаче