Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b41e8798 authored by Tomas Henzl's avatar Tomas Henzl Committed by Greg Kroah-Hartman
Browse files

scsi: megaraid_sas: Clear affinity hint 

[ Upstream commit 1eb81df5c53b1e785fdef298d533feab991381e4 ]

To avoid a warning in free_irq, clear the affinity hint.

Link: https://lore.kernel.org/r/20200709133144.8363-1-thenzl@redhat.com


Fixes: f0b9e7bd ("scsi: megaraid_sas: Set affinity for high IOPS reply queues")
Acked-by: default avatarSumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1d7e19cf

drivers/scsi/megaraid/megaraid_sas_base.c

+8 −1
Original line number Diff line number Diff line
@@ -5586,9 +5586,13 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe) 
			&instance->irq_context[i])) {

			dev_err(&instance->pdev->dev,

				"Failed to register IRQ for vector %d.\n", i);

			for (j = 0; j < i; j++)

			for (j = 0; j < i; j++) {

				if (j < instance->low_latency_index_start)

					irq_set_affinity_hint(

						pci_irq_vector(pdev, j), NULL);

				free_irq(pci_irq_vector(pdev, j),

					 &instance->irq_context[j]);

			}

			/* Retry irq register for IO_APIC*/

			instance->msix_vectors = 0;

			instance->msix_load_balance = false;
@@ -5626,6 +5630,9 @@ megasas_destroy_irqs(struct megasas_instance *instance) { 


	if (instance->msix_vectors)

		for (i = 0; i < instance->msix_vectors; i++) {

			if (i < instance->low_latency_index_start)

				irq_set_affinity_hint(

				    pci_irq_vector(instance->pdev, i), NULL);

			free_irq(pci_irq_vector(instance->pdev, i),

				 &instance->irq_context[i]);

		}