From patchwork Wed Mar 27 12:38:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 161256 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp6428974jan; Wed, 27 Mar 2019 05:39:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwsB/kvwATNFZRLHCkfRcgDm8K4oOW1D1tF8vi6fsQiiReMorW/24s8GTsN/KTwbs3gonWy X-Received: by 2002:a63:195f:: with SMTP id 31mr23559104pgz.116.1553690357666; Wed, 27 Mar 2019 05:39:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553690357; cv=none; d=google.com; s=arc-20160816; b=G//EKaN/pfcNOfXz85YfQeNlxEaEg41O2y73HRqBMW3+UGOKpme27xKzrhNPYXanpQ E2e1ks79bfa2ifpyobzVBfRabhsPXqpxjJrONGI6qunR1VsFmHth5UmCAyCar3jRIt0i GuPEZk5xR6FkTluEvMlKfcH2dcUB+vzoE5CcvVFfbnDBVElfU5di/UFbRXn1Ww4B9z58 wbHMmGLmF6UVA56MQf+L45tTo8yxajwbBmenjkFD4W4idKKY6EeU96FG45b5NsRyyWCE CIrECK3ESD4kl39VnIrnfZp3IvisnqhL7dyDawhq1taZxZSDZsWI3slF73ELosjzr6D0 SB8w== 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=5qmvZqgtgFCm+E60IYDulX78UobhHhs7WgEUg1M5oz8=; b=CvTr7x+QIJHO8I512FIsGnIUqqQ6hwgN2zjhO9lzJJ3kx415WDhheAiNdEetSQ/zip 8xCoRbN2MYjJuKneepAjQC/z8TFdWTGPYIOldzPzQZWOdJihmNXWJmKMQPToRnjtOpm4 0KOCYbGFpPhniNSuCqonVl5daBknS+ULvh8ECrZIosSuU00lY2qPy1z0ZskUQAv9BDch eGe80lZQkXAeA1PpJjM3EWRVb7ErH5N/0ba4KdXCSDp0et3QPOrZ0zhNVbkdO+KIMRxD Vs8LWPpr08YkrQ3pSIHg7PnOvgw3uGZT0DaYDXMh7VK9rzT0xxQAr8mrWeyYvQ+VAW2I KNuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b="j++U/tue"; dkim=pass header.i=@codeaurora.org header.s=default header.b=drihDVGX; 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 z184si12604785pgd.588.2019.03.27.05.39.17; Wed, 27 Mar 2019 05:39:17 -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="j++U/tue"; dkim=pass header.i=@codeaurora.org header.s=default header.b=drihDVGX; 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 S1730008AbfC0MjQ (ORCPT + 31 others); Wed, 27 Mar 2019 08:39:16 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56390 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726233AbfC0MjP (ORCPT ); Wed, 27 Mar 2019 08:39:15 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B128360E73; Wed, 27 Mar 2019 12:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553690354; bh=AS5I22ecQVFwq+LdlTN7wgWkEr1j5jJHQNKCvyxp5j8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j++U/tueIVRuIcZIQ/+Xj5lRElTIbjqR7ENRD+1R33AynBfyM07gV/ej3Syjk1YQT J5jZM55pmsRtm7CyPaCIWgKlEa2nDbILRTm+zPHktIl0/hX/tUF1aSw+IW6oIHL7Bw f8rfRSJXJe5cA1FbNL0WNBaCpI0vNmkJLLB8lWaA= 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 AC43F60E5C; Wed, 27 Mar 2019 12:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553690351; bh=AS5I22ecQVFwq+LdlTN7wgWkEr1j5jJHQNKCvyxp5j8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=drihDVGXpNvEVxjYVEac0aBpL+fh3oCNcDRq9+Mcj/3lzmMl2eG7D+sxBuChIpv2b /EPLtv0xFnX5XjkLgHHNOttJci+55BDpVu5Ybsr6wh0viGIAWqQvUGHwJqp2SvBLeM 1LxnCVbPKdXpImV2fKkhp9UtU0hE7DdZtV98m8DE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AC43F60E5C 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, andy.gross@linaro.org, rnayak@codeaurora.org Cc: david.brown@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org, devicetree@vger.kernel.org, Sibi Sankar Subject: [PATCH v3 5/9] soc: qcom: rpmpd: Add QCS404 power-domains Date: Wed, 27 Mar 2019 18:08:28 +0530 Message-Id: <20190327123832.11566-6-sibis@codeaurora.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190327123832.11566-1-sibis@codeaurora.org> References: <20190327123832.11566-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 ca736ceb969c..238a9e02e890 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -19,11 +19,16 @@ /* Resource types */ #define RPMPD_SMPA 0x61706d73 /* smpa */ #define RPMPD_LDOA 0x616f646c /* ldoa */ +#define RPMPD_RWMX 0x786d7772 /* rwmx */ +#define RPMPD_RWLC 0x636c7772 /* rwlc */ +#define RPMPD_RWLM 0x6d6c7772 /* rwlm */ /* 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 @@ -54,6 +59,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, }, \ @@ -62,6 +75,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; @@ -114,8 +135,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 }, { } }; @@ -230,7 +278,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);