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: 132807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2359955vqr; Tue, 8 Aug 2023 12:54:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSKNVSx1TOJQZqXL72BejEUeAT9c05ppnidie1CBcx2x2Yy+7dPyi1CuXxspJmSmX7x/hr X-Received: by 2002:a17:902:b191:b0:1bc:e37:aa76 with SMTP id s17-20020a170902b19100b001bc0e37aa76mr10157780plr.6.1691524446315; Tue, 08 Aug 2023 12:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691524446; cv=none; d=google.com; s=arc-20160816; b=bqKI7fJ5H3iXSNBaXD6SPnjTaqYjsEpVqtFkzuLhBYj0lLREp3qFR/kfuk1dCi6RiG tlCLW4v96idVcVotmpjbu2CrYo5H+z+l75QSmxHfbtQ8xRzBVUjC3p2XiwXvOXi1SIet NrG6NYfWdnl7F+SF9u1uuKGFedumHKjJ9t0bzNzfDGEAC9Lb8zWuNPDsA82GvHxzTh6M mHhBe64INdzJ4ToswX3rKS0e64gladKOfpVurhq+uHrCi/LzjgewAMzL1xQRaG5K1c5O 7+PgQ7aFYCnC7OMArcT/AUlb3myArV071dTcmTkGR/wejb5X6c0wRyUEqORqKLoX3AoP CPEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=4KW5W/BsMVq6+QNzWH4B7mMdqsIsqWz/fCs4TWl8ltY=; fh=VohwHOOqzSlyJV69dvs7BsalUDFtNFz6jeRDBhhLiNI=; b=GD2HdOmL0Squ04Bjc0WiDB3V8rAtZLaSx/ga++Mr61VGCkjYHfVv89LwhnwEai4+/X iLgEStbrNNyYC7Bhk3ga5tAQxIpfewcf86K3eYIRFeGi+6LAu+E4dL3pmSW0HHK+erDY PeTBz5w+gHCpeYQbNYxrFrvaaMdoC84lTO9ynCpUdWO2tSsiOhVrtMGDA03UDTs6vohu GOyy0h0ZFHenrlfBUd9Bontt5PIxp18Fp2Y+W2vAcfvl5TUzMHB3LxVfJEC23rDb2zzH h/AOn2GjtjF5HVSu7Vb346I1KDYMakm/2WjGDi159fDZW+EEcGRkFKM2LV/AN065ETAA 0QVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PeDpiZiP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e15-20020a17090301cf00b001bb9f190bafsi6031252plh.526.2023.08.08.12.53.53; Tue, 08 Aug 2023 12:54:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PeDpiZiP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229763AbjHHSKF (ORCPT + 99 others); Tue, 8 Aug 2023 14:10:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235263AbjHHSJ3 (ORCPT ); Tue, 8 Aug 2023 14:09:29 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DA6B67682 for ; Tue, 8 Aug 2023 10:11:32 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4fe48a2801bso9749006e87.1 for ; Tue, 08 Aug 2023 10:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691514690; x=1692119490; 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=PeDpiZiPdx0rfY/xiGGijxkiUGkLshZvKNY254WpIwc0Xip6UnSyZACDX6cDjqhWEh CaQl+o/tQXR+U6aSuTa9yyC2JPB7WpGmzDIyBp2DmiG+tqIteTNm/KmomrTaqpXEQvrS THy+M9D3OAQ1Hs1DG8keqSMDLN9Au33yUyvtx6X9+yL5ra/t80O87n5bnS3PggqP41bk kaeTKWbaWHw9/4zDFQfNti+iXhiNbahmQT0AtKjwgyIFfLqQ10Y7tsajfYu+S62s2rwM WijFwD4toa4fj9J/ta/T2R8eS3kfErFzPb60yoq2W50KhhxIyVgtKSaagvfHw/81b8fH QvcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691514690; x=1692119490; 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=i9/iC21x4z+BD4XRUxGGMToQWM8yUIGetIC2C9tDfPhPNFZl5Gqt5zG4Eu6jbo1wLX r1LlPuaU8jia4iunrPzKe/mA5nIqFGAGbCfHBFU9yCSuV8MUnkkqbuGuazd5Tt+TDDR9 QChEPTuflozHjf8m8jMacgrla8HOuxoDihPc3Jog2U2FMswvvsWzE9KdkhEUcDfIB3fd EdG0SfVwEUkojl+NKvJeSC0PdZJFMtrkbIvlCzFDqRfipK/tV70+pIXE5GAS6VJeN3VU 9FBtyiz3yCtjVKbMMEA3eDmYgYP0yqt1tsQOWWNueIoWZ9VLJfnw5Sy6vgZLyouO9rdt t6GA== X-Gm-Message-State: AOJu0YzIMbl3Y+4VLz3j8U31msUOY5+df5HAEQF0oZUtL7eCKi0JPYEE 2Zfy0Aqq2yNJ+V3LKe+dVxOBf9llJR7fG7eWVAo= 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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773691938079459692 X-GMAIL-MSGID: 1773691938079459692 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: 132719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2328339vqr; Tue, 8 Aug 2023 11:54:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSInvqeZhS6poIZlW28/etdAW8V2KYfCUYVRur1JaD7QuLway8fNwXHdSFVonthSOVf4wE X-Received: by 2002:a17:902:8609:b0:1bb:9f07:5e0 with SMTP id f9-20020a170902860900b001bb9f0705e0mr480198plo.60.1691520882046; Tue, 08 Aug 2023 11:54:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691520882; cv=none; d=google.com; s=arc-20160816; b=X6JC8yYN+5iDMxoI6X6c37uwaNCquthTImsqAgrsI8Zi8OTeTEnZU/sXnjdW5T1B8m aQ1Ri+mEab+R8wgRL9SCAhSZRzDvILJ3DjPURaidl0f60XkOo7wEmtsZb5LcOdsFfDYP GnGpLzrT/xcgbT+0Xb3Ev2wsDj08Y9XcaGQw38T7uvtH5s5rMmkJ7Bx7sDkvJvUVyyGi D5PbZYCQwc259UN1lJ3t9q3fyn7MTxbEju/SGmQbmQjV0H6zmEjBJQ7OK1gy6YdUB9Vj gDIwRrCS/xbilC/9MGAthJ+47TgqGxYLriogpR9ohPUWk5+OvrgVYrkpfJWip2haxmj+ HjfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=X+614xtHjgD1nkm8xRBKqqyV2uZni5hqr1Y2F11sHVk=; fh=VohwHOOqzSlyJV69dvs7BsalUDFtNFz6jeRDBhhLiNI=; b=i5nqZuLgERrldzpgvdQ7RF6KLokpvzfMMpMwpiUhqRQPOlK2ht4/undDlLuZ05qcgh qpdjUxVrcrTNvNOaK/O9KpIlgjgLKtFyIvQdQ5lA3dPM7VQVabmyEGye2uSGdkgkypii u080pH2zVd1hW/5n9UXKMQDEBNVZlxIayFbiX5GdMS72NVHHftfoad6lKEC/P5hupXpE X44bYkPg9F9S/ZTsBBcDxsF6Xp3Ld/bFFLvbb667KU4V/qEfUAxwTLnSzAed/UUbmfIn knLYc0qtYZ1zLDLd8a9QAEyz5i0mf+G5LwmxGC1XUNWZBJV2VvY33O6OPRYSRbop1Eke byUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ve2TIQdK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p5-20020a170902ebc500b001b02bd00c67si7740295plg.324.2023.08.08.11.54.28; Tue, 08 Aug 2023 11:54:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ve2TIQdK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235318AbjHHSLL (ORCPT + 99 others); Tue, 8 Aug 2023 14:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235263AbjHHSKl (ORCPT ); Tue, 8 Aug 2023 14:10:41 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A57B71BAE3 for ; Tue, 8 Aug 2023 10:13:04 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-99bed101b70so846086766b.3 for ; Tue, 08 Aug 2023 10:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691514783; x=1692119583; 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=Ve2TIQdKK/NdzaYfIuspk1xhzrl8T2ojwRfERXse1GT2fJPGHqKXI3eqJUyVKQ8zDa Z7PIuil4QlVAKiaW9vZ4dxv+CqqDKUKwErIemaLF8iaPH5RlgJsHx5G5g520IrgUY7Na p2i4cBf9PzfnpISRFk/gIMezsinWnoSWToIbh0cTo0yw7EwxAMNBIaDw70E1UkaD3cJi Z1EnwfyOiHdzD7tyM2Pr0G94TmhwHXtol7PczcTre5KtSKNxJj9H63GXSL0L/FdudXHf kSXNWvS506f6D29z/ElS5a+RWrsAfJZqFYtfV8e92xjJZ2wcSyoyZ3vjZUIxMOMH0Q8y 3Vwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691514783; x=1692119583; 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=eBkurp4o59twQrHRBYvfseKZ/G7i3WCwOhqG6y/d0Rc3KS/f2KkVh0ti8K1zPYo1BM Lg5sjg1voCvTXqESLW2zZqyUJ+SazAdeqdbDmwx8FvgykXFNFngj8nBGw7dgEwgVtd2X qXJG5HX5hFXkS8lCAxi1Cdy1gkQKEfeo/Mb8Xx+wI3ih5fei8sik2z8aeWuVO9fs1mIT egsesQAS6Z+2KhD2PHsxTD6Cv8rBU+TZRwpwipmdZhnwwdeF4HI5Gr9ehF/ocGVYiKyc SHFjt6eoazGfbqrx32Ru7dx9D+AUtmlYhSc2Tj0HHzMZWTC22Vuq+TR+o/JAQB6FWSkr 2Mqg== X-Gm-Message-State: AOJu0YzM6GKx3X8wget0btJwqwVsAtP/0v1xAgrcKR5Gn5KCIdiqZW18 LwJivuinzPHMrtR85Cpfo4iypYf17uD33FrRuP0= 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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773688200427315571 X-GMAIL-MSGID: 1773688200427315571 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: 132980 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2462622vqr; Tue, 8 Aug 2023 16:48:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHDStMhq3WGeDjpRHZ6Is1xs5ylSZnvmPOeKX4aV4D30fkMwVEm0u0jrGvkkj5gSU1UA9e X-Received: by 2002:a17:906:3102:b0:982:c69c:8c30 with SMTP id 2-20020a170906310200b00982c69c8c30mr760876ejx.55.1691538511557; Tue, 08 Aug 2023 16:48:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691538511; cv=none; d=google.com; s=arc-20160816; b=wd3xC5K6ho/ap2EW+fy3elv2eS+SZ6HDhiBdsV9n2IRWEND8W06ywQuksUFVY7thKY TMti/luPz60MzwtVGd+kT05xk37k1l5UADEizhLCJcvHcESaFiThzk8vSzr2UAMBpTwE 9teN0WePtYC2nTx5b+qTPUScdtmpWe8TC1ySFMo/HsEnqmIV3nlxBpB2PGrfT/CyuPai 2Yc1guux1gn/EbAY+yJeqywgMTn3KiEqCAxlXK8TZAWYrKD0tP5rMC31ska0LJ+DUCq6 5/OA/zB0Q7WbkcAcAnVLo0pwegY0/PmKrJJn3M76uHDiVTS9rnTE+yMOWqdYt7m/W89G StVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=TJRcX7l83GzG4nljjiXsSgTVORkCZorOu6CVVdtQF3E=; fh=VohwHOOqzSlyJV69dvs7BsalUDFtNFz6jeRDBhhLiNI=; b=fK0H7GEcBvZ2F1dMlz6MSvq2FIkve/Lp5zK0kqCU/NETFpoFgyXjJd5NpttkjGHnu9 N3hySBp+Ewio0+jTfJSzp5zruulmucceU4jLtAeEJwjD7lnr3Gu6QiDBMKt8mF3EgdKL LDdOLFbFawyvzTcebQSd2rgnq0+XB2wx2aSaLSleSI5uyMR2tLtTTSwv2SBez/b12D2n rkxJWEYIGzwWl0nwlOmm8WNHloS2vUYHD+60GFta3Tb7T6ZmHRCwtUr2eADpGI9VWQFG Mx9qm3GM9hhBcbCqAg07hgN1WNtx7JTh4ND3ZVhvniCQp/pJEh0Oizx26D7dpEGRn7v2 r4SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lhP8jaID; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c25-20020a170906529900b0099ce38da75csi3064401ejm.1002.2023.08.08.16.47.57; Tue, 08 Aug 2023 16:48:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lhP8jaID; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232725AbjHHTo6 (ORCPT + 99 others); Tue, 8 Aug 2023 15:44:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236513AbjHHToi (ORCPT ); Tue, 8 Aug 2023 15:44:38 -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 AACC116B2E for ; Tue, 8 Aug 2023 09:48:26 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4fe15bfb1adso9799287e87.0 for ; Tue, 08 Aug 2023 09:48:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513304; x=1692118104; 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=lhP8jaID/32H118Cq0phMy24SFxRTSvvSLxdnpi45ud1vWWqGs2G1wYKPFtGcs24M9 PKZIxBdXtssstD/lUFVmt/f+jDHMgQ/uZ3aEe5Q2IW0m1IbSX0vtwCg2wgka/WsHWVRG lLRvag2OuLkFJ0HsYtFqYai55/teKxg6n7PsdKAX7fPBq2F6MB8FhCaRiD/XgTGhBLlz 5wYJJfCdcm6RT4ahT8CH7ETkqqoF5rQliwnYnHiyEKQb+gRVUF4XsxOMhdFG+dhoI//V nqVSQU1qazf9QBNdnjMZbLTgXrCqr//iRbSBu484rtrDbJ4VifeJzBOsKexRXRuazUII qhOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513304; x=1692118104; 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=ZqLM9+MrKxTqQaQEjTLxKurtJT7B0rIxO+a5Azkmdf3CFaeUhdeEFwAZsMmV71waaT HXSglac/hlAzXBOFyOvoV8/aPTDsEr2L25hzq34x3S8+yP2fgB7GsGE5O31S6oM30OFP tAIWn7CQ1nj6TfG8btXaZfwY5H5HAJilKZGXiRc6FQ0ptEYnQX4G0N1qu8Dcw9OlqzlM wbolq1rqGHFMHBhv/ZoppKwHrXY2VzMcnMwIUTs6R8aPdSXcRvgZYIhDFMSg5ptv+U21 qAnXUU49SPEYnc9VZUuzyYyH4sk4wydwAs3gp48LoUCl9s2KSekg8qQ5su2gGZMaWmX2 fIsA== X-Gm-Message-State: AOJu0YxfAEL8+32sm3RCp73cOZpA/7nNq1szZa7nlSIao+UnsKccJ29C +k4Zvy8IpjLTY89bdxBZmvyO2YaQjZO/O6Oi5Rg= 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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773706686139694132 X-GMAIL-MSGID: 1773706686139694132 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: 132886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2411302vqr; Tue, 8 Aug 2023 14:43:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZpDjnWJklW89vCSFZL/pr+rE5jl+KTW/MKJ5Aw4CYdtW+yHZbg/zh4fXHsTBoHvq7ihBn X-Received: by 2002:a9d:6a93:0:b0:6bc:f639:713d with SMTP id l19-20020a9d6a93000000b006bcf639713dmr1032254otq.30.1691530983411; Tue, 08 Aug 2023 14:43:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691530983; cv=none; d=google.com; s=arc-20160816; b=l5BgaNb+B4faPWXEox0PlKKafPyfSTzPEjb+ANfHAGJdTrWpkB2ZX72VZ24VMqH8Co EOSP589jQB4Z91bIFaH8Jn0EY1lp2MMnU0EupiWd3lMwQAIM/DniaerlUUykPEbvV0jf HEorUUBozLiF7ZIeWJCSHaeOrrcbtbg+CVqaVqA3QzerxV6L3eh6YTNUx11ddsymwLTV KFBAz5FnER1hUf5fZdMb3Y0jogn0N6GHqGhLwS74EVbZHG0m+uNvubcbi/C2dp/VyBHk 7LWb5BQ0PQo26g/jZJpEJhLHqy+x7ZvOInW8WMqkrEbhxKFfz7ZOaSSHIwujkX8nzRCT SXkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=gAg8mzz6tXJyaH1tEofpHQ5TEsFiQj+ho2hy+w4Tmaw=; fh=VohwHOOqzSlyJV69dvs7BsalUDFtNFz6jeRDBhhLiNI=; b=lJDyK3VSS2ACbJLrwVMc46b2RbjxSJIjXqCQOntk/Os4qoZAhnXVI0DV0JkA/z6ucp 1kd2Bh9AitACrO4VbwZzqQpv7ZUWJdofrz2sucnqneQa6vhUe0iy5E9j69ItNjTmk7mh WmhKlu9jvtxLXCs7QfcI3s/Hy3QJrk9AHy6XWHR/LC/c6JXE4G1IN3zZmrOzMMIH8Bha mabuKhDkuB/LRliSDEIXH6TkJ9h0JDa/HDyo/9fGIZismC/ojbx4G9QB07gvDkDglC9I x4WJmBBrXoZpcHhY4utqQLCPi4NgN41lbgUXl4Ec4ImfGvlHGQYALR8oMPG7I50+DtcI Hjyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p1cM9Ecj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d19-20020a637353000000b00553810ea8e5si7770531pgn.303.2023.08.08.14.42.49; Tue, 08 Aug 2023 14:43:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p1cM9Ecj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233433AbjHHSi1 (ORCPT + 99 others); Tue, 8 Aug 2023 14:38:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232140AbjHHSiB (ORCPT ); Tue, 8 Aug 2023 14:38:01 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20FCB117A35 for ; Tue, 8 Aug 2023 09:48:17 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fe32016bc8so49669405e9.1 for ; Tue, 08 Aug 2023 09:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513294; x=1692118094; 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=p1cM9EcjvVVgWJq2lQuzwDZDGsqB+brrTMqGChh+6ULWo8smSHu/aHPcxrJFHlynB8 075KnC7+IV5BhoZ3K2858NWyltQFJqxjNyEaXL7JfeGJ46KszRfY5elDAjhG5T3L5TId qMQjHvnrYHcxSs0YEyB1FHKA/2VZTuxAUxa6t9TxL5x5D+ApbmUAhDHvB2bdwThiRXIG lNZL8QkaEEdIuhY2OO1E9uuytLF+X/001zpqDgu9DNsX0dvfNRc/P4fayr+zXRr2gZ8y GLRhcPgYiKPbCIqKIV1fU2p48rx/WoCBQOScEWoCzY+sdHn0EXm4gdmQHgYLLWnZ1uB3 B7OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513294; x=1692118094; 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=DXH0HO5yeMG1GZazRNzkGONGzeSesSMEyo9D3y/esfbLFoAmSfgTF1H8pciT5NeGpY CDXmNe3a77lQrCRnVz80GmrnkFmmtAQuHTtlyNMeLJpPD+N66ULYYXGcSKD4VbZzGfqT o8KLjfae85DyrXTG6bzbZ+iHVOSagYv44YSmxHmaFap0PLgwfmuInB8NBVuPfyVFpisQ g/uwjNh+bFjct4CrURR594PaeOgKws0dlmr/MJufk7+5bhXkQ7O89ji8ohjjEE7hO/Jo KW/TFv6veu41aKcFsmbt19L94wQOeusiQS/y8CXaUR2IGUYUSb65ztp22bkc+4Z+yyNB 7nWA== X-Gm-Message-State: AOJu0YxzFHkySsKx+SsIWO3rxBBxG8xQP+5KWfUqlARtPxhGFMSAp7YK UNZoSNsQbS5lSxVIsAwGAzXkUoqSD7USSQKdJb8= 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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773698792258909149 X-GMAIL-MSGID: 1773698792258909149 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: 132978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2461856vqr; Tue, 8 Aug 2023 16:46:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHcrqaHpmsynMlMmhPhLLJBaudtqgjfz8n9b4A47H2ctQz09X4HGZ6Wb74Bb1X+uWJFSpJ X-Received: by 2002:a19:2d45:0:b0:4fe:a2c:24b0 with SMTP id t5-20020a192d45000000b004fe0a2c24b0mr666058lft.26.1691538376711; Tue, 08 Aug 2023 16:46:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691538376; cv=none; d=google.com; s=arc-20160816; b=T/CW4JYlsSNSDxjYfWbOhZY7jdCa5+vDy6en3KIjeEyCO+hTOcqSZq26Qko2N3zh/A UkzgWOSRocZPDXzIczlWpiZwwGcERzmdsmk1cS4ugaEAcWawTVvvpDj68ORfDGX/Avid ERIutZPuLADpPdRhJbIG5ZuTaVp+4DazohPoLiVYrxOtvSmlKpHZ05cUGtGb+rGnY08+ TYtTXlvPChQD277MgVOM+GWdRMGTEE37IVRneoDS9Ri1C0S9gnrHXZCpOrkAUxsuVbwv uymaQ1xIskiwRXtw89tBsXJa7CT6sw+sXzMZ5GwYmIinm0vk8/7I+nJr77+rMg+i6SUS u02A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=dlY5pXEYcBgHeb5qjzLwZeG+1V5JyWmwzq+8kailYB8=; fh=VohwHOOqzSlyJV69dvs7BsalUDFtNFz6jeRDBhhLiNI=; b=08O9tvQArGcOuxg3tPTlOYi/+vDrQ/w7yhme22OPro3scNLmiaXw3wHAbZDd7Ol7Mm Xj6jbaqXO08vd85QuRQEYC+8UBvveKvTD1hTYaNVyC2yV+A0qbceX29iI1lVt2Uy0FAv 9XbtIQ2RLdt1KwvwgSkWOcjCVESHn9pmUk7lrrv2IOAU+Xmrtddp9NMIurzeCmDse4JW u3HoMVxH/tinIQ2MRkpEVlR1gvD0a6gIGqNCyQRGMVu3efpNDN3u4ftHvwCKD/9S277+ jPLCQdFxi9H5lqdn3l/+IeN6nUSqknljByRUW+Zt2TCfwSOAjODC3TDbLL3WvH155w4e r7vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KxN9zn0q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020aa7d60f000000b0052334e15299si4714835edr.292.2023.08.08.16.45.47; Tue, 08 Aug 2023 16:46:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KxN9zn0q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232131AbjHHTwr (ORCPT + 99 others); Tue, 8 Aug 2023 15:52:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233988AbjHHTvt (ORCPT ); Tue, 8 Aug 2023 15:51: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 AB4016AAE for ; Tue, 8 Aug 2023 09:59:13 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-99c0290f0a8so773917766b.1 for ; Tue, 08 Aug 2023 09:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513952; x=1692118752; 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=KxN9zn0qcdPsWOBXcEYE7vphYvP4clfks02uQjtxf756V5xr3iZSwToC7ltPI2T0dm 9jHbqraC7A07kvMkxdZ8S2XsSNE2uqpTs9f85TYSiwUTRvNdsG6oAyTIzMvzk4oHaQ5p JzJb3VuBxLBlu9QfyNeMf1Ul7TNB9JT3+/r68DapmcyhzBg6aqWK62AI92n035fGZu9u C6twuf0TldzXlUkqfgf2vvOrZk7p94hcmF6cRtMHkxbsZCotI6z28yEklNyaQAs0g+Yr eCbBjB7WlIuort18bV0WOvldZG48RIi4RTI4U0i86DA6rUT1+KKMT8d2P/a4TtH+EIBe LyGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513952; x=1692118752; 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=lm7q71jDAmc7RtdOhJKOb26Dlb7sAFXNsEytaByM7P6MHDX4c/jzd8MTN1xfhKfwHX ev5/7qG+nJjc3PR2i4wGzIrQn7Fm0lUaa2Aylf4FSsDGzZWGUl1KcWu1/6wL0Kt/9mDH C+QKE776+ku4uAdUgHlDr5wOsPk+T0/QOYHRhIBF6agLrd1+XItJZ/uHFVVTUxFl3dlV 7kdYSR14HRL84a/vglUUIsBiWCxW4YPGuR1B+7A1/IFeFNpiyD28+vc1+z4nvIZRRYao XrxQ09YhaN1sFJIHhseB2d//tiVm3rGqnUYeQ/KhUWOAgUhRr+MLeDX1FTbyMA5PNvTc P69Q== X-Gm-Message-State: AOJu0YxLwr0JRLIQ6yWqJIOL0b29FSYcvcaLZOMxNFJPhXC/vaXiPGjO Ev8W+USSV4eo4AmpXmqe7F7UIxX1gdWgbDzChtM= 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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773706544740438106 X-GMAIL-MSGID: 1773706544740438106 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: 132909 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2417877vqr; Tue, 8 Aug 2023 14:59:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJylTxRDv10fEB+BzT/t9Yt+PcHJXy4297XrjtMGTnJYfzqKOOzZskSFeEpWm9tAL0qNAE X-Received: by 2002:a05:6a20:5483:b0:140:98b2:899b with SMTP id i3-20020a056a20548300b0014098b2899bmr1027182pzk.59.1691531996588; Tue, 08 Aug 2023 14:59:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691531996; cv=none; d=google.com; s=arc-20160816; b=ttVVv1IXeBsm+5UIh4C6JtbReM8MErvSh4DlPqZ0tiR3qakn3UfXZQBv9S92lhO0Lu 0t1UIAMKVAcf8m/0N9DJgg7Abkf2RzPG0sfZA91rEjlr5+rYO9BeAqITIUPfdsUeOWY3 qAl55rkydmPFn4cPzfljVY7wOmp3yZJ8Xakcv6a04ZHJ9W59DXVEwH24pdXCyila2vhg 4F/RpINwYoyPLXP5AkDRkvwnV/wwHmxwJPhDp2y3IL/vqzxh3SA8wlqBJ4OV5O/4z6BD J1YaEGD2wjS0DD82wuX1fgY0Y/EWuvD+wZh01HXvauWxgaa20eaZHkaMbQktbFiNom7G /xWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=2UuNhIPZQtVYzGmtMAw0xH3Mxdy93w7NQpbLuvaKjSg=; fh=VohwHOOqzSlyJV69dvs7BsalUDFtNFz6jeRDBhhLiNI=; b=TZQ15Ffk1LD4WupPpXbEi1FNsz+cohoZnC1JAl5RB2HPnisys0A1mYYTZ80QlVWOCE v7BeZdVh0D1GA+CD0iFWGr/SCF9ZSKnp1IM7zf26+LXagz8OWDw/BvafEsJSxRMirldd 6oPVE1vh/9O+rwGN8yaPRl+QSxl1Qx5Ibg5g8+Hs3hcIOjU5aK+KrwQN7kPH0Y8HNTpd Y6fyEEvVsE7Jzq+ccp7HX5VrtKiArOPgEDYiYcbwE1ea8uIx+0p+IPRTMUNcmwjB/x4D HogvNDTQuLOwI9eFAlMhkWaBVRshgDs8+x6pk7hP/NDag/1vO5TDCXB6FJSUfR69pIQq 6yrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OSHf146I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w8-20020a63f508000000b005578c6a7672si7870725pgh.90.2023.08.08.14.59.41; Tue, 08 Aug 2023 14:59:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OSHf146I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235277AbjHHUuy (ORCPT + 99 others); Tue, 8 Aug 2023 16:50:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235021AbjHHUuh (ORCPT ); Tue, 8 Aug 2023 16:50:37 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 557E444450 for ; Tue, 8 Aug 2023 09:46:18 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-99c136ee106so858158166b.1 for ; Tue, 08 Aug 2023 09:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513177; x=1692117977; 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=OSHf146I6F2wP5s2LV6VnA447Y5tDXIgBW88I33QkCDyar0uZR1Nu01fOHMyC/fU2j NliiOvz343A9rWhFQVl+a/0LaCdkjbofX0/DzZBIqPrdm8BDluKsT8qgw+39e7mTQQKD maqEKYv4tfZI1jNAqdNGHdYez6GE8MrWIC+0t16khWpcFxMiLf2bHvlcWcVyEmXuZkBJ IQACwsJJcPb5LxnGaQa4H8mteIscWTSZdFBlJwS1vkSRt4R/mZkCbPkV35+G+6tJdWrm 5MvYjpxpq+kaPozqQMsfAT9eG0BylNfHmi6x3EG9t1aDBBFj0asyYYXknHapdVIxBFLV 6Wtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513177; x=1692117977; 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=Jbda8ZRHhaDZJnFHmiVdVQyV9rYMa3Y4cQNKTfL1gLs9uvMCCS/btfT0Sw0shFojzk Yuu6KTDR+xnsjH6WGXA4ndQuCHHoZq+f/L2ekWSQr0E0iZ84Ti64LnNCUxz2goQTwZiL wFHRK8calxSMWY4qkXzdbKn8u77+WxDwlo5Y+en4SIZjKy+LTJK8RsPt8zqj9m+N1dSI /USkIA8oCseAfeTDdO5lAN+uxv683Vnvh8v6qqK6O3+7gnlryX6T2r+Et/70jBrV1Nme pvMaMwJ/ZJXwBLGDC2n9gGmw6oNbAQlDK/oEK8ta2abZSh1esqoOuJCZ3T3EtLCXGfZ6 asJA== X-Gm-Message-State: AOJu0Yz8iyCD+IRco5FhcLpZY/VtTmC46boti6zV1FACgo27JnUY+ZeP kuXsiEZY7OQ3ZlWnMtxoBFQE4NUtWDUgdFRjFqA= 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= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773678502945468623 X-GMAIL-MSGID: 1773699854873996666 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 --- .../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: