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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 C60A5C2D0CD for ; Tue, 17 Dec 2019 16:17:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DC9121835 for ; Tue, 17 Dec 2019 16:17:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MjwQiS35" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728902AbfLQQRG (ORCPT ); Tue, 17 Dec 2019 11:17:06 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:41840 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728198AbfLQQRA (ORCPT ); Tue, 17 Dec 2019 11:17:00 -0500 Received: by mail-lj1-f195.google.com with SMTP id h23so11583039ljc.8; Tue, 17 Dec 2019 08:16:58 -0800 (PST) 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=H6ypYsxFQ0FmuKGVvw4Sqkr3ujkj1CaK+qwJmBDsjEA=; b=MjwQiS35dgm5KPq5Wt9h03946rFoY/NCv8ffSwpNiXPHlEstmGAujcVSfk1LRdfgNU WrluwUPdIfPs5Hvm28c43cma1r9sJ4hPkdtwv+I6ojjsg+ggOD099Pr6XYSggxkVl/ob WIQIAdSQLhUVmBGauO0dZ0eJeONkB6+OCPn3lyP2odMXoqfq2yrP/4zUGYiH1mulkRzI ln25H0H3OKRSGmAXmVMJhtoa1HRNmMrUyYWqxQxyy40twr1XlHP5YuluJ/Lg1b7SBNxA lzxETxX66QVOBrKCGexz4Tv1Wo4PP1feVimh8920wF6tFEU0YZ/FAgbmVmhCJZgDgYlK mGYQ== 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=H6ypYsxFQ0FmuKGVvw4Sqkr3ujkj1CaK+qwJmBDsjEA=; b=dz3crx2Ace/IXsRzOJoCPvLlOLrboLfEKLFROCYpOxTtZ3sUdITbiv+Oep52B1Tv8q hvn7ptsbLNIMznAxm+nWXwa692yA7v3hatAHDiQKLaFfgaDWgY1YtlSx6gTSxJOVVWSZ 6kydcQ7cV+V/1O0B9Kw2CuRZVt/2bc/ClqrDWGvtqQ3md4o1V1ans+TAZ1gHEoaQnV1O 3LhfMGM6uow0hddqZH3Rz1cE0SmbYg5x1trzXPIxoXrnTqdjhKNrJ589aU+JKm0z4vD8 5dlBFzABD0Tgj06KTi/CqQ+wyCrgRFwt+6YWtVWlxBDmLSnNlhPB9NWz+CLz3GQHa2Cr 2+dA== X-Gm-Message-State: APjAAAWWHIzO+q9ZNDmYRwK1/5BQeC82HJnKryTxT+9677aFDBmFgCQD /V1J1Sd8rLcNRIikC+0NUww= X-Google-Smtp-Source: APXvYqxMWlDAv/TvZ/ajhTeAFUM0fEKaa62aS9MXtO89NZkxGcSkjRb3uIrT1qwGoyVNXmYk5dOwew== X-Received: by 2002:a05:651c:321:: with SMTP id b1mr3884204ljp.62.1576599417760; Tue, 17 Dec 2019 08:16:57 -0800 (PST) Received: from [192.168.2.145] (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.googlemail.com with ESMTPSA id q186sm859072ljq.14.2019.12.17.08.16.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Dec 2019 08:16:57 -0800 (PST) Subject: Re: [PATCH v3 08/15] ASoC: tegra: Add audio mclk control through clk_out_1 and extern1 To: Sowjanya Komatineni , thierry.reding@gmail.com, jonathanh@nvidia.com, mperttunen@nvidia.com, sboyd@kernel.org Cc: gregkh@linuxfoundation.org, tglx@linutronix.de, robh+dt@kernel.org, mark.rutland@arm.com, allison@lohutok.net, pdeschrijver@nvidia.com, pgaikwad@nvidia.com, mturquette@baylibre.com, horms+renesas@verge.net.au, Jisheng.Zhang@synaptics.com, krzk@kernel.org, arnd@arndb.de, spujar@nvidia.com, josephl@nvidia.com, vidyas@nvidia.com, daniel.lezcano@linaro.org, mmaddireddy@nvidia.com, markz@nvidia.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, alexios.zavras@intel.com, alsa-devel@alsa-project.org References: <1575600535-26877-1-git-send-email-skomatineni@nvidia.com> <1575600535-26877-9-git-send-email-skomatineni@nvidia.com> <0ce2e83b-800c-da1e-7a3c-3cf1427cfe20@gmail.com> <2eeceabe-b5f0-6f9e-ff8c-4ac6167b7cc3@nvidia.com> <41a7325c-9bb9-f681-4d30-d19079869d12@nvidia.com> From: Dmitry Osipenko Message-ID: <225860bb-38e0-75ea-c08f-6090b2fc16b0@gmail.com> Date: Tue, 17 Dec 2019 19:16:55 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 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 17.12.2019 19:12, Sowjanya Komatineni пишет: > > On 12/17/19 7:36 AM, Dmitry Osipenko wrote: >> 17.12.2019 04:29, Sowjanya Komatineni пишет: >>> On 12/7/19 11:20 AM, Sowjanya Komatineni wrote: >>>> On 12/7/19 6:58 AM, Dmitry Osipenko wrote: >>>>> 06.12.2019 05:48, Sowjanya Komatineni пишет: >>>>>> Current ASoC driver uses extern1 as cdev1 clock from Tegra30 onwards >>>>>> through device tree. >>>>>> >>>>>> Actual audio mclk is clk_out_1 and to use PLLA for mclk rate control, >>>>>> need to clk_out_1_mux parent to extern1 and extern1 parent to >>>>>> PLLA_OUT0. >>>>>> >>>>>> Currently Tegra clock driver init sets the parents and enables both >>>>>> clk_out_1 and extern1 clocks. But these clocks parent and enables >>>>>> should >>>>>> be controlled by ASoC driver. >>>>>> >>>>>> Clock parents can be specified in device tree using assigned-clocks >>>>>> and assigned-clock-parents. >>>>>> >>>>>> To enable audio mclk, both clk_out_1 and extern1 clocks need to be >>>>>> enabled. >>>>>> >>>>>> This patch configures parents for clk_out_1 and extern1 clocks if >>>>>> device >>>>>> tree does not specify clock parents inorder to support old device >>>>>> tree >>>>>> and controls mclk using both clk_out_1 and extern1 clocks. >>>>>> >>>>>> Signed-off-by: Sowjanya Komatineni >>>>>> --- >>>>>>    sound/soc/tegra/tegra_asoc_utils.c | 66 >>>>>> ++++++++++++++++++++++++++++++++++++++ >>>>>>    sound/soc/tegra/tegra_asoc_utils.h |  1 + >>>>>>    2 files changed, 67 insertions(+) >>>>>> >>>>>> diff --git a/sound/soc/tegra/tegra_asoc_utils.c >>>>>> b/sound/soc/tegra/tegra_asoc_utils.c >>>>>> index 536a578e9512..8e3a3740df7c 100644 >>>>>> --- a/sound/soc/tegra/tegra_asoc_utils.c >>>>>> +++ b/sound/soc/tegra/tegra_asoc_utils.c >>>>>> @@ -60,6 +60,7 @@ int tegra_asoc_utils_set_rate(struct >>>>>> tegra_asoc_utils_data *data, int srate, >>>>>>        data->set_mclk = 0; >>>>>>          clk_disable_unprepare(data->clk_cdev1); >>>>>> +    clk_disable_unprepare(data->clk_extern1); >>>>>>        clk_disable_unprepare(data->clk_pll_a_out0); >>>>>>        clk_disable_unprepare(data->clk_pll_a); >>>>>>    @@ -89,6 +90,14 @@ int tegra_asoc_utils_set_rate(struct >>>>>> tegra_asoc_utils_data *data, int srate, >>>>>>            return err; >>>>>>        } >>>>>>    +    if (!IS_ERR_OR_NULL(data->clk_extern1)) { >>>>>> +        err = clk_prepare_enable(data->clk_extern1); >>>>>> +        if (err) { >>>>>> +            dev_err(data->dev, "Can't enable extern1: %d\n", err); >>>>>> +            return err; >>>>>> +        } >>>>>> +    } >>>>>> + >>>>>>        err = clk_prepare_enable(data->clk_cdev1); >>>>>>        if (err) { >>>>>>            dev_err(data->dev, "Can't enable cdev1: %d\n", err); >>>>>> @@ -109,6 +118,7 @@ int tegra_asoc_utils_set_ac97_rate(struct >>>>>> tegra_asoc_utils_data *data) >>>>>>        int err; >>>>>>          clk_disable_unprepare(data->clk_cdev1); >>>>>> +    clk_disable_unprepare(data->clk_extern1); >>>>>>        clk_disable_unprepare(data->clk_pll_a_out0); >>>>>>        clk_disable_unprepare(data->clk_pll_a); >>>>>>    @@ -142,6 +152,14 @@ int tegra_asoc_utils_set_ac97_rate(struct >>>>>> tegra_asoc_utils_data *data) >>>>>>            return err; >>>>>>        } >>>>>>    +    if (!IS_ERR_OR_NULL(data->clk_extern1)) { >>>>>> +        err = clk_prepare_enable(data->clk_extern1); >>>>>> +        if (err) { >>>>>> +            dev_err(data->dev, "Can't enable extern1: %d\n", err); >>>>>> +            return err; >>>>>> +        } >>>>>> +    } >>>>> Why this is needed given that clk_extern1 is either a child of MCLK or >>>>> MCLK itself (on T20)? The child clocks are enabled when the parent is >>>>> enabled. >>>> For T30 and later, clk_extern1 is one of the source for clk_out_1_mux. >>>> clk_extern1 is in CAR and it has its own gate and mux. >>>> >>>> As audio mclk related clocks (clk_out_1, clk_out_1_mux, and extern1) >>>> are moved into ASoC driver from clock driver >>>> >>>> need to enable extern1 gate as well along with clk_out1 for T30 >>>> through T210. >>>> >>>> Just FYI, extern1 enable here happens only when data->clk_extern1 is >>>> available which is for T30 onwards. >>>> >>>>>>        err = clk_prepare_enable(data->clk_cdev1); >>>>>>        if (err) { >>>>>>            dev_err(data->dev, "Can't enable cdev1: %d\n", err); >>>>>> @@ -158,6 +176,7 @@ >>>>>> EXPORT_SYMBOL_GPL(tegra_asoc_utils_set_ac97_rate); >>>>>>    int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, >>>>>>                  struct device *dev) >>>>>>    { >>>>>> +    struct clk *clk_out_1_mux; >>>>>>        int ret; >>>>>>          data->dev = dev; >>>>>> @@ -196,6 +215,51 @@ int tegra_asoc_utils_init(struct >>>>>> tegra_asoc_utils_data *data, >>>>>>            goto err_put_pll_a_out0; >>>>>>        } >>>>> In a previous patch you added fallback to EXTPERIPH when clk_get(MCLK) >>>>> fails. This will work perfectly fine for the older kernels which have >>>>> all clocks in the same single CaR driver, but this may not work that >>>>> great for the newer kernels because PMC driver isn't registered early >>>>> during boot and thus it is possible to get a legit -EPROBE_DEFER which >>>>> shouldn't be ignored. In other words, you need to add into this >>>>> patch a >>>>> check for the error code returned by clk_get(MCLK) and fallback >>>>> only for >>>>> -EINVAL. >>>> yeah right, will add check in next version. >>>>>> +    /* >>>>>> +     * If clock parents are not set in DT, configure here to use >>>>>> clk_out_1 >>>>>> +     * as mclk and extern1 as parent for Tegra30 and higher. >>>>>> +     */ >>>>>> +    if (!of_find_property(dev->of_node, "assigned-clock-parents", >>>>>> NULL) && >>>>>> +        data->soc > TEGRA_ASOC_UTILS_SOC_TEGRA20) { >>>>>> +        data->clk_extern1 = clk_get_sys("clk_out_1", "extern1"); >>>>>> +        if (IS_ERR(data->clk_extern1)) { >>>>>> +            dev_err(data->dev, "Can't retrieve clk extern1\n"); >>>>>> +            ret = PTR_ERR(data->clk_extern1); >>>>>> +            goto err_put_cdev1; >>>>>> +        } >>>>>> + >>>>>> +        ret = clk_set_parent(data->clk_extern1, >>>>>> data->clk_pll_a_out0); >>>>>> +        if (ret < 0) { >>>>>> +            dev_err(data->dev, >>>>>> +                "Set parent failed for clk extern1: %d\n", >>>>>> +                ret); >>>>>> +            goto err_put_cdev1; >>>>>> +        } >>>>>> + >>>>>> +        clk_out_1_mux = clk_get_sys(NULL, "clk_out_1_mux"); >>>>> Note1: clk_get(dev, "clk_out_1_mux") should work here by letting clk >>>>> core to fall back to the clk_get_sys() by itself. Either way should >>>>> be good. >>> clk_get uses device rather and dev_id will be name of this device and >>> when clk_get fall back to __clk_get_sys() it still will use dev id of >>> this device rather than actual dev_id that pmc clocks are added to the >>> lookup. So clk_get_sys() seems to be correct to use as we can specify >>> exact dev_id and con_id. >> It should be better to use something "resource managed", thus >> devm_clk_get() should be a better choice. >> >>> Also, clk_find retrieves clock from lookup only when it finds matching >>> clock with both dev_id and con_id as pmc clocks are registered with both >>> dev_id and con_id. >>> >>> I see existing clock driver adds both extern and pmc clocks (clk_out) to >>> lookup with same dev_id of clk_out_1/2/3 and con_id of extern1/2/3 and >>> with this always extern clock will be retrieved and this is probably >>> because old DT and audio driver always uses extern1 rather than actual >>> clk_out_1 >>> >>> But this need to be fixed now as we changed to use clk_out directly >>> rather than extern (even for other pmc clocks) to match actual hw >>> design. >>> >>> Will fix this as well to register pmc clocks using con_id as >>> clk_out_1/2/3 in pmc driver and extern clocks using con_id of >>> extern1/2/3 with dev_id being NULL so we can retrieve these clocks by >>> just using con_id only using clk_get_sys as we switched to use clk_out_1 >>> directly as pmc clock rather than extern from DT and no longer need to >>> pair pmc clocks to extern clocks. >> I'm not sure it's worth the effort to care about con_ids if implicit >> fallback to clk_get_sys(NULL, "...") does the right thing for the audio >> driver. >> >> IIRC, CCF uses variant of matching clocks by names, although I'm not >> sure whether that applies to older stable kernels. >> >> [snip] > > Current clock driver adds EXTERN clock to lookup with dev_id as > clk_out_1/2/3 and con_id as extern_1/2/3 > > With this we can retrieve clock from lookup only with clk_get_sys where > we can pass dev_id as clk_out_1/2/3 and con_id as extern_1/2/3. > > We cant use devm_clk_get() or clk_get() for retrieving clocks from > lookup by passing device object from sound driver as dev_id will be diff > and clk_find will return NULL. Have you actually tried to test that it fails? I think it's a false assumption. > But with the fix of having dev_id as NULL and use only con_id to add to > lookup, we can use resource managed APIs devm_clk_get. > > So was saying will fix this in clock driver as part of removing > clk_out_1/2/3 ids and pmc init from clock driver so we can use > devm_clk_get API in audio driver. > >>