scsi: qla2xxx: Skip IRQ affinity for Target QPairs

hreinecke · hreinecke · commit 62f02d308dea · 2018-02-14T15:58:21.000+01:00
(bsc#1043726,FATE#324770).

suse-commit: afc9b3ca42238ef57ad620e946be54fa96061e96
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
@@ -6610,9 +6610,14 @@ qla83xx_disable_laser(scsi_qla_host_t *vha)
 
 static int qla2xxx_map_queues(struct Scsi_Host *shost)
 {
+	int rc;
 	scsi_qla_host_t *vha = (scsi_qla_host_t *)shost->hostdata;
 
-	return blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);
+	if (USER_CTRL_IRQ(vha->hw))
+		rc = blk_mq_map_queues(&shost->tag_set);
+	else
+		rc = blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);
+	return rc;
 }
 
 static const struct pci_error_handlers qla2xxx_err_handler = {

Original file line number	Diff line number	Diff line change
`@@ -6610,9 +6610,14 @@ qla83xx_disable_laser(scsi_qla_host_t *vha)`
`6610`	`6610`
`6611`	`6611`	`static int qla2xxx_map_queues(struct Scsi_Host *shost)`
`6612`	`6612`	`{`
	`6613`	`+ int rc;`
`6613`	`6614`	`scsi_qla_host_t vha = (scsi_qla_host_t )shost->hostdata;`
`6614`	`6615`
`6615`		`- return blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);`
	`6616`	`+ if (USER_CTRL_IRQ(vha->hw))`
	`6617`	`+ rc = blk_mq_map_queues(&shost->tag_set);`
	`6618`	`+ else`
	`6619`	`+ rc = blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev);`
	`6620`	`+ return rc;`
`6616`	`6621`	`}`
`6617`	`6622`
`6618`	`6623`	`static const struct pci_error_handlers qla2xxx_err_handler = {`