From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2022 16:53:45 +0000 (-0800)
Subject: Merge tag 'irq-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.17-rc1~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=147cc5838c0f5c76e908b816e924ca378e0d4735;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'irq-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq updates from Thomas Gleixner:
 "Updates for the interrupt subsystem:

  Core:

   - Provide a new interface for affinity hints to provide a separation
     between hint and actual affinity change which has become a hidden
     property of the current interface

   - Fix up the in tree usage of the affinity hint interfaces

  Drivers:

   - No new irqchip drivers!

   - Fix GICv3 redistributor table reservation with RT across kexec

   - Fix GICv4.1 redistributor view of the VPE table across kexec

   - Add support for extra interrupts on spear-shirq

   - Make obtaining some interrupts optional for the Renesas drivers

   - Various cleanups and bug fixes"

* tag 'irq-core-2022-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits)
  irqchip/renesas-intc-irqpin: Use platform_get_irq_optional() to get the interrupt
  irqchip/renesas-irqc: Use platform_get_irq_optional() to get the interrupt
  irqchip/gic-v4: Disable redistributors' view of the VPE table at boot time
  irqchip/ingenic-tcu: Use correctly sized arguments for bit field
  irqchip/gic-v2m: Add const to of_device_id
  irqchip/imx-gpcv2: Mark imx_gpcv2_instance with __ro_after_init
  irqchip/spear-shirq: Add support for IRQ 0..6
  irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime
  irqchip/gic-v3-its: Postpone LPI pending table freeing and memreserve
  irqchip/gic-v3-its: Give the percpu rdist struct its own flags field
  net/mlx4: Use irq_update_affinity_hint()
  net/mlx5: Use irq_set_affinity_and_hint()
  hinic: Use irq_set_affinity_and_hint()
  scsi: lpfc: Use irq_set_affinity()
  mailbox: Use irq_update_affinity_hint()
  ixgbe: Use irq_update_affinity_hint()
  be2net: Use irq_update_affinity_hint()
  enic: Use irq_update_affinity_hint()
  RDMA/irdma: Use irq_update_affinity_hint()
  scsi: mpt3sas: Use irq_set_affinity_and_hint()
  ...
---

147cc5838c0f5c76e908b816e924ca378e0d4735
diff --cc drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
index 90fec0649ef53,fd7a671eda33b..41807ef552011
--- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
@@@ -236,10 -244,6 +236,10 @@@ struct mlx5_irq *mlx5_irq_alloc(struct 
  		err = -ENOMEM;
  		goto err_cpumask;
  	}
 +	if (affinity) {
 +		cpumask_copy(irq->mask, affinity);
- 		irq_set_affinity_hint(irq->irqn, irq->mask);
++		irq_set_affinity_and_hint(irq->irqn, irq->mask);
 +	}
  	irq->pool = pool;
  	irq->refcount = 1;
  	irq->index = i;
@@@ -251,7 -255,6 +251,7 @@@
  	}
  	return irq;
  err_xa:
- 	irq_set_affinity_hint(irq->irqn, NULL);
++	irq_update_affinity_hint(irq->irqn, NULL);
  	free_cpumask_var(irq->mask);
  err_cpumask:
  	free_irq(irq->irqn, &irq->nh);