Commit 42e1cc2d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/irqdomain: Propagate early activation 



Propagate the early activation mode to the irqdomain activate()
callbacks. This is required for the upcoming reservation, late vector
assignment scheme, so that the early activation call can act accordingly.

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/20170913213153.028353660@linutronix.de
parent bb9b428a

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -2096,7 +2096,7 @@ static inline void __init check_timer(void) 
				unmask_ioapic_irq(irq_get_irq_data(0));

		}

		irq_domain_deactivate_irq(irq_data);

		irq_domain_activate_irq(irq_data);

		irq_domain_activate_irq(irq_data, false);

		if (timer_irq_works()) {

			if (disable_timer_pin_1 > 0)

				clear_IO_APIC_pin(0, pin1);
@@ -2118,7 +2118,7 @@ static inline void __init check_timer(void) 
		 */

		replace_pin_at_irq_node(data, node, apic1, pin1, apic2, pin2);

		irq_domain_deactivate_irq(irq_data);

		irq_domain_activate_irq(irq_data);

		irq_domain_activate_irq(irq_data, false);

		legacy_pic->unmask(0);

		if (timer_irq_works()) {

			apic_printk(APIC_QUIET, KERN_INFO "....... works.\n");

include/linux/irqdomain.h

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ extern int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, 
				   unsigned int nr_irqs, int node, void *arg,

				   bool realloc, const struct cpumask *affinity);

extern void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs);

extern int irq_domain_activate_irq(struct irq_data *irq_data);

extern int irq_domain_activate_irq(struct irq_data *irq_data, bool early);

extern void irq_domain_deactivate_irq(struct irq_data *irq_data);



static inline int irq_domain_alloc_irqs(struct irq_domain *domain,

kernel/irq/chip.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ __irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force) 
	 * Managed interrupts have reserved resources, so this should not

	 * happen.

	 */

	if (WARN_ON(irq_domain_activate_irq(d)))

	if (WARN_ON(irq_domain_activate_irq(d, false)))

		return IRQ_STARTUP_ABORT;

	return IRQ_STARTUP_MANAGED;

}
@@ -290,7 +290,7 @@ int irq_activate(struct irq_desc *desc) 
	struct irq_data *d = irq_desc_get_irq_data(desc);



	if (!irqd_affinity_is_managed(d))

		return irq_domain_activate_irq(d);

		return irq_domain_activate_irq(d, false);

	return 0;

}

kernel/irq/internals.h

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static inline bool irq_fixup_move_pending(struct irq_desc *desc, bool fclear) 
#endif /* !CONFIG_GENERIC_PENDING_IRQ */



#if !defined(CONFIG_IRQ_DOMAIN) || !defined(CONFIG_IRQ_DOMAIN_HIERARCHY)

static inline int irq_domain_activate_irq(struct irq_data *data)

static inline int irq_domain_activate_irq(struct irq_data *data, bool early)

{

	irqd_set_activated(data);

	return 0;

kernel/irq/irqdomain.c

+6 −5
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ static void __irq_domain_deactivate_irq(struct irq_data *irq_data) 
	}

}



static int __irq_domain_activate_irq(struct irq_data *irqd)

static int __irq_domain_activate_irq(struct irq_data *irqd, bool early)

{

	int ret = 0;
@@ -1702,9 +1702,10 @@ static int __irq_domain_activate_irq(struct irq_data *irqd) 
		struct irq_domain *domain = irqd->domain;



		if (irqd->parent_data)

			ret = __irq_domain_activate_irq(irqd->parent_data);

			ret = __irq_domain_activate_irq(irqd->parent_data,

							early);

		if (!ret && domain->ops->activate) {

			ret = domain->ops->activate(domain, irqd, false);

			ret = domain->ops->activate(domain, irqd, early);

			/* Rollback in case of error */

			if (ret && irqd->parent_data)

				__irq_domain_deactivate_irq(irqd->parent_data);
@@ -1721,12 +1722,12 @@ static int __irq_domain_activate_irq(struct irq_data *irqd) 
 * This is the second step to call domain_ops->activate to program interrupt

 * controllers, so the interrupt could actually get delivered.

 */

int irq_domain_activate_irq(struct irq_data *irq_data)

int irq_domain_activate_irq(struct irq_data *irq_data, bool early)

{

	int ret = 0;



	if (!irqd_is_activated(irq_data))

		ret = __irq_domain_activate_irq(irq_data);

		ret = __irq_domain_activate_irq(irq_data, early);

	if (!ret)

		irqd_set_activated(irq_data);

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE