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

Commit 72491643 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/irqdomain: Update irq_domain_ops.activate() signature 



The irq_domain_ops.activate() callback has no return value and no way to
tell the function that the activation is early.

The upcoming changes to support a reservation scheme which allows to assign
interrupt vectors on x86 only when the interrupt is actually requested
requires:

  - A return value, so activation can fail at request_irq() time
  
  - Information that the activate invocation is early, i.e. before
    request_irq().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Tested-by: default avatarYu Chen <yu.c.chen@intel.com>
Acked-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Rui Zhang <rui.zhang@intel.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Len Brown <lenb@kernel.org>
Link: https://lkml.kernel.org/r/20170913213152.848490816@linutronix.de
parent c942cee4

arch/x86/include/asm/irqdomain.h

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ extern int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq, 
			      unsigned int nr_irqs, void *arg);

extern void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,

			      unsigned int nr_irqs);

extern void mp_irqdomain_activate(struct irq_domain *domain,

				  struct irq_data *irq_data);

extern int mp_irqdomain_activate(struct irq_domain *domain,

				 struct irq_data *irq_data, bool early);

extern void mp_irqdomain_deactivate(struct irq_domain *domain,

				    struct irq_data *irq_data);

extern int mp_irqdomain_ioapic_idx(struct irq_domain *domain);

arch/x86/kernel/apic/htirq.c

+3 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ static void htirq_domain_free(struct irq_domain *domain, unsigned int virq, 
	irq_domain_free_irqs_top(domain, virq, nr_irqs);

}



static void htirq_domain_activate(struct irq_domain *domain,

				  struct irq_data *irq_data)

static int htirq_domain_activate(struct irq_domain *domain,

				 struct irq_data *irq_data, bool early)

{

	struct ht_irq_msg msg;

	struct irq_cfg *cfg = irqd_cfg(irq_data);
@@ -132,6 +132,7 @@ static void htirq_domain_activate(struct irq_domain *domain, 
			HT_IRQ_LOW_MT_ARBITRATED) |

		HT_IRQ_LOW_IRQ_MASKED;

	write_ht_irq_msg(irq_data->irq, &msg);

	return 0;

}



static void htirq_domain_deactivate(struct irq_domain *domain,

arch/x86/kernel/apic/io_apic.c

+3 −2
Original line number Diff line number Diff line
@@ -2977,8 +2977,8 @@ void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq, 
	irq_domain_free_irqs_top(domain, virq, nr_irqs);

}



void mp_irqdomain_activate(struct irq_domain *domain,

			   struct irq_data *irq_data)

int mp_irqdomain_activate(struct irq_domain *domain,

			  struct irq_data *irq_data, bool early)

{

	unsigned long flags;

	struct irq_pin_list *entry;
@@ -2988,6 +2988,7 @@ void mp_irqdomain_activate(struct irq_domain *domain, 
	for_each_irq_pin(entry, data->irq_2_pin)

		__ioapic_write_entry(entry->apic, entry->pin, data->entry);

	raw_spin_unlock_irqrestore(&ioapic_lock, flags);

	return 0;

}



void mp_irqdomain_deactivate(struct irq_domain *domain,

arch/x86/platform/uv/uv_irq.c

+3 −2
Original line number Diff line number Diff line
@@ -127,10 +127,11 @@ static void uv_domain_free(struct irq_domain *domain, unsigned int virq, 
 * Re-target the irq to the specified CPU and enable the specified MMR located

 * on the specified blade to allow the sending of MSIs to the specified CPU.

 */

static void uv_domain_activate(struct irq_domain *domain,

			       struct irq_data *irq_data)

static int uv_domain_activate(struct irq_domain *domain,

			      struct irq_data *irq_data, bool early)

{

	uv_program_mmr(irqd_cfg(irq_data), irq_data->chip_data);

	return 0;

}



/*

drivers/gpio/gpio-xgene-sb.c

+5 −3
Original line number Diff line number Diff line
@@ -140,8 +140,9 @@ static int xgene_gpio_sb_to_irq(struct gpio_chip *gc, u32 gpio) 
	return irq_create_fwspec_mapping(&fwspec);

}



static void xgene_gpio_sb_domain_activate(struct irq_domain *d,

		struct irq_data *irq_data)

static int xgene_gpio_sb_domain_activate(struct irq_domain *d,

					 struct irq_data *irq_data,

					 bool early)

{

	struct xgene_gpio_sb *priv = d->host_data;

	u32 gpio = HWIRQ_TO_GPIO(priv, irq_data->hwirq);
@@ -150,11 +151,12 @@ static void xgene_gpio_sb_domain_activate(struct irq_domain *d, 
		dev_err(priv->gc.parent,

		"Unable to configure XGene GPIO standby pin %d as IRQ\n",

				gpio);

		return;

		return -ENOSPC;

	}



	xgene_gpio_set_bit(&priv->gc, priv->regs + MPA_GPIO_SEL_LO,

			gpio * 2, 1);

	return 0;

}



static void xgene_gpio_sb_domain_deactivate(struct irq_domain *d,