Received: by 10.223.185.116 with SMTP id b49csp8469977wrg; Fri, 2 Mar 2018 02:18:07 -0800 (PST) X-Google-Smtp-Source: AG47ELu9Z+6yXjcjGfG2znsE7hGCyK36+BwWB5VMCYt5QiVacIqaoHCtwMRrcfmtVJUk9g126oSI X-Received: by 2002:a17:902:20e5:: with SMTP id v34-v6mr4736306plg.66.1519985887579; Fri, 02 Mar 2018 02:18:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519985887; cv=none; d=google.com; s=arc-20160816; b=pCOVBqruPAPsyslTuDi5x0DrTUywkfQgUBhJfKWtY4Eq77dynReH74Tmz4RXdMxfN4 44P/i+1BdaCkVvWR8a5oGz0i3QkxDB2ulC7RkpGKLhyIHdhMRlXv05VKY+qP4yU9Fut3 96Yheq8KfXhcuTzEKhHXRU6n/cHeuxwCtTJxn8+hfFAnzRVJHmhZPA/e4PVQtO3FtPbM RlLKt/bGvmrOgRLxhEcFuTymdsJoQ2uoVIpK6oc2gb8GsE1b4RlnWHPHGGWRhMjAUlAh uVdcN+26QS2uWwjvu7TQqrOYjRZV4bRramcXz+5zOUySFmsfvSmlzjR8OfJct7ZFi/4p 0SHg== 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=iMB0ayKdgIJloZQH2mk7gYSTr/o+WvS6zOoOb+i4cs4=; b=jvtZEsmvtrjrwWDqVD+UO10LkcoUZ3lc/fWiYl/1sqZFB52gObsnMN2J8lUc76tO+C WWFth0ODQdRu5VAOP8M+m3Gv1M1kBRXG8ILPFt10UMlOc+xnAjlJ6y0BI7Aovgul890A Ji6lCd2U5neSy3qaJZTbT2HkSsMuwNWUoXgFfx6VcUzDM+PyHyLz7xqWw1ks1JyLF5yv QNzNOSi4MpEQtKp61v9O2w3MBevwcD0+gjFn8pHxvzJQtEzCsOMnWhgnDUTVW4e0AhuG WlEvcU1/Jmov+2bn4YS37skE699TPg1tiJnZuUAzN9MWuEtl60h/CKbD9sV00Bjed3vl UkFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=IYMiOEVv; dkim=pass header.i=@codeaurora.org header.s=default header.b=dc/j986H; 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 i13si3790192pgq.508.2018.03.02.02.17.53; Fri, 02 Mar 2018 02:18:07 -0800 (PST) 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=IYMiOEVv; dkim=pass header.i=@codeaurora.org header.s=default header.b=dc/j986H; 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 S1426266AbeCBKPK (ORCPT + 99 others); Fri, 2 Mar 2018 05:15:10 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:46658 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426160AbeCBKLO (ORCPT ); Fri, 2 Mar 2018 05:11:14 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9520A607A2; Fri, 2 Mar 2018 10:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519985473; bh=B5GPKk9G9aFt8z0N+U7rNg/EpXct1GmqXY8jFjTKABM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IYMiOEVv+aB1K91jlUB99LSkWRVj3EAdGW50Xem11tniL/+Fda50/rs+gvIjEKoJI zEPwOGARe7v92+jXHej1ErZV3T6QqZ34X1V+xrTs51iwdZmiGjpu17zCLvn3LvcE5Z 4hCewUdOicNLpxqkIP4+i9L+hT589lEWxYLXsLTM= 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 268AA6074C; Fri, 2 Mar 2018 10:11:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519985472; bh=B5GPKk9G9aFt8z0N+U7rNg/EpXct1GmqXY8jFjTKABM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dc/j986HxDzqfr49x/Enic00Nox0IlbuVafd97NS+pLV9e/LEpum5fJpB08msdF0E R2wo0MNJPNlZSkzwga7HPPjfZt74iTMB1kIz2BKXtO9WZcXT/qhTuO0tXY9ARK/zr9 Uz6HjJkxDsekIXowYa6dIcTDRASukbdnTaf7Fq/E= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 268AA6074C 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, mark.rutland@arm.com, rjw@rjwysocki.net, robin.murphy@arm.com, will.deacon@arm.com, robdclark@gmail.com, iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tfiga@chromium.org, jcrouse@codeaurora.org, sboyd@codeaurora.org, sricharan@codeaurora.org, m.szyprowski@samsung.com, architt@codeaurora.org, linux-arm-msm@vger.kernel.org, vivek.gautam@codeaurora.org Subject: [PATCH v8 2/5] iommu/arm-smmu: Add pm_runtime/sleep ops Date: Fri, 2 Mar 2018 15:40:47 +0530 Message-Id: <20180302101050.6191-3-vivek.gautam@codeaurora.org> X-Mailer: git-send-email 2.16.1.72.g5be1f00a9a70 In-Reply-To: <20180302101050.6191-1-vivek.gautam@codeaurora.org> References: <20180302101050.6191-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 --- 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 ffc152c36002..c8b16f53f597 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 */ @@ -1902,10 +1905,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); @@ -1924,6 +1929,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) { @@ -2006,6 +2028,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); @@ -2104,6 +2129,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; @@ -2186,6 +2219,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; } @@ -2202,7 +2238,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