Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b98b7ee authored by Nilesh Javali's avatar Nilesh Javali Committed by Greg Kroah-Hartman
Browse files

scsi: qedi: Add the CRC size within iSCSI NVM image 



[ Upstream commit c77a2fa3ff8f73d1a485e67e6f81c64823739d59 ]

The QED driver commit, 1ac4329a1cff ("qed: Add configuration information
to register dump and debug data"), removes the CRC length validation
causing nvm_get_image failure while loading qedi driver:

[qed_mcp_get_nvm_image:2700(host_10-0)]Image [0] is too big - 00006008 bytes
where only 00006004 are available
[qedi_get_boot_info:2253]:10: Could not get NVM image. ret = -12

Hence add and adjust the CRC size to iSCSI NVM image to read boot info at
qedi load time.

Signed-off-by: default avatarNilesh Javali <nilesh.javali@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd44c35c

drivers/scsi/qedi/qedi.h

+6 −1
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ enum qedi_nvm_tgts { 
	QEDI_NVM_TGT_SEC,

};



struct qedi_nvm_iscsi_image {

	struct nvm_iscsi_cfg iscsi_cfg;

	u32 crc;

};



struct qedi_uio_ctrl {

	/* meta data */

	u32 uio_hsi_version;
@@ -294,7 +299,7 @@ struct qedi_ctx { 
	void *bdq_pbl_list;

	dma_addr_t bdq_pbl_list_dma;

	u8 bdq_pbl_list_num_entries;

	struct nvm_iscsi_cfg *iscsi_cfg;

	struct qedi_nvm_iscsi_image *iscsi_image;

	dma_addr_t nvm_buf_dma;

	void __iomem *bdq_primary_prod;

	void __iomem *bdq_secondary_prod;

drivers/scsi/qedi/qedi_main.c

+15 −13
Original line number Diff line number Diff line
@@ -1147,23 +1147,26 @@ static int qedi_setup_int(struct qedi_ctx *qedi) 


static void qedi_free_nvm_iscsi_cfg(struct qedi_ctx *qedi)

{

	if (qedi->iscsi_cfg)

	if (qedi->iscsi_image)

		dma_free_coherent(&qedi->pdev->dev,

				  sizeof(struct nvm_iscsi_cfg),

				  qedi->iscsi_cfg, qedi->nvm_buf_dma);

				  sizeof(struct qedi_nvm_iscsi_image),

				  qedi->iscsi_image, qedi->nvm_buf_dma);

}



static int qedi_alloc_nvm_iscsi_cfg(struct qedi_ctx *qedi)

{

	qedi->iscsi_cfg = dma_zalloc_coherent(&qedi->pdev->dev,

					     sizeof(struct nvm_iscsi_cfg),

					     &qedi->nvm_buf_dma, GFP_KERNEL);

	if (!qedi->iscsi_cfg) {

	struct qedi_nvm_iscsi_image nvm_image;



	qedi->iscsi_image = dma_zalloc_coherent(&qedi->pdev->dev,

						sizeof(nvm_image),

						&qedi->nvm_buf_dma,

						GFP_KERNEL);

	if (!qedi->iscsi_image) {

		QEDI_ERR(&qedi->dbg_ctx, "Could not allocate NVM BUF.\n");

		return -ENOMEM;

	}

	QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_INFO,

		  "NVM BUF addr=0x%p dma=0x%llx.\n", qedi->iscsi_cfg,

		  "NVM BUF addr=0x%p dma=0x%llx.\n", qedi->iscsi_image,

		  qedi->nvm_buf_dma);



	return 0;
@@ -1716,7 +1719,7 @@ qedi_get_nvram_block(struct qedi_ctx *qedi) 
	struct nvm_iscsi_block *block;



	pf = qedi->dev_info.common.abs_pf_id;

	block = &qedi->iscsi_cfg->block[0];

	block = &qedi->iscsi_image->iscsi_cfg.block[0];

	for (i = 0; i < NUM_OF_ISCSI_PF_SUPPORTED; i++, block++) {

		flags = ((block->id) & NVM_ISCSI_CFG_BLK_CTRL_FLAG_MASK) >>

			NVM_ISCSI_CFG_BLK_CTRL_FLAG_OFFSET;
@@ -2008,15 +2011,14 @@ static void qedi_boot_release(void *data) 
static int qedi_get_boot_info(struct qedi_ctx *qedi)

{

	int ret = 1;

	u16 len;



	len = sizeof(struct nvm_iscsi_cfg);

	struct qedi_nvm_iscsi_image nvm_image;



	QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_INFO,

		  "Get NVM iSCSI CFG image\n");

	ret = qedi_ops->common->nvm_get_image(qedi->cdev,

					      QED_NVM_IMAGE_ISCSI_CFG,

					      (char *)qedi->iscsi_cfg, len);

					      (char *)qedi->iscsi_image,

					      sizeof(nvm_image));

	if (ret)

		QEDI_ERR(&qedi->dbg_ctx,

			 "Could not get NVM image. ret = %d\n", ret);