Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp37209imm; Thu, 30 Aug 2018 07:48:12 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbd58oiBsoec7FF7tKTrjjYV2Ig4Kn1MPKSsfod0/lJfxaCbJV2JvfwBy/MX0/Hpm4q22/z X-Received: by 2002:a17:902:b115:: with SMTP id q21-v6mr10673888plr.333.1535640492798; Thu, 30 Aug 2018 07:48:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535640492; cv=none; d=google.com; s=arc-20160816; b=01gLhNdNDIWyqUZiBlNqVA6EqhZjHgu8DLQm37rElO0iCiA1CUOQWoxZo1JS1eH6o/ yRYM9aB36j1YilwwS05kI/N3DrM3mKP9bLiixZRVxTFhz7K8qeHCTTGiGEwU0bRaT7PS TugICMHo08FYCZk/HDc4cR808MI02DClVBBUBG5b9mF5E5maFA19dn5LVjzGFtEJfB7x B7+nsaFxAzgEmnvBhFG0lPsqJD/5WAntOOFODfq2B80QaF3tMzL+XidlfU2sf/BpVknz TifyqkfBxuANGK+SUrSwe/jp1VYh2MP9DE5/968EdYHhM+SPq1/Xc0HpCI7hFDny0how l9JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=KMHB/clV8l1Yx0kAp4cahX19RT5Y7FP4VNcQR2WtKQo=; b=vr540zHJZNRU4up8HFvAmzDP+OIeF/jJI37c6/sR/McQZpAYLdvTJ/vakCAGIxaZ7e g8Luu3WbaRlUkvsY1G5s+DT+rN8WFl1lZzdmLvsNuLWzdMabsPDBhl2xgzy1PeT8kTJZ 05rvnTHoq9/cPx5lNzXboyNW2Jgf0DxfVN4QW95zXC5sZ5mFb+7PsSqb/Jx9pybUpMsJ rMuGohwIHUJWJHADpul++rEh/3Pix2AvKRD0HbXlpzhrBXEqp7PAFOc29KFAVjV2CIbV 9kX1QwMOPhRKFXZB6Z5sBIW2CVlY82fFcHi+lJYc11W83RfZpZe2uRjITYu5ssz8gD3w 0rIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b="f+bZNq/Z"; dkim=pass header.i=@codeaurora.org header.s=default header.b=Zfp1a9Bs; 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 bc3-v6si6131886plb.214.2018.08.30.07.47.57; Thu, 30 Aug 2018 07:48:12 -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="f+bZNq/Z"; dkim=pass header.i=@codeaurora.org header.s=default header.b=Zfp1a9Bs; 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 S1729699AbeH3Sso (ORCPT + 99 others); Thu, 30 Aug 2018 14:48:44 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56620 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729167AbeH3Sso (ORCPT ); Thu, 30 Aug 2018 14:48:44 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 88DD56079C; Thu, 30 Aug 2018 14:46:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1535640373; bh=DjTJNK7N7FSWwsFguQJE/+ci0yWeT8qwGbu98bor/+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f+bZNq/ZMS2BuADEE1IOatSUP0v7bIsjwnAkoQIJZASwI3RBBoVRcXv0J046Mczop +tSCyTb6uPcTuTv2gECFYyx1ZQGT/qq+r2ljU5ZqIJ52fuhANaN3BWNYIbvI1kZv80 iePQZKranU+NU8DryYtMG70ndIGPDhr7uQB93rf4= 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.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-41.ap.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: vivek.gautam@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6427060709; Thu, 30 Aug 2018 14:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1535640370; bh=DjTJNK7N7FSWwsFguQJE/+ci0yWeT8qwGbu98bor/+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zfp1a9BsKVJ9Bof6MLudbGcUkRjKe5FaNAhEt6yT9/NXw/bbNfF007pII9HOBpNMI xYPQ/0ZMPOGSPxYze5/uxm2vIsxa/pO1DLPZ09V6zI8Q9AW5yPyxYFiu+7OTEj+0NP 3giZzIna2P38EPtksaB1YnQA0NCdAE/tG7coiMuI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6427060709 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=vivek.gautam@codeaurora.org From: Vivek Gautam To: joro@8bytes.org, robh+dt@kernel.org, robin.murphy@arm.com, will.deacon@arm.com, iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alex.williamson@redhat.com, mark.rutland@arm.com, rjw@rjwysocki.net, robdclark@gmail.com, linux-pm@vger.kernel.org, freedreno@lists.freedesktop.org, sboyd@kernel.org, tfiga@chromium.org, jcrouse@codeaurora.org, sricharan@codeaurora.org, m.szyprowski@samsung.com, architt@codeaurora.org, linux-arm-msm@vger.kernel.org, Vivek Gautam Subject: [PATCH v16 1/5] iommu/arm-smmu: Add pm_runtime/sleep ops Date: Thu, 30 Aug 2018 20:15:37 +0530 Message-Id: <20180830144541.17740-2-vivek.gautam@codeaurora.org> X-Mailer: git-send-email 2.16.1.72.g5be1f00a9a70 In-Reply-To: <20180830144541.17740-1-vivek.gautam@codeaurora.org> References: <20180830144541.17740-1-vivek.gautam@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sricharan R The smmu needs to be functional only when the respective master's using it are active. The device_link feature helps to track such functional dependencies, so that the iommu gets powered when the master device enables itself using pm_runtime. So by adapting the smmu driver for runtime pm, above said dependency can be addressed. This patch adds the pm runtime/sleep callbacks to the driver and also the functions to parse the smmu clocks from DT and enable them in resume/suspend. Also, while we enable the runtime pm add a pm sleep suspend callback that pushes devices to low power state by turning the clocks off in a system sleep. Also add corresponding clock enable path in resume callback. Signed-off-by: Sricharan R Signed-off-by: Archit Taneja [vivek: rework for clock and pm ops] Signed-off-by: Vivek Gautam Reviewed-by: Tomasz Figa Tested-by: Srinivas Kandagatla --- drivers/iommu/arm-smmu.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index fd1b80ef9490..d900e007c3c9 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -205,6 +206,8 @@ struct arm_smmu_device { u32 num_global_irqs; u32 num_context_irqs; unsigned int *irqs; + struct clk_bulk_data *clks; + int num_clks; u32 cavium_id_base; /* Specific to Cavium */ @@ -1896,10 +1899,12 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) struct arm_smmu_match_data { enum arm_smmu_arch_version version; enum arm_smmu_implementation model; + const char * const *clks; + int num_clks; }; #define ARM_SMMU_MATCH_DATA(name, ver, imp) \ -static struct arm_smmu_match_data name = { .version = ver, .model = imp } +static const struct arm_smmu_match_data name = { .version = ver, .model = imp } ARM_SMMU_MATCH_DATA(smmu_generic_v1, ARM_SMMU_V1, GENERIC_SMMU); ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU); @@ -1918,6 +1923,23 @@ static const struct of_device_id arm_smmu_of_match[] = { }; MODULE_DEVICE_TABLE(of, arm_smmu_of_match); +static void arm_smmu_fill_clk_data(struct arm_smmu_device *smmu, + const char * const *clks) +{ + int i; + + if (smmu->num_clks < 1) + return; + + smmu->clks = devm_kcalloc(smmu->dev, smmu->num_clks, + sizeof(*smmu->clks), GFP_KERNEL); + if (!smmu->clks) + return; + + for (i = 0; i < smmu->num_clks; i++) + smmu->clks[i].id = clks[i]; +} + #ifdef CONFIG_ACPI static int acpi_smmu_get_data(u32 model, struct arm_smmu_device *smmu) { @@ -2000,6 +2022,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev, data = of_device_get_match_data(dev); smmu->version = data->version; smmu->model = data->model; + smmu->num_clks = data->num_clks; + + arm_smmu_fill_clk_data(smmu, data->clks); parse_driver_options(smmu); @@ -2098,6 +2123,14 @@ static int arm_smmu_device_probe(struct platform_device *pdev) smmu->irqs[i] = irq; } + err = devm_clk_bulk_get(smmu->dev, smmu->num_clks, smmu->clks); + if (err) + return err; + + err = clk_bulk_prepare_enable(smmu->num_clks, smmu->clks); + if (err) + return err; + err = arm_smmu_device_cfg_probe(smmu); if (err) return err; @@ -2184,6 +2217,9 @@ static int arm_smmu_device_remove(struct platform_device *pdev) /* Turn the thing off */ writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0); + + clk_bulk_disable_unprepare(smmu->num_clks, smmu->clks); + return 0; } @@ -2192,15 +2228,50 @@ static void arm_smmu_device_shutdown(struct platform_device *pdev) arm_smmu_device_remove(pdev); } -static int __maybe_unused arm_smmu_pm_resume(struct device *dev) +static int __maybe_unused arm_smmu_runtime_resume(struct device *dev) { struct arm_smmu_device *smmu = dev_get_drvdata(dev); + int ret; + + ret = clk_bulk_enable(smmu->num_clks, smmu->clks); + if (ret) + return ret; arm_smmu_device_reset(smmu); + return 0; } -static SIMPLE_DEV_PM_OPS(arm_smmu_pm_ops, NULL, arm_smmu_pm_resume); +static int __maybe_unused arm_smmu_runtime_suspend(struct device *dev) +{ + struct arm_smmu_device *smmu = dev_get_drvdata(dev); + + clk_bulk_disable(smmu->num_clks, smmu->clks); + + return 0; +} + +static int __maybe_unused arm_smmu_pm_resume(struct device *dev) +{ + if (pm_runtime_suspended(dev)) + return 0; + + return arm_smmu_runtime_resume(dev); +} + +static int __maybe_unused arm_smmu_pm_suspend(struct device *dev) +{ + if (pm_runtime_suspended(dev)) + return 0; + + return arm_smmu_runtime_suspend(dev); +} + +static const struct dev_pm_ops arm_smmu_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(arm_smmu_pm_suspend, arm_smmu_pm_resume) + SET_RUNTIME_PM_OPS(arm_smmu_runtime_suspend, + arm_smmu_runtime_resume, NULL) +}; static struct platform_driver arm_smmu_driver = { .driver = { -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation