From patchwork Mon May 13 10:20:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 164010 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1133840ili; Mon, 13 May 2019 03:20:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqxoaawo/djS+z+HieHYNCB+244qs1JnwG6lYIuNlFKUjvXChHIEi4hnMxfHypq+9K8J7nUx X-Received: by 2002:a63:2745:: with SMTP id n66mr29319878pgn.208.1557742856520; Mon, 13 May 2019 03:20:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557742856; cv=none; d=google.com; s=arc-20160816; b=zy0/3Fwbi2fRZlfi6+9BAjs3J88ltFBmajSO2aM7uyqcbl73IqWexpYOqlD0AQY952 9VvFHPNMwK66BO8AP4qYrg3yHFdZTl3ze3hbybQRXD/KhEjVVA5xoJMb456zTBGofIH4 /ytT8ZiHYgt48dQ7iIRkXPJoF3+tymvEcBWshkWuAmrXS1+RhQiphO3RcEKMfHaWPYNp JblRW6cB8jeRb6Wc3XLukDUQMfU9vFGEiO+zx8ZaZuMOWVYSbeeS7Pwk1bLRubMJCRH4 aRyXIh2+tewzuZ2ixGIhSr/Og/rgondi0VDlUvVc/up+6gpFPNoMKEqh5W/3H6nNUW8d Y6Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=eBsdrwG+TSdPxrs6YGM5keFGn95UdRIhyad/iSLrunk=; b=JHLUlt8YIvXc3EwgXXtgZU88yhne3qbaJm5XRC8wCmiiNpuM2xK70VbYm/9CMMnnvC 4P3xVQdC5RD45uz+nkNL95sZrAA7ptGupIl4Iz29Sggevl4V0sa2Ha5n/e7bAYSf1C02 jmKLD1Yd7p37gjJJ/2YmI487xYRHrLbXLzteGnsy5uoI6GYyUskGFKXBl05g8XmARncF 10qj2ns2T2zVI9G0Chq7ivyBQnMIYh+tiqP3CGVqXiCTFShHUaL5O5uJbaVMBPqN+FfU 4U+cFKX/lNgojeb5JMiN5q5S52w7Imevcyh3cEzezZOlcbZdvPGJEPjrCXPgjvNgc95m Djaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=YxKtefOB; dkim=pass header.i=@codeaurora.org header.s=default header.b=BNgGssgF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y9si1967107pgj.57.2019.05.13.03.20.56; Mon, 13 May 2019 03:20:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=YxKtefOB; dkim=pass header.i=@codeaurora.org header.s=default header.b=BNgGssgF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728994AbfEMKUz (ORCPT + 30 others); Mon, 13 May 2019 06:20:55 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56786 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727590AbfEMKUx (ORCPT ); Mon, 13 May 2019 06:20:53 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 61B7061157; Mon, 13 May 2019 10:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557742852; bh=tx4lpJiLY6uEc/yWnowsmX4GLmrZr+OIrz370A8ASUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YxKtefOBGA6kXjwXzpBADDvLLGBuQPpNvUpqrkVK52/AiE3kiLWcSRbPgELZFRAWK ayfaaLL/xc9plrNGcoOCuR3hVkZuq/+BlcsETWb6fpe64aMAtjavdeJ+uwXVa74OzI DvN3dhHClQ7HzxelYiFbMfvpwrh4I31et7FRZ6Eg= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID, DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-87.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 2CEE860FE9; Mon, 13 May 2019 10:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557742851; bh=tx4lpJiLY6uEc/yWnowsmX4GLmrZr+OIrz370A8ASUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BNgGssgFWVc/BaKNK48lFGC4JXMJmNmd1G6Ms1fcvnGs44PnbKKijIDXqVJ/bPLfX FPFHYpyW7gii50BEp6Rh44O1fC6jLgGKh2kMpPEWZQK+iOOmHOv00J1ATkE6dueAAy 0j7pr/ADfbR5PcyWLHD7a639R/58U4oiAn2hFvaM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2CEE860FE9 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: bjorn.andersson@linaro.org, robh+dt@kernel.org, agross@kernel.org Cc: david.brown@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, rnayak@codeaurora.org, marc.w.gonzalez@free.fr, Sibi Sankar Subject: [PATCH v4 5/9] soc: qcom: rpmpd: Add QCS404 power-domains Date: Mon, 13 May 2019 15:50:11 +0530 Message-Id: <20190513102015.26551-6-sibis@codeaurora.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190513102015.26551-1-sibis@codeaurora.org> References: <20190513102015.26551-1-sibis@codeaurora.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson Add the shared cx/mx and the low-power-island's cx and mx power-domains found on QCS404. Signed-off-by: Bjorn Andersson [sibi: Fixup corner/vfc with vlfl/vfl] Signed-off-by: Sibi Sankar --- drivers/soc/qcom/rpmpd.c | 52 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index bac4499c269d..63db8b26642c 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -20,11 +20,16 @@ * RPMPD_X is X encoded as a little-endian, lower-case, ASCII string */ #define RPMPD_SMPA 0x61706d73 #define RPMPD_LDOA 0x616f646c +#define RPMPD_RWMX 0x786d7772 +#define RPMPD_RWLC 0x636c7772 +#define RPMPD_RWLM 0x6d6c7772 /* Operation Keys */ #define KEY_CORNER 0x6e726f63 /* corn */ #define KEY_ENABLE 0x6e657773 /* swen */ #define KEY_FLOOR_CORNER 0x636676 /* vfc */ +#define KEY_FLOOR_LEVEL 0x6c6676 /* vfl */ +#define KEY_LEVEL 0x6c766c76 /* vlvl */ #define MAX_8996_RPMPD_STATE 6 @@ -55,6 +60,14 @@ .key = KEY_CORNER, \ } +#define DEFINE_RPMPD_LEVEL(_platform, _name, r_type, r_id) \ + static struct rpmpd _platform##_##_name = { \ + .pd = { .name = #_name, }, \ + .res_type = RPMPD_##r_type, \ + .res_id = r_id, \ + .key = KEY_LEVEL, \ + } + #define DEFINE_RPMPD_VFC(_platform, _name, r_type, r_id) \ static struct rpmpd _platform##_##_name = { \ .pd = { .name = #_name, }, \ @@ -63,6 +76,14 @@ .key = KEY_FLOOR_CORNER, \ } +#define DEFINE_RPMPD_VFL(_platform, _name, r_type, r_id) \ + static struct rpmpd _platform##_##_name = { \ + .pd = { .name = #_name, }, \ + .res_type = RPMPD_##r_type, \ + .res_id = r_id, \ + .key = KEY_FLOOR_LEVEL, \ + } + struct rpmpd_req { __le32 key; __le32 nbytes; @@ -115,8 +136,35 @@ static const struct rpmpd_desc msm8996_desc = { .max_state = MAX_8996_RPMPD_STATE, }; +/* qcs404 RPM Power domains */ +DEFINE_RPMPD_PAIR(qcs404, vddmx, vddmx_ao, RWMX, LEVEL, 0); +DEFINE_RPMPD_VFL(qcs404, vddmx_vfl, RWMX, 0); + +DEFINE_RPMPD_LEVEL(qcs404, vdd_lpicx, RWLC, 0); +DEFINE_RPMPD_VFL(qcs404, vdd_lpicx_vfl, RWLC, 0); + +DEFINE_RPMPD_LEVEL(qcs404, vdd_lpimx, RWLM, 0); +DEFINE_RPMPD_VFL(qcs404, vdd_lpimx_vfl, RWLM, 0); + +static struct rpmpd *qcs404_rpmpds[] = { + [QCS404_VDDMX] = &qcs404_vddmx, + [QCS404_VDDMX_AO] = &qcs404_vddmx_ao, + [QCS404_VDDMX_VFL] = &qcs404_vddmx_vfl, + [QCS404_LPICX] = &qcs404_vdd_lpicx, + [QCS404_LPICX_VFL] = &qcs404_vdd_lpicx_vfl, + [QCS404_LPIMX] = &qcs404_vdd_lpimx, + [QCS404_LPIMX_VFL] = &qcs404_vdd_lpimx_vfl, +}; + +static const struct rpmpd_desc qcs404_desc = { + .rpmpds = qcs404_rpmpds, + .num_pds = ARRAY_SIZE(qcs404_rpmpds), + .max_state = RPM_SMD_LEVEL_BINNING, +}; + static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,msm8996-rpmpd", .data = &msm8996_desc }, + { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc }, { } }; @@ -231,7 +279,9 @@ static int rpmpd_set_performance(struct generic_pm_domain *domain, pd->corner = state; - if (!pd->enabled && pd->key != KEY_FLOOR_CORNER) + /* Always send updates for vfc and vfl */ + if (!pd->enabled && pd->key != KEY_FLOOR_CORNER && + pd->key != KEY_FLOOR_LEVEL) goto out; ret = rpmpd_aggregate_corner(pd); From patchwork Mon May 13 10:20:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 164011 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1133899ili; Mon, 13 May 2019 03:21:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwPSOltv1vGHogsBfiNcG1w2xXTdizXROisqquEXUZKt+pIp+azEOKg+0OLv7acndxDiDdh X-Received: by 2002:a63:234c:: with SMTP id u12mr30911866pgm.264.1557742860272; Mon, 13 May 2019 03:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557742860; cv=none; d=google.com; s=arc-20160816; b=QyH/Bjj00lK7vg1gJbVdSRKoowNnshQ/jUFh257RidFP7bh6Sq4hDpz/nM1mRIYVkq h3kv7kMWd4XVgBI6i+4Tfa31SrYhCvMEbbXPfOu3SRwbGxCE/YmEkmwhg7sLQ+Fa4gCt ovcvom62zXRDArdj/mvBLJT+4N/tWSD/0OXLPL+qv/Vox1gBCnHUfTjmJkf/dpjaVI5t I2pEEJjNADiV52pDXHoAVTr+u4rDqBBPyIPHv8RnKx9MhvUneQ7zD4VLA89o6G1YCKf0 97PgpVdXFok1VsSIj0HjRDvFZ0zDNKeXZ0fV4r8aue/sw/a76YRqh11u09fKmKRfwRMa nxhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=GzcOSgckoDCb0RDM9TVfZGU5Q/hBsySs0yI/Tp5x8GM=; b=HtrGcXQct00ovdNYvxso5LpzV6+mBxJ5o3SoaG2PriK1o0yox9JaypqSnjF4q7POvN tgcUR0bytaj7pQL1gbTUCBRk7JwCk/EIoh9paOa08Z+/xj1VmnspF2Vw1Vep+UhLVOT5 41NCqxVI0p3eE8dlfz4vq7sMU9dOpYAI2sXrlNXNSi4Yh738WVatEcgnQQ7B6MgBjd4I 2V3znriavXCLYHbeJaszT8MfXI+7EgrMQeapxxJ6TwJ85QVOIjnedudedNOEEXngv9h7 pQK5gJQKcs0Tgfejznf6oXlDucds/Q9MnfxrMnzdmQOZwj4eTi/lQb/EE5+a0WrqnAUA 4Bpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=XQjfCPD5; dkim=pass header.i=@codeaurora.org header.s=default header.b=Rp0gszvN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p7si17939797pfb.213.2019.05.13.03.20.59; Mon, 13 May 2019 03:21:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=XQjfCPD5; dkim=pass header.i=@codeaurora.org header.s=default header.b=Rp0gszvN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729010AbfEMKU7 (ORCPT + 30 others); Mon, 13 May 2019 06:20:59 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56938 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728995AbfEMKU4 (ORCPT ); Mon, 13 May 2019 06:20:56 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id AEDF76115D; Mon, 13 May 2019 10:20:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557742855; bh=UXI5aOJAovwTCn4b4Ku7WbQH/PEWiqh8TRq5o7PQsDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XQjfCPD5YpoVHkSfRyKxS0pLgNGjxP3BZGIyN2Gm3TsMIWOr9ZQoMIQKdqLYWoXUf VOcgMSVbMRxpae6GDi1951BuTtrZV0/Rm+4jtsYgoieamhT5LQNBnNhEaXa6RfsvbG d3jbPYf+ldNXXg+uUN4EKsvLydTVUF29/DpUJzwk= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID, DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-87.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A8B2E6115D; Mon, 13 May 2019 10:20:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557742854; bh=UXI5aOJAovwTCn4b4Ku7WbQH/PEWiqh8TRq5o7PQsDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rp0gszvNgmg+4CIBDXNkYoxwbOAvBbvpEN1Ylp3j68uDw8qMeyhcQiVKSM8oScgrB zVJcPjzPL8tRX37n9rA6VeVInWSFV7dnE41rnwSTOo1O78zZh+o91hKlk+Pz0macht vYbF+keG19Omz6XYYaKVaypMhwjt4yx1Q7Qd/Ts0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A8B2E6115D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: bjorn.andersson@linaro.org, robh+dt@kernel.org, agross@kernel.org Cc: david.brown@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, rnayak@codeaurora.org, marc.w.gonzalez@free.fr, Sibi Sankar Subject: [PATCH v4 6/9] arm64: dts: qcom: qcs404: Add rpmpd node Date: Mon, 13 May 2019 15:50:12 +0530 Message-Id: <20190513102015.26551-7-sibis@codeaurora.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190513102015.26551-1-sibis@codeaurora.org> References: <20190513102015.26551-1-sibis@codeaurora.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson Add the rpmpd node on the qcs404 and define the available levels. Signed-off-by: Bjorn Andersson [sibis: fixup available levels] Signed-off-by: Sibi Sankar --- arch/arm64/boot/dts/qcom/qcs404.dtsi | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index ffedf9640af7..d1484480c237 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -4,6 +4,7 @@ #include #include #include +#include / { interrupt-parent = <&intc>; @@ -230,6 +231,60 @@ compatible = "qcom,rpmcc-qcs404"; #clock-cells = <1>; }; + + rpmpd: power-controller { + compatible = "qcom,qcs404-rpmpd"; + #power-domain-cells = <1>; + operating-points-v2 = <&rpmpd_opp_table>; + + rpmpd_opp_table: opp-table { + compatible = "operating-points-v2"; + + rpmpd_opp_ret: opp1 { + opp-level = ; + }; + + rpmpd_opp_ret_plus: opp2 { + opp-level = ; + }; + + rpmpd_opp_min_svs: opp3 { + opp-level = ; + }; + + rpmpd_opp_low_svs: opp4 { + opp-level = ; + }; + + rpmpd_opp_svs: opp5 { + opp-level = ; + }; + + rpmpd_opp_svs_plus: opp6 { + opp-level = ; + }; + + rpmpd_opp_nom: opp7 { + opp-level = ; + }; + + rpmpd_opp_nom_plus: opp8 { + opp-level = ; + }; + + rpmpd_opp_turbo: opp9 { + opp-level = ; + }; + + rpmpd_opp_turbo_no_cpr: opp10 { + opp-level = ; + }; + + rpmpd_opp_turbo_plus: opp11 { + opp-level = ; + }; + }; + }; }; };