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

Commit 27ab5414 authored by James Smart's avatar James Smart Committed by Greg Kroah-Hartman
Browse files

scsi: lpfc: Correct WQ creation for pagesize 



commit 8ea73db486cda442f0671f4bc9c03a76be398a28 upstream.

Correct WQ creation for pagesize

The driver was calculating the adapter command pagesize indicator from
the system pagesize. However, the buffers the driver allocates are only
one size (SLI4_PAGE_SIZE), so no calculation was necessary.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Cc: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aae02d1a

drivers/scsi/lpfc/lpfc_hw4.h

+2 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ struct lpfc_mbx_wq_create { 
#define lpfc_mbx_wq_create_page_size_SHIFT	0

#define lpfc_mbx_wq_create_page_size_MASK	0x000000FF

#define lpfc_mbx_wq_create_page_size_WORD	word1

#define LPFC_WQ_PAGE_SIZE_4096	0x1

#define lpfc_mbx_wq_create_wqe_size_SHIFT	8

#define lpfc_mbx_wq_create_wqe_size_MASK	0x0000000F

#define lpfc_mbx_wq_create_wqe_size_WORD	word1
@@ -1256,6 +1257,7 @@ struct rq_context { 
#define lpfc_rq_context_page_size_SHIFT	0		/* Version 1 Only */

#define lpfc_rq_context_page_size_MASK	0x000000FF

#define lpfc_rq_context_page_size_WORD	word0

#define	LPFC_RQ_PAGE_SIZE_4096	0x1

	uint32_t reserved1;

	uint32_t word2;

#define lpfc_rq_context_cq_id_SHIFT	16

drivers/scsi/lpfc/lpfc_sli.c

+5 −4
Original line number Diff line number Diff line
@@ -13678,7 +13678,7 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq, 
			       LPFC_WQ_WQE_SIZE_128);

			bf_set(lpfc_mbx_wq_create_page_size,

			       &wq_create->u.request_1,

			       (PAGE_SIZE/SLI4_PAGE_SIZE));

			       LPFC_WQ_PAGE_SIZE_4096);

			page = wq_create->u.request_1.page;

			break;

		}
@@ -13704,8 +13704,9 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq, 
			       LPFC_WQ_WQE_SIZE_128);

			break;

		}

		bf_set(lpfc_mbx_wq_create_page_size, &wq_create->u.request_1,

		       (PAGE_SIZE/SLI4_PAGE_SIZE));

		bf_set(lpfc_mbx_wq_create_page_size,

		       &wq_create->u.request_1,

		       LPFC_WQ_PAGE_SIZE_4096);

		page = wq_create->u.request_1.page;

		break;

	default:
@@ -13891,7 +13892,7 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq, 
		       LPFC_RQE_SIZE_8);

		bf_set(lpfc_rq_context_page_size,

		       &rq_create->u.request.context,

		       (PAGE_SIZE/SLI4_PAGE_SIZE));

		       LPFC_RQ_PAGE_SIZE_4096);

	} else {

		switch (hrq->entry_count) {

		default: