From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B11242420B; Tue, 16 Jan 2024 19:43:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434215; cv=none; b=PX+xCFSzZqOjDghIW9kqDTDyEJK0AzX2V6hnBaWYnP4qLJn6m/jjUyFVDxwkZWIXv7gJOPKBNaXdgSdodImd5+AZOhXeXXoK9XQDMxv+eZCGD8JslJI6ExKatRmun2DdItE5VUT4OJLSZ9P6GnvlVHmUj0RO2R31XYJE6xdyTuE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434215; c=relaxed/simple; bh=blXIGgS3TI6vcbmkgBePWK4rHG/nauAYtWa3aqolbQE=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version:X-stable: X-Patchwork-Hint:X-stable-base:Content-Transfer-Encoding; b=hZg9qx/RXddtWZGzm/WUsLg4bcFFtgmm/KJX2c4km2ScTf2330+P6bLYIKrVbfsJUk2KYXpZWgERnssJ2RekeJ7ltcp6GTU2k04xo6y5O32uo2DCXOfDQualWGuAY8HB753C/gaHBsrNhqMxJYY4uHVsbU8dZ5FUAdnNr3/j8W8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IMFMkoVV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IMFMkoVV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E66AC433B1; Tue, 16 Jan 2024 19:43:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434215; bh=blXIGgS3TI6vcbmkgBePWK4rHG/nauAYtWa3aqolbQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IMFMkoVVV+p5/Wh2Z2mKs8OCPLFhENq+i8oV/4dFqD9x7+yyrBJ6hDeztqB8MhTAX u8HPrGwLVCLitwReZnxME+ZsDly8p5hapoZSTecGKpp8gZknO9Pl1OGDabXnu0B+QR xt2edeOmDr9lUpQcuF6IppA+xLHBreo70vXqKFaEpt1PRgzWJpM4gp55Lqy/crVULy 4MfTvQUu3H8dSxj+7lpcK6L1jzalRVggQ9I4kitoh865T5Cr/JDDcIrsOByoLv9Ph4 asYt9sCModlttGp2oIRZHkMW2MXTFphRS7ptTzk9rGKfXxRKikRMCc6cydAjKMBKBU S0fjns8iGPm5Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sumit Saxena , "Martin K . Petersen" , Sasha Levin , sathya.prakash@broadcom.com, kashyap.desai@broadcom.com, sreekanth.reddy@broadcom.com, jejb@linux.ibm.com, mpi3mr-linuxdrv.pdl@broadcom.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 6.7 026/108] scsi: mpi3mr: Add PCI checks where SAS5116 diverges from SAS4116 Date: Tue, 16 Jan 2024 14:38:52 -0500 Message-ID: <20240116194225.250921-26-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116194225.250921-1-sashal@kernel.org> References: <20240116194225.250921-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7 Content-Transfer-Encoding: 8bit From: Sumit Saxena [ Upstream commit c9260ff28ee561fca5f96425c9328a9698e8427b ] Add PCI IDs checks for the cases where SAS5116 diverges from SAS4116 in behavior. Signed-off-by: Sumit Saxena Link: https://lore.kernel.org/r/20231123160132.4155-3-sumit.saxena@broadcom.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpi3mr/mpi3mr_fw.c | 3 ++- drivers/scsi/mpi3mr/mpi3mr_os.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index f039f1d98647..0d148c39ebcc 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -1892,7 +1892,8 @@ static int mpi3mr_create_op_reply_q(struct mpi3mr_ioc *mrioc, u16 qidx) reply_qid = qidx + 1; op_reply_q->num_replies = MPI3MR_OP_REP_Q_QD; - if (!mrioc->pdev->revision) + if ((mrioc->pdev->device == MPI3_MFGPAGE_DEVID_SAS4116) && + !mrioc->pdev->revision) op_reply_q->num_replies = MPI3MR_OP_REP_Q_QD4K; op_reply_q->ci = 0; op_reply_q->ephase = 1; diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index a8d7dbf0159a..91a22e6e5c3f 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -5101,7 +5101,10 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id) mpi3mr_init_drv_cmd(&mrioc->evtack_cmds[i], MPI3MR_HOSTTAG_EVTACKCMD_MIN + i); - if (pdev->revision) + if ((pdev->device == MPI3_MFGPAGE_DEVID_SAS4116) && + !pdev->revision) + mrioc->enable_segqueue = false; + else mrioc->enable_segqueue = true; init_waitqueue_head(&mrioc->reset_waitq); -- 2.43.0