From patchwork Tue Mar 7 16:50:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 736297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vd2jZ3GqGz9sN1; Wed, 8 Mar 2017 03:51:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="CkvuvXX8"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1clIKJ-0008B4-OZ; Tue, 07 Mar 2017 16:51:07 +0000 Received: from mail-it0-f48.google.com ([209.85.214.48]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1clIKF-00089O-S5 for kernel-team@lists.ubuntu.com; Tue, 07 Mar 2017 16:51:03 +0000 Received: by mail-it0-f48.google.com with SMTP id m27so17745128iti.0 for ; Tue, 07 Mar 2017 08:51:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=PhC+f+vYsRNeTgZALiRvwDx/a7OfhF6YSzYCu3lcwSM=; b=CkvuvXX8of4bBHGTyWsmMm0J83FsFY5lO3BEFNwq8J82tjvkSg8dbk24ZHzZL6MzPF oiOqJDcH+TlTCIs1WqBlcabXHzEGI2uJNTdKzT4IBD85+aSx6cDAJq7VikXdfzy2laHN +FVd2EgB+iiEAx16O+NPbcHopEAzI4q7hQqjnhiV6HQPjqb3zZb1qcZDqCqmJMbPtOwO tF2Xs9Nk8UEpLoEgfSvcDcZqrKEgNTNZ1RUlRIc2LXvD3SXJQ9NNZEejM/h2MG9c9C1t xq7Vp0MN1RgUL+4d2lxoKyws9Cri7943jhZio0hSKeX3aRBaRLwqnKQKfEjJa8wp6HZX MOxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PhC+f+vYsRNeTgZALiRvwDx/a7OfhF6YSzYCu3lcwSM=; b=khh15ghL8jDzIVVESDMhsL0SuhBqNVMR0/7vSdbZuiT3Qpliv4MY9DKIocQyO5DqdB +Ry4tq6sY/dwjIU7oIO63gQWu3hDSPIT4e84cgVyoP6n5ZWksF+ryxbPJXUxWntn4cZZ tuyeKklXbPDH/rXTg4gMslOfVwmg+7WYUx2LVdMOqZAawRLmsCXs5aciqO5XOasK7fRf 9CcXb8OyvD6Cuqagma4LIVl2v54VAywILqeoSjemipBe3IkP/j0oo3mK8wQPItT63+bl 9D4JUk/OkzlP3KzZ3B7z/rvNUxe66hPr8fk61i2PG/5+YiVhT8sqN/1Tx0pEOu9Qckz1 20Bg== X-Gm-Message-State: AMke39k29V6CL+UPt1SPa6uNeCoM2ilRxC2sMk0DtlTtXQpmM84DPE5vde26o7SXM66ljrKt X-Received: by 10.36.238.139 with SMTP id b133mr21067094iti.26.1488905462565; Tue, 07 Mar 2017 08:51:02 -0800 (PST) Received: from localhost.localdomain (host-98-127-250-84.bln-mt.client.bresnan.net. [98.127.250.84]) by smtp.gmail.com with ESMTPSA id x127sm337533itg.26.2017.03.07.08.51.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Mar 2017 08:51:01 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] scsi: lpfc: Correct WQ creation for pagesize Date: Tue, 7 Mar 2017 09:50:48 -0700 Message-Id: <1488905449-27611-2-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488905449-27611-1-git-send-email-tim.gardner@canonical.com> References: <1488905449-27611-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: James Smart BugLink: http://bugs.launchpad.net/bugs/1670490 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: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Hannes Reinecke Reviewed-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig Signed-off-by: Martin K. Petersen (cherry picked from commit 8ea73db486cda442f0671f4bc9c03a76be398a28) Signed-off-by: Tim Gardner --- drivers/scsi/lpfc/lpfc_hw4.h | 2 ++ drivers/scsi/lpfc/lpfc_sli.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h index 608f941..c8c7267 100644 --- a/drivers/scsi/lpfc/lpfc_hw4.h +++ b/drivers/scsi/lpfc/lpfc_hw4.h @@ -1182,6 +1182,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 @@ -1253,6 +1254,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 diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 92dfd6a..f5aeda8 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -13475,7 +13475,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; } @@ -13501,8 +13501,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: @@ -13688,7 +13689,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: