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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58A60C433FE for ; Wed, 13 Apr 2022 17:25:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231264AbiDMR2D (ORCPT ); Wed, 13 Apr 2022 13:28:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237564AbiDMR15 (ORCPT ); Wed, 13 Apr 2022 13:27:57 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0746049246 for ; Wed, 13 Apr 2022 10:25:35 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 15so3044387ljw.8 for ; Wed, 13 Apr 2022 10:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=AFB49n3ccwShObe5VN2eXkvESc9Ed3xNAe5Qs7+1brY=; b=QY+cPkHvf3eaxsMvtzkMqHp4F7hLMr1CTxp9exKWWZvaXt+fnyMN5vj6VC/XvpRDkU cCjQrufYXvUv/f1KnaTH+IlrqA7X/wbO8c+cRDo5FP+v2sg36+cZoxCAgTPvOWO0Az2c goKcBgOvs1mXGzZEDW7gHvxKN2kZUbxf1tnAL9tjxeJFHlw45Tsqy9m1umzRsTcIvc4k H0U7dVImQ+sETmw013aDrkrdijqG4f+HTw4IpdgUIdcnA9LOgoKeXTNi5wT3qjJxRMIE lrCNT6RuUDVbKFdQYzpnsnv4fjhOqDnW3Z/11FKcfRJ6vL0G22Fu+IseFAMMyY50c/8r HO2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=AFB49n3ccwShObe5VN2eXkvESc9Ed3xNAe5Qs7+1brY=; b=CRouiChHndI8gCnIIJ9o+w9F9OgCOUfm3cWc0gwjHCFonTt1KQPc1criRErshveDPJ NuMliDa5M+uX1IV9GQ5vkCnQpHj1u4vRfNN6FCir8S96ilLwGFxdH5gOTPLtbPNzzl9k jnHcK0XQYcDWBYdwPkMe3Rd6ZwL0Hkf1hDLIdGj/7k7NUuUmyRMhcXm3dZCYV8nz3kvp smllJpnqiMOEJF94Kr5adxhmosq8J/Eg+wcnp/aHdyTJ59sDQn2eaLXg2GTeTl1aJoO/ bcFpPAkBv5h3g4LYV9YQPA60MqxT2kaJU8MOz9OoqzWF0uO6rac0VMGazDvJ0KjI5C1F RA9A== X-Gm-Message-State: AOAM533BbKXn+jVgrcc3ud00wpbw1usN7k7UaKKwzs8wtxhjLhA3nMkO 1Vuwyppjt68GhNqDeZLDC5jpRg== X-Google-Smtp-Source: ABdhPJzpycJQkkZDnmqk2bGVOzQniY60qCiAK4HWIrUsUuASrZH96tJQHM0BT7H45jINIdrndzGujw== X-Received: by 2002:a2e:5c41:0:b0:24b:156c:7100 with SMTP id q62-20020a2e5c41000000b0024b156c7100mr27190253ljb.80.1649870733246; Wed, 13 Apr 2022 10:25:33 -0700 (PDT) Received: from [192.168.1.211] ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id a5-20020ac25045000000b0046ba5e7edb0sm1260418lfm.270.2022.04.13.10.25.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Apr 2022 10:25:32 -0700 (PDT) Message-ID: Date: Wed, 13 Apr 2022 20:25:31 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH v6 10/18] clk: qcom: krait-cc: drop hardcoded safe_sel Content-Language: en-GB To: Ansuel Smith , Rob Herring , Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org References: <20220321231548.14276-1-ansuelsmth@gmail.com> <20220321231548.14276-11-ansuelsmth@gmail.com> From: Dmitry Baryshkov In-Reply-To: <20220321231548.14276-11-ansuelsmth@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/03/2022 02:15, Ansuel Smith wrote: > Drop hardcoded safe_sel definition and use helper to correctly calculate > it. We assume qsb clk is always present as it should be declared in DTS > per Documentation and in the absence of that, it's declared as a fixed > clk. Why? Can safe_sel (sec_mux index) change? > > Signed-off-by: Ansuel Smith > --- > drivers/clk/qcom/krait-cc.c | 40 +++++++++++++++++++++++++------------ > 1 file changed, 27 insertions(+), 13 deletions(-) > > diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c > index e9508e3104ea..5f98ee1c3681 100644 > --- a/drivers/clk/qcom/krait-cc.c > +++ b/drivers/clk/qcom/krait-cc.c > @@ -26,6 +26,17 @@ static unsigned int pri_mux_map[] = { > 0, > }; > > +static u8 krait_get_mux_sel(struct krait_mux_clk *mux, struct clk *safe_clk) > +{ > + struct clk_hw *safe_hw = __clk_get_hw(safe_clk); > + > + /* > + * We can ignore errors from clk_hw_get_index_of_parent() > + * as we create these parents in this driver. > + */ > + return clk_hw_get_index_of_parent(&mux->hw, safe_hw); > +} > + > /* > * Notifier function for switching the muxes to safe parent > * while the hfpll is getting reprogrammed. > @@ -116,8 +127,8 @@ krait_add_div(struct device *dev, int id, const char *s, unsigned int offset) > } > > static struct clk * > -krait_add_sec_mux(struct device *dev, int id, const char *s, > - unsigned int offset, bool unique_aux) > +krait_add_sec_mux(struct device *dev, struct clk *qsb, int id, > + const char *s, unsigned int offset, bool unique_aux) > { > int ret; > struct krait_mux_clk *mux; > @@ -144,7 +155,6 @@ krait_add_sec_mux(struct device *dev, int id, const char *s, > mux->shift = 2; > mux->parent_map = sec_mux_map; > mux->hw.init = &init; > - mux->safe_sel = 0; > > init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s); > if (!init.name) > @@ -166,6 +176,7 @@ krait_add_sec_mux(struct device *dev, int id, const char *s, > if (IS_ERR(clk)) > goto err_clk; > > + mux->safe_sel = krait_get_mux_sel(mux, qsb); > ret = krait_notifier_register(dev, clk, mux); > if (ret) > clk = ERR_PTR(ret); > @@ -204,7 +215,6 @@ krait_add_pri_mux(struct device *dev, struct clk *hfpll_div, struct clk *sec_mux > mux->lpl = id >= 0; > mux->parent_map = pri_mux_map; > mux->hw.init = &init; > - mux->safe_sel = 2; > > init.name = kasprintf(GFP_KERNEL, "krait%s_pri_mux", s); > if (!init.name) > @@ -226,6 +236,7 @@ krait_add_pri_mux(struct device *dev, struct clk *hfpll_div, struct clk *sec_mux > if (IS_ERR(clk)) > goto err_clk; > > + mux->safe_sel = krait_get_mux_sel(mux, sec_mux); > ret = krait_notifier_register(dev, clk, mux); > if (ret) > clk = ERR_PTR(ret); > @@ -238,7 +249,9 @@ krait_add_pri_mux(struct device *dev, struct clk *hfpll_div, struct clk *sec_mux > } > > /* id < 0 for L2, otherwise id == physical CPU number */ > -static struct clk *krait_add_clks(struct device *dev, int id, bool unique_aux) > +static struct clk * > +krait_add_clks(struct device *dev, struct clk *qsb, int id, > + bool unique_aux) > { > unsigned int offset; > void *p = NULL; > @@ -261,7 +274,7 @@ static struct clk *krait_add_clks(struct device *dev, int id, bool unique_aux) > goto err; > } > > - sec_mux = krait_add_sec_mux(dev, id, s, offset, unique_aux); > + sec_mux = krait_add_sec_mux(dev, qsb, id, s, offset, unique_aux); > if (IS_ERR(sec_mux)) { > clk = sec_mux; > goto err; > @@ -301,18 +314,19 @@ static int krait_cc_probe(struct platform_device *pdev) > int cpu; > struct clk *clk; > struct clk **clks; > - struct clk *l2_pri_mux_clk; > + struct clk *l2_pri_mux_clk, *qsb; > > id = of_match_device(krait_cc_match_table, dev); > if (!id) > return -ENODEV; > > /* Rate is 1 because 0 causes problems for __clk_mux_determine_rate */ > - if (IS_ERR(clk_get(dev, "qsb"))) > - clk = clk_register_fixed_rate(dev, "qsb", NULL, 0, 1); > + qsb = clk_get(dev, "qsb"); > + if (IS_ERR(qsb)) > + qsb = clk_register_fixed_rate(dev, "qsb", NULL, 0, 1); > > - if (IS_ERR(clk)) > - return PTR_ERR(clk); > + if (IS_ERR(qsb)) > + return PTR_ERR(qsb); > > if (!id->data) { > clk = clk_register_fixed_factor(dev, "acpu_aux", > @@ -327,13 +341,13 @@ static int krait_cc_probe(struct platform_device *pdev) > return -ENOMEM; > > for_each_possible_cpu(cpu) { > - clk = krait_add_clks(dev, cpu, id->data); > + clk = krait_add_clks(dev, qsb, cpu, id->data); > if (IS_ERR(clk)) > return PTR_ERR(clk); > clks[cpu] = clk; > } > > - l2_pri_mux_clk = krait_add_clks(dev, -1, id->data); > + l2_pri_mux_clk = krait_add_clks(dev, qsb, -1, id->data); > if (IS_ERR(l2_pri_mux_clk)) > return PTR_ERR(l2_pri_mux_clk); > clks[4] = l2_pri_mux_clk; -- With best wishes Dmitry