From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F6F2C43387 for ; Fri, 11 Jan 2019 14:38:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F31752063F for ; Fri, 11 Jan 2019 14:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217487; bh=fNBT+C+0oR9DOsQyaU1xXsDhHcpfZz0FpaTgELKzUZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LwvbwPs0bmCPgY01mpKb7ucG5ZtQCb8QRiXI1+29CIk3pNeeLmP/eGV54vLSKkpLd DCO1e3QowjduaUjb7Zac+r69sz9b0QBiQix3laN0au+NnMvCfoQ1dgzPnao4Dz2QFt uAguc4nD6U2hNCdfzBgOX+Tl52dzumOhLe7yY/2A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390769AbfAKOiG (ORCPT ); Fri, 11 Jan 2019 09:38:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:58634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390755AbfAKOiE (ORCPT ); Fri, 11 Jan 2019 09:38:04 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3AB432063F; Fri, 11 Jan 2019 14:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547217483; bh=fNBT+C+0oR9DOsQyaU1xXsDhHcpfZz0FpaTgELKzUZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r1MrTo8BH/ezf/K3BbGDoOIVhnwplbxPSNRtC8xySruvJ8VIpCSsBRSQb2Css89S6 6fSQscUkKhf0HzhuXn7V/VTcSFZqwb4mFn0KK4H6oO00KpzNfMtQORrGWiAUyNAOWX wi5HgAilN7zv0+IZwGrdh69OrU1Wz2VzB7APfK4c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Ewan D. Milne" , Laurence Oberman , "Martin K. Petersen" Subject: [PATCH 4.19 078/148] scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid Date: Fri, 11 Jan 2019 15:14:16 +0100 Message-Id: <20190111131117.338368753@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131114.337122649@linuxfoundation.org> References: <20190111131114.337122649@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ewan D. Milne commit 4e87eb2f46ea547d12a276b2e696ab934d16cfb6 upstream. Certain older adapters such as the OneConnect OCe10100 may not have a valid wqpcnt value. In this case, do not set queue->page_count to 0 in lpfc_sli4_queue_alloc() as this will prevent the driver from initializing. Fixes: 895427bd01 ("scsi: lpfc: NVME Initiator: Base modifications") Cc: stable@vger.kernel.org # 4.11+ Signed-off-by: Ewan D. Milne Reviewed-by: Laurence Oberman Tested-by: Laurence Oberman Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/lpfc/lpfc_sli.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -14221,7 +14221,8 @@ lpfc_sli4_queue_alloc(struct lpfc_hba *p hw_page_size))/hw_page_size; /* If needed, Adjust page count to match the max the adapter supports */ - if (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt) + if (phba->sli4_hba.pc_sli4_params.wqpcnt && + (queue->page_count > phba->sli4_hba.pc_sli4_params.wqpcnt)) queue->page_count = phba->sli4_hba.pc_sli4_params.wqpcnt; INIT_LIST_HEAD(&queue->list);