Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp1209921ybh; Sat, 3 Aug 2019 20:41:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqxb36CrbVMPCRLoLf6Jw+H58TLNg1O8hu6hQLYVHxmF6gZaQYn9y3+SwKnblF8ysVUsRR75 X-Received: by 2002:a17:902:20ec:: with SMTP id v41mr131057862plg.142.1564890082373; Sat, 03 Aug 2019 20:41:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564890082; cv=none; d=google.com; s=arc-20160816; b=Mxkf7GKJ2Dj8PskLulbbYZdDbJ/aOdLWH0qpYaBkn/z1jNYbu1wJmu+zOXZOAxZ5f8 MhBxMWSscx4bq37AaOC6v36QWps2EzOtjwmopB5xY+nCJcAvDRnssGQd8jxRuuqhJ3sw GuqlrZ9pBxPohk3U6HT5fV9awLYFrOlAKivfjhxfCne8cCJ1SYlm2NmHgoL1ytkqy1rF TzX3GZd0sEYdgQxGMW3W2XQdAeAR6hMyPkUViEGbo6hCbxSin1ermMjP5Q3gRVYDixno 7rn1/Pddtspb0D2CKS6OMKFrQ+2OSqJxtdAlu4QC6otXIM+PBGC0USu9P+kEJlXYtT+0 J+kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=V1h8plXYdJwr/o7pvi+lDJ/pQGi0csXTOMSTkxBJX7c=; b=a0sCtCaDxlp4+vwUpiFSl1BwG6Tn3fhw9UdGogTtMs9Amfk61lyWEen90/qLFCyme4 c9k6k/Fq7kEnjZKyc2tiCcAgRGLiOeTmaCkyobozxffiDZDNbFRbQXIYyxFTyRUAmW7c 6dJdChXNLC5dNo2gS+ahKYklYSlz8n65pVZRq7gcAuUTeAxhrPvFWYd0jmnDSzqBvvQY 2jl2DDqXLtkesylJfH49iEL+ytF4gIx3T+jVYzR5ca0M6UypMgkcZtkALY68E8fhmQxS PGgia5/M7uCdatWWjknbUhhHHEX0JbymKIaK3xBGhvrpAYi6DdAxJcFMGHYQd+yYh+jw 1/rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=REqRzl9F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f25si46323079pfd.157.2019.08.03.20.41.07; Sat, 03 Aug 2019 20:41:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=REqRzl9F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388582AbfHCKd0 (ORCPT + 99 others); Sat, 3 Aug 2019 06:33:26 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:45464 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388423AbfHCKdZ (ORCPT ); Sat, 3 Aug 2019 06:33:25 -0400 Received: by mail-lj1-f193.google.com with SMTP id m23so75051789lje.12; Sat, 03 Aug 2019 03:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=V1h8plXYdJwr/o7pvi+lDJ/pQGi0csXTOMSTkxBJX7c=; b=REqRzl9FcwpqGK1c2r7yv1gG03aHy4W237uaiAu/N6irDJB1fJ6lAao04/SZkc/Gim euBKob37SCxNU9koruT9I+Lki9s5P8fA1UO78ikDek8zeTszX8thh3duqlWgPgijHXmE N4JiJQEnbiYjAvE8ryembZjWQAK2iadIjs3zO9Mpftp12jQ6uK8Y+dq8jOW9KG3OnsOl 2GUm4Nxy2OysGFPmIroZezFyv/J2bBYf8i1ZcGVeKEYHCZu7fpg2SwLEQm4+34dDON7T hHDzYnKzCK7aPf25Mzkn1NNPaeLhl0gfq1ffP8xDXGVkYnnVp5XYdKZTZ+LYorSSNuob gR6g== 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:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=V1h8plXYdJwr/o7pvi+lDJ/pQGi0csXTOMSTkxBJX7c=; b=aLvWNa4R8uvsQfR4e+/vKZPt+LJ18XspLP8ThOhDRzqHFsjrbGHGh3k91dDD9dy2sf quJCkASi55TU1x1Q8LbGFXEjNxbW3HNyPj6HSeFHJOmNYOnr1wEpeoKbFNzONZ2CePQc FwNq+a83zXhm29X/LNzjsYpdmaT4VTVf8EyitQWzZoSEuIj7NgcpAAP4yOp6UwTtCSJq RZwJHCuUaYc780VaXW5iRRc3dRrnbj25d5dP2cVy5WZ3B4RPcgU9LxCTixWtupvfKe7+ 6TM8Ao2T6lHtF/X7cbXaNrE7yZxJd1bfOp4zukQGqTtR76InvqjvcmMzSeJ15/LmwmIn PkGg== X-Gm-Message-State: APjAAAWzC8oTFdMRNlPc03Kp0fEcy+Sryi43t2gc6eI5i8GeFno4kam1 wDo2jkKpkqMNGC/r6PzQZNfOoNfh X-Received: by 2002:a2e:9f0d:: with SMTP id u13mr27414587ljk.186.1564828400926; Sat, 03 Aug 2019 03:33:20 -0700 (PDT) Received: from [192.168.2.145] (ppp91-78-220-99.pppoe.mtu-net.ru. [91.78.220.99]) by smtp.googlemail.com with ESMTPSA id w21sm13359913lfl.84.2019.08.03.03.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Aug 2019 03:33:19 -0700 (PDT) Subject: Re: [PATCH v7 07/20] clk: tegra: clk-periph: Add save and restore support To: Sowjanya Komatineni , thierry.reding@gmail.com, jonathanh@nvidia.com, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, linus.walleij@linaro.org, stefan@agner.ch, mark.rutland@arm.com Cc: pdeschrijver@nvidia.com, pgaikwad@nvidia.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, jckuo@nvidia.com, josephl@nvidia.com, talho@nvidia.com, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, mperttunen@nvidia.com, spatra@nvidia.com, robh+dt@kernel.org, devicetree@vger.kernel.org References: <1564532424-10449-1-git-send-email-skomatineni@nvidia.com> <67cf6c13-688d-0305-61e2-c63c8e8b4729@nvidia.com> <550de191-f982-4544-6fbc-bf16dfeae2c6@nvidia.com> <50bad1d3-df41-d1e5-a7c7-4be9c661ed14@nvidia.com> <62a5c6ed-21b1-8403-6fac-9c5d99b5a255@gmail.com> <85cd5100-467e-d08e-0ae5-ae57a6de5312@nvidia.com> <61652889-2e77-8f1e-9ed4-b7e525a40b10@nvidia.com> <9f6fc791-5c76-76d5-98fb-fd8facfd75d7@nvidia.com> <8bca50b2-a78c-c6b1-6547-4cec98a3e9cb@gmail.com> <314b5572-4113-d5c5-5956-1a55555a573c@nvidia.com> <90268663-e5a7-4715-bd1a-31644c2fe9ab@gmail.com> <73cd521b-782c-7fb2-d904-ae8b07927d47@gmail.com> From: Dmitry Osipenko Message-ID: <8d30f325-1c63-3802-7c21-f313115f8e55@gmail.com> Date: Sat, 3 Aug 2019 13:33:18 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 03.08.2019 2:51, Sowjanya Komatineni пишет: > > On 8/2/19 2:15 PM, Dmitry Osipenko wrote: >> 02.08.2019 23:32, Sowjanya Komatineni пишет: >>> On 8/2/19 1:17 PM, Dmitry Osipenko wrote: >>>> 02.08.2019 23:13, Dmitry Osipenko пишет: >>>>> 02.08.2019 21:33, Sowjanya Komatineni пишет: >>>>>> On 8/2/19 5:38 AM, Dmitry Osipenko wrote: >>>>>>> 02.08.2019 2:49, Sowjanya Komatineni пишет: >>>>>>>> On 8/1/19 4:19 PM, Sowjanya Komatineni wrote: >>>>>>>>> On 8/1/19 2:30 PM, Sowjanya Komatineni wrote: >>>>>>>>>> On 8/1/19 1:54 PM, Dmitry Osipenko wrote: >>>>>>>>>>> 01.08.2019 23:31, Sowjanya Komatineni пишет: >>>>>>>>>>>> On 8/1/19 1:17 PM, Dmitry Osipenko wrote: >>>>>>>>>>>>> 01.08.2019 22:42, Sowjanya Komatineni пишет: >>>>>>>>>>>>>> On 8/1/19 12:00 PM, Dmitry Osipenko wrote: >>>>>>>>>>>>>>> 01.08.2019 20:58, Sowjanya Komatineni пишет: >>>>>>>>>>>>>>>> On 7/31/19 4:09 PM, Sowjanya Komatineni wrote: >>>>>>>>>>>>>>>>> On 7/31/19 3:44 AM, Dmitry Osipenko wrote: >>>>>>>>>>>>>>>>>> 31.07.2019 12:50, Dmitry Osipenko пишет: >>>>>>>>>>>>>>>>>>> 31.07.2019 3:20, Sowjanya Komatineni пишет: >>>>>>>>>>>>>>>>>>>> This patch implements save and restore context for >>>>>>>>>>>>>>>>>>>> peripheral >>>>>>>>>>>>>>>>>>>> fixed >>>>>>>>>>>>>>>>>>>> clock ops, peripheral gate clock ops, sdmmc mux clock >>>>>>>>>>>>>>>>>>>> ops, and >>>>>>>>>>>>>>>>>>>> peripheral clock ops. >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> During system suspend, core power goes off and >>>>>>>>>>>>>>>>>>>> looses the >>>>>>>>>>>>>>>>>>>> settings >>>>>>>>>>>>>>>>>>>> of the Tegra CAR controller registers. >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> So during suspend entry clock and reset state of >>>>>>>>>>>>>>>>>>>> peripherals is >>>>>>>>>>>>>>>>>>>> saved >>>>>>>>>>>>>>>>>>>> and on resume they are restored to have clocks back to >>>>>>>>>>>>>>>>>>>> same >>>>>>>>>>>>>>>>>>>> rate and >>>>>>>>>>>>>>>>>>>> state as before suspend. >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> Acked-by: Thierry Reding >>>>>>>>>>>>>>>>>>>> Signed-off-by: Sowjanya Komatineni >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> --- >>>>>>>>>>>>>>>>>>>>         drivers/clk/tegra/clk-periph-fixed.c | 33 >>>>>>>>>>>>>>>>>>>> ++++++++++++++++++++++++++++++++ >>>>>>>>>>>>>>>>>>>>         drivers/clk/tegra/clk-periph-gate.c  | 34 >>>>>>>>>>>>>>>>>>>> +++++++++++++++++++++++++++++++++ >>>>>>>>>>>>>>>>>>>>         drivers/clk/tegra/clk-periph.c       | 37 >>>>>>>>>>>>>>>>>>>> ++++++++++++++++++++++++++++++++++++ >>>>>>>>>>>>>>>>>>>>         drivers/clk/tegra/clk-sdmmc-mux.c    | 28 >>>>>>>>>>>>>>>>>>>> +++++++++++++++++++++++++++ >>>>>>>>>>>>>>>>>>>>         drivers/clk/tegra/clk.h              | 6 ++++++ >>>>>>>>>>>>>>>>>>>>         5 files changed, 138 insertions(+) >>>>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>> diff --git a/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>>>>>>>>>>>>>> b/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>>>>>>>>>>>>>> index c088e7a280df..21b24530fa00 100644 >>>>>>>>>>>>>>>>>>>> --- a/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>>>>>>>>>>>>>> +++ b/drivers/clk/tegra/clk-periph-fixed.c >>>>>>>>>>>>>>>>>>>> @@ -60,11 +60,44 @@ >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_recalc_rate(struct >>>>>>>>>>>>>>>>>>>> clk_hw *hw, >>>>>>>>>>>>>>>>>>>>             return (unsigned long)rate; >>>>>>>>>>>>>>>>>>>>         } >>>>>>>>>>>>>>>>>>>>         +static int >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_save_context(struct >>>>>>>>>>>>>>>>>>>> clk_hw >>>>>>>>>>>>>>>>>>>> *hw) >>>>>>>>>>>>>>>>>>>> +{ >>>>>>>>>>>>>>>>>>>> +    struct tegra_clk_periph_fixed *fixed = >>>>>>>>>>>>>>>>>>>> to_tegra_clk_periph_fixed(hw); >>>>>>>>>>>>>>>>>>>> +    u32 mask = 1 << (fixed->num % 32); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    fixed->enb_ctx = readl_relaxed(fixed->base + >>>>>>>>>>>>>>>>>>>> fixed->regs->enb_reg) & >>>>>>>>>>>>>>>>>>>> +             mask; >>>>>>>>>>>>>>>>>>>> +    fixed->rst_ctx = readl_relaxed(fixed->base + >>>>>>>>>>>>>>>>>>>> fixed->regs->rst_reg) & >>>>>>>>>>>>>>>>>>>> +             mask; >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    return 0; >>>>>>>>>>>>>>>>>>>> +} >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +static void >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_restore_context(struct >>>>>>>>>>>>>>>>>>>> clk_hw >>>>>>>>>>>>>>>>>>>> *hw) >>>>>>>>>>>>>>>>>>>> +{ >>>>>>>>>>>>>>>>>>>> +    struct tegra_clk_periph_fixed *fixed = >>>>>>>>>>>>>>>>>>>> to_tegra_clk_periph_fixed(hw); >>>>>>>>>>>>>>>>>>>> +    u32 mask = 1 << (fixed->num % 32); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    if (fixed->enb_ctx) >>>>>>>>>>>>>>>>>>>> +        writel_relaxed(mask, fixed->base + >>>>>>>>>>>>>>>>>>>> fixed->regs->enb_set_reg); >>>>>>>>>>>>>>>>>>>> +    else >>>>>>>>>>>>>>>>>>>> +        writel_relaxed(mask, fixed->base + >>>>>>>>>>>>>>>>>>>> fixed->regs->enb_clr_reg); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    udelay(2); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    if (!fixed->rst_ctx) { >>>>>>>>>>>>>>>>>>>> +        udelay(5); /* reset propogation delay */ >>>>>>>>>>>>>>>>>>>> +        writel_relaxed(mask, fixed->base + >>>>>>>>>>>>>>>>>>>> fixed->regs->rst_reg); >>>>>>>>>>>>>>>>>>>> +    } >>>>>>>>>>>>>>>>>>>> +} >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>>         static const struct clk_ops >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_ops >>>>>>>>>>>>>>>>>>>> = { >>>>>>>>>>>>>>>>>>>>             .is_enabled = >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_is_enabled, >>>>>>>>>>>>>>>>>>>>             .enable = tegra_clk_periph_fixed_enable, >>>>>>>>>>>>>>>>>>>>             .disable = tegra_clk_periph_fixed_disable, >>>>>>>>>>>>>>>>>>>>             .recalc_rate = >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_recalc_rate, >>>>>>>>>>>>>>>>>>>> +    .save_context = >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_save_context, >>>>>>>>>>>>>>>>>>>> +    .restore_context = >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_fixed_restore_context, >>>>>>>>>>>>>>>>>>>>         }; >>>>>>>>>>>>>>>>>>>>           struct clk >>>>>>>>>>>>>>>>>>>> *tegra_clk_register_periph_fixed(const >>>>>>>>>>>>>>>>>>>> char >>>>>>>>>>>>>>>>>>>> *name, >>>>>>>>>>>>>>>>>>>> diff --git a/drivers/clk/tegra/clk-periph-gate.c >>>>>>>>>>>>>>>>>>>> b/drivers/clk/tegra/clk-periph-gate.c >>>>>>>>>>>>>>>>>>>> index 4b31beefc9fc..6ba5b08e0787 100644 >>>>>>>>>>>>>>>>>>>> --- a/drivers/clk/tegra/clk-periph-gate.c >>>>>>>>>>>>>>>>>>>> +++ b/drivers/clk/tegra/clk-periph-gate.c >>>>>>>>>>>>>>>>>>>> @@ -25,6 +25,8 @@ static >>>>>>>>>>>>>>>>>>>> DEFINE_SPINLOCK(periph_ref_lock); >>>>>>>>>>>>>>>>>>>>           #define read_rst(gate) \ >>>>>>>>>>>>>>>>>>>>             readl_relaxed(gate->clk_base + >>>>>>>>>>>>>>>>>>>> (gate->regs->rst_reg)) >>>>>>>>>>>>>>>>>>>> +#define write_rst_set(val, gate) \ >>>>>>>>>>>>>>>>>>>> +    writel_relaxed(val, gate->clk_base + >>>>>>>>>>>>>>>>>>>> (gate->regs->rst_set_reg)) >>>>>>>>>>>>>>>>>>>>         #define write_rst_clr(val, gate) \ >>>>>>>>>>>>>>>>>>>>             writel_relaxed(val, gate->clk_base + >>>>>>>>>>>>>>>>>>>> (gate->regs->rst_clr_reg)) >>>>>>>>>>>>>>>>>>>>         @@ -110,10 +112,42 @@ static void >>>>>>>>>>>>>>>>>>>> clk_periph_disable(struct >>>>>>>>>>>>>>>>>>>> clk_hw *hw) >>>>>>>>>>>>>>>>>>>> spin_unlock_irqrestore(&periph_ref_lock, flags); >>>>>>>>>>>>>>>>>>>>         } >>>>>>>>>>>>>>>>>>>>         +static int clk_periph_gate_save_context(struct >>>>>>>>>>>>>>>>>>>> clk_hw >>>>>>>>>>>>>>>>>>>> *hw) >>>>>>>>>>>>>>>>>>>> +{ >>>>>>>>>>>>>>>>>>>> +    struct tegra_clk_periph_gate *gate = >>>>>>>>>>>>>>>>>>>> to_clk_periph_gate(hw); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    gate->clk_state_ctx = read_enb(gate) & >>>>>>>>>>>>>>>>>>>> periph_clk_to_bit(gate); >>>>>>>>>>>>>>>>>>>> +    gate->rst_state_ctx = read_rst(gate) & >>>>>>>>>>>>>>>>>>>> periph_clk_to_bit(gate); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    return 0; >>>>>>>>>>>>>>>>>>>> +} >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +static void clk_periph_gate_restore_context(struct >>>>>>>>>>>>>>>>>>>> clk_hw >>>>>>>>>>>>>>>>>>>> *hw) >>>>>>>>>>>>>>>>>>>> +{ >>>>>>>>>>>>>>>>>>>> +    struct tegra_clk_periph_gate *gate = >>>>>>>>>>>>>>>>>>>> to_clk_periph_gate(hw); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    if (gate->clk_state_ctx) >>>>>>>>>>>>>>>>>>>> + write_enb_set(periph_clk_to_bit(gate), gate); >>>>>>>>>>>>>>>>>>>> +    else >>>>>>>>>>>>>>>>>>>> + write_enb_clr(periph_clk_to_bit(gate), gate); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    udelay(5); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    if (!(gate->flags & TEGRA_PERIPH_NO_RESET) && >>>>>>>>>>>>>>>>>>>> +        !(gate->flags & TEGRA_PERIPH_MANUAL_RESET)) { >>>>>>>>>>>>>>>>>>>> +        if (gate->rst_state_ctx) >>>>>>>>>>>>>>>>>>>> + write_rst_set(periph_clk_to_bit(gate), gate); >>>>>>>>>>>>>>>>>>>> +        else >>>>>>>>>>>>>>>>>>>> + write_rst_clr(periph_clk_to_bit(gate), gate); >>>>>>>>>>>>>>>>>>>> +    } >>>>>>>>>>>>>>>>>>>> +} >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>>         const struct clk_ops >>>>>>>>>>>>>>>>>>>> tegra_clk_periph_gate_ops = { >>>>>>>>>>>>>>>>>>>>             .is_enabled = clk_periph_is_enabled, >>>>>>>>>>>>>>>>>>>>             .enable = clk_periph_enable, >>>>>>>>>>>>>>>>>>>>             .disable = clk_periph_disable, >>>>>>>>>>>>>>>>>>>> +    .save_context = clk_periph_gate_save_context, >>>>>>>>>>>>>>>>>>>> +    .restore_context = >>>>>>>>>>>>>>>>>>>> clk_periph_gate_restore_context, >>>>>>>>>>>>>>>>>>>>         }; >>>>>>>>>>>>>>>>>>>>           struct clk >>>>>>>>>>>>>>>>>>>> *tegra_clk_register_periph_gate(const >>>>>>>>>>>>>>>>>>>> char *name, >>>>>>>>>>>>>>>>>>>> diff --git a/drivers/clk/tegra/clk-periph.c >>>>>>>>>>>>>>>>>>>> b/drivers/clk/tegra/clk-periph.c >>>>>>>>>>>>>>>>>>>> index 58437da25156..06fb62955768 100644 >>>>>>>>>>>>>>>>>>>> --- a/drivers/clk/tegra/clk-periph.c >>>>>>>>>>>>>>>>>>>> +++ b/drivers/clk/tegra/clk-periph.c >>>>>>>>>>>>>>>>>>>> @@ -99,6 +99,37 @@ static void >>>>>>>>>>>>>>>>>>>> clk_periph_disable(struct >>>>>>>>>>>>>>>>>>>> clk_hw >>>>>>>>>>>>>>>>>>>> *hw) >>>>>>>>>>>>>>>>>>>>             gate_ops->disable(gate_hw); >>>>>>>>>>>>>>>>>>>>         } >>>>>>>>>>>>>>>>>>>>         +static int clk_periph_save_context(struct >>>>>>>>>>>>>>>>>>>> clk_hw *hw) >>>>>>>>>>>>>>>>>>>> +{ >>>>>>>>>>>>>>>>>>>> +    struct tegra_clk_periph *periph = >>>>>>>>>>>>>>>>>>>> to_clk_periph(hw); >>>>>>>>>>>>>>>>>>>> +    const struct clk_ops *gate_ops = periph->gate_ops; >>>>>>>>>>>>>>>>>>>> +    struct clk_hw *gate_hw = &periph->gate.hw; >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    if (!(periph->gate.flags & TEGRA_PERIPH_NO_GATE)) >>>>>>>>>>>>>>>>>>>> +        gate_ops->save_context(gate_hw); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    periph->parent_ctx = clk_periph_get_parent(hw); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    return 0; >>>>>>>>>>>>>>>>>>>> +} >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +static void clk_periph_restore_context(struct clk_hw >>>>>>>>>>>>>>>>>>>> *hw) >>>>>>>>>>>>>>>>>>>> +{ >>>>>>>>>>>>>>>>>>>> +    struct tegra_clk_periph *periph = >>>>>>>>>>>>>>>>>>>> to_clk_periph(hw); >>>>>>>>>>>>>>>>>>>> +    const struct clk_ops *gate_ops = periph->gate_ops; >>>>>>>>>>>>>>>>>>>> +    struct clk_hw *gate_hw = &periph->gate.hw; >>>>>>>>>>>>>>>>>>>> +    const struct clk_ops *div_ops = periph->div_ops; >>>>>>>>>>>>>>>>>>>> +    struct clk_hw *div_hw = &periph->divider.hw; >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    clk_periph_set_parent(hw, periph->parent_ctx); >>>>>>>>>>>>>>>>>>>> + >>>>>>>>>>>>>>>>>>>> +    if (!(periph->gate.flags & TEGRA_PERIPH_NO_DIV)) >>>>>>>>>>>>>>>>>>>> + div_ops->restore_context(div_hw); >>>>>>>>>>>>>>>>>>> Could you please point to where the divider's >>>>>>>>>>>>>>>>>>> save_context() >>>>>>>>>>>>>>>>>>> happens? >>>>>>>>>>>>>>>>>>> Because I can't see it. >>>>>>>>>>>>>>>>>> Ah, I now see that there is no need to save the dividers >>>>>>>>>>>>>>>>>> context >>>>>>>>>>>>>>>>>> because >>>>>>>>>>>>>>>>>> clk itself has enough info that is needed for the >>>>>>>>>>>>>>>>>> context's >>>>>>>>>>>>>>>>>> restoring >>>>>>>>>>>>>>>>>> (like I pointed in the review to v6). >>>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>> Looks like you could also implement a new >>>>>>>>>>>>>>>>>> clk_hw_get_parent_index() >>>>>>>>>>>>>>>>>> generic helper to get the index instead of storing it >>>>>>>>>>>>>>>>>> manually. >>>>>>>>>>>>>>>>> clk_periph_get_parent basically invokes existing >>>>>>>>>>>>>>>>> clk_mux_ops >>>>>>>>>>>>>>>>> get_parent() which is then saved in tegra_clk_periph. >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> All existing drivers are using directly get_parent() from >>>>>>>>>>>>>>>>> clk_mux >>>>>>>>>>>>>>>>> which actually gets index from the register read. >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> To have this more generic w.r.t save/restore context >>>>>>>>>>>>>>>>> point of >>>>>>>>>>>>>>>>> view, >>>>>>>>>>>>>>>>> probably instead of implementing new get_parent_index >>>>>>>>>>>>>>>>> helper, >>>>>>>>>>>>>>>>> I think >>>>>>>>>>>>>>>>> its better to implement save_context and >>>>>>>>>>>>>>>>> restore_context to >>>>>>>>>>>>>>>>> clk_mux_ops along with creating parent_index field into >>>>>>>>>>>>>>>>> clk_mux to >>>>>>>>>>>>>>>>> cache index during set_parent. >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>> So we just need to invoke mux_ops save_context and >>>>>>>>>>>>>>>>> restore_context. >>>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> I hope its ok to add save/restore context to clk_mux_ops >>>>>>>>>>>>>>>> to be >>>>>>>>>>>>>>>> more >>>>>>>>>>>>>>>> generic w.r.t save/restore context rather than >>>>>>>>>>>>>>>> get_parent_index >>>>>>>>>>>>>>>> API. >>>>>>>>>>>>>>>> Please confirm if you agree. >>>>>>>>>>>>>>> Sounds like a good idea. I see that there is a 'restoring' >>>>>>>>>>>>>>> helper for >>>>>>>>>>>>>>> the generic clk_gate, seems something similar could be done >>>>>>>>>>>>>>> for the >>>>>>>>>>>>>>> clk_mux. And looks like anyway you'll need to associate the >>>>>>>>>>>>>>> parent >>>>>>>>>>>>>>> clock >>>>>>>>>>>>>>> with the hw index in order to restore the muxing. >>>>>>>>>>>>>> by 'restoring' helper for generic clk_gate, are you >>>>>>>>>>>>>> referring to >>>>>>>>>>>>>> clk_gate_restore_context API? >>>>>>>>>>>>> Yes. >>>>>>>>>>>>> >>>>>>>>>>>>>> clk_gate_restore_context is API that's any clk drivers can >>>>>>>>>>>>>> use for >>>>>>>>>>>>>> clk_gate operation restore for custom gate clk_ops. >>>>>>>>>>>>>> >>>>>>>>>>>>>> But clk-periph is directly using generic clk_mux ops from >>>>>>>>>>>>>> clk_mux >>>>>>>>>>>>>> so I >>>>>>>>>>>>>> think we should add .restore_context to clk_mux_ops and then >>>>>>>>>>>>>> during >>>>>>>>>>>>>> clk-periph restore need to invoke mux_ops->restore_context. >>>>>>>>>>>>> I'm not sure whether it will be good for every driver that >>>>>>>>>>>>> uses >>>>>>>>>>>>> generic >>>>>>>>>>>>> clk_mux ops. Should be more flexible to have a generic helper >>>>>>>>>>>>> function >>>>>>>>>>>>> that any driver could use in order to restore the clock's >>>>>>>>>>>>> parent. >>>>>>>>>>>>> >>>>>>>>>>>>> The clk-periph restoring also includes case of combining >>>>>>>>>>>>> divider >>>>>>>>>>>>> and >>>>>>>>>>>>> parent restoring, so generic helper could be useful in that >>>>>>>>>>>>> case >>>>>>>>>>>>> as well. >>>>>>>>>>>>> >>>>>>>>>>>>> It also looks like you could actually use the >>>>>>>>>>>>> clk_gate_restore_context() >>>>>>>>>>>>> instead of manually saving the clock's enable-state, couldn't >>>>>>>>>>>>> you? >>>>>>>>>>>> ok for clk_mux, can add generic clk_mux_restore_context API >>>>>>>>>>>> rather >>>>>>>>>>>> than >>>>>>>>>>>> using restore_context in clk_ops and will invoke that during >>>>>>>>>>>> clk_periph >>>>>>>>>>>> restore. >>>>>>>>>>>> >>>>>>>> digging thru looks like for clk_periph source restore instead of >>>>>>>> clk_mux_restore_context, i can directly do clk_hw_get_parent and >>>>>>>> clk_set_parent with mux_hw as they invoke mux_ops get/set parent >>>>>>>> anyway. >>>>>>>> Will do this for periph clk mux > > Just to be clear, clk_mux don't have cached parent. get_parent is by > register read. So, cant directly use get_parent and then set during > restore. > > So will create both clk_mux_save/restore_context in generic clk driver > and will invoke them during tegra peripheral clock suspend/resume. Why MUX clock doesn't have a cached parent? What MUX clock you're talking about? [snip]