From patchwork Fri Apr 29 12:01:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 567568 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 5E558C433FE for ; Fri, 29 Apr 2022 12:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358847AbiD2MHt (ORCPT ); Fri, 29 Apr 2022 08:07:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237453AbiD2MHr (ORCPT ); Fri, 29 Apr 2022 08:07:47 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CF04C6EFF; Fri, 29 Apr 2022 05:04:29 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id l7so15054447ejn.2; Fri, 29 Apr 2022 05:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MAO8TPdkS/wAOL2z8gJwcoS1KWOSvDeDfX6yBFnKhlo=; b=TwcVT36ACatSdJjbWQLZgjEG36se8Dz+a5bmDrzbkrad5tPBuu0MiVBj5T8oGBgs0q K21iFlb7ZOEYoOLZR8s5Ir/5K8KNtWR1TCEwjFhCCARFESV9Si0DyyQLybpdJUEPm40A bbRNfOjaDrSqXwE0lNnuXOHZa5Lb7TxY3Y4/VAufcgTH5pzJEytuLlN3A1TEutvvGE5f 3NCIj/zzcfR4K+jnHqPXUv1JsyiIkUZg+wSNG8wS6h7kGDaiG/rH7BOhLzEyciEtKEr/ 1aHZy5wbuKWWgTDR709B21Ga7CBrBPposaZDBdv5R7skC/qTh/A/wwjgFooMiP8jnIwP Nl4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MAO8TPdkS/wAOL2z8gJwcoS1KWOSvDeDfX6yBFnKhlo=; b=mDK/tgc9QVchQYR28xph/enku6n5YHXPW7JLbg2umejJF89e3rNxHmTpisTnY8ij38 32nPH3MKKuZ0YqF5eslKO5TWgasdxBEzStux+OKpqdc54GpUpe4ZxmGBHnalushJBLbH +YKL3Is98GcC4d6rpBwKfth5X3bN68Oz+SDDAIBSeMdSUmi9BMvtDbfrrKPN/sQH4ebS ECFBm1yemq3p4I8SLvaE3WK/WVM5nCbxyj2NF2w/ZSrViF/PhcHAtj4QaGxyULZ+WYug l/zj1SHHXnOwTNMYq2ori0ujK/mjsH4MR1L49XGcQ8bf+zsdNPqf6yHa2+S0w9Amc8CA 8DGw== X-Gm-Message-State: AOAM533LwHGC/uPfQGn+pxYGiiQcL7H6YUgaNMJiESVKorVfqg7HtWje J5GJBtmas9NBwYT4rOYq2R0= X-Google-Smtp-Source: ABdhPJwms9n5YioYF4+hBcM2Zmu04MxgSvYY6gQcH8JnomaZd3SQJeH9a2YqGVtSxDPxUnCHm0+MrA== X-Received: by 2002:a17:907:7202:b0:6df:83a9:67d2 with SMTP id dr2-20020a170907720200b006df83a967d2mr35225102ejc.327.1651233868057; Fri, 29 Apr 2022 05:04:28 -0700 (PDT) Received: from localhost.localdomain (93-42-70-190.ip85.fastwebnet.it. [93.42.70.190]) by smtp.googlemail.com with ESMTPSA id eo9-20020a1709069b0900b006f3ef214e02sm581338ejc.104.2022.04.29.05.04.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 05:04:26 -0700 (PDT) From: Ansuel Smith To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Sricharan R , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ansuel Smith Subject: [PATCH 1/4] clk: qcom: clk-hfpll: use poll_timeout macro Date: Fri, 29 Apr 2022 14:01:05 +0200 Message-Id: <20220429120108.9396-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220429120108.9396-1-ansuelsmth@gmail.com> References: <20220429120108.9396-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use regmap_read_poll_timeout macro instead of do-while structure to tidy things up. Also set a timeout to prevent any sort of system stall. Signed-off-by: Ansuel Smith Reviewed-by: Dmitry Baryshkov --- drivers/clk/qcom/clk-hfpll.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/clk/qcom/clk-hfpll.c b/drivers/clk/qcom/clk-hfpll.c index e847d586a73a..7dd17c184b69 100644 --- a/drivers/clk/qcom/clk-hfpll.c +++ b/drivers/clk/qcom/clk-hfpll.c @@ -72,13 +72,16 @@ static void __clk_hfpll_enable(struct clk_hw *hw) regmap_update_bits(regmap, hd->mode_reg, PLL_RESET_N, PLL_RESET_N); /* Wait for PLL to lock. */ - if (hd->status_reg) { - do { - regmap_read(regmap, hd->status_reg, &val); - } while (!(val & BIT(hd->lock_bit))); - } else { + if (hd->status_reg) + /* + * Busy wait. Should never timeout, we add a timeout to + * prevent any sort of stall. + */ + regmap_read_poll_timeout(regmap, hd->status_reg, val, + !(val & BIT(hd->lock_bit)), 0, + 100 * USEC_PER_MSEC); + else udelay(60); - } /* Enable PLL output. */ regmap_update_bits(regmap, hd->mode_reg, PLL_OUTCTRL, PLL_OUTCTRL); From patchwork Fri Apr 29 12:01:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 568239 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 C31FDC4332F for ; Fri, 29 Apr 2022 12:04:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358856AbiD2MHv (ORCPT ); Fri, 29 Apr 2022 08:07:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358850AbiD2MHt (ORCPT ); Fri, 29 Apr 2022 08:07:49 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9A50C864B; Fri, 29 Apr 2022 05:04:30 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id i19so14976198eja.11; Fri, 29 Apr 2022 05:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jWJFJ4Mb0qP+VRMm4evCxcC91IxX72L57yrRrtHm9eg=; b=q3uXrUtoHQrV/np2U4K2tFvnoo8uawobQvYjxzU96LZkEh+PAnHUWzNHAUQfqNang9 fUg7loVFAhlhowz+3FMrAvsBu/BFA9Tb7I7Ri1k7BljN5PPmMKNohIuUo/AAuy1dYhXe EWd2jWtSD5acJn+nuNJoCFSDs/zrB9iS7/B7uNp0Dv9YNyHJmOazRTk3ChOPfsEHPJoO zHaKC+5jn0NEoCAanfGzCS7HoWz9uN6Ek5/tFl9xfkGjmodCPD6cDCb0AHfi7iF87ERo rX7Su4xo2Ztzs1YHJyyy6Y+vu7mg05MuYA238qE8F1+CfvJRoIRwF1qL3DDVxURXIxvm Hi1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jWJFJ4Mb0qP+VRMm4evCxcC91IxX72L57yrRrtHm9eg=; b=L8mHtUze5YVkJSdVByTu22OyfLun2GKFqz2TOdo8G2qz5SxbNFpMTXbr9iZYV/2Pq9 hxEuouLKN2SBhVjyIh+CxUNU9loqDShFeF9fTegxThTWw3YdtqIXugVgHLoV2oNZFzyV lDL+4xurH16ohslcWlD4oU/WoBo4RWSXMcopneXtHaIS437YSHCRZIv3ZWt2qI0ymOw8 pGx08P9vIOo8plfTYNWZKTKMa7SRCL+955pbC/iQ1hzlzymHcde3/dLYv3mi+9Nb7FEo vbV+wsZssmsC8T0Ots7LrFcZ1VSCX/M5O9twtKKS8nIBZsS6gAWGzMbzBf9YbcO/fe8G hZmQ== X-Gm-Message-State: AOAM531x56r3Fu9148Kl4rjj82LKt5wYT0aA0e33/pF3bi59LHHJ5qa0 /2SIWnYyVeDDKUtT1DKuEUU= X-Google-Smtp-Source: ABdhPJzsyMM0eTdOapwiissGROn9ZAJUlwqtSDXlcUfsVAmDv3KOyUId3Ml0Qd8+sMDkS0bjUsuJAg== X-Received: by 2002:a17:906:4985:b0:6ef:b344:2a56 with SMTP id p5-20020a170906498500b006efb3442a56mr36753125eju.625.1651233869134; Fri, 29 Apr 2022 05:04:29 -0700 (PDT) Received: from localhost.localdomain (93-42-70-190.ip85.fastwebnet.it. [93.42.70.190]) by smtp.googlemail.com with ESMTPSA id eo9-20020a1709069b0900b006f3ef214e02sm581338ejc.104.2022.04.29.05.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 05:04:28 -0700 (PDT) From: Ansuel Smith To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Sricharan R , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ansuel Smith Subject: [PATCH 2/4] clk: qcom: clk-krait: unlock spin after mux completion Date: Fri, 29 Apr 2022 14:01:06 +0200 Message-Id: <20220429120108.9396-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220429120108.9396-1-ansuelsmth@gmail.com> References: <20220429120108.9396-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Unlock spinlock after the mux switch is completed to prevent any corner case of mux request while the switch still needs to be done. Fixes: 4d7dc77babfe ("clk: qcom: Add support for Krait clocks") Signed-off-by: Ansuel Smith --- drivers/clk/qcom/clk-krait.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c index 59f1af415b58..90046428693c 100644 --- a/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c @@ -32,11 +32,16 @@ static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel) regval |= (sel & mux->mask) << (mux->shift + LPL_SHIFT); } krait_set_l2_indirect_reg(mux->offset, regval); - spin_unlock_irqrestore(&krait_clock_reg_lock, flags); /* Wait for switch to complete. */ mb(); udelay(1); + + /* + * Unlock now to make sure the mux register is not + * modified while switching to the new parent. + */ + spin_unlock_irqrestore(&krait_clock_reg_lock, flags); } static int krait_mux_set_parent(struct clk_hw *hw, u8 index) From patchwork Fri Apr 29 12:01:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 567567 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 4374FC433FE for ; Fri, 29 Apr 2022 12:04:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358858AbiD2MHv (ORCPT ); Fri, 29 Apr 2022 08:07:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358842AbiD2MHv (ORCPT ); Fri, 29 Apr 2022 08:07:51 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2618C6EFF; Fri, 29 Apr 2022 05:04:31 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id i27so15011254ejd.9; Fri, 29 Apr 2022 05:04:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OTN4YPB3ReVlC0xdlo/o2kEZ6pNHWHpS60qNSXbPOCg=; b=PohNDIo+Eo0LZnDzbZrJiK9XGhhrFEicR8oWQHwLl8Y1a8Sr5Bu/ge1oiQqdduVBNN NOkmVUHpXRR+2jDUlU/FRsbsQjCN+WWz4OujIMTu0Ao6eX18LeK6JHHvHqssXmhLJCI7 ywTNp9+Qno+exjne71N7srBOzz/thnQwfGFVGIs49OQlwKTAHmHe8hsqlzKU/bHTrira hZUReCoW4x4YLiISOlFiWQTOf2WspqAqhCHLRfUReCLKgI/SvsLX0hRJrP80JTZQDIR9 uOa4ra4LOEWYe7sTsVZqDSshbfdxUHlZuZjpM62cmvvx5n5RaI9wRcFRZ1ub6kGZbqPq RQjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OTN4YPB3ReVlC0xdlo/o2kEZ6pNHWHpS60qNSXbPOCg=; b=1mRhXYJ3a8Fl35y9sQB+znhTPz0jWo8mKt4PQ2yFlnq2PPZinI7oPD/+VVhrQNCyDy OZUaHZi9V2rWDGaiDNPJezLeuwBEuymOT/yYLJj0Wkfco/hzwNd/q2WcylBR8r+4djs1 JMSkqOCxjCN27ZZyDjU3aV0tpfYR7k//I6hPbX/hbkAov0D9MVx+zx2HCSZ9kYbIyhGt iynLp9MoCU4e7DR8XIANtn5+0mTJtQAWfykQKks02rTdGOF22BU/lyDRQJLcYOlH/kNW gw+k5e3prDJqZ88A+fLe4WOcQlT6+65b8YV4XWnNsG9LFmx3muz5oOCeD/DZaDdwfoWH +5eQ== X-Gm-Message-State: AOAM530NDTffSVVmkn/V0J9Cs+y0/sPD/RFjPiT3ph+WFRulWYM3wfTG /nXE2Q6VxaGE7vAvi6mzvx0= X-Google-Smtp-Source: ABdhPJyXOodPPAA+FfJITY6pN4kVrunB2JpbhBMBMTT7QLBbEVaC1lUl4mfZyzDq6xLnqNZLMhQhvA== X-Received: by 2002:a17:906:8982:b0:6f3:95f4:4adf with SMTP id gg2-20020a170906898200b006f395f44adfmr23837541ejc.524.1651233870256; Fri, 29 Apr 2022 05:04:30 -0700 (PDT) Received: from localhost.localdomain (93-42-70-190.ip85.fastwebnet.it. [93.42.70.190]) by smtp.googlemail.com with ESMTPSA id eo9-20020a1709069b0900b006f3ef214e02sm581338ejc.104.2022.04.29.05.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 05:04:29 -0700 (PDT) From: Ansuel Smith To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Sricharan R , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ansuel Smith Subject: [PATCH 3/4] clk: qcom: clk-krait: add hw_parent check for div2_round_rate Date: Fri, 29 Apr 2022 14:01:07 +0200 Message-Id: <20220429120108.9396-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220429120108.9396-1-ansuelsmth@gmail.com> References: <20220429120108.9396-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Check if hw_parent is present before calculating the round_rate to prevent kernel panic. On error -EINVAL is reported. Signed-off-by: Ansuel Smith --- drivers/clk/qcom/clk-krait.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c index 90046428693c..6c367ad6506a 100644 --- a/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c @@ -84,7 +84,12 @@ EXPORT_SYMBOL_GPL(krait_mux_clk_ops); static long krait_div2_round_rate(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate) { - *parent_rate = clk_hw_round_rate(clk_hw_get_parent(hw), rate * 2); + struct clk_hw *hw_parent = clk_hw_get_parent(hw); + + if (!hw_parent) + return -EINVAL; + + *parent_rate = clk_hw_round_rate(hw_parent, rate * 2); return DIV_ROUND_UP(*parent_rate, 2); } From patchwork Fri Apr 29 12:01:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 568238 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 2F47DC433FE for ; Fri, 29 Apr 2022 12:04:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358842AbiD2MIE (ORCPT ); Fri, 29 Apr 2022 08:08:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358868AbiD2MHx (ORCPT ); Fri, 29 Apr 2022 08:07:53 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CE5BC866F; Fri, 29 Apr 2022 05:04:33 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id e23so8798386eda.11; Fri, 29 Apr 2022 05:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EC9ILjDGL3YF8DKjgFAU1/3Xp1zrJQq7k7xRaKAybfM=; b=D+iWrmXg19BEad+DLw8cIOPvJlYhItIDdZqTuyZybVcCxroDVkJ97vSPWnwlIXwFzU ZoRoSZ/QLyhOkA1/okvQYXbeS90QiZqtfXswQyGvnOLSCUxkP73g0hpbfXHVl6Ko9mRP XW0nnV3XtvgwPyrBDeDzXEYk3wBi3l7c1qsPEXFIYtTGlAFFbmZPiHRQySrwoAQafHnP J9/baeXOH7Wlw8dN6g1QerJ50e1CTkvwjgHq31SVWWNu1A8JfcXKuEsNgIq6RySt6xVi gGq9zm9cfe15HzTLnjoMOa7nYcWIwT1cyfvIo/V45ODkiltO5AH5fFPQ0+klLrKRUHcV KZPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EC9ILjDGL3YF8DKjgFAU1/3Xp1zrJQq7k7xRaKAybfM=; b=jesgliccKwrpcTjZKtUJgEFUwFZQ04d8gPxQujDBT0dcFqzP90FNUqefngEEzitWr+ biXC+uSX24UkmVlZKMmEYVGtpLUwohiwcCe17mLc7aRlRHqEaLXplN608JEAmR+wSbMg 9mm49bTREi48lpsZblKUTkq/Khx/hdJyJZk2oHIR2in+PUeJe5WizJl9AOz22yArkDdY 79fkL2gAARpjfXjgf8gVLRy7g5WdEbCoHvjEX4mSrsVtemDytVK6CBOpNcdFH50BH6rq 4upHuTuAoqjTGJpF+DxJiA+moaV2rEKbR0Y9gssLHbgYhU21k35+wxl/mrwwN5bzw4E9 UURQ== X-Gm-Message-State: AOAM532P9r6PwR2+gG8lddQULMo0Vy00gX/kBSzzFEHLjWTUwbqfpvk+ 1o/plEQdXzxxmV3ofmMUJwLb1Qfmjqs= X-Google-Smtp-Source: ABdhPJx1+RF5T8GZpmW1o93stK0/PvpCeUxoJ0xeV0iatikrqIWy41vwCDxagNkza9zDakDxP7aiDA== X-Received: by 2002:a05:6402:254a:b0:424:1ed9:e173 with SMTP id l10-20020a056402254a00b004241ed9e173mr41785315edb.276.1651233871725; Fri, 29 Apr 2022 05:04:31 -0700 (PDT) Received: from localhost.localdomain (93-42-70-190.ip85.fastwebnet.it. [93.42.70.190]) by smtp.googlemail.com with ESMTPSA id eo9-20020a1709069b0900b006f3ef214e02sm581338ejc.104.2022.04.29.05.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 05:04:31 -0700 (PDT) From: Ansuel Smith To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Sricharan R , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ansuel Smith Subject: [PATCH 4/4] clk: qcom: clk-krait: add apq/ipq8064 errata workaround Date: Fri, 29 Apr 2022 14:01:08 +0200 Message-Id: <20220429120108.9396-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220429120108.9396-1-ansuelsmth@gmail.com> References: <20220429120108.9396-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add apq/ipq8064 errata workaround where the sec_src clock gating needs to be disabled during switching. To enable this set disable_sec_src_gating in the mux struct. Signed-off-by: Ansuel Smith --- drivers/clk/qcom/clk-krait.c | 16 ++++++++++++++++ drivers/clk/qcom/clk-krait.h | 1 + drivers/clk/qcom/krait-cc.c | 1 + 3 files changed, 18 insertions(+) diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c index 6c367ad6506a..4a9b3296c45b 100644 --- a/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c @@ -18,13 +18,23 @@ static DEFINE_SPINLOCK(krait_clock_reg_lock); #define LPL_SHIFT 8 +#define SECCLKAGD BIT(4) + static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel) { unsigned long flags; u32 regval; spin_lock_irqsave(&krait_clock_reg_lock, flags); + regval = krait_get_l2_indirect_reg(mux->offset); + + /* apq/ipq8064 Errata: disable sec_src clock gating during switch. */ + if (mux->disable_sec_src_gating) { + regval |= SECCLKAGD; + krait_set_l2_indirect_reg(mux->offset, regval); + } + regval &= ~(mux->mask << mux->shift); regval |= (sel & mux->mask) << mux->shift; if (mux->lpl) { @@ -33,6 +43,12 @@ static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel) } krait_set_l2_indirect_reg(mux->offset, regval); + /* apq/ipq8064 Errata: re-enabled sec_src clock gating. */ + if (mux->disable_sec_src_gating) { + regval &= ~SECCLKAGD; + krait_set_l2_indirect_reg(mux->offset, regval); + } + /* Wait for switch to complete. */ mb(); udelay(1); diff --git a/drivers/clk/qcom/clk-krait.h b/drivers/clk/qcom/clk-krait.h index 9120bd2f5297..f930538c539e 100644 --- a/drivers/clk/qcom/clk-krait.h +++ b/drivers/clk/qcom/clk-krait.h @@ -15,6 +15,7 @@ struct krait_mux_clk { u8 safe_sel; u8 old_index; bool reparent; + bool disable_sec_src_gating; struct clk_hw hw; struct notifier_block clk_nb; diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c index 4d4b657d33c3..0f88bf41ec6e 100644 --- a/drivers/clk/qcom/krait-cc.c +++ b/drivers/clk/qcom/krait-cc.c @@ -138,6 +138,7 @@ krait_add_sec_mux(struct device *dev, int id, const char *s, mux->parent_map = sec_mux_map; mux->hw.init = &init; mux->safe_sel = 0; + mux->disable_sec_src_gating = true; init.name = kasprintf(GFP_KERNEL, "krait%s_sec_mux", s); if (!init.name)