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

Commit 702cb0a0 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/irqdomain: Rename early argument of irq_domain_activate_irq() 



The 'early' argument of irq_domain_activate_irq() is actually used to
denote reservation mode. To avoid confusion, rename it before abuse
happens.

No functional change.

Fixes: 72491643 ("genirq/irqdomain: Update irq_domain_ops.activate() signature")
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Alexandru Chirvasitu <achirvasub@gmail.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Dou Liyang <douly.fnst@cn.fujitsu.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Mikael Pettersson <mikpelinux@gmail.com>
Cc: Josh Poulson <jopoulso@microsoft.com>
Cc: Mihai Costache <v-micos@microsoft.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-pci@vger.kernel.org
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Dexuan Cui <decui@microsoft.com>
Cc: Simon Xiao <sixiao@microsoft.com>
Cc: Saeed Mahameed <saeedm@mellanox.com>
Cc: Jork Loeser <Jork.Loeser@microsoft.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: devel@linuxdriverproject.org
Cc: KY Srinivasan <kys@microsoft.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Sakari Ailus <sakari.ailus@intel.com>,
Cc: linux-media@vger.kernel.org
parent 945f50a5

arch/x86/include/asm/irqdomain.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq, 
extern void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,

			      unsigned int nr_irqs);

extern int mp_irqdomain_activate(struct irq_domain *domain,

				 struct irq_data *irq_data, bool early);

				 struct irq_data *irq_data, bool reserve);

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/include/asm/trace/irq_vectors.h

+8 −8
Original line number Diff line number Diff line
@@ -283,34 +283,34 @@ TRACE_EVENT(vector_alloc_managed, 
DECLARE_EVENT_CLASS(vector_activate,



	TP_PROTO(unsigned int irq, bool is_managed, bool can_reserve,

		 bool early),

		 bool reserve),



	TP_ARGS(irq, is_managed, can_reserve, early),

	TP_ARGS(irq, is_managed, can_reserve, reserve),



	TP_STRUCT__entry(

		__field(	unsigned int,	irq		)

		__field(	bool,		is_managed	)

		__field(	bool,		can_reserve	)

		__field(	bool,		early		)

		__field(	bool,		reserve		)

	),



	TP_fast_assign(

		__entry->irq		= irq;

		__entry->is_managed	= is_managed;

		__entry->can_reserve	= can_reserve;

		__entry->early		= early;

		__entry->reserve	= reserve;

	),



	TP_printk("irq=%u is_managed=%d can_reserve=%d early=%d",

	TP_printk("irq=%u is_managed=%d can_reserve=%d reserve=%d",

		  __entry->irq, __entry->is_managed, __entry->can_reserve,

		  __entry->early)

		  __entry->reserve)

);



#define DEFINE_IRQ_VECTOR_ACTIVATE_EVENT(name)				\

DEFINE_EVENT_FN(vector_activate, name,					\

	TP_PROTO(unsigned int irq, bool is_managed,			\

		 bool can_reserve, bool early),				\

	TP_ARGS(irq, is_managed, can_reserve, early), NULL, NULL);	\

		 bool can_reserve, bool reserve),			\

	TP_ARGS(irq, is_managed, can_reserve, reserve), NULL, NULL);	\



DEFINE_IRQ_VECTOR_ACTIVATE_EVENT(vector_activate);

DEFINE_IRQ_VECTOR_ACTIVATE_EVENT(vector_deactivate);

arch/x86/kernel/apic/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2988,7 +2988,7 @@ void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq, 
}



int mp_irqdomain_activate(struct irq_domain *domain,

			  struct irq_data *irq_data, bool early)

			  struct irq_data *irq_data, bool reserve)

{

	unsigned long flags;

arch/x86/kernel/apic/vector.c

+3 −3
Original line number Diff line number Diff line
@@ -399,21 +399,21 @@ static int activate_managed(struct irq_data *irqd) 
}



static int x86_vector_activate(struct irq_domain *dom, struct irq_data *irqd,

			       bool early)

			       bool reserve)

{

	struct apic_chip_data *apicd = apic_chip_data(irqd);

	unsigned long flags;

	int ret = 0;



	trace_vector_activate(irqd->irq, apicd->is_managed,

			      apicd->can_reserve, early);

			      apicd->can_reserve, reserve);



	/* Nothing to do for fixed assigned vectors */

	if (!apicd->can_reserve && !apicd->is_managed)

		return 0;



	raw_spin_lock_irqsave(&vector_lock, flags);

	if (early || irqd_is_managed_and_shutdown(irqd))

	if (reserve || irqd_is_managed_and_shutdown(irqd))

		vector_assign_managed_shutdown(irqd);

	else if (apicd->is_managed)

		ret = activate_managed(irqd);

arch/x86/platform/uv/uv_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void uv_domain_free(struct irq_domain *domain, unsigned int virq, 
 * on the specified blade to allow the sending of MSIs to the specified CPU.

 */

static int uv_domain_activate(struct irq_domain *domain,

			      struct irq_data *irq_data, bool early)

			      struct irq_data *irq_data, bool reserve)

{

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

	return 0;