Merge tag 'irqchip-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm...

Pull irqchip fixes for 4.13 from Marc Zyngier

Mostly GIC related, again:
- GICv3 ITS NUMA handling fixes
- GICv3 force affinity handling
- Barrier adjustment in both GIC interrupt handling
- Error reporting when the DT presents an incompatible interrupt
- GICv3 platform MSI DT parsing bug fix
- Broadcom L2 PM fix
- Atmel AIC cleanups

diff --combined drivers/irqchip/irq-gic-v3-its.c
index 68932873eebc0c3d14caa00b048d0c961e765a98,5fd5f62c925d2ce918ba36e0802abe685d59f678..284738add89b3b94f77ad257fd314bc89a423cae
--- 1/drivers/irqchip/irq-gic-v3-its.c
--- 2/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@@ -1663,7 -1663,7 +1663,7 @@@ static int its_init_domain(struct fwnod
        }
  
        inner_domain->parent = its_parent;
 -      inner_domain->bus_token = DOMAIN_BUS_NEXUS;
 +      irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS);
        inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_REMAP;
        info->ops = &its_msi_domain_ops;
        info->data = its;
@@@ -1835,7 -1835,7 +1835,7 @@@ static int __init its_of_probe(struct d
  
  #define ACPI_GICV3_ITS_MEM_SIZE (SZ_128K)
  
- #if defined(CONFIG_ACPI_NUMA) && (ACPI_CA_VERSION >= 0x20170531)
+ #ifdef CONFIG_ACPI_NUMA
  struct its_srat_map {
        /* numa node id */
        u32     numa_node;
@@@ -1843,7 -1843,7 +1843,7 @@@
        u32     its_id;
  };
  
- static struct its_srat_map its_srat_maps[MAX_NUMNODES] __initdata;
+ static struct its_srat_map *its_srat_maps __initdata;
  static int its_in_srat __initdata;
  
  static int __init acpi_get_its_numa_node(u32 its_id)
@@@ -1857,6 -1857,12 +1857,12 @@@
        return NUMA_NO_NODE;
  }
  
+ static int __init gic_acpi_match_srat_its(struct acpi_subtable_header *header,
+                                         const unsigned long end)
+ {
+       return 0;
+ }
+ 
  static int __init gic_acpi_parse_srat_its(struct acpi_subtable_header *header,
                         const unsigned long end)
  {
@@@ -1873,12 -1879,6 +1879,6 @@@
                return -EINVAL;
        }
  
-       if (its_in_srat >= MAX_NUMNODES) {
-               pr_err("SRAT: ITS affinity exceeding max count[%d]\n",
-                               MAX_NUMNODES);
-               return -EINVAL;
-       }
- 
        node = acpi_map_pxm_to_node(its_affinity->proximity_domain);
  
        if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {
@@@ -1897,14 -1897,37 +1897,37 @@@
  
  static void __init acpi_table_parse_srat_its(void)
  {
+       int count;
+ 
+       count = acpi_table_parse_entries(ACPI_SIG_SRAT,
+                       sizeof(struct acpi_table_srat),
+                       ACPI_SRAT_TYPE_GIC_ITS_AFFINITY,
+                       gic_acpi_match_srat_its, 0);
+       if (count <= 0)
+               return;
+ 
+       its_srat_maps = kmalloc(count * sizeof(struct its_srat_map),
+                               GFP_KERNEL);
+       if (!its_srat_maps) {
+               pr_warn("SRAT: Failed to allocate memory for its_srat_maps!\n");
+               return;
+       }
+ 
        acpi_table_parse_entries(ACPI_SIG_SRAT,
                        sizeof(struct acpi_table_srat),
                        ACPI_SRAT_TYPE_GIC_ITS_AFFINITY,
                        gic_acpi_parse_srat_its, 0);
  }
+ 
+ /* free the its_srat_maps after ITS probing */
+ static void __init acpi_its_srat_maps_free(void)
+ {
+       kfree(its_srat_maps);
+ }
  #else
  static void __init acpi_table_parse_srat_its(void)    { }
  static int __init acpi_get_its_numa_node(u32 its_id) { return NUMA_NO_NODE; }
+ static void __init acpi_its_srat_maps_free(void) { }
  #endif
  
  static int __init gic_acpi_parse_madt_its(struct acpi_subtable_header *header,
@@@ -1951,6 -1974,7 +1974,7 @@@ static void __init its_acpi_probe(void
        acpi_table_parse_srat_its();
        acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR,
                              gic_acpi_parse_madt_its, 0);
+       acpi_its_srat_maps_free();
  }
  #else
  static void __init its_acpi_probe(void) { }