scsi: qla2xxx: Fix control flags for login/logout IOCB

This patch fixes control flag options for login/logout IOCB.

Link: https://lore.kernel.org/r/20200212214436.25532-23-hmadhani@marvell.com
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 5b73d09da73926cf1e163f2bac339bf70a97c700..4f022955eb94fddb724b28e001b5fb77e8e77e76 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -2362,6 +2362,8 @@ qla24xx_login_iocb(srb_t *sp, struct logio_entry_24xx *logio)
        struct srb_iocb *lio = &sp->u.iocb_cmd;
 
        logio->entry_type = LOGINOUT_PORT_IOCB_TYPE;
+       logio->control_flags = cpu_to_le16(LCF_COMMAND_PLOGI);
+
        if (lio->u.logio.flags & SRB_LOGIN_PRLI_ONLY) {
                logio->control_flags = cpu_to_le16(LCF_COMMAND_PRLI);
        } else {
@@ -2939,7 +2941,6 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode,
        sp->fcport = fcport;
 
        elsio->timeout = qla2x00_els_dcmd2_iocb_timeout;
-       init_completion(&elsio->u.els_plogi.comp);
        if (wait)
                sp->flags = SRB_WAKEUP_ON_COMP;
 
@@ -2949,7 +2950,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode,
        elsio->u.els_plogi.tx_size = elsio->u.els_plogi.rx_size = DMA_POOL_SIZE;
 
        ptr = elsio->u.els_plogi.els_plogi_pyld =
-           dma_alloc_coherent(&ha->pdev->dev, DMA_POOL_SIZE,
+           dma_alloc_coherent(&ha->pdev->dev, elsio->u.els_plogi.tx_size,
                &elsio->u.els_plogi.els_plogi_pyld_dma, GFP_KERNEL);
 
        if (!elsio->u.els_plogi.els_plogi_pyld) {
@@ -2958,7 +2959,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode,
        }
 
        resp_ptr = elsio->u.els_plogi.els_resp_pyld =
-           dma_alloc_coherent(&ha->pdev->dev, DMA_POOL_SIZE,
+           dma_alloc_coherent(&ha->pdev->dev, elsio->u.els_plogi.rx_size,
                &elsio->u.els_plogi.els_resp_pyld_dma, GFP_KERNEL);
 
        if (!elsio->u.els_plogi.els_resp_pyld) {
@@ -2982,6 +2983,7 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode,
            (uint8_t *)elsio->u.els_plogi.els_plogi_pyld,
            sizeof(*elsio->u.els_plogi.els_plogi_pyld));
 
+       init_completion(&elsio->u.els_plogi.comp);
        rval = qla2x00_start_sp(sp);
        if (rval != QLA_SUCCESS) {
                rval = QLA_FUNCTION_FAILED;