From: Quinn Tran <qutran@marvell.com>

Date: Tue, 26 Oct 2021 04:54:09 -0700

Subject: scsi: qla2xxx: edif: Increase ELS payload

Patch-mainline: v5.16-rc1

Git-commit: 0f6d600a26e89d31d8381b324fc970f72579a126

References: git-fixes

Currently, firmware limits ELS payload to FC frame size/2112.  This patch

adjusts memory buffer size to be able to handle max ELS payload.

Link: https://lore.kernel.org/r/20211026115412.27691-11-njavali@marvell.com

Fixes: 84318a9f01ce ("scsi: qla2xxx: edif: Add send, receive, and accept for auth_els")

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

Signed-off-by: Quinn Tran <qutran@marvell.com>

Signed-off-by: Nilesh Javali <njavali@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/scsi/qla2xxx/qla_edif.c     |    2 +-

 drivers/scsi/qla2xxx/qla_edif.h     |    3 ++-

 drivers/scsi/qla2xxx/qla_edif_bsg.h |    2 +-

 drivers/scsi/qla2xxx/qla_init.c     |    4 ++++

 drivers/scsi/qla2xxx/qla_os.c       |    2 +-

 5 files changed, 9 insertions(+), 4 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_edif.c

+++ b/drivers/scsi/qla2xxx/qla_edif.c

@@ -2384,7 +2384,7 @@ void qla24xx_auth_els(scsi_qla_host_t *v

 		return;

 	}

-	if (totlen > MAX_PAYLOAD) {

+	if (totlen > ELS_MAX_PAYLOAD) {

 		ql_dbg(ql_dbg_edif, vha, 0x0910d,

 		    "%s WARNING: verbose ELS frame received (totlen=%x)\n",

 		    __func__, totlen);

--- a/drivers/scsi/qla2xxx/qla_edif.h

+++ b/drivers/scsi/qla2xxx/qla_edif.h

@@ -93,7 +93,6 @@ struct sa_update_28xx {

 };

 #define        NUM_ENTRIES     256

-#define        MAX_PAYLOAD     1024

 #define        PUR_GET         1

 struct dinfo {

@@ -128,6 +127,8 @@ struct enode {

 	} u;

 };

+#define RX_ELS_SIZE (roundup(sizeof(struct enode) + ELS_MAX_PAYLOAD, SMP_CACHE_BYTES))

+

 #define EDIF_SESSION_DOWN(_s) \

 	(qla_ini_mode_enabled(_s->vha) && (_s->disc_state == DSC_DELETE_PEND || \

 	 _s->disc_state == DSC_DELETED || \

--- a/drivers/scsi/qla2xxx/qla_edif_bsg.h

+++ b/drivers/scsi/qla2xxx/qla_edif_bsg.h

@@ -8,7 +8,7 @@

 #define __QLA_EDIF_BSG_H

 /* BSG Vendor specific commands */

-#define	ELS_MAX_PAYLOAD		1024

+#define	ELS_MAX_PAYLOAD		2112

 #ifndef	WWN_SIZE

 #define WWN_SIZE		8

 #endif

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -4468,6 +4468,10 @@ qla2x00_init_rings(scsi_qla_host_t *vha)

 		    (ha->flags.fawwpn_enabled) ? "enabled" : "disabled");

 	}

+	/* ELS pass through payload is limit by frame size. */

+	if (ha->flags.edif_enabled)

+		mid_init_cb->init_cb.frame_payload_size = cpu_to_le16(ELS_MAX_PAYLOAD);

+

 	rval = qla2x00_init_firmware(vha, ha->init_cb_size);

 next_check:

 	if (rval) {

--- a/drivers/scsi/qla2xxx/qla_os.c

+++ b/drivers/scsi/qla2xxx/qla_os.c

@@ -4389,7 +4389,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha

 	/* allocate the purex dma pool */

 	ha->purex_dma_pool = dma_pool_create(name, &ha->pdev->dev,

-	    MAX_PAYLOAD, 8, 0);

+	    ELS_MAX_PAYLOAD, 8, 0);

 	if (!ha->purex_dma_pool) {

 		ql_dbg_pci(ql_dbg_init, ha->pdev, 0x011b,