From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2020 23:03:31 +0000 (-0800)
Subject: Merge tag 'irq-core-2020-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~2214
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cffa11e2aa76a0560c890f057858b68fe744d03;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'irq-core-2020-12-15' of git://git./linux/kernel/git/tip/tip

Pull irq updates from Thomas Gleixner:
 "Generic interrupt and irqchips subsystem updates. Unusually, there is
  not a single completely new irq chip driver, just new DT bindings and
  extensions of existing drivers to accomodate new variants!

  Core:

   - Consolidation and robustness changes for irq time accounting

   - Cleanup and consolidation of irq stats

   - Remove the fasteoi IPI flow which has been proved useless

   - Provide an interface for converting legacy interrupt mechanism into
     irqdomains

  Drivers:

   - Preliminary support for managed interrupts on platform devices

   - Correctly identify allocation of MSIs proxyied by another device

   - Generalise the Ocelot support to new SoCs

   - Improve GICv4.1 vcpu entry, matching the corresponding KVM
     optimisation

   - Work around spurious interrupts on Qualcomm PDC

   - Random fixes and cleanups"

* tag 'irq-core-2020-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (54 commits)
  irqchip/qcom-pdc: Fix phantom irq when changing between rising/falling
  driver core: platform: Add devm_platform_get_irqs_affinity()
  ACPI: Drop acpi_dev_irqresource_disabled()
  resource: Add irqresource_disabled()
  genirq/affinity: Add irq_update_affinity_desc()
  irqchip/gic-v3-its: Flag device allocation as proxied if behind a PCI bridge
  irqchip/gic-v3-its: Tag ITS device as shared if allocating for a proxy device
  platform-msi: Track shared domain allocation
  irqchip/ti-sci-intr: Fix freeing of irqs
  irqchip/ti-sci-inta: Fix printing of inta id on probe success
  drivers/irqchip: Remove EZChip NPS interrupt controller
  Revert "genirq: Add fasteoi IPI flow"
  irqchip/hip04: Make IPIs use handle_percpu_devid_irq()
  irqchip/bcm2836: Make IPIs use handle_percpu_devid_irq()
  irqchip/armada-370-xp: Make IPIs use handle_percpu_devid_irq()
  irqchip/gic, gic-v3: Make SGIs use handle_percpu_devid_irq()
  irqchip/ocelot: Add support for Jaguar2 platforms
  irqchip/ocelot: Add support for Serval platforms
  irqchip/ocelot: Add support for Luton platforms
  irqchip/ocelot: prepare to support more SoC
  ...
---

2cffa11e2aa76a0560c890f057858b68fe744d03
diff --cc include/asm-generic/msi.h
index 25344de,1010e74..bf910d4
--- a/include/asm-generic/msi.h
+++ b/include/asm-generic/msi.h
@@@ -30,8 -29,9 +31,11 @@@ typedef struct msi_alloc_info 
  	} scratchpad[NUM_MSI_ALLOC_SCRATCHPAD_REGS];
  } msi_alloc_info_t;
  
+ /* Device generating MSIs is proxying for another device */
+ #define MSI_ALLOC_FLAGS_PROXY_DEVICE	(1UL << 0)
+ 
  #define GENERIC_MSI_DOMAIN_OPS		1
  
 +#endif /* CONFIG_GENERIC_MSI_IRQ_DOMAIN */
 +
  #endif
diff --cc include/linux/irqdomain.h
index ea5a337,5701a8b..42d1968
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@@ -381,12 -387,9 +387,10 @@@ extern int irq_domain_associate(struct 
  extern void irq_domain_associate_many(struct irq_domain *domain,
  				      unsigned int irq_base,
  				      irq_hw_number_t hwirq_base, int count);
- extern void irq_domain_disassociate(struct irq_domain *domain,
- 				    unsigned int irq);
  
 -extern unsigned int irq_create_mapping(struct irq_domain *host,
 -				       irq_hw_number_t hwirq);
 +extern unsigned int irq_create_mapping_affinity(struct irq_domain *host,
 +				      irq_hw_number_t hwirq,
 +				      const struct irq_affinity_desc *affinity);
  extern unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);
  extern void irq_dispose_mapping(unsigned int virq);