From patchwork Wed May 31 09:01:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13261792 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 6D120C77B73 for ; Wed, 31 May 2023 09:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230039AbjEaJBh (ORCPT ); Wed, 31 May 2023 05:01:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234799AbjEaJBc (ORCPT ); Wed, 31 May 2023 05:01:32 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18BA611F for ; Wed, 31 May 2023 02:01:31 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2af2c7f2883so58973591fa.3 for ; Wed, 31 May 2023 02:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685523689; x=1688115689; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=YwKzCoB/TILHKyYpnl4R4TBT0ZP2W8fCrxJWyMABiAg=; b=VEGUj0x9Uzf8Pr5fl4WpLLIvhZBGhzK4Q4mHOJp7suaXLvfHMv8N5fPWEGjp9CdlWs Lksbh9LvBEdK8N21eKo0gl0ZiZB5wJoy/G6swWYe29TmlNq7uONg1xQFwtyxs4ctoZJl CpoaYoFdIbgVJHhku72BprC4KSqX+dQ0Z5sogbU4KEqFUtRViwGIDF8QaE3SQk2hql/5 e9Kbd90BAVc+ncYxnSRYQu0ZGTeOv7gsb6uvxPwdRPS/vtAFyCSwYrzPOP79bxmb+Pcv 9Xk53QUfhvnWZOdOGmJwZD5yRELyIq35B1DlpCoyaM4RUcR74uSQrw0Lce9hFDgDht54 upOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685523689; x=1688115689; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YwKzCoB/TILHKyYpnl4R4TBT0ZP2W8fCrxJWyMABiAg=; b=ZcvHo0QxBAtoqZ1l7aKxq2+jFFG5IPWGQLZ4EkaIvseBzAYhMZBnrDrD7WQPs3UpZO BQGaSYW48VHBM1YlVfSkss9Ur8A0wmmghgpmOlUPPHteArHb8QevAn3Id6QQXkeJNGom wtrMPIdH8i6lIdZhVgezE9Z2QzOBoyY+/2kFdO/+raMSAK+c5wNba8pXGsBOZ/f10m/t CbY2G5dQGCHEvZ/2gyAhFfmA5onys+ZYWdl0u0h8/pMh81hEJv+Db1j2Rcbq6xyJP70e XaABC2zFSyZ8qd+K4U/XDi0+Gh4qiUGqusmFUMimu2KZjupuBx9UCdylVDjzWiyO6Hwg WK7Q== X-Gm-Message-State: AC+VfDxMlNlt40PlUc/boZ/mki+munyrkVlW82OKsJAWTCcteGSDmNba 2GhANwaP01drHMGMEwnx/6DJcg== X-Google-Smtp-Source: ACHHUZ5eeMdogXUkIZOGHqySKWYHoayjit9FS3WVhcQFuA/mcrIpJjfpQZOK2mPjgdom1ljzUvl5+g== X-Received: by 2002:a2e:2c06:0:b0:2af:18c3:8bd5 with SMTP id s6-20020a2e2c06000000b002af18c38bd5mr2308261ljs.14.1685523689448; Wed, 31 May 2023 02:01:29 -0700 (PDT) Received: from [192.168.1.101] (abyj77.neoplus.adsl.tpnet.pl. [83.9.29.77]) by smtp.gmail.com with ESMTPSA id f4-20020a2e9184000000b002adbe01cd69sm3217446ljg.9.2023.05.31.02.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 02:01:29 -0700 (PDT) From: Konrad Dybcio Date: Wed, 31 May 2023 11:01:20 +0200 Subject: [PATCH 1/4] arm64: dts: qcom: msm8998: Properly describe MMSS SMMU MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v1-1-2b5a8fc90991@linaro.org> References: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Michael Turquette , Stephen Boyd , Jeffrey Hugo , Imran Khan , Rajendra Nayak , Joonwoo Park , Jeffrey Hugo Cc: Marijn Suijten , Dmitry Baryshkov , Jami Kettunen , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1685523686; l=1326; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=i0NwJMAAnRECp+k7KcPhWAOJXSM4/4ftIM+77PjbY6U=; b=BGyufNvhaW0pxT12xw1LjSk1u+kvz6rfQ1SRXNhMYH3mgey6Icz+rTWlHdTqfAz2wnjT6t3Md MZ5/Y3eyck+A2AoAIcZW/PS3Wr7F3rDncrHYuSykoAPO3FHLjrNNxYF X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org The MMSS SMMU has been abusingly consuming the exposed RPM interconnect clock and not describing the power domain it needs. Put an end to that. Fixes: 05ce21b54423 ("arm64: dts: qcom: msm8998: Configure the multimedia subsystem iommu") Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index f0e943ff0046..a4016085b750 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -2737,10 +2737,10 @@ mmss_smmu: iommu@cd00000 { clocks = <&mmcc MNOC_AHB_CLK>, <&mmcc BIMC_SMMU_AHB_CLK>, - <&rpmcc RPM_SMD_MMAXI_CLK>, <&mmcc BIMC_SMMU_AXI_CLK>; - clock-names = "iface-mm", "iface-smmu", - "bus-mm", "bus-smmu"; + clock-names = "iface-mm", + "iface-smmu", + "bus-smmu"; #global-interrupts = <0>; interrupts = @@ -2764,6 +2764,8 @@ mmss_smmu: iommu@cd00000 { , , ; + + power-domains = <&mmcc BIMC_SMMU_GDSC>; }; remoteproc_adsp: remoteproc@17300000 { From patchwork Wed May 31 09:01:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13261793 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 62427C77B7C for ; Wed, 31 May 2023 09:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235273AbjEaJBk (ORCPT ); Wed, 31 May 2023 05:01:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235232AbjEaJBe (ORCPT ); Wed, 31 May 2023 05:01:34 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E29FCC0 for ; Wed, 31 May 2023 02:01:32 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2af1e290921so57520501fa.3 for ; Wed, 31 May 2023 02:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685523691; x=1688115691; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Yzn4m2H/FTJRfB6bL/ET9uNQCruK8cNknsLXsMEBu2E=; b=ROrn/OQ80wrgTm1WTNqqnPiEHuLEDkI0JODJbZ1ec7jx2JPoLm5jeP/VoCbaSGPqtd zCisK5VEiJuxY8FIDnLQStny+QIu5xosh2X3f1g9gGx1O76QXPRzCnqYRDTRQVWP67nx LTcjetWRP+UdP8lwt536SsagLUsDsYCq+PriKUhcIV0GKmwQKkCxAcuFwDiaX+FXMqGL ZrV9r2TSkwUs4iVB47w3PcemwSYSsIy0Ln4AWl5ChIkjGgv7T9TNRjtlcs3fI6d23Wdd QBTATxzzbnsmaxHlfDN623sKRNDhflTPKwOiD26/l9barwljGDvXFh1KK83HnakqIGbE sxqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685523691; x=1688115691; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Yzn4m2H/FTJRfB6bL/ET9uNQCruK8cNknsLXsMEBu2E=; b=EQ2/bdW9xLmLt48j4T4seX8RaK8koS7BOB1LLkzc1mSOkq9HWb/5Ih5YbK8OnpZgtx Xx0YxlTVoo2YcHPbl3Fpp9my7qBe28ZWyAKh8xw4kz79e/tgVwc2p2MsAhnkqJyQDf8c oPyM3SAwcMh7XqoHw5YiiEqjh4COfpSgxM8zawnlnC5u13/FRi3YX7neNrbtmTQEKNaS m5ho1MVMTnhnIF3MTSMhfdQxWh1xO04uDlNmVsiA0iAuftxW+Ee2fstZ+lgvsseHfVRj R+zEshcW68mxbuY7iBCQx7M0spNQ7S4vUA49mMrqlw0UuWle6eIerQMduNnylSUbsuiJ NzYw== X-Gm-Message-State: AC+VfDwISymnvT02/+XmfMobCAMRFhvuW4jwTw5ImHHrhzP5+SA8KD33 p5vZL7/VdjLQ8BM67NmbBmIbfQ== X-Google-Smtp-Source: ACHHUZ6eAO4MLkWKSzQ1EWOX6goASrvWTAshO8u2qa5GJ5XpLI20XqQHeTybKLJ5NCy67gNHZnv59w== X-Received: by 2002:a2e:3e01:0:b0:2af:1262:e917 with SMTP id l1-20020a2e3e01000000b002af1262e917mr2085788lja.25.1685523690859; Wed, 31 May 2023 02:01:30 -0700 (PDT) Received: from [192.168.1.101] (abyj77.neoplus.adsl.tpnet.pl. [83.9.29.77]) by smtp.gmail.com with ESMTPSA id f4-20020a2e9184000000b002adbe01cd69sm3217446ljg.9.2023.05.31.02.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 02:01:30 -0700 (PDT) From: Konrad Dybcio Date: Wed, 31 May 2023 11:01:21 +0200 Subject: [PATCH 2/4] clk: qcom: gcc-msm8998: Don't check halt bit on some branch clks MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v1-2-2b5a8fc90991@linaro.org> References: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Michael Turquette , Stephen Boyd , Jeffrey Hugo , Imran Khan , Rajendra Nayak , Joonwoo Park , Jeffrey Hugo Cc: Marijn Suijten , Dmitry Baryshkov , Jami Kettunen , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1685523686; l=1575; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=3hJNNh4/9lwYUqpHcPuPz2a/mPNaOro7+/PxaHyFiI4=; b=D1cKQbxl6Xtd1J+LgAXmgHxu0Ctd1287EHb5ahT81jhB+8oir0bvlwKU/9Yd7q9zlcE9kYHd7 LbEi/VMCfCUA4ssNg9vYIWFjz1hEtBchnbksdUULcaB26XqQFz2Sv07 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Some branch clocks are governed externally and we're only supposed to send a request concerning their shutdown, not actually ensure it happens. Use the BRANCH_HALT_SKIP define to skip checking the halt bit. Fixes: db2c7c0a04b1 ("clk: qcom: Add missing msm8998 gcc_bimc_gfx_clk") Fixes: b5f5f525c547 ("clk: qcom: Add MSM8998 Global Clock Control (GCC) driver") Signed-off-by: Konrad Dybcio Reviewed-by: Jeffrey Hugo --- drivers/clk/qcom/gcc-msm8998.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c index be024f8093c5..c343bdfc3cc1 100644 --- a/drivers/clk/qcom/gcc-msm8998.c +++ b/drivers/clk/qcom/gcc-msm8998.c @@ -2061,7 +2061,7 @@ static struct clk_branch gcc_gp3_clk = { static struct clk_branch gcc_bimc_gfx_clk = { .halt_reg = 0x46040, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x46040, .enable_mask = BIT(0), @@ -2074,7 +2074,7 @@ static struct clk_branch gcc_bimc_gfx_clk = { static struct clk_branch gcc_gpu_bimc_gfx_clk = { .halt_reg = 0x71010, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x71010, .enable_mask = BIT(0), @@ -2100,7 +2100,7 @@ static struct clk_branch gcc_gpu_bimc_gfx_src_clk = { static struct clk_branch gcc_gpu_cfg_ahb_clk = { .halt_reg = 0x71004, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x71004, .enable_mask = BIT(0), From patchwork Wed May 31 09:01:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13261794 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 4D0DCC77B73 for ; Wed, 31 May 2023 09:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235277AbjEaJBl (ORCPT ); Wed, 31 May 2023 05:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235261AbjEaJBh (ORCPT ); Wed, 31 May 2023 05:01:37 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E63FF113 for ; Wed, 31 May 2023 02:01:34 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2af30d10d8fso57934941fa.0 for ; Wed, 31 May 2023 02:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685523693; x=1688115693; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7aNVVNs8eqPTnK0Wd32QsSw3ccebDUPM7FkJjTlItZ0=; b=DFpSVbtQAJdLS9L1Z4OqaYcq3z5wqP/Kjvjeuvb8W/UeZIZorQUgGLC+Ou6/dnQ1nM ohoLJ9zLgJkTWJAMxcSCaNpOZtWkeLgsiJNUs27ZJDu+rrINp1NXX/c6x6kIBc8XA/OC DfW0bMObEptzREw96ago+o/OQi8DEvQdFiNqEIViGG22BCVMn4bBFuVjQZ5g4ozTwMPz PPO+Dim+F2EMU/Jdj7XeYbPd78tSHTVVHCKITOnFcwMvYC+gTYbIFpQHzREtsoDUuIWd wXAKmCcHaC+WyJiE/wOXAhfHruz47163E9SSHYmZ8MGBWXgRdKAD+a6U5pGW0xYVhYVb KiFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685523693; x=1688115693; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7aNVVNs8eqPTnK0Wd32QsSw3ccebDUPM7FkJjTlItZ0=; b=fxjy/bDtbmxJJqd150TxGfBbuk7XKbfy8mAhB09/VX0bRrDeIxEBTGuLLnWw8RgrIB VajW97qu5sekBHKO+3FCLaNo8uafgNFebrjKJqpuwDQXJQZRQFjAqwe2Nq9cfE1SdSeP JJD5sCE2eDmo/A+KCSopv4HhCIOXLwKPp8q6F3ux3X12UQGr6yAJXLsurXqN0a4g0J/c Qv3PCsEbyDXgVC7Nh9tL6inBsPEhX1+VUA2ThIF2cbkHiRJpi9hhbwwcNP6MLjsXHRtg 5n3qwmUiQWwFI/Qx7DVC5HnMxcFqg9vtlt8uCdV55dUFbIUGm1BxgE8fdwNwt75/BBdc 6xZQ== X-Gm-Message-State: AC+VfDyHIx4s+GCvqyln2ElOmITK7b2hk4CV8TUuNJs+9IlFqpv7adGN 5woGib/TsNHr+zjE9lNX/Ug63A== X-Google-Smtp-Source: ACHHUZ4a/ohv1nAHcZ4EgpJh+dY8ucizn8JplkQ7RJTesz0nm6WL80NqRNfhJZMIQVHQEBEX6+6GQA== X-Received: by 2002:a2e:9810:0:b0:2a7:853e:a43 with SMTP id a16-20020a2e9810000000b002a7853e0a43mr2078686ljj.40.1685523692380; Wed, 31 May 2023 02:01:32 -0700 (PDT) Received: from [192.168.1.101] (abyj77.neoplus.adsl.tpnet.pl. [83.9.29.77]) by smtp.gmail.com with ESMTPSA id f4-20020a2e9184000000b002adbe01cd69sm3217446ljg.9.2023.05.31.02.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 02:01:32 -0700 (PDT) From: Konrad Dybcio Date: Wed, 31 May 2023 11:01:22 +0200 Subject: [PATCH 3/4] clk: qcom: mmcc-msm8998: Don't check halt bit on some branch clks MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v1-3-2b5a8fc90991@linaro.org> References: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Michael Turquette , Stephen Boyd , Jeffrey Hugo , Imran Khan , Rajendra Nayak , Joonwoo Park , Jeffrey Hugo Cc: Marijn Suijten , Dmitry Baryshkov , Jami Kettunen , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1685523686; l=1355; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=bXqrPCtrvBWn269gLXl5t9pRQrXP7UP5yO8wMS9RYTM=; b=25wVDjm0aFKb9J+/7hjzG1PYk8SUins5HpBOIMcmo9kgItzdowE+W0TmGB+9j6TP2q68ZYpA9 hSNCtDfJkB2DBdHtrip8T/GzVMUqVT6C5BxHs3AWbECJ60y0iYexcZc X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Some branch clocks are governed externally and we're only supposed to send a request concerning their shutdown, not actually ensure it happens. Use the BRANCH_HALT_SKIP define to skip checking the halt bit. Fixes: d14b15b5931c ("clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver") Signed-off-by: Konrad Dybcio Reviewed-by: Jeffrey Hugo --- drivers/clk/qcom/mmcc-msm8998.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/qcom/mmcc-msm8998.c b/drivers/clk/qcom/mmcc-msm8998.c index 4490594bde69..9b98e0fb8b91 100644 --- a/drivers/clk/qcom/mmcc-msm8998.c +++ b/drivers/clk/qcom/mmcc-msm8998.c @@ -2453,6 +2453,7 @@ static struct clk_branch fd_ahb_clk = { static struct clk_branch mnoc_ahb_clk = { .halt_reg = 0x5024, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x5024, .enable_mask = BIT(0), @@ -2468,6 +2469,7 @@ static struct clk_branch mnoc_ahb_clk = { static struct clk_branch bimc_smmu_ahb_clk = { .halt_reg = 0xe004, + .halt_check = BRANCH_HALT_SKIP, .hwcg_reg = 0xe004, .hwcg_bit = 1, .clkr = { @@ -2485,6 +2487,7 @@ static struct clk_branch bimc_smmu_ahb_clk = { static struct clk_branch bimc_smmu_axi_clk = { .halt_reg = 0xe008, + .halt_check = BRANCH_HALT_SKIP, .hwcg_reg = 0xe008, .hwcg_bit = 1, .clkr = { From patchwork Wed May 31 09:01:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13261795 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 F0851C7EE31 for ; Wed, 31 May 2023 09:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235281AbjEaJBl (ORCPT ); Wed, 31 May 2023 05:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235269AbjEaJBi (ORCPT ); Wed, 31 May 2023 05:01:38 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9014136 for ; Wed, 31 May 2023 02:01:36 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4f4b2bc1565so6179188e87.2 for ; Wed, 31 May 2023 02:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685523695; x=1688115695; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=TRDkbjMTdDqIX5txCgAI4qwPmqTuC0wBW6Dd+QET4Vg=; b=aJfxubRXb5x1zHRFjCAXEHB4LdoqpZF7IAqlg4LUNeG2wdmcLSFNxGHJ2ggXXozOEG iSunyTSAz+yAYvBKwU3fb+qUTV5jdOuD6S7dUSyMZScotapFVvlXvDWaUHoQIJgO/irm xIuqb/EPQYgGgY/naa9xVq7hU+L7UbzgjEYwz6Sr4kwrz2WznMC3Otzay9/d7IQ74XKL JuozV8swJzhGH2gwnNs1c3NwxvxvCjBllT7FpEQ7MzXRGoI9lSl21oUkwiFT5oRP6LxD qbyVAR70MBV53ZZtSyDUwZN15WS9bZslb7Tg2EILJ9AyG20FHoXdLbdNCu5HBjKjJtL8 NKGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685523695; x=1688115695; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TRDkbjMTdDqIX5txCgAI4qwPmqTuC0wBW6Dd+QET4Vg=; b=EHSd1ePhPETLc6J6sb60CmH4ZW9YXKKhyJGF/UKVmmhpLQx9tazl947zW7FSMIV127 JlQDBIl64UJ96K1bbUO5WsUqg2jWea7WiTrnsxlQTm4cJwuUrg/LGH6+jXkKV3dwdfwO e97hfiuRsy3nyhIF3eSym2lVWAch6/g+dbwAYoGdXVf28XYmlAJ8S7KlwQyOS+WOeJW0 zphJWrhb7q9ekeDMmd/p6/iYnQlaZ+JDFCBjv7rD94boMLATESITbzVz8zI+42T4pv2H SdqKOucC+CTUNzjP7Sy4l4FdeuZvbyLWinIIGEspMPSRTPgCjtTbKwlBdRjp2MO/d0NR nBJQ== X-Gm-Message-State: AC+VfDwSmf6mCbcxx3WZO2RPs9Oqh8zugSyMASX22h+czuQ9L358TzGf 4y+TKwAbxcBDqQ9Ke44a59BADw== X-Google-Smtp-Source: ACHHUZ6+/Qk5gAJYAjLG8FzKNVMug7bY6Nbrgy6YrjoDolg3NgEkWoyRilUbuWh7St3iWPxUWnbsjQ== X-Received: by 2002:a2e:924b:0:b0:2b0:497a:2029 with SMTP id v11-20020a2e924b000000b002b0497a2029mr2279050ljg.23.1685523694853; Wed, 31 May 2023 02:01:34 -0700 (PDT) Received: from [192.168.1.101] (abyj77.neoplus.adsl.tpnet.pl. [83.9.29.77]) by smtp.gmail.com with ESMTPSA id f4-20020a2e9184000000b002adbe01cd69sm3217446ljg.9.2023.05.31.02.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 02:01:34 -0700 (PDT) From: Konrad Dybcio Date: Wed, 31 May 2023 11:01:23 +0200 Subject: [PATCH 4/4] clk: qcom: mmcc-msm8998: Fix the SMMU GDSC MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v1-4-2b5a8fc90991@linaro.org> References: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Michael Turquette , Stephen Boyd , Jeffrey Hugo , Imran Khan , Rajendra Nayak , Joonwoo Park , Jeffrey Hugo Cc: Marijn Suijten , Dmitry Baryshkov , Jami Kettunen , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1685523686; l=1105; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=U11cPNBCetgr5hd+fDIKoJDD5fDRdvw6Gnlma9DUXKU=; b=N3+OLnogrIsl+g8OU9USSSHaW3r6dF+xQp++9Sdi5dDUtVtkR4Fsz0TOp+XZXk2eA25+y0lcX zb4+VCa6xi+BhsZqQAlHww+t/C/O0XsXx8tNBBbragw5+aSpME8EHtT X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org The SMMU GDSC doesn't have to be ALWAYS-ON and shouldn't feature the HW_CTRL flag (it's separate from hw_ctrl_addr). In addition to that, it should feature a cxc entry for bimc_smmu_axi_clk and be marked as votable. Fix all of these issues. Fixes: d14b15b5931c ("clk: qcom: Add MSM8998 Multimedia Clock Controller (MMCC) driver") Signed-off-by: Konrad Dybcio --- drivers/clk/qcom/mmcc-msm8998.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/mmcc-msm8998.c b/drivers/clk/qcom/mmcc-msm8998.c index 9b98e0fb8b91..7b1d105afbd8 100644 --- a/drivers/clk/qcom/mmcc-msm8998.c +++ b/drivers/clk/qcom/mmcc-msm8998.c @@ -2628,11 +2628,13 @@ static struct gdsc camss_cpp_gdsc = { static struct gdsc bimc_smmu_gdsc = { .gdscr = 0xe020, .gds_hw_ctrl = 0xe024, + .cxcs = (unsigned int []){ 0xe008 }, + .cxc_count = 1, .pd = { .name = "bimc_smmu", }, .pwrsts = PWRSTS_OFF_ON, - .flags = HW_CTRL | ALWAYS_ON, + .flags = VOTABLE, }; static struct clk_regmap *mmcc_msm8998_clocks[] = {