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

Commit 2592ee60 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "i40e: Use irq_update_affinity_hint()" 



This reverts commit 18c4c357 which is
commit d34c54d1739c2cdf2e4437b74e6da269147f4987 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I7c0e3af8cbc1963c3cb1949683dc0dddcb408dab
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 463637bf

drivers/net/ethernet/intel/i40e/i40e_main.c

+4 −4
Original line number Diff line number Diff line
@@ -3882,10 +3882,10 @@ static int i40e_vsi_request_irq_msix(struct i40e_vsi *vsi, char *basename) 
		 *

		 * get_cpu_mask returns a static constant mask with

		 * a permanent lifetime so it's ok to pass to

		 * irq_update_affinity_hint without making a copy.

		 * irq_set_affinity_hint without making a copy.

		 */

		cpu = cpumask_local_spread(q_vector->v_idx, -1);

		irq_update_affinity_hint(irq_num, get_cpu_mask(cpu));

		irq_set_affinity_hint(irq_num, get_cpu_mask(cpu));

	}



	vsi->irqs_ready = true;
@@ -3896,7 +3896,7 @@ static int i40e_vsi_request_irq_msix(struct i40e_vsi *vsi, char *basename) 
		vector--;

		irq_num = pf->msix_entries[base + vector].vector;

		irq_set_affinity_notifier(irq_num, NULL);

		irq_update_affinity_hint(irq_num, NULL);

		irq_set_affinity_hint(irq_num, NULL);

		free_irq(irq_num, &vsi->q_vectors[vector]);

	}

	return err;
@@ -4714,7 +4714,7 @@ static void i40e_vsi_free_irq(struct i40e_vsi *vsi) 
			/* clear the affinity notifier in the IRQ descriptor */

			irq_set_affinity_notifier(irq_num, NULL);

			/* remove our suggested affinity mask for this IRQ */

			irq_update_affinity_hint(irq_num, NULL);

			irq_set_affinity_hint(irq_num, NULL);

			synchronize_irq(irq_num);

			free_irq(irq_num, vsi->q_vectors[i]);