From patchwork Wed Oct 11 13:05:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 9999597 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0927C6037F for ; Wed, 11 Oct 2017 13:05:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED31727853 for ; Wed, 11 Oct 2017 13:05:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2049289FD; Wed, 11 Oct 2017 13:05:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D30D727853 for ; Wed, 11 Oct 2017 13:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752050AbdJKNFn (ORCPT ); Wed, 11 Oct 2017 09:05:43 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:49085 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752006AbdJKNFm (ORCPT ); Wed, 11 Oct 2017 09:05:42 -0400 Received: from w540.lan (unknown [IPv6:2001:b07:6442:1ac4:20c9:7689:c48d:8ab2]) (Authenticated sender: jacopo@jmondi.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 407B51720D3; Wed, 11 Oct 2017 15:05:39 +0200 (CEST) From: Jacopo Mondi To: geert+renesas@glider.be, chris.brandt@renesas.com Cc: linux-renesas-soc@vger.kernel.org, Jacopo Mondi Subject: [PATCH v2] clocksource/drivers/ostm: Use unique device name instead of ostm Date: Wed, 11 Oct 2017 15:05:30 +0200 Message-Id: <1507727130-17641-1-git-send-email-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507725113-18070-1-git-send-email-geert+renesas@glider.be> References: <1507725113-18070-1-git-send-email-geert+renesas@glider.be> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven Currently all OSTM devices are called "ostm", also in kernel messages. As there can be multiple instances in an SoC, this can confuse the user. Hence construct a unique name from the DT node name, like is done for platform devices. On GR-Peach, the boot log changes like: -clocksource: ostm: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 57352151442 ns +clocksource: ostm /timer@fcfec000: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 57352151442 ns sched_clock: 32 bits at 33MHz, resolution 30ns, wraps every 64440619504ns -ostm: used for clocksource -ostm: used for clock events +ostm /timer@fcfec000: used for clocksource +ostm /timer@fcfec400: used for clock events Signed-off-by: Geert Uytterhoeven Signed-off-by: Jacopo Mondi Tested-by: Jacopo Mondi --- Hi Geert, with your original patch boot log looks like: clocksource: ostm timer: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 57339246898 ns ostm timer: used for clocksource ostm timer: used for clock events clocksource: Switched to clocksource ostm timer Using "np->name" to sprintf the ostm name is not that useful as all ostm instances will appear as "ostm timer". With this v2 I am using "np->full_name" and custom print modifier "%pOF" to sprintf the node name, and now boot log looks like what I have reported in the change log (*) Thanks j (*) Using %pOF results in "/timer@fcfec000" with the "/" at beginning of timer name. I used %pOF as it has been recently introduced, but if you feel like it's better to get rid of the "/" I can fall back to ("%s", np->full_name) --- drivers/clocksource/renesas-ostm.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/clocksource/renesas-ostm.c b/drivers/clocksource/renesas-ostm.c index 6cffd7c..0db75de 100644 --- a/drivers/clocksource/renesas-ostm.c +++ b/drivers/clocksource/renesas-ostm.c @@ -37,6 +37,7 @@ struct ostm_device { void __iomem *base; unsigned long ticks_per_jiffy; struct clock_event_device ced; + char name[0]; }; static void __iomem *system_clock; /* For sched_clock() */ @@ -88,9 +89,8 @@ static int __init ostm_init_clksrc(struct ostm_device *ostm, unsigned long rate) writeb(CTL_FREERUN, ostm->base + OSTM_CTL); writeb(TS, ostm->base + OSTM_TS); - return clocksource_mmio_init(ostm->base + OSTM_CNT, - "ostm", rate, - 300, 32, clocksource_mmio_readl_up); + return clocksource_mmio_init(ostm->base + OSTM_CNT, ostm->name, rate, + 300, 32, clocksource_mmio_readl_up); } static u64 notrace ostm_read_sched_clock(void) @@ -170,15 +170,14 @@ static int __init ostm_init_clkevt(struct ostm_device *ostm, int irq, struct clock_event_device *ced = &ostm->ced; int ret = -ENXIO; - ret = request_irq(irq, ostm_timer_interrupt, - IRQF_TIMER | IRQF_IRQPOLL, - "ostm", ostm); + ret = request_irq(irq, ostm_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL, + ostm->name, ostm); if (ret) { - pr_err("ostm: failed to request irq\n"); + pr_err("%s: failed to request irq\n", ostm->name); return ret; } - ced->name = "ostm"; + ced->name = ostm->name; ced->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC; ced->set_state_shutdown = ostm_shutdown; ced->set_state_periodic = ostm_set_periodic; @@ -194,38 +193,41 @@ static int __init ostm_init_clkevt(struct ostm_device *ostm, int irq, static int __init ostm_init(struct device_node *np) { + unsigned int n = sizeof("ostm ") + strlen(np->full_name); struct ostm_device *ostm; int ret = -EFAULT; struct clk *ostm_clk = NULL; int irq; unsigned long rate; - ostm = kzalloc(sizeof(*ostm), GFP_KERNEL); + ostm = kzalloc(sizeof(*ostm) + n, GFP_KERNEL); if (!ostm) return -ENOMEM; + snprintf(ostm->name, n, "ostm %pOF", np); + ostm->base = of_iomap(np, 0); if (!ostm->base) { - pr_err("ostm: failed to remap I/O memory\n"); + pr_err("%s: failed to remap I/O memory\n", ostm->name); goto err; } irq = irq_of_parse_and_map(np, 0); if (irq < 0) { - pr_err("ostm: Failed to get irq\n"); + pr_err("%s: Failed to get irq\n", ostm->name); goto err; } ostm_clk = of_clk_get(np, 0); if (IS_ERR(ostm_clk)) { - pr_err("ostm: Failed to get clock\n"); + pr_err("%s: Failed to get clock\n", ostm->name); ostm_clk = NULL; goto err; } ret = clk_prepare_enable(ostm_clk); if (ret) { - pr_err("ostm: Failed to enable clock\n"); + pr_err("%s: Failed to enable clock\n", ostm->name); goto err; } @@ -241,14 +243,14 @@ static int __init ostm_init(struct device_node *np) if (!ret) { ostm_init_sched_clock(ostm, rate); - pr_info("ostm: used for clocksource\n"); + pr_info("%s: used for clocksource\n", ostm->name); } } else { ret = ostm_init_clkevt(ostm, irq, rate); if (!ret) - pr_info("ostm: used for clock events\n"); + pr_info("%s: used for clock events\n", ostm->name); } err: