Commit 11e67320 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Rename hisi_sas_cq.pci_irq_mask 

In future we will want to use hisi_sas_cq.pci_irq_mask for non-pci
interrupt masks, so rename to be more general.

Link: https://lore.kernel.org/r/1579522957-4393-7-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 33c77c31

drivers/scsi/hisi_sas/hisi_sas.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ struct hisi_sas_port { 


struct hisi_sas_cq {

	struct hisi_hba *hisi_hba;

	const struct cpumask *pci_irq_mask;

	const struct cpumask *irq_mask;

	int	rd_point;

	int	id;

	int	irq_no;

drivers/scsi/hisi_sas/hisi_sas_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2125,7 +2125,7 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, 
	case HISI_SAS_INT_ABT_DEV:

		for (i = 0; i < hisi_hba->cq_nvecs; i++) {

			struct hisi_sas_cq *cq = &hisi_hba->cq[i];

			const struct cpumask *mask = cq->pci_irq_mask;

			const struct cpumask *mask = cq->irq_mask;



			if (mask && !cpumask_intersects(cpu_online_mask, mask))

				continue;

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ static void setup_reply_map_v3_hw(struct hisi_hba *hisi_hba, int nvecs) 
					    BASE_VECTORS_V3_HW);

		if (!mask)

			goto fallback;

		cq->pci_irq_mask = mask;

		cq->irq_mask = mask;

		for_each_cpu(cpu, mask)

			hisi_hba->reply_map[cpu] = queue;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE