From nobody Wed May 13 22:55:08 2026 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 D7955C433FE for ; Fri, 13 May 2022 06:14:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377263AbiEMGOg (ORCPT ); Fri, 13 May 2022 02:14:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377199AbiEMGOP (ORCPT ); Fri, 13 May 2022 02:14:15 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53E4826FA09 for ; Thu, 12 May 2022 23:14:13 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id k126so4208430wme.2 for ; Thu, 12 May 2022 23:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j60Q+m0nDVDVeq/kqo9om6jZKItdmd/25D1fiKUieoo=; b=RXdzPf6RIzYbLiWfscYfUw6T2WzdY+PgkUVapfUOjjVwymUsMjbC26PCR35K/9ros3 NFCHpbJFnlIG89xtEy3Y8fJuHDs+f8y2VWtdjyFzlJNHqMWyxu/4TS0DPZBsmdXlvRfO gOLDtt3A/M8SMk1hz6AeH3bZfptUbnH8srkE0oGQgkPBc4uhxYckRGx+iphp7MkOWgBT Ebk/eV5bimzuyoo0GoKPNTzwrrxVsJuRM3lyE2FTid1oRakLXfLEAbUMBbZ6azdMuZck AT14UTj/IIsDlEaeXLMvp4YOFlzorgSQCY7QkLrxR7FJ5oZSqzKhgU4mKwztI8qW8DHA pRHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j60Q+m0nDVDVeq/kqo9om6jZKItdmd/25D1fiKUieoo=; b=5c7eiCfcTNZouiVozhY+ghwqQfsAiNkfH5hZ2pP1yfyNpXS1ej33bYM/FVAT4EHVV5 kPqnFsG7Dt9BYDULa0LdaLRQMDN/pZzejIwi9S632CHAwOXwBM2abgC43OgmdiRQ+Z+L qksH+3zuZoBGiBaYzvS6Iy+ALHFeCWkW0ChKEJtZdK9uqJSGbtdPtfBQgWS+eGjBgfB7 rbZpxu4cJK0wiRPf6YdizHbMCrzVib8bWA9l50vXDYxHumU8qlYXfE8KEZRtV7yZ4SAl Yg9h4AJVpggnVUrjiE0tHArGws42OCmEdvkysbJxIBQAD+5gXTT6OZCrYFJUgZZIK94U 4kSA== X-Gm-Message-State: AOAM533lIY8lWGou5850eO+9Zq6SBabAlPwopLv0gXr2w7DOdb4bqVU+ JatguisY78jHdeIMFOnWdQt0/Q== X-Google-Smtp-Source: ABdhPJxxiNFky+FKvagxgESN3eexGwvVdyb6o64BeUJIDlYUYHYzW412ZYFbVs0kakubT1n7lNKQ5A== X-Received: by 2002:a1c:19c1:0:b0:393:a19f:8f95 with SMTP id 184-20020a1c19c1000000b00393a19f8f95mr2940751wmz.149.1652422451913; Thu, 12 May 2022 23:14:11 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id g4-20020adfbc84000000b0020c5253d8f3sm1477760wrh.63.2022.05.12.23.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 23:14:11 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , "Rafael J. Wysocki" , Taniya Das , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring , Manivannan Sadhasivam Subject: [PATCH v3 1/7] dt-bindings: clock: qcom,gcc-sdm845: add parent power domain Date: Fri, 13 May 2022 08:13:41 +0200 Message-Id: <20220513061347.46480-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> References: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Allow Qualcomm GCC to register its parent power domain (e.g. RPMHPD) to properly pass performance state from children. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Bjorn Andersson Acked-by: Rob Herring Reviewed-by: Manivannan Sadhasivam --- Cc: Manivannan Sadhasivam --- Documentation/devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-sdm845.yaml b= /Documentation/devicetree/bindings/clock/qcom,gcc-sdm845.yaml index d902f137ab17..daf7906ebc40 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-sdm845.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-sdm845.yaml @@ -43,6 +43,9 @@ properties: '#reset-cells': const: 1 =20 + power-domains: + maxItems: 1 + '#power-domain-cells': const: 1 =20 --=20 2.32.0 From nobody Wed May 13 22:55:08 2026 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 8B754C433EF for ; Fri, 13 May 2022 06:14:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377276AbiEMGOu (ORCPT ); Fri, 13 May 2022 02:14:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377209AbiEMGOR (ORCPT ); Fri, 13 May 2022 02:14:17 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25BF326FA2B for ; Thu, 12 May 2022 23:14:15 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id j25so8987477wrc.9 for ; Thu, 12 May 2022 23:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2QnLrd3aQG4x4XRKBeZ9JG1UWhf0XATvYFxcEhWYbS4=; b=F9+/MjIyLcTvcR1BJUDgg0hsFVaPyYtyTtFv2BGsFvgPi1jYrt9LIO7KKPxj40kLGj qW16X7HTzpFZcQXbRkMY7x5C+OiDC1hiishMwQt9XXr1HsFf5xCLnmgpktv9gurX7350 B5GNOBgSoNBSIdzlr1P/uNFsBkjbOtzG+Kzy6idCPJ7q8CeiHs6gtzwc4X2v4cASoWfW jgJCriYt1rst1Tyg/q3RwW+Lzoqs3M8riw7W4c2kAV5s9NWf0YQD4NlsIEqFFAnMVVJ+ OxpYhfHTf6Zk2gt/rqjEaAtZKYnmvY8tiuG+uLzmFPp53H1Nlvtz9A56Pu1Mm8CSStC9 GbEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2QnLrd3aQG4x4XRKBeZ9JG1UWhf0XATvYFxcEhWYbS4=; b=Na/6ILNd+2kJ0cRu5qggiNnpqmsMKvm9uNaayQ/yJOp0v0NjruoQU//kQBU28ZVDfZ L2IRST5Ghs25mKWnAuF2rJYF7xwoNb37kN/smld/0NIq5qfdumGH+8UafK0y0xKacRYL 4X7H1dwMQubRHlepVvt5p/kviph2e9Y0yQAzpjPZCdMZDm3FBHRhRAs2EDyBBNBfeJGq iTFmlhYEw+FRsK7jBi1gFOa41BsKRzPSX5pyOYGkfz52pGDIBmX1mRH/sQ1dHFqiqbzt Raw/bL2kEFN9E+waYF4p4aJ8W0gz1gPFzYAgwZ00X4Sm8lb0fn9ovtuIQsvwsctd1lY6 KBcQ== X-Gm-Message-State: AOAM533AgQnGRlkvHmakED6z8TFdPT97QozJjA98GjoyZ17RZ1UcVb35 gn2X8jNPNJIX32QLCmsh1i/7pQ== X-Google-Smtp-Source: ABdhPJyxlT4LTSxCcbfKaqSmTY40Q1OhX2cXOOeh7WoWgy+4treWyWheDFYdpt7Ykc/JFDcvcDXSNw== X-Received: by 2002:adf:facd:0:b0:20a:de99:403c with SMTP id a13-20020adffacd000000b0020ade99403cmr2477557wrs.123.1652422453624; Thu, 12 May 2022 23:14:13 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id g4-20020adfbc84000000b0020c5253d8f3sm1477760wrh.63.2022.05.12.23.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 23:14:12 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , "Rafael J. Wysocki" , Taniya Das , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring , Manivannan Sadhasivam Subject: [PATCH v3 2/7] dt-bindings: opp: accept array of frequencies Date: Fri, 13 May 2022 08:13:42 +0200 Message-Id: <20220513061347.46480-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> References: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Devices might need to control several clocks when scaling the frequency and voltage. Allow passing array of clock frequencies, similarly to the voltages. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Bjorn Andersson Acked-by: Rob Herring Reviewed-by: Manivannan Sadhasivam --- Cc: Manivannan Sadhasivam --- Documentation/devicetree/bindings/opp/opp-v2-base.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/opp/opp-v2-base.yaml b/Docum= entation/devicetree/bindings/opp/opp-v2-base.yaml index 76c8acd981b3..66d0ec763f0b 100644 --- a/Documentation/devicetree/bindings/opp/opp-v2-base.yaml +++ b/Documentation/devicetree/bindings/opp/opp-v2-base.yaml @@ -50,6 +50,16 @@ patternProperties: property to uniquely identify the OPP nodes exists. Devices like= power domains must have another (implementation dependent) property. =20 + Entries for multiple clocks shall be provided in the same field,= as + array of frequencies. The OPP binding doesn't provide any provi= sions + to relate the values to their clocks or the order in which the c= locks + need to be configured and that is left for the implementation + specific binding. + minItems: 1 + maxItems: 16 + items: + maxItems: 1 + opp-microvolt: description: | Voltage for the OPP --=20 2.32.0 From nobody Wed May 13 22:55:08 2026 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 AB93DC433EF for ; Fri, 13 May 2022 06:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377271AbiEMGOr (ORCPT ); Fri, 13 May 2022 02:14:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377220AbiEMGOS (ORCPT ); Fri, 13 May 2022 02:14:18 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EA7D2734DA for ; Thu, 12 May 2022 23:14:17 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id k2so10019010wrd.5 for ; Thu, 12 May 2022 23:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5QCjzQNVfIHTI2M93e76yaRYudMGDMABQBv/3THcrs0=; b=vYS6qMmJEZVFNULnMGiG3qsBGiCBybGyHh3F32mu4gPpUhpEKTMXB3gNlbkeTpK+Jj Pb1PByrmtrKmUCYDJxjKWvOADoYhS+ecZHjhbJgxims2cBAc3m3IPvin4c2Rr5JX9jbG fnHmkLvQwm9NOzay2YWyWOTZ4WCQa5mfTtqIvWC2GNXG2vmtqr91ds6Cb8b9noveYIIo CLQnKsoGKvHQa+kSFLgb00XcdQ6qxXUeuTHHoKG6RjorWj/swLRWQKFBOpUWOOv++3f+ fpvUEQna6eVt8v33qsJKuh8VFQsKHQnnJUWwtjlC9fZh1h741IBejnMZgXz/SMusYNw5 B9gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5QCjzQNVfIHTI2M93e76yaRYudMGDMABQBv/3THcrs0=; b=en07FsyFqJRoSNFSFb0JsIhfbJ1Lvv8+bd+TUh0lOpLcF/UeTVvunwmtWqTEtaWxGa Z2tADLeUFfRujupfo1ccGawLBVPjJJvnw2669CXViK0wvZwfuhwOxiRYE+uLuT5OsWaq z2eg03dg0n3GmmQrgb85Ha3crYmmupOuCH2lbuTzvgrTH2GbW9gvXvgp78MZ0w3YCGgV exwEaZStBSaoucraRdMXSbxq06P2Y9Rj44oYNeJZ8L8notLAU5+RB7yp1Js45NJ+oSBv f6QTFed5SVr+nLn6u6F36YctYXXGTTvUleRR8NWCPpVgsWr+1+wbdnl09ujAXLx4sMWB Ie/A== X-Gm-Message-State: AOAM531qOVUm2PO/fjfzaXkYPNbrlzdW+hljOQXF0FpGg31kTootgFvM ee3SoKdXPHFC+pR0ASX8ZIcwPA== X-Google-Smtp-Source: ABdhPJyyIATyKjiRUxeid5jOjreYwVZ6wwH6YSUPZtqc4E+NEAssOgxzP1UL9k5cqWgrg0H/MOTBlg== X-Received: by 2002:a5d:630d:0:b0:20a:e1a3:8018 with SMTP id i13-20020a5d630d000000b0020ae1a38018mr2429406wru.489.1652422455421; Thu, 12 May 2022 23:14:15 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id g4-20020adfbc84000000b0020c5253d8f3sm1477760wrh.63.2022.05.12.23.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 23:14:14 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , "Rafael J. Wysocki" , Taniya Das , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring , Manivannan Sadhasivam Subject: [PATCH v3 3/7] dt-bindings: ufs: common: add OPP table Date: Fri, 13 May 2022 08:13:43 +0200 Message-Id: <20220513061347.46480-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> References: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Except scaling UFS and bus clocks, it's necessary to scale also the voltages of regulators or power domain performance state levels. Adding Operating Performance Points table allows to adjust power domain performance state, depending on the UFS clock speed. OPPv2 deprecates previous property limited to clock scaling: freq-table-hz. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Cc: Manivannan Sadhasivam --- .../devicetree/bindings/ufs/ufs-common.yaml | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/ufs/ufs-common.yaml b/Docume= ntation/devicetree/bindings/ufs/ufs-common.yaml index 47a4e9e1a775..d7d2c8a136bb 100644 --- a/Documentation/devicetree/bindings/ufs/ufs-common.yaml +++ b/Documentation/devicetree/bindings/ufs/ufs-common.yaml @@ -20,11 +20,24 @@ properties: items: - description: Minimum frequency for given clock in Hz - description: Maximum frequency for given clock in Hz + deprecated: true description: | + Preferred is operating-points-v2. + Array of operating frequencies in Hz stored in the same or= der - as the clocks property. If this property is not defined or a value i= n the - array is "0" then it is assumed that the frequency is set by the par= ent - clock or a fixed rate clock source. + as the clocks property. If either this property or operating-points-= v2 is + not defined or a value in the array is "0" then it is assumed that t= he + frequency is set by the parent clock or a fixed rate clock source. + + operating-points-v2: + description: + Preferred over freq-table-hz. + If present, each OPP must contain array of frequencies stored in the= same + order for each clock. If clock frequency in the array is "0" then i= t is + assumed that the frequency is set by the parent clock or a fixed rate + clock source. + + opp-table: true =20 interrupts: maxItems: 1 @@ -75,8 +88,23 @@ properties: =20 dependencies: freq-table-hz: [ 'clocks' ] + operating-points-v2: [ 'clocks', 'clock-names' ] =20 required: - interrupts =20 +allOf: + - if: + required: + - freq-table-hz + then: + properties: + operating-points-v2: false + - if: + required: + - operating-points-v2 + then: + properties: + freq-table-hz: false + additionalProperties: true --=20 2.32.0 From nobody Wed May 13 22:55:08 2026 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 26900C433EF for ; Fri, 13 May 2022 06:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377265AbiEMGOo (ORCPT ); Fri, 13 May 2022 02:14:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377224AbiEMGOT (ORCPT ); Fri, 13 May 2022 02:14:19 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6FF226FA01 for ; Thu, 12 May 2022 23:14:17 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id q23so10015938wra.1 for ; Thu, 12 May 2022 23:14:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nZOjg8XaBh6CCn6Js3G6uXfs3Op7yvcsYaras8GIlj8=; b=mQSh+ms5+NL9ibLzhzevs3/7uTZWbcZSWelheKfn5E66Rm84nIBINpLsidC1xbazL4 ZkVzZ2AWThUzGbRkvSYVkwTwjyFhVD25zTEPUcJg9L7OaoqmvwO/cWckLFXYs0kALyjl r5Ib42OtKSswbevBRFxUqk3laoOMdp/9qfUsFoENplsmwjTMmAFxeZpgccTfJUoUO9vU bkP0/73/2NNzkbDIM4jFAqa9GBMMqTfCuPqm7jkKvEmSuN88QRb0ienHxf2eUmm+18cP 3Y9zb4NXVi3M4yr5E6YNPPWsZfxPLnF0xVYdjoZnYVESZuWg7yuAw9fYg4v/r2tS7YBA SqSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nZOjg8XaBh6CCn6Js3G6uXfs3Op7yvcsYaras8GIlj8=; b=eUKzsAySr5XTuYeps6T88JV57oFa21KFzLMVlGdCfP3rukG4gKNMkT5E/uHjeSERmJ URAR+Yp8UxQAPHaa7jMhCe9JnxyH3fSTjVeNHEtsOrSLUKY1+yEwBHet6eVHCj2rCeAz aKk7fA6R2LGYoT20VuIBc6eFii4UnFtDvy7y2HX+1aICaMt4/jiEg9AG9ofC72sjB/VZ ZtvAbAnByR6M856kRCq3P2ljri/wf0NECsKx5UxOKJdg+Z4kVzmbB7XaL0z0sGnJhXpH E8tgQKmxAl/rS4bpQQoRfYggkc6mHu/NZuQRKsHszdbjmq3Mv9NBwRUAhZB2P23Gtrjo W6eA== X-Gm-Message-State: AOAM530zP18kSDoXQwTPTkwDUnMwDDA4C62ica7TG/HLQl6bh9E1YB+t hCxbINgR2WW+v5SYp9c18TrDlg== X-Google-Smtp-Source: ABdhPJx2CIvfrYk5wtBGS086/J/W4yDfOHmMCCEUwK9Xdb+yFj+w25mFVpRT7qXoE/PEk1kDR64olw== X-Received: by 2002:a5d:6d0b:0:b0:20c:4ec7:8e84 with SMTP id e11-20020a5d6d0b000000b0020c4ec78e84mr2413197wrq.281.1652422457425; Thu, 12 May 2022 23:14:17 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id g4-20020adfbc84000000b0020c5253d8f3sm1477760wrh.63.2022.05.12.23.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 23:14:16 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , "Rafael J. Wysocki" , Taniya Das , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Krzysztof Kozlowski , Manivannan Sadhasivam Subject: [PATCH v3 4/7] arm64: dts: qcom: sdm845: control RPMHPD performance states with UFS Date: Fri, 13 May 2022 08:13:44 +0200 Message-Id: <20220513061347.46480-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> References: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" UFS, when scaling gears, should choose appropriate performance state of RPMHPD power domain controller. Since UFS belongs to UFS_PHY_GDSC power domain, add necessary parent power domain to GCC. Signed-off-by: Krzysztof Kozlowski --- Cc: Manivannan Sadhasivam --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 43 +++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qco= m/sdm845.dtsi index 692cf4be4eef..befcdd04d832 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -1078,6 +1078,7 @@ gcc: clock-controller@100000 { #clock-cells =3D <1>; #reset-cells =3D <1>; #power-domain-cells =3D <1>; + power-domains =3D <&rpmhpd SDM845_CX>; }; =20 qfprom@784000 { @@ -2326,18 +2327,40 @@ ufs_mem_hc: ufshc@1d84000 { <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>, <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>, <&gcc GCC_UFS_PHY_ICE_CORE_CLK>; - freq-table-hz =3D - <50000000 200000000>, - <0 0>, - <0 0>, - <37500000 150000000>, - <0 0>, - <0 0>, - <0 0>, - <0 0>, - <0 300000000>; =20 + operating-points-v2 =3D <&ufs_opp_table>; status =3D "disabled"; + + ufs_opp_table: opp-table { + compatible =3D "operating-points-v2"; + + opp-50000000 { + opp-hz =3D /bits/ 64 <50000000 + 0 + 0 + 37500000 + 0 + 0 + 0 + 0 + // FIXME: value 0 copied from freq-table-hz + 0>; + required-opps =3D <&rpmhpd_opp_svs>; + }; + + opp-200000000 { + opp-hz =3D /bits/ 64 <200000000 + 0 + 0 + 150000000 + 0 + 0 + 0 + 0 + 300000000>; + required-opps =3D <&rpmhpd_opp_nom>; + }; + }; }; =20 ufs_mem_phy: phy@1d87000 { --=20 2.32.0 From nobody Wed May 13 22:55:08 2026 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 95E53C433EF for ; Fri, 13 May 2022 06:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377243AbiEMGPH (ORCPT ); Fri, 13 May 2022 02:15:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377236AbiEMGO0 (ORCPT ); Fri, 13 May 2022 02:14:26 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A7A62734F6 for ; Thu, 12 May 2022 23:14:20 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id f2so2990632wrc.0 for ; Thu, 12 May 2022 23:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aLu21/EAMBj4rBYhFk0RNS4w0Ycj4tgK+zAO7gTd2s4=; b=BUxLVCLTDJ8V3dc/ZchI6ZEzQpiFZYUxB6fKnCDJGAwEUFZlOhFlMdutjcbkbXKmcn VLOG8rA/I+9qLBmuF70RthtGred4rFEN6Gi8OCXqtFUZoanoFwANjm5YUnynw/19DgSl JFu9mKmfGXpgW+6r7Vq5QTK2PMS0abfhMPiQwNPV40ggJ/acEGwFiFWXsVoAI/dmV3ms yxrcEfT5z2dQVoMgP9XtNxZdcoLuH3aW7IBr6eN8aBBbFSywOIKcyZAxSx2EieDBse5W vYv2J4lp/MetB05aaudq5ggLcMalbvoeBUToOOx15+9d3xLTGKX0NrnF0dMZVNuVF9ZF FE6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aLu21/EAMBj4rBYhFk0RNS4w0Ycj4tgK+zAO7gTd2s4=; b=F49LRGNSe2n1+L9E+D7nW/+6Bn5odoiSuJFHI8qZOA7jdTbrBvpPbT9xHaDfKlDwva 0GmO38ppq5rRWHdnBinDGN56CWFOJu2Sh+g0/TClSUGNemyfNsTPxDRBCz++zxRC3dkr H0r+B2WHmneBdJPTSH49X/LAxJuZwjeWGtFNj2hHOSUn6HohJp0eVmGJoPXMFOOmy3fu dbMHXNlpcetmxmDf7a/VdSt0ZxHuS26HDCPcE2S1R+kUyK2kq35C7cqSB3XWowcRu0oR xXy9cxRytMw8xqc7bpLraJiwXhHr0kH13bMWdrSqrxcQwOJtMil/fmNoH1lpEOfYIX1I xCoQ== X-Gm-Message-State: AOAM5321bwinzp5fwjCwat4tHIFv/DurnRhzEiCaKU5wwLe7jjHPWlz5 7661Y4AHib41sjH9jWV3Svhucg== X-Google-Smtp-Source: ABdhPJx1UCYChPWaV7usSuEDEzkAG38Ui94RRVT8rND6KcnUFi6DNGfzlVER+jUAUJQDT50g9fHzPw== X-Received: by 2002:adf:e8cb:0:b0:20c:5584:ba44 with SMTP id k11-20020adfe8cb000000b0020c5584ba44mr2464665wrn.173.1652422458839; Thu, 12 May 2022 23:14:18 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id g4-20020adfbc84000000b0020c5253d8f3sm1477760wrh.63.2022.05.12.23.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 23:14:18 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , "Rafael J. Wysocki" , Taniya Das , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Krzysztof Kozlowski , Manivannan Sadhasivam Subject: [PATCH v3 5/7] PM: opp: allow control of multiple clocks Date: Fri, 13 May 2022 08:13:45 +0200 Message-Id: <20220513061347.46480-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> References: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Devices might need to control several clocks when scaling the frequency and voltage. Example is the Universal Flash Storage (UFS) which scales several independent clocks with change of performance levels. Add parsing of multiple clocks and clock names, similarly to parsing multiple regulators, and store them for custom set_opp. The custom set_opp helper is a requirement in such case, otherwise OPP framework will refuse to scale multiple clocks. Signed-off-by: Krzysztof Kozlowski --- Cc: Manivannan Sadhasivam --- drivers/opp/core.c | 187 +++++++++++++++++++++++++++--------- drivers/opp/opp.h | 7 +- drivers/opp/ti-opp-supply.c | 6 +- include/linux/pm_opp.h | 29 +++++- 4 files changed, 177 insertions(+), 52 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 84063eaebb91..aac3c6d89ae0 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -66,6 +66,18 @@ static struct opp_table *_find_opp_table_unlocked(struct= device *dev) return ERR_PTR(-ENODEV); } =20 +static void _put_clocks(struct opp_table *opp_table) +{ + if (!opp_table->clks) + return; + + clk_bulk_put(opp_table->clk_count, opp_table->clks); + + kfree(opp_table->clks); + opp_table->clks =3D NULL; + opp_table->clk_count =3D -1; +}; + /** * _find_opp_table() - find opp_table struct using device pointer * @dev: device pointer used to lookup OPP table @@ -874,11 +886,23 @@ static int _set_opp_voltage(struct device *dev, struc= t regulator *reg, return ret; } =20 -static inline int _generic_set_opp_clk_only(struct device *dev, struct clk= *clk, +static inline int _generic_set_opp_clk_only(struct device *dev, + struct opp_table *opp_table, unsigned long freq) { + struct clk *clk; int ret; =20 + /* This function only supports single clock per device */ + if (WARN_ON(opp_table->clk_count > 1)) { + dev_err(dev, "multiple clocks are not supported\n"); + return -EINVAL; + } + + if (!opp_table->clks) + return 0; + clk =3D opp_table->clks[0].clk; + /* We may reach here for devices which don't change frequency */ if (IS_ERR(clk)) return 0; @@ -903,8 +927,9 @@ static int _generic_set_opp_regulator(struct opp_table = *opp_table, int ret; =20 /* This function only supports single regulator per device */ - if (WARN_ON(opp_table->regulator_count > 1)) { - dev_err(dev, "multiple regulators are not supported\n"); + if (WARN_ON(opp_table->regulator_count > 1) || + WARN_ON(opp_table->clk_count > 1)) { + dev_err(dev, "multiple clocks/regulators are not supported\n"); return -EINVAL; } =20 @@ -916,7 +941,7 @@ static int _generic_set_opp_regulator(struct opp_table = *opp_table, } =20 /* Change frequency */ - ret =3D _generic_set_opp_clk_only(dev, opp_table->clk, freq); + ret =3D _generic_set_opp_clk_only(dev, opp_table, freq); if (ret) goto restore_voltage; =20 @@ -940,7 +965,7 @@ static int _generic_set_opp_regulator(struct opp_table = *opp_table, return 0; =20 restore_freq: - if (_generic_set_opp_clk_only(dev, opp_table->clk, old_opp->rate)) + if (_generic_set_opp_clk_only(dev, opp_table, old_opp->rate)) dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n", __func__, old_opp->rate); restore_voltage: @@ -987,8 +1012,8 @@ static int _set_opp_custom(const struct opp_table *opp= _table, int size; =20 /* - * We support this only if dev_pm_opp_set_regulators() was called - * earlier. + * We support this only if dev_pm_opp_set_regulators() or + * dev_pm_opp_set_clknames() were called earlier. */ if (opp_table->sod_supplies) { size =3D sizeof(*old_opp->supplies) * opp_table->regulator_count; @@ -999,8 +1024,13 @@ static int _set_opp_custom(const struct opp_table *op= p_table, data->regulator_count =3D 0; } =20 + if (opp_table->clks) + data->clk_count =3D opp_table->clk_count; + else + data->clk_count =3D 0; + data->regulators =3D opp_table->regulators; - data->clk =3D opp_table->clk; + data->clks =3D opp_table->clks; data->dev =3D dev; data->old_opp.rate =3D old_opp->rate; data->new_opp.rate =3D freq; @@ -1089,8 +1119,8 @@ static void _find_current_opp(struct device *dev, str= uct opp_table *opp_table) struct dev_pm_opp *opp =3D ERR_PTR(-ENODEV); unsigned long freq; =20 - if (!IS_ERR(opp_table->clk)) { - freq =3D clk_get_rate(opp_table->clk); + if (opp_table->clks && !IS_ERR(opp_table->clks[0].clk)) { + freq =3D clk_get_rate(opp_table->clks[0].clk); opp =3D _find_freq_ceil(opp_table, &freq); } =20 @@ -1190,7 +1220,7 @@ static int _set_opp(struct device *dev, struct opp_ta= ble *opp_table, scaling_down); } else { /* Only frequency scaling */ - ret =3D _generic_set_opp_clk_only(dev, opp_table->clk, freq); + ret =3D _generic_set_opp_clk_only(dev, opp_table, freq); } =20 if (ret) @@ -1255,11 +1285,12 @@ int dev_pm_opp_set_rate(struct device *dev, unsigne= d long target_freq) * equivalent to a clk_set_rate() */ if (!_get_opp_count(opp_table)) { - ret =3D _generic_set_opp_clk_only(dev, opp_table->clk, target_freq); + ret =3D _generic_set_opp_clk_only(dev, opp_table, target_freq); goto put_opp_table; } =20 - freq =3D clk_round_rate(opp_table->clk, target_freq); + if (opp_table->clks) + freq =3D clk_round_rate(opp_table->clks[0].clk, target_freq); if ((long)freq <=3D 0) freq =3D target_freq; =20 @@ -1366,7 +1397,8 @@ static struct opp_table *_allocate_opp_table(struct d= evice *dev, int index) INIT_LIST_HEAD(&opp_table->dev_list); INIT_LIST_HEAD(&opp_table->lazy); =20 - /* Mark regulator count uninitialized */ + /* Mark regulator/clk count uninitialized */ + opp_table->clk_count =3D -1; opp_table->regulator_count =3D -1; =20 opp_dev =3D _add_opp_dev(dev, opp_table); @@ -1415,21 +1447,29 @@ static struct opp_table *_update_opp_table_clk(stru= ct device *dev, * Return early if we don't need to get clk or we have already tried it * earlier. */ - if (!getclk || IS_ERR(opp_table) || opp_table->clk) + if (!getclk || IS_ERR(opp_table) || opp_table->clks) return opp_table; =20 - /* Find clk for the device */ - opp_table->clk =3D clk_get(dev, NULL); + opp_table->clks =3D kcalloc(1, sizeof(*opp_table->clks), GFP_KERNEL); + if (!opp_table->clks) + return ERR_PTR(-ENOMEM); =20 - ret =3D PTR_ERR_OR_ZERO(opp_table->clk); - if (!ret) + /* Find clk for the device */ + ret =3D clk_bulk_get(dev, 1, opp_table->clks); + if (!ret) { + opp_table->clk_count =3D 1; return opp_table; + } =20 if (ret =3D=3D -ENOENT) { + opp_table->clk_count =3D 0; dev_dbg(dev, "%s: Couldn't find clock: %d\n", __func__, ret); return opp_table; } =20 + kfree(opp_table->clks); + opp_table->clks =3D NULL; + opp_table->clk_count =3D -1; dev_pm_opp_put_opp_table(opp_table); dev_err_probe(dev, ret, "Couldn't find clock\n"); =20 @@ -1528,9 +1568,7 @@ static void _opp_table_kref_release(struct kref *kref) =20 _of_clear_opp_table(opp_table); =20 - /* Release clk */ - if (!IS_ERR(opp_table->clk)) - clk_put(opp_table->clk); + _put_clocks(opp_table); =20 if (opp_table->paths) { for (i =3D 0; i < opp_table->path_count; i++) @@ -2263,9 +2301,50 @@ EXPORT_SYMBOL_GPL(devm_pm_opp_set_regulators); * This must be called before any OPPs are initialized for the device. */ struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *n= ame) +{ + return dev_pm_opp_set_clknames(dev, &name, 1); +} +EXPORT_SYMBOL_GPL(dev_pm_opp_set_clkname); + +/** + * dev_pm_opp_put_clkname() - Releases resources blocked for clk. + * @opp_table: OPP table returned from dev_pm_opp_set_clkname(). + */ +void dev_pm_opp_put_clkname(struct opp_table *opp_table) +{ + return dev_pm_opp_put_clknames(opp_table); +} +EXPORT_SYMBOL_GPL(dev_pm_opp_put_clkname); + +/** + * devm_pm_opp_set_clkname() - Set clk name for the device + * @dev: Device for which clk name is being set. + * @name: Clk name. + * + * This is a resource-managed variant of dev_pm_opp_set_clkname(). + * + * Return: 0 on success and errorno otherwise. + */ +int devm_pm_opp_set_clkname(struct device *dev, const char *name) +{ + return devm_pm_opp_set_clknames(dev, &name, 1); +} +EXPORT_SYMBOL_GPL(devm_pm_opp_set_clkname); + +/** + * dev_pm_opp_set_clknames() - Set clk names for the device + * @dev: Device for which clock names are being set. + * @names: Array of pointers to the names of the clocks. + * @count: Number of clocks. + * + * See: dev_pm_opp_set_clkname() + */ +struct opp_table *dev_pm_opp_set_clknames(struct device *dev, + const char * const names[], + unsigned int count) { struct opp_table *opp_table; - int ret; + int ret, i; =20 opp_table =3D _add_opp_table(dev, false); if (IS_ERR(opp_table)) @@ -2278,70 +2357,83 @@ struct opp_table *dev_pm_opp_set_clkname(struct dev= ice *dev, const char *name) } =20 /* clk shouldn't be initialized at this point */ - if (WARN_ON(opp_table->clk)) { + if (WARN_ON(opp_table->clks)) { ret =3D -EBUSY; goto err; } =20 - /* Find clk for the device */ - opp_table->clk =3D clk_get(dev, name); - if (IS_ERR(opp_table->clk)) { - ret =3D dev_err_probe(dev, PTR_ERR(opp_table->clk), - "%s: Couldn't find clock\n", __func__); + opp_table->clks =3D kcalloc(count, sizeof(*opp_table->clks), GFP_KERNEL); + if (!opp_table->clks) { + ret =3D -ENOMEM; goto err; } =20 + for (i =3D 0; i < count; i++) + opp_table->clks[i].id =3D names[i]; + + ret =3D clk_bulk_get(dev, count, opp_table->clks); + if (ret) + goto free_clks; + + opp_table->clk_count =3D count; + return opp_table; =20 +free_clks: + kfree(opp_table->clks); + opp_table->clks =3D NULL; + opp_table->clk_count =3D -1; err: dev_pm_opp_put_opp_table(opp_table); =20 return ERR_PTR(ret); } -EXPORT_SYMBOL_GPL(dev_pm_opp_set_clkname); +EXPORT_SYMBOL_GPL(dev_pm_opp_set_clknames); =20 /** - * dev_pm_opp_put_clkname() - Releases resources blocked for clk. - * @opp_table: OPP table returned from dev_pm_opp_set_clkname(). + * dev_pm_opp_put_clknames() - Releases resources blocked for clk. + * @opp_table: OPP table returned from dev_pm_opp_set_clknames(). */ -void dev_pm_opp_put_clkname(struct opp_table *opp_table) +void dev_pm_opp_put_clknames(struct opp_table *opp_table) { if (unlikely(!opp_table)) return; =20 - clk_put(opp_table->clk); - opp_table->clk =3D ERR_PTR(-EINVAL); + _put_clocks(opp_table); =20 dev_pm_opp_put_opp_table(opp_table); } -EXPORT_SYMBOL_GPL(dev_pm_opp_put_clkname); +EXPORT_SYMBOL_GPL(dev_pm_opp_put_clknames); =20 -static void devm_pm_opp_clkname_release(void *data) +static void devm_pm_opp_clknames_release(void *data) { - dev_pm_opp_put_clkname(data); + dev_pm_opp_put_clknames(data); } =20 /** - * devm_pm_opp_set_clkname() - Set clk name for the device - * @dev: Device for which clk name is being set. - * @name: Clk name. + * devm_pm_opp_set_clknames() - Set clock names for the device + * @dev: Device for which clock names are being set. + * @names: Array of pointers to the names of the clocks. + * @count: Number of clocks. * - * This is a resource-managed variant of dev_pm_opp_set_clkname(). + * This is a resource-managed variant of dev_pm_opp_set_clknames(). * * Return: 0 on success and errorno otherwise. */ -int devm_pm_opp_set_clkname(struct device *dev, const char *name) +int devm_pm_opp_set_clknames(struct device *dev, + const char * const names[], + unsigned int count) { struct opp_table *opp_table; =20 - opp_table =3D dev_pm_opp_set_clkname(dev, name); + opp_table =3D dev_pm_opp_set_clknames(dev, names, count); if (IS_ERR(opp_table)) return PTR_ERR(opp_table); =20 - return devm_add_action_or_reset(dev, devm_pm_opp_clkname_release, + return devm_add_action_or_reset(dev, devm_pm_opp_clknames_release, opp_table); } -EXPORT_SYMBOL_GPL(devm_pm_opp_set_clkname); +EXPORT_SYMBOL_GPL(devm_pm_opp_set_clknames); =20 /** * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper @@ -2756,7 +2848,8 @@ int dev_pm_opp_add(struct device *dev, unsigned long = freq, unsigned long u_volt) if (IS_ERR(opp_table)) return PTR_ERR(opp_table); =20 - /* Fix regulator count for dynamic OPPs */ + /* Fix regulator/clk count for dynamic OPPs */ + opp_table->clk_count =3D 1; opp_table->regulator_count =3D 1; =20 ret =3D _opp_add_v1(opp_table, dev, freq, u_volt, true); diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 45e3a55239a1..59aac08baf82 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -149,7 +149,9 @@ enum opp_table_access { * @supported_hw: Array of version number to support. * @supported_hw_count: Number of elements in supported_hw array. * @prop_name: A name to postfix to many DT properties, while parsing them. - * @clk: Device's clock handle + * @clks: Device clocks handles (clk bulk API). + * @clk_count: Number of clocks. Its value can be -1 (uninitialized), 0 (no + * clock handle provided) or > 0 (has clock handles). * @regulators: Supply regulators * @regulator_count: Number of power supply regulators. Its value can be -1 * (uninitialized), 0 (no opp-microvolt property) or > 0 (has opp-microvolt @@ -200,7 +202,8 @@ struct opp_table { unsigned int *supported_hw; unsigned int supported_hw_count; const char *prop_name; - struct clk *clk; + struct clk_bulk_data *clks; + int clk_count; struct regulator **regulators; int regulator_count; struct icc_path **paths; diff --git a/drivers/opp/ti-opp-supply.c b/drivers/opp/ti-opp-supply.c index bd4771f388ab..ebb6531f39c4 100644 --- a/drivers/opp/ti-opp-supply.c +++ b/drivers/opp/ti-opp-supply.c @@ -281,12 +281,16 @@ static int ti_opp_supply_set_opp(struct dev_pm_set_op= p_data *data) struct dev_pm_opp_supply *new_supply_vbb =3D &data->new_opp.supplies[1]; struct device *dev =3D data->dev; unsigned long old_freq =3D data->old_opp.rate, freq =3D data->new_opp.rat= e; - struct clk *clk =3D data->clk; struct regulator *vdd_reg =3D data->regulators[0]; struct regulator *vbb_reg =3D data->regulators[1]; + struct clk *clk; int vdd_uv; int ret; =20 + if (WARN_ON_ONCE(!data->clk_count)) + return -EINVAL; + + clk =3D data->clks[0].clk; vdd_uv =3D _get_optimal_vdd_voltage(dev, &opp_data, new_supply_vdd->u_volt); =20 diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 6708b4ec244d..5f17f10fcc3f 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -75,7 +75,8 @@ struct dev_pm_opp_info { * @new_opp: New OPP info * @regulators: Array of regulator pointers * @regulator_count: Number of regulators - * @clk: Pointer to clk + * @clks: Device clocks handles (clk bulk API) + * @clk_count: Number of clocks * @dev: Pointer to the struct device * * This structure contains all information required for setting an OPP. @@ -86,7 +87,8 @@ struct dev_pm_set_opp_data { =20 struct regulator **regulators; unsigned int regulator_count; - struct clk *clk; + struct clk_bulk_data *clks; + unsigned int clk_count; struct device *dev; }; =20 @@ -165,6 +167,13 @@ int devm_pm_opp_set_regulators(struct device *dev, con= st char * const names[], u struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *n= ame); void dev_pm_opp_put_clkname(struct opp_table *opp_table); int devm_pm_opp_set_clkname(struct device *dev, const char *name); +struct opp_table *dev_pm_opp_set_clknames(struct device *dev, + const char * const names[], + unsigned int count); +void dev_pm_opp_put_clknames(struct opp_table *opp_table); +int devm_pm_opp_set_clknames(struct device *dev, + const char * const names[], + unsigned int count); struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, i= nt (*set_opp)(struct dev_pm_set_opp_data *data)); void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table); int devm_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)= (struct dev_pm_set_opp_data *data)); @@ -405,6 +414,22 @@ static inline int devm_pm_opp_set_clkname(struct devic= e *dev, const char *name) return -EOPNOTSUPP; } =20 +static inline struct opp_table *dev_pm_opp_set_clknames(struct device *dev, + const char * const names[], + unsigned int count) +{ + return ERR_PTR(-EOPNOTSUPP); +} + +static inline void dev_pm_opp_put_clknames(struct opp_table *opp_table) {} + +static inline int devm_pm_opp_set_clknames(struct device *dev, + const char * const names[], + unsigned int count) +{ + return -EOPNOTSUPP; +} + static inline struct opp_table *dev_pm_opp_attach_genpd(struct device *dev= , const char * const *names, struct device ***virt_devs) { return ERR_PTR(-EOPNOTSUPP); --=20 2.32.0 From nobody Wed May 13 22:55:08 2026 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 54B25C433EF for ; Fri, 13 May 2022 06:15:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377315AbiEMGPP (ORCPT ); Fri, 13 May 2022 02:15:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377239AbiEMGO0 (ORCPT ); Fri, 13 May 2022 02:14:26 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B30B273F6B for ; Thu, 12 May 2022 23:14:21 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id k2so10018938wrd.5 for ; Thu, 12 May 2022 23:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qzW3JoJQPDC9Hv68vgom4XDNC9N28iHOq+Cur+ByVqQ=; b=zrKpZ6Kx2dSCwdX5Q0oRdTH5rr733qHsdN8O8dGeRJiBpBq1L9iwbLvMvBuRmPLCjt OFvYaYDNoa7t3BYOWzILjyBHlydlPCThP0ESB/exAMKXdymr0pH05hz/joLdFSETmadp SCB6WEH/ZjEepEQGHgix1RdhRH6Flu9/qa0L7HRlIu8slnxvMVI7dgAIS30tGyWvIAnN eZnUc8+eK9BoSVHjGpBilxj6incGshRhhTWfWNSpX7j/m0oS1ACjcydj46c4p33szAIp r8RdvDPWdLmMZdXSvN8nU+TuWL4w47y3Z9Pcd8rr5SLgyH1/W/saY5hD2REuMXFMCk8S xYSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qzW3JoJQPDC9Hv68vgom4XDNC9N28iHOq+Cur+ByVqQ=; b=FDPoCmKcgwdru1yBisFnF0IOjX+b4X5Rfci8sracTACJUsxaFXRLI8cXjOCpDRaV9J sNZp+6E1HY0RDMQOLH+8s6b/qtvf/XfvwJbygWQh4V0OeLjsDa+44XcO/drAvV9OEO4Q 71TsHoVTYvkzCpakMKDXl2ow67D7TCvnRy2i7bk/aSlFEuz6MmHsN2qRwedhph4Qp+qC 1pYC7fxvB+SH8hg4CxtqpiJKk5jTNmA9WMi+Zjl7D9g1VnaOrGl8OtfFUp9+DYg5opeX SF01wVKmFWUQP/LXoqlug+49NfYLbd6xaLGJHs94cR/MgiulNI8o+oKGTFA2SdpzObha norg== X-Gm-Message-State: AOAM533km3auEyJqCwFFdTY0XM/51gSSsoiF0PLO9cz43yLzn7hi838+ x/keQuhMFPnbtlV+6RQv1G6c7g== X-Google-Smtp-Source: ABdhPJxmM0MKGTb9qCGmU9hYDJSgF6LhHt/K3GDRIhTzQ+jQrRpgDVLPrwWVSWhfArX6dSfHStQ+Xw== X-Received: by 2002:a05:6000:718:b0:20c:c39e:867e with SMTP id bs24-20020a056000071800b0020cc39e867emr2450397wrb.599.1652422460530; Thu, 12 May 2022 23:14:20 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id g4-20020adfbc84000000b0020c5253d8f3sm1477760wrh.63.2022.05.12.23.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 23:14:19 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , "Rafael J. Wysocki" , Taniya Das , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Krzysztof Kozlowski , Manivannan Sadhasivam Subject: [PATCH v3 6/7] PM: opp: parse multiple frequencies in each OPP Date: Fri, 13 May 2022 08:13:46 +0200 Message-Id: <20220513061347.46480-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> References: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Devices might need to control several clocks when scaling the frequency and voltage, with each clock having different frequency. Parse the 'opp-hz' Devicetree property as an array and store all frequencies for the custom set_opp in a new field 'rates'. Since the PM OPP framework operates on only one clock (multiple clocks are for custom set_opp helpers), these frequencies are actually not used internally and still the core relies on the original field 'rate'. All other PM OPP functions, like finding floor/ceil PM OPPs, operate still on first rate given in the 'opp-hz' frequency. Signed-off-by: Krzysztof Kozlowski --- Cc: Manivannan Sadhasivam --- drivers/opp/core.c | 20 +++++++++++++++--- drivers/opp/of.c | 47 ++++++++++++++++++++++++++++++++++++++++++ drivers/opp/opp.h | 2 ++ include/linux/pm_opp.h | 3 +++ 4 files changed, 69 insertions(+), 3 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index aac3c6d89ae0..563e962c3411 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1033,7 +1033,9 @@ static int _set_opp_custom(const struct opp_table *op= p_table, data->clks =3D opp_table->clks; data->dev =3D dev; data->old_opp.rate =3D old_opp->rate; + data->old_opp.rates =3D old_opp->rates; data->new_opp.rate =3D freq; + data->new_opp.rates =3D opp->rates; =20 return opp_table->set_opp(data); } @@ -1307,6 +1309,11 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned= long target_freq) __func__, freq, ret); goto put_opp_table; } + /* + * opp->rates are used for scaling clocks, so be sure accurate + * 'freq' is used, instead what was defined via e.g. Devicetree. + */ + opp->rates[0] =3D freq; } =20 ret =3D _set_opp(dev, opp_table, opp, freq); @@ -1761,23 +1768,29 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_remove_all_dynamic); struct dev_pm_opp *_opp_allocate(struct opp_table *table) { struct dev_pm_opp *opp; - int supply_count, supply_size, icc_size; + int rate_count, rate_size, supply_count, supply_size, icc_size; =20 /* Allocate space for at least one supply */ supply_count =3D table->regulator_count > 0 ? table->regulator_count : 1; supply_size =3D sizeof(*opp->supplies) * supply_count; + /* Allocate space for at least one rate */ + rate_count =3D table->clk_count > 0 ? table->clk_count : 1; + rate_size =3D sizeof(*opp->rates) * rate_count; icc_size =3D sizeof(*opp->bandwidth) * table->path_count; =20 /* allocate new OPP node and supplies structures */ - opp =3D kzalloc(sizeof(*opp) + supply_size + icc_size, GFP_KERNEL); + opp =3D kzalloc(sizeof(*opp) + rate_size + supply_size + icc_size, + GFP_KERNEL); =20 if (!opp) return NULL; =20 /* Put the supplies at the end of the OPP structure as an empty array */ opp->supplies =3D (struct dev_pm_opp_supply *)(opp + 1); + opp->rates =3D (unsigned long *)(opp->supplies + supply_count); if (icc_size) - opp->bandwidth =3D (struct dev_pm_opp_icc_bw *)(opp->supplies + supply_c= ount); + opp->bandwidth =3D (struct dev_pm_opp_icc_bw *)(opp->rates + rate_count); + INIT_LIST_HEAD(&opp->node); =20 return opp; @@ -1957,6 +1970,7 @@ int _opp_add_v1(struct opp_table *opp_table, struct d= evice *dev, =20 /* populate the opp table */ new_opp->rate =3D freq; + new_opp->rates[0] =3D freq; tol =3D u_volt * opp_table->voltage_tolerance_v1 / 100; new_opp->supplies[0].u_volt =3D u_volt; new_opp->supplies[0].u_volt_min =3D u_volt - tol; diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 30394929d700..b226d2c7a84b 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -767,6 +767,46 @@ void dev_pm_opp_of_remove_table(struct device *dev) } EXPORT_SYMBOL_GPL(dev_pm_opp_of_remove_table); =20 +static int _read_clocks(struct dev_pm_opp *opp, struct opp_table *opp_tabl= e, + struct device_node *np) +{ + int i, count, ret; + u64 *freq; + + count =3D of_property_count_u64_elems(np, "opp-hz"); + if (count < 0) { + pr_err("%s: Invalid %s property (%d)\n", + __func__, of_node_full_name(np), count); + return count; + } + + if (count !=3D opp_table->clk_count) { + pr_err("%s: number of rates %d does not match number of clocks %d in %pO= F\n", + __func__, count, opp_table->clk_count, np); + return -EINVAL; + } + + freq =3D kmalloc_array(count, sizeof(*freq), GFP_KERNEL); + if (!freq) + return -ENOMEM; + + ret =3D of_property_read_u64_array(np, "opp-hz", freq, count); + if (ret) { + pr_err("%s: error parsing %s: %d\n", __func__, + of_node_full_name(np), ret); + ret =3D -EINVAL; + goto free_freq; + } + + for (i =3D 0; i < count; i++) + opp->rates[i] =3D freq[i]; + +free_freq: + kfree(freq); + + return ret; +} + static int _read_bw(struct dev_pm_opp *new_opp, struct opp_table *table, struct device_node *np, bool peak) { @@ -827,6 +867,13 @@ static int _read_opp_key(struct dev_pm_opp *new_opp, s= truct opp_table *table, } *rate_not_available =3D !!ret; =20 + if (!ret) { + ret =3D _read_clocks(new_opp, table, np); + /* The properties were found but we failed to parse them */ + if (ret && ret !=3D -ENODEV) + return ret; + } + /* * Bandwidth consists of peak and average (optional) values: * opp-peak-kBps =3D ; diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 59aac08baf82..217d4376af9b 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -61,6 +61,7 @@ extern struct list_head opp_tables, lazy_opp_tables; * @rate: Frequency in hertz * @level: Performance level * @supplies: Power supplies voltage/current values + * @rates: Frequency rates for the clocks (equal to @rate for one clock) * @bandwidth: Interconnect bandwidth values * @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's * frequency from any other OPP's frequency. @@ -85,6 +86,7 @@ struct dev_pm_opp { unsigned int level; =20 struct dev_pm_opp_supply *supplies; + unsigned long *rates; struct dev_pm_opp_icc_bw *bandwidth; =20 unsigned long clock_latency_ns; diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 5f17f10fcc3f..5fd3895af605 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -60,12 +60,15 @@ struct dev_pm_opp_icc_bw { /** * struct dev_pm_opp_info - OPP freq/voltage/current values * @rate: Target clk rate in hz + * @rates: Array of clock frequencies for all clocks (equal to @rate for + * one clock) * @supplies: Array of voltage/current values for all power supplies * * This structure stores the freq/voltage/current values for a single OPP. */ struct dev_pm_opp_info { unsigned long rate; + unsigned long *rates; struct dev_pm_opp_supply *supplies; }; =20 --=20 2.32.0 From nobody Wed May 13 22:55:08 2026 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 4ADEAC433EF for ; Fri, 13 May 2022 06:15:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357826AbiEMGPZ (ORCPT ); Fri, 13 May 2022 02:15:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377244AbiEMGO0 (ORCPT ); Fri, 13 May 2022 02:14:26 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B8B6274A06 for ; Thu, 12 May 2022 23:14:22 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id v12so9970525wrv.10 for ; Thu, 12 May 2022 23:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LettUZrmtWFjDsFmqWZJ7ObdkPslBud714e9wIv8Uc0=; b=ojgVydyVFBx//22p/9qTLJ+5/mHNPD0b57JxlQMBS27tzA96I5C+8rffSAXDhL/qDM K1X43Iqaelb3cABYHpCagLQr5ftCuW8hRm8R5oeWWE9gC+VK1b+sF8s9EFid6mHF2H2o Utc2sNOj93Q3wJ8WYOs7p25FMo6JwaMeOrGYGtV4MWZRUJlTj6iDOD9FymtbUNXdxCTr 8Yi01qV7K79yk0SjhM8/Tv41mOhAtoFca4QH6FjSZwF6/C3ZDIJ3GDywcw2SSDCSGwIP yWATiKnudUprZzRdRNQZdoRu6jcUX8TWbwTJsZn3vdhSgt77KFi3qcLS0vfMldfoLIMk LXSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LettUZrmtWFjDsFmqWZJ7ObdkPslBud714e9wIv8Uc0=; b=UIcHwGSoupR2HR62RkpCr8c07kGqoHirhPqrbJQ2uCcSSvpWDD8Qvnym/3Acj2dTRv K0zvo756vmcmnn0PyjpAZW1XDRCL8aTDEqwxXRMbeNhnHEJr5NELE/7cZ63EgdbdASq3 x0YIFTN4QfqLIeJAiW63Wp3NZARmWTnwujOtNdgfZAVHGlSqkU+eDZp6Jsxr2nYOIVJy /dQ3lzCOiGcBQ9DhwwwWFJMgRORDNMN7Oq+37xw4hSYz9dvluUEvEWLHKN+EZcBWuFvF kZoDN9I4TgSMJGuXeC8q+yDNk3rMIqQKRNxv7JrwX0G3tuEH1p0uPWhhj6tH1WpzsIUJ BYBw== X-Gm-Message-State: AOAM5339x40XCpG//hG8y4kdLys6vpBSHmJerOc7IBWVWjtXmIbWtLYC baXwqLs6+YGMf0OB8Kb/mC61vQ== X-Google-Smtp-Source: ABdhPJzf0sBAplYLZwmAE0yuGK5oYabgC7aryMA1kj6/5VC2Q6MKCC2r+gz0of7ZnAwLgIAuOpfj3A== X-Received: by 2002:a05:6000:178d:b0:20c:5bfd:4d7d with SMTP id e13-20020a056000178d00b0020c5bfd4d7dmr2470463wrg.23.1652422462113; Thu, 12 May 2022 23:14:22 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id g4-20020adfbc84000000b0020c5253d8f3sm1477760wrh.63.2022.05.12.23.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 23:14:21 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Viresh Kumar , Nishanth Menon , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , "Rafael J. Wysocki" , Taniya Das , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Krzysztof Kozlowski , Manivannan Sadhasivam Subject: [PATCH v3 7/7] ufs: use PM OPP when scaling gears Date: Fri, 13 May 2022 08:13:47 +0200 Message-Id: <20220513061347.46480-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> References: <20220513061347.46480-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Scaling gears requires not only scaling clocks, but also voltage levels, e.g. via performance states. Use the provided OPP table, to set proper OPP frequency which through required-opps will trigger performance state change. This deprecates the old freq-table-hz Devicetree property and old clock scaling method in favor of PM core code. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Bjorn Andersson --- Cc: Manivannan Sadhasivam --- drivers/scsi/ufs/ufshcd-pltfrm.c | 73 +++++++++++++++ drivers/scsi/ufs/ufshcd.c | 150 ++++++++++++++++++++++++------- drivers/scsi/ufs/ufshcd.h | 6 ++ 3 files changed, 195 insertions(+), 34 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-plt= frm.c index 3ab555f6e66e..a603ca8e383b 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -10,6 +10,7 @@ =20 #include #include +#include #include #include =20 @@ -108,6 +109,72 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) return ret; } =20 +static int ufshcd_parse_operating_points(struct ufs_hba *hba) +{ + struct device *dev =3D hba->dev; + struct device_node *np =3D dev->of_node; + struct ufs_clk_info *clki; + const char *names[16]; + int cnt, i, ret; + + if (!of_find_property(dev->of_node, "operating-points-v2", NULL)) + return 0; + + cnt =3D of_property_count_strings(np, "clock-names"); + if (cnt <=3D 0) { + dev_warn(dev, "%s: Missing clock-names\n", + __func__); + return -EINVAL; + } + + if (cnt > ARRAY_SIZE(names)) { + dev_info(dev, "%s: Too many clock-names\n", __func__); + return -EINVAL; + } + + if (of_find_property(np, "freq-table-hz", NULL)) { + dev_info(dev, "%s: operating-points and freq-table-hz are incompatible\n= ", + __func__); + return -EINVAL; + } + + for (i =3D 0; i < cnt; i++) { + ret =3D of_property_read_string_index(np, "clock-names", i, + &names[i]); + if (ret) + return ret; + + clki =3D devm_kzalloc(dev, sizeof(*clki), GFP_KERNEL); + if (!clki) + return -ENOMEM; + + clki->name =3D devm_kstrdup(dev, names[i], GFP_KERNEL); + if (!clki->name) + return -ENOMEM; + + if (!strcmp(names[i], "ref_clk")) + clki->keep_link_active =3D true; + + list_add_tail(&clki->list, &hba->clk_list_head); + } + + ret =3D devm_pm_opp_set_clknames(dev, names, i); + if (ret) + return ret; + + ret =3D devm_pm_opp_register_set_opp_helper(dev, ufshcd_set_opp); + if (ret) + return ret; + + ret =3D devm_pm_opp_of_add_table(dev); + if (ret) + return ret; + + hba->use_pm_opp =3D true; + + return 0; +} + #define MAX_PROP_SIZE 32 static int ufshcd_populate_vreg(struct device *dev, const char *name, struct ufs_vreg **out_vreg) @@ -363,6 +430,12 @@ int ufshcd_pltfrm_init(struct platform_device *pdev, goto dealloc_host; } =20 + err =3D ufshcd_parse_operating_points(hba); + if (err) { + dev_err(dev, "%s: OPP parse failed %d\n", __func__, err); + goto dealloc_host; + } + ufshcd_init_lanes_per_dir(hba); =20 err =3D ufshcd_init(hba, mmio_base, irq); diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index ea43aa2d26e1..9f07c4fd0087 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -259,7 +260,8 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba= *hba); static void ufshcd_resume_clkscaling(struct ufs_hba *hba); static void ufshcd_suspend_clkscaling(struct ufs_hba *hba); static void __ufshcd_suspend_clkscaling(struct ufs_hba *hba); -static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up); +static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up, + unsigned long freq); static irqreturn_t ufshcd_intr(int irq, void *__hba); static int ufshcd_change_power_mode(struct ufs_hba *hba, struct ufs_pa_layer_attr *pwr_mode); @@ -962,7 +964,7 @@ static bool ufshcd_is_unipro_pa_params_tuning_req(struc= t ufs_hba *hba) } =20 /** - * ufshcd_set_clk_freq - set UFS controller clock frequencies + * ufshcd_set_clk_freq - set UFS controller clock frequencies (directly) * @hba: per adapter instance * @scale_up: If True, set max possible frequency othewise set low frequen= cy * @@ -1024,15 +1026,48 @@ static int ufshcd_set_clk_freq(struct ufs_hba *hba,= bool scale_up) return ret; } =20 +/** + * ufshcd_set_opp - scale UFS controller clocks, called via PM OPP + * @data: PM OPP data + * + * Returns 0 for success, non-zero error value for errors. + */ +int ufshcd_set_opp(struct dev_pm_set_opp_data *data) +{ + struct ufs_hba *hba =3D dev_get_drvdata(data->dev); + int i, ret; + + if (!data->clk_count) + return 0; + + for (i =3D 0; i < data->clk_count; i++) { + if (!data->new_opp.rates[i]) + continue; + + ret =3D clk_set_rate(data->clks[i].clk, data->new_opp.rates[i]); + if (ret) { + dev_err(hba->dev, "%s: %pC clk set rate(%luHz) failed, %d\n", + __func__, data->clks[i].clk, + data->new_opp.rates[i], ret); + break; + } + } + + return ret; +} +EXPORT_SYMBOL_GPL(ufshcd_set_opp); + /** * ufshcd_scale_clks - scale up or scale down UFS controller clocks * @hba: per adapter instance * @scale_up: True if scaling up and false if scaling down + * @freq: Target frequency * * Returns 0 if successful * Returns < 0 for any other errors */ -static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up) +static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up, + unsigned long freq) { int ret =3D 0; ktime_t start =3D ktime_get(); @@ -1041,13 +1076,21 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, b= ool scale_up) if (ret) goto out; =20 - ret =3D ufshcd_set_clk_freq(hba, scale_up); + if (hba->use_pm_opp) + ret =3D dev_pm_opp_set_rate(hba->dev, freq); + else + ret =3D ufshcd_set_clk_freq(hba, scale_up); if (ret) goto out; =20 ret =3D ufshcd_vops_clk_scale_notify(hba, scale_up, POST_CHANGE); - if (ret) - ufshcd_set_clk_freq(hba, !scale_up); + if (ret) { + if (hba->use_pm_opp) + dev_pm_opp_set_rate(hba->dev, + hba->devfreq->previous_freq); + else + ufshcd_set_clk_freq(hba, !scale_up); + } =20 out: trace_ufshcd_profile_clk_scaling(dev_name(hba->dev), @@ -1059,11 +1102,13 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, b= ool scale_up) /** * ufshcd_is_devfreq_scaling_required - check if scaling is required or not * @hba: per adapter instance + * @freq: Target frequency * @scale_up: True if scaling up and false if scaling down * * Returns true if scaling is required, false otherwise. */ static bool ufshcd_is_devfreq_scaling_required(struct ufs_hba *hba, + unsigned long freq, bool scale_up) { struct ufs_clk_info *clki; @@ -1072,6 +1117,9 @@ static bool ufshcd_is_devfreq_scaling_required(struct= ufs_hba *hba, if (list_empty(head)) return false; =20 + if (hba->use_pm_opp) + return freq !=3D hba->clk_scaling.target_freq; + list_for_each_entry(clki, head, list) { if (!IS_ERR_OR_NULL(clki->clk)) { if (scale_up && clki->max_freq) { @@ -1251,13 +1299,15 @@ static void ufshcd_clock_scaling_unprepare(struct u= fs_hba *hba, bool writelock) /** * ufshcd_devfreq_scale - scale up/down UFS clocks and gear * @hba: per adapter instance + * @freq: Target frequency * @scale_up: True for scaling up and false for scalin down * * Returns 0 for success, * Returns -EBUSY if scaling can't happen at this time * Returns non-zero for any other errors */ -static int ufshcd_devfreq_scale(struct ufs_hba *hba, bool scale_up) +static int ufshcd_devfreq_scale(struct ufs_hba *hba, unsigned long freq, + bool scale_up) { int ret =3D 0; bool is_writelock =3D true; @@ -1273,7 +1323,7 @@ static int ufshcd_devfreq_scale(struct ufs_hba *hba, = bool scale_up) goto out_unprepare; } =20 - ret =3D ufshcd_scale_clks(hba, scale_up); + ret =3D ufshcd_scale_clks(hba, scale_up, freq); if (ret) { if (!scale_up) ufshcd_scale_gear(hba, true); @@ -1284,7 +1334,8 @@ static int ufshcd_devfreq_scale(struct ufs_hba *hba, = bool scale_up) if (scale_up) { ret =3D ufshcd_scale_gear(hba, true); if (ret) { - ufshcd_scale_clks(hba, false); + ufshcd_scale_clks(hba, false, + hba->devfreq->previous_freq); goto out_unprepare; } } @@ -1347,9 +1398,20 @@ static int ufshcd_devfreq_target(struct device *dev, if (!ufshcd_is_clkscaling_supported(hba)) return -EINVAL; =20 - clki =3D list_first_entry(&hba->clk_list_head, struct ufs_clk_info, list); /* Override with the closest supported frequency */ - *freq =3D (unsigned long) clk_round_rate(clki->clk, *freq); + if (hba->use_pm_opp) { + struct dev_pm_opp *opp; + + opp =3D devfreq_recommended_opp(dev, freq, flags); + if (IS_ERR(opp)) + return PTR_ERR(opp); + dev_pm_opp_put(opp); + } else { + clki =3D list_first_entry(&hba->clk_list_head, struct ufs_clk_info, + list); + *freq =3D (unsigned long) clk_round_rate(clki->clk, *freq); + } + spin_lock_irqsave(hba->host->host_lock, irq_flags); if (ufshcd_eh_in_progress(hba)) { spin_unlock_irqrestore(hba->host->host_lock, irq_flags); @@ -1365,11 +1427,11 @@ static int ufshcd_devfreq_target(struct device *dev, } =20 /* Decide based on the rounded-off frequency and update */ - scale_up =3D *freq =3D=3D clki->max_freq; - if (!scale_up) + scale_up =3D (*freq > hba->clk_scaling.target_freq); + if (!hba->use_pm_opp && !scale_up) *freq =3D clki->min_freq; /* Update the frequency */ - if (!ufshcd_is_devfreq_scaling_required(hba, scale_up)) { + if (!ufshcd_is_devfreq_scaling_required(hba, *freq, scale_up)) { spin_unlock_irqrestore(hba->host->host_lock, irq_flags); ret =3D 0; goto out; /* no state change required */ @@ -1377,7 +1439,9 @@ static int ufshcd_devfreq_target(struct device *dev, spin_unlock_irqrestore(hba->host->host_lock, irq_flags); =20 start =3D ktime_get(); - ret =3D ufshcd_devfreq_scale(hba, scale_up); + ret =3D ufshcd_devfreq_scale(hba, *freq, scale_up); + if (!ret) + hba->clk_scaling.target_freq =3D *freq; =20 trace_ufshcd_profile_clk_scaling(dev_name(hba->dev), (scale_up ? "up" : "down"), @@ -1397,8 +1461,6 @@ static int ufshcd_devfreq_get_dev_status(struct devic= e *dev, struct ufs_hba *hba =3D dev_get_drvdata(dev); struct ufs_clk_scaling *scaling =3D &hba->clk_scaling; unsigned long flags; - struct list_head *clk_list =3D &hba->clk_list_head; - struct ufs_clk_info *clki; ktime_t curr_t; =20 if (!ufshcd_is_clkscaling_supported(hba)) @@ -1411,13 +1473,20 @@ static int ufshcd_devfreq_get_dev_status(struct dev= ice *dev, if (!scaling->window_start_t) goto start_window; =20 - clki =3D list_first_entry(clk_list, struct ufs_clk_info, list); - /* - * If current frequency is 0, then the ondemand governor considers - * there's no initial frequency set. And it always requests to set - * to max. frequency. - */ - stat->current_frequency =3D clki->curr_freq; + if (hba->use_pm_opp) { + stat->current_frequency =3D hba->clk_scaling.target_freq; + } else { + struct list_head *clk_list =3D &hba->clk_list_head; + struct ufs_clk_info *clki; + + clki =3D list_first_entry(clk_list, struct ufs_clk_info, list); + /* + * If current frequency is 0, then the ondemand governor considers + * there's no initial frequency set. And it always requests to set + * to max. frequency. + */ + stat->current_frequency =3D clki->curr_freq; + } if (scaling->is_busy_started) scaling->tot_busy_t +=3D ktime_us_delta(curr_t, scaling->busy_start_t); @@ -1450,9 +1519,11 @@ static int ufshcd_devfreq_init(struct ufs_hba *hba) if (list_empty(clk_list)) return 0; =20 - clki =3D list_first_entry(clk_list, struct ufs_clk_info, list); - dev_pm_opp_add(hba->dev, clki->min_freq, 0); - dev_pm_opp_add(hba->dev, clki->max_freq, 0); + if (!hba->use_pm_opp) { + clki =3D list_first_entry(clk_list, struct ufs_clk_info, list); + dev_pm_opp_add(hba->dev, clki->min_freq, 0); + dev_pm_opp_add(hba->dev, clki->max_freq, 0); + } =20 ufshcd_vops_config_scaling_param(hba, &hba->vps->devfreq_profile, &hba->vps->ondemand_data); @@ -1464,8 +1535,10 @@ static int ufshcd_devfreq_init(struct ufs_hba *hba) ret =3D PTR_ERR(devfreq); dev_err(hba->dev, "Unable to register with devfreq %d\n", ret); =20 - dev_pm_opp_remove(hba->dev, clki->min_freq); - dev_pm_opp_remove(hba->dev, clki->max_freq); + if (!hba->use_pm_opp) { + dev_pm_opp_remove(hba->dev, clki->min_freq); + dev_pm_opp_remove(hba->dev, clki->max_freq); + } return ret; } =20 @@ -1477,7 +1550,6 @@ static int ufshcd_devfreq_init(struct ufs_hba *hba) static void ufshcd_devfreq_remove(struct ufs_hba *hba) { struct list_head *clk_list =3D &hba->clk_list_head; - struct ufs_clk_info *clki; =20 if (!hba->devfreq) return; @@ -1485,9 +1557,13 @@ static void ufshcd_devfreq_remove(struct ufs_hba *hb= a) devfreq_remove_device(hba->devfreq); hba->devfreq =3D NULL; =20 - clki =3D list_first_entry(clk_list, struct ufs_clk_info, list); - dev_pm_opp_remove(hba->dev, clki->min_freq); - dev_pm_opp_remove(hba->dev, clki->max_freq); + if (!hba->use_pm_opp) { + struct ufs_clk_info *clki; + + clki =3D list_first_entry(clk_list, struct ufs_clk_info, list); + dev_pm_opp_remove(hba->dev, clki->min_freq); + dev_pm_opp_remove(hba->dev, clki->max_freq); + } } =20 static void __ufshcd_suspend_clkscaling(struct ufs_hba *hba) @@ -1571,8 +1647,14 @@ static ssize_t ufshcd_clkscale_enable_store(struct d= evice *dev, if (value) { ufshcd_resume_clkscaling(hba); } else { + struct dev_pm_opp *opp; + unsigned long freq =3D ULONG_MAX; + + opp =3D dev_pm_opp_find_freq_floor(dev, &freq); + dev_pm_opp_put(opp); + ufshcd_suspend_clkscaling(hba); - err =3D ufshcd_devfreq_scale(hba, true); + err =3D ufshcd_devfreq_scale(hba, freq, true); if (err) dev_err(hba->dev, "%s: failed to scale clocks up %d\n", __func__, err); diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 0b8d0192f069..6962d36e6c65 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -400,6 +400,7 @@ struct ufs_saved_pwr_info { * @is_initialized: Indicates whether clock scaling is initialized or not * @is_busy_started: tracks if busy period has started or not * @is_suspended: tracks if devfreq is suspended or not + * @target_freq: frequency requested by devfreq framework */ struct ufs_clk_scaling { int active_reqs; @@ -417,6 +418,7 @@ struct ufs_clk_scaling { bool is_initialized; bool is_busy_started; bool is_suspended; + unsigned long target_freq; }; =20 #define UFS_EVENT_HIST_LENGTH 8 @@ -771,6 +773,8 @@ struct ufs_hba_monitor { * @auto_bkops_enabled: to track whether bkops is enabled in device * @vreg_info: UFS device voltage regulator information * @clk_list_head: UFS host controller clocks list node head + * @use_pm_opp: whether OPP table is provided and scaling gears should tri= gger + * setting OPP * @req_abort_count: number of times ufshcd_abort() has been called * @lanes_per_direction: number of lanes per data direction between the UFS * controller and the UFS device. @@ -906,6 +910,7 @@ struct ufs_hba { bool auto_bkops_enabled; struct ufs_vreg_info vreg_info; struct list_head clk_list_head; + bool use_pm_opp; =20 /* Number of requests aborts */ int req_abort_count; @@ -1037,6 +1042,7 @@ void ufshcd_remove(struct ufs_hba *); int ufshcd_uic_hibern8_enter(struct ufs_hba *hba); int ufshcd_uic_hibern8_exit(struct ufs_hba *hba); void ufshcd_delay_us(unsigned long us, unsigned long tolerance); +int ufshcd_set_opp(struct dev_pm_set_opp_data *data); void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba, struct clk *refclk= ); void ufshcd_update_evt_hist(struct ufs_hba *hba, u32 id, u32 val); void ufshcd_hba_stop(struct ufs_hba *hba); --=20 2.32.0