Commit 43a7eec0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-core-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq updates from Thomas Gleixner:
 "A small set of core changes for the interrupt subsystem:

   - Expose the MSI message in the existing debug filesystem dump.
     That's useful for validation and debugging.

   - Small cleanups"

* tag 'irq-core-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Make a few functions static
  irqdomain: Remove extern from function declarations
  genirq/msi: Expose MSI message data in debugfs
parents 2df0c02d 827bafd5

include/linux/irqdomain.h

+68 −69
Original line number Diff line number Diff line
@@ -350,11 +350,11 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, 
					    irq_hw_number_t first_hwirq,

					    const struct irq_domain_ops *ops,

					    void *host_data);

extern struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,

struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,

					    enum irq_domain_bus_token bus_token);

extern void irq_set_default_host(struct irq_domain *host);

extern struct irq_domain *irq_get_default_host(void);

extern int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,

void irq_set_default_host(struct irq_domain *host);

struct irq_domain *irq_get_default_host(void);

int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,

			   irq_hw_number_t hwirq, int node,

			   const struct irq_affinity_desc *affinity);
@@ -370,7 +370,7 @@ static inline bool is_fwnode_irqchip(const struct fwnode_handle *fwnode) 
	return fwnode && fwnode->ops == &irqchip_fwnode_ops;

}



extern void irq_domain_update_bus_token(struct irq_domain *domain,

void irq_domain_update_bus_token(struct irq_domain *domain,

				 enum irq_domain_bus_token bus_token);



static inline
@@ -454,7 +454,7 @@ static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nod 
	return IS_ERR(d) ? NULL : d;

}



extern unsigned int irq_create_direct_mapping(struct irq_domain *host);

unsigned int irq_create_direct_mapping(struct irq_domain *host);

#endif



static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,
@@ -507,19 +507,19 @@ static inline struct irq_domain *irq_domain_create_tree(struct fwnode_handle *fw 
	return IS_ERR(d) ? NULL : d;

}



extern void irq_domain_remove(struct irq_domain *host);

void irq_domain_remove(struct irq_domain *host);



extern int irq_domain_associate(struct irq_domain *domain, unsigned int irq,

int irq_domain_associate(struct irq_domain *domain, unsigned int irq,

			 irq_hw_number_t hwirq);

extern void irq_domain_associate_many(struct irq_domain *domain,

void irq_domain_associate_many(struct irq_domain *domain,

			       unsigned int irq_base,

			       irq_hw_number_t hwirq_base, int count);



extern unsigned int irq_create_mapping_affinity(struct irq_domain *host,

unsigned int irq_create_mapping_affinity(struct irq_domain *host,

					 irq_hw_number_t hwirq,

					 const struct irq_affinity_desc *affinity);

extern unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);

extern void irq_dispose_mapping(unsigned int virq);

unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec);

void irq_dispose_mapping(unsigned int virq);



static inline unsigned int irq_create_mapping(struct irq_domain *host,

					      irq_hw_number_t hwirq)
@@ -527,7 +527,7 @@ static inline unsigned int irq_create_mapping(struct irq_domain *host, 
	return irq_create_mapping_affinity(host, hwirq, NULL);

}



extern struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,

struct irq_desc *__irq_resolve_mapping(struct irq_domain *domain,

				       irq_hw_number_t hwirq,

				       unsigned int *irq);
@@ -587,19 +587,21 @@ int irq_reserve_ipi(struct irq_domain *domain, const struct cpumask *dest); 
int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest);



/* V2 interfaces to support hierarchy IRQ domains. */

extern struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,

struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,

					 unsigned int virq);

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

void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,

			 irq_hw_number_t hwirq,

			 const struct irq_chip *chip,

			 void *chip_data, irq_flow_handler_t handler,

			 void *handler_data, const char *handler_name);

extern void irq_domain_reset_irq_data(struct irq_data *irq_data);

void irq_domain_reset_irq_data(struct irq_data *irq_data);

#ifdef	CONFIG_IRQ_DOMAIN_HIERARCHY

extern struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent,

			unsigned int flags, unsigned int size,

struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent,

					       unsigned int flags,

					       unsigned int size,

					       struct fwnode_handle *fwnode,

			const struct irq_domain_ops *ops, void *host_data);

					       const struct irq_domain_ops *ops,

					       void *host_data);



static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *parent,

					    unsigned int flags,
@@ -613,13 +615,13 @@ static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *par 
					   ops, host_data);

}



extern int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base,

int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base,

			    unsigned int nr_irqs, int node, void *arg,

			    bool realloc,

			    const struct irq_affinity_desc *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, bool early);

extern void irq_domain_deactivate_irq(struct irq_data *irq_data);

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

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

void irq_domain_deactivate_irq(struct irq_data *irq_data);



static inline int irq_domain_alloc_irqs(struct irq_domain *domain,

			unsigned int nr_irqs, int node, void *arg)
@@ -628,32 +630,29 @@ static inline int irq_domain_alloc_irqs(struct irq_domain *domain, 
				       NULL);

}



extern int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain,

					   unsigned int irq_base,

					   unsigned int nr_irqs, void *arg);

