From: Martin K. Petersen Date: Sat, 1 Apr 2023 01:45:14 +0000 (-0400) Subject: Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f467b865cf5b25aac3feee3fb5e25b90f5df35c4;p=linux.git Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging Pull in the fixes branch to resolve an mpi3mr conflict reported by sfr. Signed-off-by: Martin K. Petersen --- f467b865cf5b25aac3feee3fb5e25b90f5df35c4 diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index c55bef584a9bb,a63279f55d096..07eafae282c3a --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@@ -2522,11 -2492,10 +2522,10 @@@ static int interrupt_preinit_v3_hw(stru return -ENOENT; - hisi_hba->cq_nvecs = vectors - BASE_VECTORS_V3_HW; - shost->nr_hw_queues = hisi_hba->cq_nvecs; + hisi_hba->cq_nvecs = vectors - BASE_VECTORS_V3_HW - hisi_hba->iopoll_q_cnt; + shost->nr_hw_queues = hisi_hba->cq_nvecs + hisi_hba->iopoll_q_cnt; - devm_add_action(&pdev->dev, hisi_sas_v3_free_vectors, pdev); - return 0; + return devm_add_action(&pdev->dev, hisi_sas_v3_free_vectors, pdev); } static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba) diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c index e9b3684a3c8f9,a565817aa56d4..843f9e5511ec0 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@@ -2603,6 -2627,8 +2626,7 @@@ static int mpi3mr_setup_admin_qpair(str MPI3MR_ADMIN_REPLY_FRAME_SZ; mrioc->admin_reply_ci = 0; mrioc->admin_reply_ephase = 1; - mrioc->admin_reply_base = NULL; + atomic_set(&mrioc->admin_reply_q_in_use, 0); if (!mrioc->admin_req_base) { mrioc->admin_req_base = dma_alloc_coherent(&mrioc->pdev->dev,