linux-next: manual merge of the irqchip tree with the tip tree

linux-next: manual merge of the irqchip tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1780 bytes --]

Hi all,

Today's linux-next merge of the irqchip tree got a conflict in:

  include/linux/irq.h

between commit:

  826da771291f ("genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP")

from the tip tree and commit:

  e0c1a5b24f5b ("genirq: Add chip flag to denote automatic IRQ (un)masking")

from the irqchip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/irq.h
index c8293c817646,0b45e42812d6..000000000000
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@@ -569,7 -577,7 +577,8 @@@ struct irq_chip 
   * IRQCHIP_SUPPORTS_NMI:              Chip can deliver NMIs, only for root irqchips
   * IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND:  Invokes __enable_irq()/__disable_irq() for wake irqs
   *                                    in the suspend path if they are in disabled state
 + * IRQCHIP_AFFINITY_PRE_STARTUP:      Default affinity update before startup
+  * IRQCHIP_AUTOMASKS_FLOW:            chip->ack() masks and chip->eoi() unmasks
   */
  enum {
  	IRQCHIP_SET_TYPE_MASKED			= (1 <<  0),
@@@ -582,7 -590,7 +591,8 @@@
  	IRQCHIP_SUPPORTS_LEVEL_MSI		= (1 <<  7),
  	IRQCHIP_SUPPORTS_NMI			= (1 <<  8),
  	IRQCHIP_ENABLE_WAKEUP_ON_SUSPEND	= (1 <<  9),
 -	IRQCHIP_AUTOMASKS_FLOW                  = (1 <<  10),
 +	IRQCHIP_AFFINITY_PRE_STARTUP		= (1 << 10),
++	IRQCHIP_AUTOMASKS_FLOW                  = (1 << 11),
  };
  
  #include <linux/irqdesc.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the irqchip tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2007 bytes --]

Hi all,

Today's linux-next merge of the irqchip tree got a conflict in:

  drivers/irqchip/irq-apple-aic.c

between commit:

  0e2213fe0ab4 ("irqchip: Use irq_domain_alloc_irqs()")

from the tip tree and commit:

  c19f89719428 ("irqchip/apple-aic: Move over to core ipi-mux")

from the irqchip tree.

I fixed it up (the latter removed the code modified by the former) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

However, an earlier commit in the irqchip tree

  835a486cd9f5 ("genirq: Add mechanism to multiplex a single HW IPI")

created a new user of __irq_domain_alloc_irqs(), so I also added the
following merge fix up patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Feb 2023 12:14:47 +1100
Subject: [PATCH] fix up for "irqchip: Use irq_domain_alloc_irqs()"

interacting with "genirq: Add mechanism to multiplex a single HW IPI"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/irq/ipi-mux.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/irq/ipi-mux.c b/kernel/irq/ipi-mux.c
index 3a403c3a785d..fa4fc18c6131 100644
--- a/kernel/irq/ipi-mux.c
+++ b/kernel/irq/ipi-mux.c
@@ -185,8 +185,7 @@ int ipi_mux_create(unsigned int nr_ipi, void (*mux_send)(unsigned int cpu))
 	domain->flags |= IRQ_DOMAIN_FLAG_IPI_SINGLE;
 	irq_domain_update_bus_token(domain, DOMAIN_BUS_IPI);
 
-	rc = __irq_domain_alloc_irqs(domain, -1, nr_ipi,
-				     NUMA_NO_NODE, NULL, false, NULL);
+	rc = irq_domain_alloc_irqs(domain, nr_ipi, NUMA_NO_NODE, NULL);
 	if (rc <= 0) {
 		pr_err("unable to alloc IRQs from IPI Mux domain\n");
 		goto fail_free_domain;
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the irqchip tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 816 bytes --]

Hi all,

Today's linux-next merge of the irqchip tree got a conflict in:

  drivers/irqchip/Kconfig

between commit:

  d77aeb5d403d ("irqchip: Fix "Loongson HyperTransport Vector support" driver build on all non-MIPS platforms")

from the tip tree and commit:

  4a786cc36028 ("irqchip/loongson-htvec: Don't compile when COMPILE_TEST is selected")

from the irqchip tree.

I fixed it up (I just used the latter) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]