| Message ID | 20200516063901.18365-3-anup.patel@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | More improvements for multiple PLICs | expand |
On 2020-05-16 07:38, Anup Patel wrote: > We improve PLIC banner to help distinguish multiple PLIC instances > in boot time prints. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > drivers/irqchip/irq-sifive-plic.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/irqchip/irq-sifive-plic.c > b/drivers/irqchip/irq-sifive-plic.c > index 7dc23edb3267..2d3db927a551 100644 > --- a/drivers/irqchip/irq-sifive-plic.c > +++ b/drivers/irqchip/irq-sifive-plic.c > @@ -284,6 +284,11 @@ static int __init plic_init(struct device_node > *node, > u32 nr_irqs; > struct plic_priv *priv; > struct plic_handler *handler; > + struct resource iores; > + > + error = of_address_to_resource(node, 0, &iores); > + if (error) > + return error; > > priv = kzalloc(sizeof(*priv), GFP_KERNEL); > if (!priv) > @@ -377,8 +382,10 @@ static int __init plic_init(struct device_node > *node, > plic_cpuhp_setup_done = true; > } > > - pr_info("mapped %d interrupts with %d handlers for %d contexts.\n", > - nr_irqs, nr_handlers, nr_contexts); > + pr_info("interrupt-controller at 0x%llx " > + "(interrupts=%d, contexts=%d, handlers=%d)\n", > + (unsigned long long)iores.start, nr_irqs, > + nr_contexts, nr_handlers); Instead of displaying "interrupt controller at ...", why not use the existing printk format for OF nodes? Something along the lines of pr_info("%pOF : mapped %d interrupts with %d handlers for %d contexts\n", node, nr_irqs, nr_handlers, nr_contexts); > set_handle_irq(plic_handle_irq); > return 0; Thanks, M.
> -----Original Message----- > From: Marc Zyngier <maz@kernel.org> > Sent: 16 May 2020 17:50 > To: Anup Patel <Anup.Patel@wdc.com> > Cc: Palmer Dabbelt <palmer@dabbelt.com>; Paul Walmsley > <paul.walmsley@sifive.com>; Thomas Gleixner <tglx@linutronix.de>; Jason > Cooper <jason@lakedaemon.net>; Atish Patra <Atish.Patra@wdc.com>; Alistair > Francis <Alistair.Francis@wdc.com>; Anup Patel <anup@brainfault.org>; linux- > riscv@lists.infradead.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH 2/4] irqchip/sifive-plic: Improve boot prints for multiple > PLIC instances > > On 2020-05-16 07:38, Anup Patel wrote: > > We improve PLIC banner to help distinguish multiple PLIC instances in > > boot time prints. > > > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > > --- > > drivers/irqchip/irq-sifive-plic.c | 11 +++++++++-- > > 1 file changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/irqchip/irq-sifive-plic.c > > b/drivers/irqchip/irq-sifive-plic.c > > index 7dc23edb3267..2d3db927a551 100644 > > --- a/drivers/irqchip/irq-sifive-plic.c > > +++ b/drivers/irqchip/irq-sifive-plic.c > > @@ -284,6 +284,11 @@ static int __init plic_init(struct device_node > > *node, > > u32 nr_irqs; > > struct plic_priv *priv; > > struct plic_handler *handler; > > + struct resource iores; > > + > > + error = of_address_to_resource(node, 0, &iores); > > + if (error) > > + return error; > > > > priv = kzalloc(sizeof(*priv), GFP_KERNEL); > > if (!priv) > > @@ -377,8 +382,10 @@ static int __init plic_init(struct device_node > > *node, > > plic_cpuhp_setup_done = true; > > } > > > > - pr_info("mapped %d interrupts with %d handlers for %d contexts.\n", > > - nr_irqs, nr_handlers, nr_contexts); > > + pr_info("interrupt-controller at 0x%llx " > > + "(interrupts=%d, contexts=%d, handlers=%d)\n", > > + (unsigned long long)iores.start, nr_irqs, > > + nr_contexts, nr_handlers); > > Instead of displaying "interrupt controller at ...", why not use the existing printk > format for OF nodes? Something along the lines of > > pr_info("%pOF : mapped %d interrupts with %d handlers for %d contexts\n", > node, nr_irqs, nr_handlers, nr_contexts); Sure, I will go with your suggestion and use printk for OF nodes. Regards, Anup
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c index 7dc23edb3267..2d3db927a551 100644 --- a/drivers/irqchip/irq-sifive-plic.c +++ b/drivers/irqchip/irq-sifive-plic.c @@ -284,6 +284,11 @@ static int __init plic_init(struct device_node *node, u32 nr_irqs; struct plic_priv *priv; struct plic_handler *handler; + struct resource iores; + + error = of_address_to_resource(node, 0, &iores); + if (error) + return error; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) @@ -377,8 +382,10 @@ static int __init plic_init(struct device_node *node, plic_cpuhp_setup_done = true; } - pr_info("mapped %d interrupts with %d handlers for %d contexts.\n", - nr_irqs, nr_handlers, nr_contexts); + pr_info("interrupt-controller at 0x%llx " + "(interrupts=%d, contexts=%d, handlers=%d)\n", + (unsigned long long)iores.start, nr_irqs, + nr_contexts, nr_handlers); set_handle_irq(plic_handle_irq); return 0;
We improve PLIC banner to help distinguish multiple PLIC instances in boot time prints. Signed-off-by: Anup Patel <anup.patel@wdc.com> --- drivers/irqchip/irq-sifive-plic.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)