From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96C7BC33CB2 for ; Wed, 29 Jan 2020 11:53:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5525C2070E for ; Wed, 29 Jan 2020 11:53:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ue7E3ZnS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726145AbgA2Lxh (ORCPT ); Wed, 29 Jan 2020 06:53:37 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43824 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726067AbgA2Lxg (ORCPT ); Wed, 29 Jan 2020 06:53:36 -0500 Received: by mail-wr1-f65.google.com with SMTP id d16so19841331wre.10 for ; Wed, 29 Jan 2020 03:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:autocrypt:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=GybwIjv9BREspPyBpeYcpzvLiSMiKHCo6W4zTTh3CNE=; b=Ue7E3ZnSLOENEmkqONdz/qe/aJiG2yVHiVEM80Kfuk8BOd3CrR0i7tT26CI9QER/Ro xnvBsAkQZ9bn9IUe/PXs0HoGM2pP03Dn4YpJpyIzVYcUzDm0dvHlYUAER9W+6bg6pPPk BwEaqb6R5A2SDxNW9meHQ15eePylEP/y4zio7FYoBcJgN03cM6Tey09ZZMLCxjhJZpBr HoU1YgGM+M5brKPFGDhEh30ppGb57YVAOpVw6qhqo0vihVH4hiX8VVLB2nevcyiztsqv hxNwyhWEWKWHci0BPNAF3v7BV44Lom+kRzatttsr0laXNHz6mY2HJGfon0GTAPSNqSio mgoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=GybwIjv9BREspPyBpeYcpzvLiSMiKHCo6W4zTTh3CNE=; b=ZK9cpEXR+7FAW2Pqhlmlnrxn3B6YYgSoKS9wHE4wptF7ALDnvXw3SjeZ5dgiOA1i1O NCNrNoWQEAqfwRU+2I0XlcyGPzU5f470Z3qNk8EYoTwcY3wrNuY4zcepxKpaDn3+aTaS X7bSiKMiy1+iPcfHFzetNutZWqCEkemp400o4ApXi9yho9QChEPYKX1odUwfqEHrcFQL CLBe5QqdgKaGYcPR28wiwCbPurAMsZb/nkDZQfogjTQ2qEDVz57KRv4yg607ZvfxrepJ fk26MY406cQaQzmzGBoPQYdTFNfJsXS56KRTU8REUsb3tSxEcPF43w5FDbNayxrOPWVO z6yw== X-Gm-Message-State: APjAAAW8Ropw+A4SNLNTY+hve7eafKM2SZyVaKnCwC8a9jc1KcpfaI0w tYYl+JFdq+DyfUCajIX51ZWxvg== X-Google-Smtp-Source: APXvYqxpJlmjIV8NvR8DMlD5sRCwypNn0YGgMk8U884aQEcnmC8G7pHb/24KfPwZsJ/Wqfd/B2UFZQ== X-Received: by 2002:a5d:52c4:: with SMTP id r4mr34775688wrv.368.1580298813278; Wed, 29 Jan 2020 03:53:33 -0800 (PST) Received: from ?IPv6:2a01:e34:ed2f:f020:e1e4:cd83:e1c2:8d16? ([2a01:e34:ed2f:f020:e1e4:cd83:e1c2:8d16]) by smtp.googlemail.com with ESMTPSA id q3sm2594097wrn.33.2020.01.29.03.53.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Jan 2020 03:53:32 -0800 (PST) Subject: Re: [PATCH v2 1/4] clocksource: fttmr010: Parametrise shutdown To: Joel Stanley Cc: Rob Herring , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Thomas Gleixner , Linux Kernel Mailing List , devicetree , Linus Walleij , Andrew Jeffery References: <20191107094218.13210-1-joel@jms.id.au> <20191107094218.13210-2-joel@jms.id.au> <747e3c0a-ee10-4a41-d0b7-1d54e0f56dd0@linaro.org> From: Daniel Lezcano Autocrypt: addr=daniel.lezcano@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <805bbfa2-e6ff-3b22-02cf-cd1419bcf929@linaro.org> Date: Wed, 29 Jan 2020 12:53:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 29/01/2020 12:41, Joel Stanley wrote: > On Wed, 29 Jan 2020 at 11:25, Daniel Lezcano wrote: >> >> On 07/11/2019 10:42, Joel Stanley wrote: >>> In preparation for supporting the ast2600 which uses a different method >>> to clear bits in the control register, use a callback for performing the >>> shutdown sequence. >>> >>> Reviewed-by: Cédric Le Goater >>> Reviewed-by: Linus Walleij >>> Signed-off-by: Joel Stanley >> >> It will be cleaner if you create a struct of_device_id array where you >> store the different variant data. > > I agree, and that's the path I would have taken when writing a normal > driver. However as the timer drivers probe with the > TIMER_OF_DECLARE/timer_probe infrastructure, we can't register our own > .data pointer (TIMER_OF_DECLARE uses .data to store the _init > function). > > Unless I'm missing something? I was suggesting to add the array like: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/clocksource/timer-atmel-tcb.c#n351 TIMER_OF_DECLARE is used and the probe functions relies on the match array: match = of_match_node(atmel_tcb_of_match, node->parent); (note in this case, it is the node parent). >> >> eg. >> struct myops { >> int (*shutdown)(struct clock_event_device *evt); >> }; >> >> struct fttmr010 { >> ... >> struct myops *ops; >> }; >> >> ... >> >> static const struct of_device_id fttmr010_of_match[] = { >> { .compatible = "faraday,fttmr010", .data = &fttmr010_ops }, >> ... >> { .compatible = "aspeed,ast2600-timer", .data = &as2600_ops, }, >> { /* sentinel */ } >> }; >> >> Keep the generic timer_shutdown function, get the ops from there and >> then call the shutdown callback. >> >> At init time: >> >> ... >> >> const struct of_device_id *match; >> >> ... >> >> match = of_match_node(fttmr010_of_match, node); >> fttmr010->ops = (struct myops *)match->data; >> >> ... >> >> (also if you have time, remove the is_aspeed boolean test by a >> corresponding callback). >> >>> --- >>> drivers/clocksource/timer-fttmr010.c | 19 ++++++++----------- >>> 1 file changed, 8 insertions(+), 11 deletions(-) >>> >>> diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c >>> index fadff7915dd9..c2d30eb9dc72 100644 >>> --- a/drivers/clocksource/timer-fttmr010.c >>> +++ b/drivers/clocksource/timer-fttmr010.c >>> @@ -97,6 +97,7 @@ struct fttmr010 { >>> bool is_aspeed; >>> u32 t1_enable_val; >>> struct clock_event_device clkevt; >>> + int (*timer_shutdown)(struct clock_event_device *evt); >>> #ifdef CONFIG_ARM >>> struct delay_timer delay_timer; >>> #endif >>> @@ -140,9 +141,7 @@ static int fttmr010_timer_set_next_event(unsigned long cycles, >>> u32 cr; >>> >>> /* Stop */ >>> - cr = readl(fttmr010->base + TIMER_CR); >>> - cr &= ~fttmr010->t1_enable_val; >>> - writel(cr, fttmr010->base + TIMER_CR); >>> + fttmr010->timer_shutdown(evt); >>> >>> if (fttmr010->is_aspeed) { >>> /* >>> @@ -183,9 +182,7 @@ static int fttmr010_timer_set_oneshot(struct clock_event_device *evt) >>> u32 cr; >>> >>> /* Stop */ >>> - cr = readl(fttmr010->base + TIMER_CR); >>> - cr &= ~fttmr010->t1_enable_val; >>> - writel(cr, fttmr010->base + TIMER_CR); >>> + fttmr010->timer_shutdown(evt); >>> >>> /* Setup counter start from 0 or ~0 */ >>> writel(0, fttmr010->base + TIMER1_COUNT); >>> @@ -211,9 +208,7 @@ static int fttmr010_timer_set_periodic(struct clock_event_device *evt) >>> u32 cr; >>> >>> /* Stop */ >>> - cr = readl(fttmr010->base + TIMER_CR); >>> - cr &= ~fttmr010->t1_enable_val; >>> - writel(cr, fttmr010->base + TIMER_CR); >>> + fttmr010->timer_shutdown(evt); >>> >>> /* Setup timer to fire at 1/HZ intervals. */ >>> if (fttmr010->is_aspeed) { >>> @@ -350,6 +345,8 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed) >>> fttmr010->tick_rate); >>> } >>> >>> + fttmr010->timer_shutdown = fttmr010_timer_shutdown; >>> + >>> /* >>> * Setup clockevent timer (interrupt-driven) on timer 1. >>> */ >>> @@ -370,10 +367,10 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed) >>> fttmr010->clkevt.features = CLOCK_EVT_FEAT_PERIODIC | >>> CLOCK_EVT_FEAT_ONESHOT; >>> fttmr010->clkevt.set_next_event = fttmr010_timer_set_next_event; >>> - fttmr010->clkevt.set_state_shutdown = fttmr010_timer_shutdown; >>> + fttmr010->clkevt.set_state_shutdown = fttmr010->timer_shutdown; >>> fttmr010->clkevt.set_state_periodic = fttmr010_timer_set_periodic; >>> fttmr010->clkevt.set_state_oneshot = fttmr010_timer_set_oneshot; >>> - fttmr010->clkevt.tick_resume = fttmr010_timer_shutdown; >>> + fttmr010->clkevt.tick_resume = fttmr010->timer_shutdown; >>> fttmr010->clkevt.cpumask = cpumask_of(0); >>> fttmr010->clkevt.irq = irq; >>> clockevents_config_and_register(&fttmr010->clkevt, >>> >> >> >> -- >> Linaro.org │ Open source software for ARM SoCs >> >> Follow Linaro: Facebook | >> Twitter | >> Blog >> -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog