Received: by 10.213.65.68 with SMTP id h4csp220861imn; Tue, 13 Mar 2018 01:58:40 -0700 (PDT) X-Google-Smtp-Source: AG47ELtw6kgINvXN/VJITUFu54j7jcqEbotHlmyFUkIWxhXDcgGdDFeyCjy+k18MeSqK1RChHd7p X-Received: by 10.101.101.204 with SMTP id y12mr1153668pgv.142.1520931520793; Tue, 13 Mar 2018 01:58:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520931520; cv=none; d=google.com; s=arc-20160816; b=BlV8UNgbDR6jw97bzUNIbFjvjYmuMt+HWBhMDuC8ww8gCgk98iAYC5te7ez0m5zfJP 1ugOcxN9IkK3ABotQrDsAVM7j5jhRhexBHySAhSoR+/+ffUknAfVWgIxWuasMz1PgFMO jom33UUIADEEqgGRtAhlXZTEYurlM4wQl4QqX/B/iz4Vbi0a6CQO5iGgewNXw2Cf4/ew 7XMSh/UJk9FBsDx3yHlEW3oSgr3d6TOORCA2umJDVIKXRn1FJCjORKgQcnrNxmYp/fVr jG4U34CHG87vVB3OwjTQ9788p5k7y/71Y9A0GbyukcTffl721d4HSC+cWqwSnEUV0Uyf VemQ== 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=vPwLKZhwDkzhm49iRJytw0mj8Ye8z5pHicvotP5dG9w=; b=EhTylxinBF2GUa5biDdGPdQrQ0gxuCe1ghSScYtdasPvV/smpSh4jel5bhDDqbLchx 46wWoL1nLrcEO6C0kNcWiPHWWItAGeLT4aNsfLl0JESdFtWeJqAAfBC6BirIUdQuGbFt mhIg+Hahh8IrEckNFS/Fya08rhOTsPgg76jsAGMeZgzivUbhoZjrEDGk2f74FDaG/gIE HIxlEFpqVAAl6V7wQWx/kkV8XIWupLren//R2Mtn9BY06ZS0gqJrvvI1YhBB0G1tvH2x evM/i0cvbSD8+spvROx9jaPSGYFcWiwb6K2podpAxvK9urlJ3MP5slbZvfJzA186d49k cX7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=JcILJVpk; dkim=pass header.i=@codeaurora.org header.s=default header.b=a0ryf3fv; 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 v5-v6si4429241ply.427.2018.03.13.01.58.26; Tue, 13 Mar 2018 01:58:40 -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=JcILJVpk; dkim=pass header.i=@codeaurora.org header.s=default header.b=a0ryf3fv; 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 S1752597AbeCMI4Q (ORCPT + 99 others); Tue, 13 Mar 2018 04:56:16 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37338 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752573AbeCMI4M (ORCPT ); Tue, 13 Mar 2018 04:56:12 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 068AD60854; Tue, 13 Mar 2018 08:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520931372; bh=fmwnZeytWrJTNqp+pEqnMNVvmMccXHKJp/C9jP6a1Dw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JcILJVpkH3+XsMI/v0mAvh2O3PNGF601g3jOCcsyQiBkdX0BYeblcpdKjjvK9nG0W S5iaJvkC+YpA1j9uSvCu2hRUaBdRq6sUX5UY/VnWaDdMQrIyww+bU08WXVUxXHjocI WgcyDM9+IqcvEG1aYLGbJNVLMwWdjDglPQwuisaQ= 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.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: vivek.gautam@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 0ECBE60851; Tue, 13 Mar 2018 08:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1520931371; bh=fmwnZeytWrJTNqp+pEqnMNVvmMccXHKJp/C9jP6a1Dw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a0ryf3fviUriasb4MRnt6NzwcnNfjNSR2ux+CCJCXmm+BlGvcs9o9rC1IINiwuaAI O5JQ4Cfuf6sHtXwjqVGO4PDVXWmXHBjexFgTgi/HmfMmXLBx2gBDj6opsXMngr0GWH Pnqgn5khQs9SpnoGIDY/odBgXSpmKIqIpZbTPkMs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 0ECBE60851 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, iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: mark.rutland@arm.com, will.deacon@arm.com, robdclark@gmail.com, tfiga@chromium.org, sricharan@codeaurora.org, m.szyprowski@samsung.com, architt@codeaurora.org, linux-arm-msm@vger.kernel.org, vivek.gautam@codeaurora.org Subject: [PATCH v9 2/5] iommu/arm-smmu: Add pm_runtime/sleep ops Date: Tue, 13 Mar 2018 14:25:31 +0530 Message-Id: <20180313085534.11650-3-vivek.gautam@codeaurora.org> X-Mailer: git-send-email 2.16.1.72.g5be1f00a9a70 In-Reply-To: <20180313085534.11650-1-vivek.gautam@codeaurora.org> References: <20180313085534.11650-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. Signed-off-by: Sricharan R Signed-off-by: Archit Taneja [vivek: Clock rework to request bulk of clocks] Signed-off-by: Vivek Gautam Reviewed-by: Tomasz Figa --- drivers/iommu/arm-smmu.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 69e7c60792a8..d5873d545024 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 */ @@ -1897,10 +1900,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); @@ -1919,6 +1924,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) { @@ -2001,6 +2023,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); @@ -2099,6 +2124,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(smmu->num_clks, smmu->clks); + if (err) + return err; + err = arm_smmu_device_cfg_probe(smmu); if (err) return err; @@ -2181,6 +2214,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_unprepare(smmu->num_clks, smmu->clks); + return 0; } @@ -2197,7 +2233,27 @@ static int __maybe_unused arm_smmu_pm_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(arm_smmu_pm_ops, NULL, arm_smmu_pm_resume); +static int __maybe_unused arm_smmu_runtime_resume(struct device *dev) +{ + struct arm_smmu_device *smmu = dev_get_drvdata(dev); + + return clk_bulk_enable(smmu->num_clks, smmu->clks); +} + +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 const struct dev_pm_ops arm_smmu_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(NULL, 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