From patchwork Tue Aug 8 09:44:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 711645 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 708FEC41513 for ; Tue, 8 Aug 2023 19:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230459AbjHHT6y (ORCPT ); Tue, 8 Aug 2023 15:58:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234170AbjHHTvj (ORCPT ); Tue, 8 Aug 2023 15:51:39 -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 6AF2F135F14 for ; Tue, 8 Aug 2023 09:57:58 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2b9cd6a554cso91923911fa.3 for ; Tue, 08 Aug 2023 09:57:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513876; x=1692118676; 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=4KW5W/BsMVq6+QNzWH4B7mMdqsIsqWz/fCs4TWl8ltY=; b=fXeubM3Imzh5HfJpR8Xrx/FtqLD6TGgGotp/fDd+aTzLZPI/y+NEuVHisawgbWLm3M D42Dzm0r33tSP1V6toXNuC2+wOxXoMDt1rfZHnSJ6TiCMerh9izMgPI7be5VXN5C9ICz DYYvltZFG7gT+e7DhRlGnE3fr44DpLql56G0sQegAFcQJx/dviT1g23xJuNNUiYNuomD FUiVas0ccUu+PVp8AFpEXY0d7yoKnbeCTFkqwhuweukBqdbHob8V6er2tzjfjuO/jxe0 AX0gcIJiCTtjMZ1PQ/c4Tx6/tsJ3SQGrsckTVG4CnXUk5YXgV1EwNG9jQI8XNHBjqDxq klRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513876; x=1692118676; 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=4KW5W/BsMVq6+QNzWH4B7mMdqsIsqWz/fCs4TWl8ltY=; b=fAgyvZVAvP/fww6bakkIcYhJtgIlLHXM6/QDXv/erLiSeHK+QQYoG11fbaLTHmjVsp MPUXy6PoBHgcP0jkV9+xfFYuPckFOLRrQeAnWpezogvZkDO9r0GcRo/FjZ40YFLg3F1Z mBab9xtiv1ICW06JNN94bXndkFo3kI30orZ+UJdlXlsy6xHcvSW5WCMwDz6kDAEDoPnw 9XeS2tlEK8Jikwl0hdIIKo/eDZGrA7RT1GpYJXik3ab0iyXxc3qfGmR8I8q16THQLZdd wcBBJuIfNIs81ebkL1+QTNKarJDDJU+udabscPkJk7AOLhThf0Qn9bvC8gdG+0CJpfm7 umHw== X-Gm-Message-State: AOJu0YzEtUrYbmSp9MU83/GR5uAp5xl7+eQH/XPzZax2kSY/GikapACL spsDJYHehSsxSe97NWUEVebh89BD/vyL8x/R11g= X-Google-Smtp-Source: AGHT+IG1IYYssFkGiczWRJXJ2hNd7aUPVrG4bPRpm+cL/fBJQfj5HgLT+UBhH2Xhh05RcC4OK+d9Kw== X-Received: by 2002:a19:6518:0:b0:4fd:d18e:be33 with SMTP id z24-20020a196518000000b004fdd18ebe33mr7634340lfb.26.1691487889572; Tue, 08 Aug 2023 02:44:49 -0700 (PDT) Received: from [192.168.1.101] (abxi185.neoplus.adsl.tpnet.pl. [83.9.2.185]) by smtp.gmail.com with ESMTPSA id i6-20020a056512006600b004fdba93b92asm1818884lfo.252.2023.08.08.02.44.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 02:44:49 -0700 (PDT) From: Konrad Dybcio Date: Tue, 08 Aug 2023 11:44:41 +0200 Subject: [PATCH v2 1/6] arm64: dts: qcom: msm8998: Drop bus clock reference from MMSS SMMU MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v2-1-34273e275c51@linaro.org> References: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@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 , Will Deacon , Robin Murphy , Joerg Roedel , 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, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1691487885; l=994; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=3dPVka+1yoTBWJAX5iuBqo/JljLJGzd9OEipOW26gpY=; b=P/xfTwdFTTKmfRH1cHDGu0mhCVETc7DhmfzfJHr6hh8cV9OWxxp8ilKs4ThwIArS2RVFHOVnf uG9mGb1qwVACAbr6fd75bvJra8iZTVEziz1Kd1WLVE66/LQYZdFZUkQ X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The MMSS SMMU has been abusingly consuming the exposed RPM interconnect clock. Drop it. Fixes: 05ce21b54423 ("arm64: dts: qcom: msm8998: Configure the multimedia subsystem iommu") Signed-off-by: Konrad Dybcio Reviewed-by: Jeffrey Hugo --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index a41a34dbcc3c..e40f6461f4fd 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -2743,10 +2743,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 = From patchwork Tue Aug 8 09:44:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 711653 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 440D6C001B0 for ; Tue, 8 Aug 2023 17:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232859AbjHHRuI (ORCPT ); Tue, 8 Aug 2023 13:50:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231256AbjHHRti (ORCPT ); Tue, 8 Aug 2023 13:49:38 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 259BD26E5B for ; Tue, 8 Aug 2023 09:22:02 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-522382c4840so8306827a12.2 for ; Tue, 08 Aug 2023 09:22:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691511691; x=1692116491; 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=X+614xtHjgD1nkm8xRBKqqyV2uZni5hqr1Y2F11sHVk=; b=TJ7PRA2PDtaxpnBSUjyoSCUDN1beWb8gdNDBqjpRHQy761VztiaUhWbUhtuaJCSVBM IHot0Ud9xW5qclNcs43gjlqagjkzoGaRRWfMgcEBs+PhnCXhm9FhVY3NEcArh5EhSD4L G77ReTVfnOtIu7lyx+cpYdhc95uxXKFg8h2RHof0t4P1srJr29OTOmW/xtKokR4DnyTc W0G59ti1vSOFWFP/0WC0Dhbb6vGOiq0y3REJ+7CheVerfZp1M4b8aXObPuSxvecLmAeg i+Fhj4Qa2nmkwkxFQ3HMmrLk4tbnHh9naXZV5rC+9uJiJBynTdr/HdtxVE5YeWMjkRa6 b84Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691511691; x=1692116491; 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=X+614xtHjgD1nkm8xRBKqqyV2uZni5hqr1Y2F11sHVk=; b=CbuKcI/BUQznAgydm+c6owr9Eq8iucDfIjfHT2VIfjxrabgxFS5Hxtl4u2MNXw4WUK fruxCwKrM6jYFnkbtXSEu+0ypYStnPoLgqaayChmemZJhLDDHK5sds3/PPeVDnGWSn8l qZfCwgT3Bb28u8PrykQ396Ma8wibR84Hgpr5XLCoImd/7/yvrnv9vf8zopQ1XJ5Edco4 laZNL6aH3wZP9C8LoqWfK5XDrkVQBr5SHcnuc1LA/Qbza9MoTCEzccjK0+AIODQD2FQg FIa64AdhnpZDMkintEJ9H6fs4Yv3BDK0jwJdcHJR7APa0ZQmowY25W0ONiFg8PP8P1yY 7V2A== X-Gm-Message-State: AOJu0YwDA3sgfa4Mxjiq+JfVf/w34cQtI/1Fx/wVlcSi4nBP4TZ37EY8 V6dSM5CNj7iQit2FX8yZD5lgS5/2dJMFdmh5CF0= X-Google-Smtp-Source: AGHT+IFVMdcEkHvqjIMX5oEgG2oBE7nbsEMOVRk5VcpuTnRc1mcmt8mNUyLq7GYjCrQ3jyb2zmb5Gw== X-Received: by 2002:a05:6512:e9b:b0:4fe:5680:db1f with SMTP id bi27-20020a0565120e9b00b004fe5680db1fmr7912704lfb.53.1691487891249; Tue, 08 Aug 2023 02:44:51 -0700 (PDT) Received: from [192.168.1.101] (abxi185.neoplus.adsl.tpnet.pl. [83.9.2.185]) by smtp.gmail.com with ESMTPSA id i6-20020a056512006600b004fdba93b92asm1818884lfo.252.2023.08.08.02.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 02:44:50 -0700 (PDT) From: Konrad Dybcio Date: Tue, 08 Aug 2023 11:44:42 +0200 Subject: [PATCH v2 2/6] arm64: dts: qcom: msm8998: Add missing power domain to MMSS SMMU MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v2-2-34273e275c51@linaro.org> References: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@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 , Will Deacon , Robin Murphy , Joerg Roedel , 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, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1691487885; l=854; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=/yznmFUOFfvt3H81R22ABUv0eOeLe9LUwSr+QNKzGV0=; b=6ok/LWtlPH6zSyy5UMAq/t5bgWP3Ud7Ij9vBySuwjh3vMiS1gJVjxUKw6nLHyS95ARxX+LJAd Ibm+ib3FKxpBIIhASbXVDOfZYxEwn1cNsRmJHG+sQTEmtuUOfL5elUO X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The MMSS SMMU has its own power domain. Attach it so that we can drop the "keep it always-on" hack. Fixes: 05ce21b54423 ("arm64: dts: qcom: msm8998: Configure the multimedia subsystem iommu") Signed-off-by: Konrad Dybcio Reviewed-by: Jeffrey Hugo --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index e40f6461f4fd..39db67211fae 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -2770,6 +2770,8 @@ mmss_smmu: iommu@cd00000 { , , ; + + power-domains = <&mmcc BIMC_SMMU_GDSC>; }; remoteproc_adsp: remoteproc@17300000 { From patchwork Tue Aug 8 09:44:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 712832 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 86535C001B0 for ; Tue, 8 Aug 2023 19:50:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232479AbjHHTuX (ORCPT ); Tue, 8 Aug 2023 15:50:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232582AbjHHTuF (ORCPT ); Tue, 8 Aug 2023 15:50:05 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3940B51D38 for ; Tue, 8 Aug 2023 09:56:05 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4fe457ec6e7so9755046e87.3 for ; Tue, 08 Aug 2023 09:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513763; x=1692118563; 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=TJRcX7l83GzG4nljjiXsSgTVORkCZorOu6CVVdtQF3E=; b=FOt3x7IRa8Jm4W4GLGUpR0tEIdEDJ6D+NcaP9F0EWz97Sr0ulYLvnl9gjJ1+KecJTl PIGEd5ZHGJOGdqOLbnZ8/uhegTTYrtXR8Q56nboIgSRqxGwsahGes+PgzWbrSsqVLxk1 AhQ1ZukTFMP+6e9ObMeEp+oaT4/TS1HIal4OpQXSxEwH3+dSqQa6LL419LvOyqq6zqzj enQwTO76FvIhJJJKI+VZtvRR0kYCQE5rrIy7k99dEavGkNIz4bSPNrgzP0ny6YALCmKz Yh1AqAXQTsLrIN41pzB/YnLm5ApMDS3Z0ujo8YCzQiUbBH/pJkOXOTSOlu3i+BtigApN fb2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513763; x=1692118563; 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=TJRcX7l83GzG4nljjiXsSgTVORkCZorOu6CVVdtQF3E=; b=EicvnIfxnAxSSn4K57SXs0rtyHQNEsMKVBKjPW8gMXJDpi7JhS+jU/sMbuKFBysGrf y6QCtJ2guWie13KTxLzXgmWHiIJAAu9t3dpYsfW9S4o1Rfe42iPTb4snrMhxB5pwadCi MkKNkoO0KXfiujPpQ81ovzwZCEG3CIf4Sp78TiTx159MhJcehdsDgtRxK0VFowW2po+5 /hVM/A8Hxrq9z8s+6moLDfW+ArirIOriELg/iRUcrt5fYBmU/0N5VNchR11Kw9sg3xqj 2jzWc5c0p+jzf0D1WBl3f9rHGw3d7dpHszJbYcJNyP6qo7q+PDHWfDu091hbldn7WH7t Ok3g== X-Gm-Message-State: AOJu0YyGvclCyTw3Dx7HPMNW4FOvQlmIqq6aH3IfDzCrotUjlHEG1y5i xWIJyPnINniBEx5cfFNMJe1mX67eIMXtYkXG53E= X-Google-Smtp-Source: AGHT+IGHUT7VSfmI8VQtBPNaetpOWrfLKOPZbXgUnGq/oqs5MCTMjFVV+jNZ7mtrZHhq6p1BDeKZtQ== X-Received: by 2002:a05:6512:39c3:b0:4fb:89e3:5ac6 with SMTP id k3-20020a05651239c300b004fb89e35ac6mr9893926lfu.62.1691487893637; Tue, 08 Aug 2023 02:44:53 -0700 (PDT) Received: from [192.168.1.101] (abxi185.neoplus.adsl.tpnet.pl. [83.9.2.185]) by smtp.gmail.com with ESMTPSA id i6-20020a056512006600b004fdba93b92asm1818884lfo.252.2023.08.08.02.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 02:44:53 -0700 (PDT) From: Konrad Dybcio Date: Tue, 08 Aug 2023 11:44:43 +0200 Subject: [PATCH v2 3/6] clk: qcom: gcc-msm8998: Don't check halt bit on some branch clks MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v2-3-34273e275c51@linaro.org> References: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@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 , Will Deacon , Robin Murphy , Joerg Roedel , 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, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1691487885; l=1627; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=4vcJD39xmmwGxR16do/vEynX3nfOkYLGbzSw65dGFMA=; b=t/2b5DxWk6eOZxBSMoG1WvSgfjtXnl9wcFAwd+sra0DiGErD9S3YZpkCbKjr1qwJdtT7FY3gv IJZo/StB+T4CsgBs40j0+BPJSYBAKHNwSKgL7MrSPgapI+FCbOr3UJU X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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") Reviewed-by: Jeffrey Hugo Signed-off-by: Konrad Dybcio --- 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 1ba516a0c0f3..257b27d8eeb6 100644 --- a/drivers/clk/qcom/gcc-msm8998.c +++ b/drivers/clk/qcom/gcc-msm8998.c @@ -2060,7 +2060,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), @@ -2073,7 +2073,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), @@ -2099,7 +2099,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 Tue Aug 8 09:44:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 712838 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 5E38DC001B0 for ; Tue, 8 Aug 2023 18:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230219AbjHHSqx (ORCPT ); Tue, 8 Aug 2023 14:46:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229748AbjHHSqf (ORCPT ); Tue, 8 Aug 2023 14:46:35 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 232294BBE6 for ; Tue, 8 Aug 2023 09:52:08 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fe5c0e57d2so19447025e9.0 for ; Tue, 08 Aug 2023 09:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513526; x=1692118326; 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=gAg8mzz6tXJyaH1tEofpHQ5TEsFiQj+ho2hy+w4Tmaw=; b=FP0cVtNAZoMaxGnU8effZh1c7cO3r4KW3vUQZf99L576sDDRJugLX1sGc7GO8dz+tx uGIpaUUgUHJjozblFXJP5mT9WwQFm+jLLwM3P4+XU4VaKhePZ2m/hfJbtln5T1f7TEko aQeyHldzJjKGT5rQYdf8hF23QkvICPPo6B/Cdo/mOJOW7HRzfXJxXkpfZsMYytHIYWeI svE9Xofu9bG5a1T7bydNXHyN34m4qm8cdhPmEjvAd0Dhm3JOFsCzuJ8T7B5pPBySeGNK 5GNzCLLTXstC4dCLPIGieaCr5M1E3JD2Yghrpr8keW6WXrTAo7C2gY2h2MDpskSFpl7W gV6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513526; x=1692118326; 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=gAg8mzz6tXJyaH1tEofpHQ5TEsFiQj+ho2hy+w4Tmaw=; b=PdC1PBX98/cMUgjX5EnrmhHBmB09uzk/SkAbNbLP78vo4U5Rnij+JX9MMc2AE9d3iv 0nmx1NPuJrqCkKpH6HiApNVHj413Fe7v8xDBOMEUxmnwAcv98+SlWbpqvu6gjzMlc4VD 4eGtF7L0LP4bVqnVWEmdHumFrsXZdGcr27Uk67mVXM64J8RQPlyfbz6nIdVm+6jeDagE aYQmGD6w8NwKWRtiFP2EQdqwVnDSPrMBSm0EplG7cBQhJlYTDOTrl5nAp7Pet7Zr4KdP 8bhkypCoqvYDO9lXH8HiAtHM/mZhSQhs6+t3HsAHioNiyNkPmvVlKezfTbwpqibJlktJ fwPw== X-Gm-Message-State: AOJu0YyePLYwBQBaWQrDj3rImixX2upjjYlwjcb44aE2CXgHMkjnv6Fs 52+ze7sSdphiwxI0gEsqSL0IIBVbmodqVNKTags= X-Google-Smtp-Source: AGHT+IHZdXCtug2ljX6dDSj6oQkG8V1UJLNKTYOKnSjmV42sR9+Wv2CCmrrKVl5VAmfJlHe6DhBOLg== X-Received: by 2002:a05:6512:2018:b0:4fd:c771:ed86 with SMTP id a24-20020a056512201800b004fdc771ed86mr6615303lfb.67.1691487895251; Tue, 08 Aug 2023 02:44:55 -0700 (PDT) Received: from [192.168.1.101] (abxi185.neoplus.adsl.tpnet.pl. [83.9.2.185]) by smtp.gmail.com with ESMTPSA id i6-20020a056512006600b004fdba93b92asm1818884lfo.252.2023.08.08.02.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 02:44:54 -0700 (PDT) From: Konrad Dybcio Date: Tue, 08 Aug 2023 11:44:44 +0200 Subject: [PATCH v2 4/6] clk: qcom: mmcc-msm8998: Don't check halt bit on some branch clks MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v2-4-34273e275c51@linaro.org> References: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@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 , Will Deacon , Robin Murphy , Joerg Roedel , 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, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1691487885; l=1407; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=haDOFYx+cWB8WYF0AFsxGiNUFhwDHpLSQyDe+vgkap0=; b=ZrMZ0b0kru/BioU+kcPyTGDosiv5UYR3dvjZ97R7NYb1CKIWbtfb6OQL9uoCg1eDGTN2RtwgC KnIylLEWD68BzoXZqSp7GXw9MgJJMQxVOqARg8YLk04oG4zFHl8Kfq8 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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") Reviewed-by: Jeffrey Hugo Signed-off-by: Konrad Dybcio --- 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 c62aa270af1c..d0a5440e2291 100644 --- a/drivers/clk/qcom/mmcc-msm8998.c +++ b/drivers/clk/qcom/mmcc-msm8998.c @@ -2452,6 +2452,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), @@ -2467,6 +2468,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 = { @@ -2484,6 +2486,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 Tue Aug 8 09:44:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 711654 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 1FB20C001B0 for ; Tue, 8 Aug 2023 17:45:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233921AbjHHRp3 (ORCPT ); Tue, 8 Aug 2023 13:45:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234841AbjHHRo7 (ORCPT ); Tue, 8 Aug 2023 13:44:59 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B5789003 for ; Tue, 8 Aug 2023 09:20:23 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b95d5ee18dso90511151fa.1 for ; Tue, 08 Aug 2023 09:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691511582; x=1692116382; 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=dlY5pXEYcBgHeb5qjzLwZeG+1V5JyWmwzq+8kailYB8=; b=AXjpokP7gQlPyYtxe8cBC/8fim2+gbeg90MTM4kUgmoLF0tmWNdFW7nPBr3+MCeTbp p4481l+F9NbhxT7Rzm6htviNdxEBCWWKPQg2GI6QT/AZWkhJZTV8XnD6Qfth1lZp/xR+ 4YBSxRz/xfbmSZIAHfHRljmEoE9rcoTtwAUtPGrSzRW7mbbM4itdxdq75h46dyQi0GFn ZbXYuNMdgXXLXuAun6MS9joYtGW4N5JwdbQgXEafNZ05sEhleHCCNJEN1K/0EKHNHJ2L YVAbcNcKohiUoFjvMANbk2l0+Tu07TEwVn3GGTwsXCrY8wK13HwcXns4Koiws3ciWL98 5CoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691511582; x=1692116382; 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=dlY5pXEYcBgHeb5qjzLwZeG+1V5JyWmwzq+8kailYB8=; b=c6mzxIRQVHDElT11U5HI+VVNZucmsh9RH9gAAphVwrBxkwuBkIjM2tNK35M7aRBd3J Rnnc+l86pHnksOKwV7iLxoBRF6ua1Jtsyc0e70eHU2Hk5cILCf3hPBq3VEoyzgGErXuK z4dvXUJCyLdzTXDbXJpGUcOJ2ETbl/XDGJj+GEOU/2ZYvc7K5vqH+iRRKMkwcE9UpQXS GRUIu7T9m/wvjPp3qrygRgkRfRJ48fQncNqDo7FzY+pfkYqryN9YF0N1KfOkaSuxgSwd PI/Wye5y6j2gByD+IL31n051UzbdXNi/zspEEEy+jMRYMqVJnChXGFxU8/2A2xIjsgH7 XRjA== X-Gm-Message-State: AOJu0Yy6ukYmAhwZs/E95O3in+Bb+ojzwXz2avyje5y2zz0ErRnzi/r6 OPElT5Qjz9qb4pk6KTIvkOBuangvbqmoedy73p4= X-Google-Smtp-Source: AGHT+IHh37iYuUiKI2GbU0AYhtJBCPFDqyHRg6hHZo0rvcAp0zMmu3aywLaX3w+vkrjWoKcJi+lCTw== X-Received: by 2002:a05:6512:20c1:b0:4f8:58af:ebd7 with SMTP id u1-20020a05651220c100b004f858afebd7mr6593359lfr.39.1691487897383; Tue, 08 Aug 2023 02:44:57 -0700 (PDT) Received: from [192.168.1.101] (abxi185.neoplus.adsl.tpnet.pl. [83.9.2.185]) by smtp.gmail.com with ESMTPSA id i6-20020a056512006600b004fdba93b92asm1818884lfo.252.2023.08.08.02.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 02:44:56 -0700 (PDT) From: Konrad Dybcio Date: Tue, 08 Aug 2023 11:44:45 +0200 Subject: [PATCH v2 5/6] clk: qcom: mmcc-msm8998: Fix the SMMU GDSC MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v2-5-34273e275c51@linaro.org> References: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@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 , Will Deacon , Robin Murphy , Joerg Roedel , 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, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1691487885; l=1105; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=87zmBNCrKExC5fA2pDw1hJreUEORhjqL4+NYXqa3bgY=; b=VT9trWuRQROU5ByyIvzOsud1+jUCahMFSSwl7lXsHgNEroaV6TNcWL2Qi+2HDnBgH+uqXNQKx XLni2Mv9lxlCRZ/eHiiHKdcIHZUZoGsQGa7E5QjDCIxTVH8MTuWmOw8 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 d0a5440e2291..4fdc41e7d2a8 100644 --- a/drivers/clk/qcom/mmcc-msm8998.c +++ b/drivers/clk/qcom/mmcc-msm8998.c @@ -2627,11 +2627,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[] = { From patchwork Tue Aug 8 09:44:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 711659 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 D641FC04A6A for ; Tue, 8 Aug 2023 17:12:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230008AbjHHRMY (ORCPT ); Tue, 8 Aug 2023 13:12:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230437AbjHHRLg (ORCPT ); Tue, 8 Aug 2023 13:11:36 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5883169697 for ; Tue, 8 Aug 2023 09:04:48 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-99357737980so850539866b.2 for ; Tue, 08 Aug 2023 09:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691510684; x=1692115484; 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=2UuNhIPZQtVYzGmtMAw0xH3Mxdy93w7NQpbLuvaKjSg=; b=bsXG1fGulGkQJ6slL7CEmEiBxY3vKw/HYFzPk7D7T4p+PSfUPQK8i7tP0luFwvxR/M WhUHkaS8lp4afrmexAQW+aXE3Txi/ZGwIf3pB4tzIUlvLzvQG7NgTavfyV4F2u5vO2ZA mUFDmb2me11GTbrHuZRNBkMJjXdRo3egLbkH1lQhuIzIvcVJadDlD8/LCSLq7yWCoEgl WyetURXfUsEF0T342Ay6ynlTBUYuwjfr6t7MrcYM7H0RULAFfD0ubx7TkEC6avyAbs7l I2bZgBAfnbcW7i38X9oq8bGYnCPuInzjBb0xFs+aNwUXxHftmPe/lyYCCDrUMw1XOAR9 Mzvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691510684; x=1692115484; 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=2UuNhIPZQtVYzGmtMAw0xH3Mxdy93w7NQpbLuvaKjSg=; b=HE5ralLgj+nrwUiaf4c4EOjCkrJECUQhso3BQTDozDQGNIgZV2A7iiYso9Xvb2N5iL 0VWso8T3TkW5J+FARRI/BjcllBJ10de+Cyd7YkBJfIm9nsSuh4lVWZf7p/D98PEoXxeQ QkUYEowxd64e2Ww4cgTAlFfIQxu2WHsvdwvN9Wr7hG8bmSlmx3CkEmSVou5iph1vWNAx AiU0YGT/w/DczL6HE7QPDKuPbrBtiYABUORWdxcr2bJ5eOlCtYrOcW1T5pnw+U2EAtLt pjK969g4mgmytLUJ6kOc4CK3sWI+8uD003/GAlfBoRlwcSKWlf+vNBo+nE2PaLMqKxc3 nNAQ== X-Gm-Message-State: AOJu0YwqRmzi+KLecTKOUkYEXn8ZKIPE8L39o8Ei1m1izLmS56M4u/ki gs6YsqMSGf10yhUlaYwiK6uAI3jsJxwBI0h37D0= X-Google-Smtp-Source: AGHT+IHe6NP3MzfgZSWbkR7jxRMoFmcA9NIiePawh4EYEM7Q9mrKbCLB6JP4QQacs26mWD9MoLIIVw== X-Received: by 2002:ac2:4ece:0:b0:4f8:5604:4b50 with SMTP id p14-20020ac24ece000000b004f856044b50mr7020474lfr.64.1691487899167; Tue, 08 Aug 2023 02:44:59 -0700 (PDT) Received: from [192.168.1.101] (abxi185.neoplus.adsl.tpnet.pl. [83.9.2.185]) by smtp.gmail.com with ESMTPSA id i6-20020a056512006600b004fdba93b92asm1818884lfo.252.2023.08.08.02.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 02:44:58 -0700 (PDT) From: Konrad Dybcio Date: Tue, 08 Aug 2023 11:44:46 +0200 Subject: [PATCH v2 6/6] dt-bindings: arm-smmu: Fix MSM8998 clocks description MIME-Version: 1.0 Message-Id: <20230531-topic-8998_mmssclk-v2-6-34273e275c51@linaro.org> References: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@linaro.org> In-Reply-To: <20230531-topic-8998_mmssclk-v2-0-34273e275c51@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 , Will Deacon , Robin Murphy , Joerg Roedel , 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, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1691487885; l=2406; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=GiTo3aHVWSJqXeRVvBwFrjMpXiRsIg5liCVx9M1P4EU=; b=Nxs8hOuPBNmdHqXrObFj394Ryc0kynWXqn1i40tZ53Cb01Hzw6WwtFi+3X0Jcw4BcgOd603j0 ZWoh4q6XnKVBZvu54Q3HrIhvJNMsEM/z8rSRfzNPESDS1/k+Iq2OYtg X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org MSM8998 was abusingly referencing one of the internal bus clocks, that were recently dropped from Linux (because the original implementation did not make much sense), circumventing the interconnect framework. Fix it. Signed-off-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- .../devicetree/bindings/iommu/arm,smmu.yaml | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml index 3a31a979709b..cf29ab10501c 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml @@ -270,6 +270,47 @@ allOf: contains: enum: - qcom,msm8998-smmu-v2 + then: + anyOf: + - properties: + clock-names: + items: + - const: bus + clocks: + items: + - description: bus clock required for downstream bus access and for + the smmu ptw + - properties: + clock-names: + items: + - const: iface + - const: mem + - const: mem_iface + clocks: + items: + - description: interface clock required to access smmu's registers + through the TCU's programming interface. + - description: bus clock required for memory access + - description: bus clock required for GPU memory access + - properties: + clock-names: + items: + - const: iface-mm + - const: iface-smmu + - const: bus-smmu + clocks: + items: + - description: interface clock required to access mnoc's registers + through the TCU's programming interface. + - description: interface clock required to access smmu's registers + through the TCU's programming interface. + - description: bus clock required for the smmu ptw + + - if: + properties: + compatible: + contains: + enum: - qcom,sdm630-smmu-v2 - qcom,sm6375-smmu-v2 then: