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

Commit b977fcf4 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

irqdomain/debugfs: Use PAs to generate fwnode names 



Booting a large arm64 server (HiSi D05) leads to the following
shouting at boot time:

[   20.722132] debugfs: File 'irqchip@(____ptrval____)-3' in directory 'domains' already present!
[   20.730851] debugfs: File 'irqchip@(____ptrval____)-3' in directory 'domains' already present!
[   20.739560] debugfs: File 'irqchip@(____ptrval____)-3' in directory 'domains' already present!
[   20.748267] debugfs: File 'irqchip@(____ptrval____)-3' in directory 'domains' already present!
[   20.756975] debugfs: File 'irqchip@(____ptrval____)-3' in directory 'domains' already present!
[   20.765683] debugfs: File 'irqchip@(____ptrval____)-3' in directory 'domains' already present!
[   20.774391] debugfs: File 'irqchip@(____ptrval____)-3' in directory 'domains' already present!

and many more... Evidently, we expect something a bit more informative
than ____ptrval____, and certainly we want all of our domains, not just
the first one.

For that, turn the %p used to generate the fwnode name into something
that won't be repainted (%pa). Given that we've now fixed all users to
pass a pointer to a PA, it will actually do the right thing.

Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 467a3bb9

include/linux/irqdomain.h

+3 −3
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static inline struct device_node *irq_domain_get_of_node(struct irq_domain *d) 


#ifdef CONFIG_IRQ_DOMAIN

struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,

						const char *name, void *data);

						const char *name, phys_addr_t *pa);



enum {

	IRQCHIP_FWNODE_REAL,
@@ -241,9 +241,9 @@ struct fwnode_handle *irq_domain_alloc_named_id_fwnode(const char *name, int id) 
					 NULL);

}



static inline struct fwnode_handle *irq_domain_alloc_fwnode(void *data)

static inline struct fwnode_handle *irq_domain_alloc_fwnode(phys_addr_t *pa)

{

	return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_REAL, 0, NULL, data);

	return __irq_domain_alloc_fwnode(IRQCHIP_FWNODE_REAL, 0, NULL, pa);

}



void irq_domain_free_fwnode(struct fwnode_handle *fwnode);

kernel/irq/irqdomain.c

+5 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct irqchip_fwid { 
	struct fwnode_handle	fwnode;

	unsigned int		type;

	char			*name;

	void *data;

	phys_addr_t		*pa;

};



#ifdef CONFIG_GENERIC_IRQ_DEBUGFS
@@ -62,7 +62,8 @@ EXPORT_SYMBOL_GPL(irqchip_fwnode_ops); 
 * domain struct.

 */

struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,

						const char *name, void *data)

						const char *name,

						phys_addr_t *pa)

{

	struct irqchip_fwid *fwid;

	char *n;
@@ -77,7 +78,7 @@ struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id, 
		n = kasprintf(GFP_KERNEL, "%s-%d", name, id);

		break;

	default:

		n = kasprintf(GFP_KERNEL, "irqchip@%p", data);

		n = kasprintf(GFP_KERNEL, "irqchip@%pa", pa);

		break;

	}
@@ -89,7 +90,7 @@ struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id, 


	fwid->type = type;

	fwid->name = n;

	fwid->data = data;

	fwid->pa = pa;

	fwid->fwnode.ops = &irqchip_fwnode_ops;

	return &fwid->fwnode;

}