Merge: smartpqi: Correct blk-mq registration issue

swvrrh · swvrrh · commit 3089aeca4965 · 2024-02-22T19:56:52.000-05:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/3777 JIRA: https://issues.redhat.com/browse/RHEL-26145 Tested on an x86 server. Signed-off-by: Tomas Henzl <thenzl@redhat.com> Approved-by: Ewan D. Milne <emilne@redhat.com> Approved-by: Maurizio Lombardi <mlombard@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com>
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -6505,8 +6505,11 @@ static void pqi_map_queues(struct Scsi_Host *shost)
 {
 	struct pqi_ctrl_info *ctrl_info = shost_to_hba(shost);
 
-	blk_mq_pci_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT],
+	if (!ctrl_info->disable_managed_interrupts)
+		return blk_mq_pci_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT],
 			      ctrl_info->pci_dev, 0);
+	else
+		return blk_mq_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT]);
 }
 
 static inline bool pqi_is_tape_changer_device(struct pqi_scsi_dev *device)

Original file line number	Diff line number	Diff line change
`@@ -6505,8 +6505,11 @@ static void pqi_map_queues(struct Scsi_Host *shost)`
`6505`	`6505`	`{`
`6506`	`6506`	`struct pqi_ctrl_info *ctrl_info = shost_to_hba(shost);`
`6507`	`6507`
`6508`		`- blk_mq_pci_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT],`
	`6508`	`+ if (!ctrl_info->disable_managed_interrupts)`
	`6509`	`+ return blk_mq_pci_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT],`
`6509`	`6510`	`ctrl_info->pci_dev, 0);`
	`6511`	`+ else`
	`6512`	`+ return blk_mq_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT]);`
`6510`	`6513`	`}`
`6511`	`6514`
`6512`	`6515`	`static inline bool pqi_is_tape_changer_device(struct pqi_scsi_dev *device)`