extern int irq_domain_set_hwirq_and_chip(struct irq_domain *domain,

int irq_domain_set_hwirq_and_chip(struct irq_domain *domain,

				  unsigned int virq,

				  irq_hw_number_t hwirq,

				  const struct irq_chip *chip,

				  void *chip_data);

extern void irq_domain_free_irqs_common(struct irq_domain *domain,

void irq_domain_free_irqs_common(struct irq_domain *domain,

				 unsigned int virq,

				 unsigned int nr_irqs);

extern void irq_domain_free_irqs_top(struct irq_domain *domain,

void irq_domain_free_irqs_top(struct irq_domain *domain,

			      unsigned int virq, unsigned int nr_irqs);



extern int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg);

extern int irq_domain_pop_irq(struct irq_domain *domain, int virq);

int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg);

int irq_domain_pop_irq(struct irq_domain *domain, int virq);



extern int irq_domain_alloc_irqs_parent(struct irq_domain *domain,

int irq_domain_alloc_irqs_parent(struct irq_domain *domain,

				 unsigned int irq_base,

				 unsigned int nr_irqs, void *arg);



extern void irq_domain_free_irqs_parent(struct irq_domain *domain,

void irq_domain_free_irqs_parent(struct irq_domain *domain,

				 unsigned int irq_base,

				 unsigned int nr_irqs);



extern int irq_domain_disconnect_hierarchy(struct irq_domain *domain,

int irq_domain_disconnect_hierarchy(struct irq_domain *domain,

					   unsigned int virq);



static inline bool irq_domain_is_hierarchy(struct irq_domain *domain)

kernel/irq/chip.c

+15 −15
Original line number Diff line number Diff line
@@ -232,6 +232,21 @@ __irq_startup_managed(struct irq_desc *desc, const struct cpumask *aff, 
}

#endif



static void irq_enable(struct irq_desc *desc)

{

	if (!irqd_irq_disabled(&desc->irq_data)) {

		unmask_irq(desc);

	} else {

		irq_state_clr_disabled(desc);

		if (desc->irq_data.chip->irq_enable) {

			desc->irq_data.chip->irq_enable(&desc->irq_data);

			irq_state_clr_masked(desc);

		} else {

			unmask_irq(desc);

		}

	}

}



static int __irq_startup(struct irq_desc *desc)

{

	struct irq_data *d = irq_desc_get_irq_data(desc);
@@ -332,21 +347,6 @@ void irq_shutdown_and_deactivate(struct irq_desc *desc) 
	irq_domain_deactivate_irq(&desc->irq_data);

}



void irq_enable(struct irq_desc *desc)

{

	if (!irqd_irq_disabled(&desc->irq_data)) {

		unmask_irq(desc);

	} else {

		irq_state_clr_disabled(desc);

		if (desc->irq_data.chip->irq_enable) {

			desc->irq_data.chip->irq_enable(&desc->irq_data);

			irq_state_clr_masked(desc);

		} else {

			unmask_irq(desc);

		}

	}

}



static void __irq_disable(struct irq_desc *desc, bool mask)

{

	if (irqd_irq_disabled(&desc->irq_data)) {

kernel/irq/internals.h

+0 −9
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ extern int irq_startup(struct irq_desc *desc, bool resend, bool force); 


extern void irq_shutdown(struct irq_desc *desc);

extern void irq_shutdown_and_deactivate(struct irq_desc *desc);

extern void irq_enable(struct irq_desc *desc);

extern void irq_disable(struct irq_desc *desc);

extern void irq_percpu_enable(struct irq_desc *desc, unsigned int cpu);

extern void irq_percpu_disable(struct irq_desc *desc, unsigned int cpu);
@@ -98,18 +97,12 @@ extern void mask_irq(struct irq_desc *desc); 
extern void unmask_irq(struct irq_desc *desc);

extern void unmask_threaded_irq(struct irq_desc *desc);



extern unsigned int kstat_irqs_desc(struct irq_desc *desc, const struct cpumask *cpumask);



#ifdef CONFIG_SPARSE_IRQ

static inline void irq_mark_irq(unsigned int irq) { }

#else

extern void irq_mark_irq(unsigned int irq);

#endif



extern int __irq_get_irqchip_state(struct irq_data *data,

				   enum irqchip_irq_state which,

				   bool *state);



irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc);

irqreturn_t handle_irq_event_percpu(struct irq_desc *desc);

irqreturn_t handle_irq_event(struct irq_desc *desc);
@@ -139,8 +132,6 @@ static inline void unregister_handler_proc(unsigned int irq, 


extern bool irq_can_set_affinity_usr(unsigned int irq);



extern void irq_set_thread_affinity(struct irq_desc *desc);



extern int irq_do_set_affinity(struct irq_data *data,

			       const struct cpumask *dest, bool force);

kernel/irq/irqdesc.c

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ unsigned int kstat_irqs_cpu(unsigned int irq, int cpu) 
	return desc && desc->kstat_irqs ? per_cpu(desc->kstat_irqs->cnt, cpu) : 0;

}



unsigned int kstat_irqs_desc(struct irq_desc *desc, const struct cpumask *cpumask)

static unsigned int kstat_irqs_desc(struct irq_desc *desc, const struct cpumask *cpumask)

{

	unsigned int sum = 0;

	int cpu;

kernel/irq/irqdomain.c

+2 −3
Original line number Diff line number Diff line
@@ -1589,8 +1589,7 @@ static void irq_domain_free_irqs_hierarchy(struct irq_domain *domain, 
	}

}



int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain,

				    unsigned int irq_base,

static int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain, unsigned int irq_base,

					   unsigned int nr_irqs, void *arg)

{

	if (!domain->ops->alloc) {