From patchwork Wed Sep 12 19:45:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Ramirez Luna X-Patchwork-Id: 1446231 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 59AFADF238 for ; Wed, 12 Sep 2012 19:47:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752715Ab2ILTrs (ORCPT ); Wed, 12 Sep 2012 15:47:48 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:39351 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752418Ab2ILTqN (ORCPT ); Wed, 12 Sep 2012 15:46:13 -0400 Received: by mail-ob0-f174.google.com with SMTP id uo13so3246390obb.19 for ; Wed, 12 Sep 2012 12:46:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=7iyEBJ2CMcLpfHxdg3Oe2qGqiwnjQo66eYL5gWmWgr0=; b=GmKHaBBe35/lCw9slyStwLSep4hIsdIY1KUWPWLk/Cabql/hAt7XlRi2Rgog8tJZTD vJs3YClO5MdGV0vvFsi1m3Jo/TIW5GiWyAZ/tx4zevu57+isVAc7gf5KLffYWfYP7jQt ENEvpaFtrwCy9JmYRfugJ2x3TM5cT2iRtg2UrpG7YvDPUNii/kwVdG9OTnHdwpbwsDMZ 9XGoqHs9oVmRXDme8zNJrH3T+OMlOIQ4pmescwUNwD7KKNlZNzfqloYRO4yr7tBGr0rH A95VU82sX7UZaY30V8pXVrUZ5bWEqOjZdvjpeDZF+2t5TduayH8D9yviShTAke6iZOIu b7qw== Received: by 10.60.171.69 with SMTP id as5mr24455751oec.100.1347479172974; Wed, 12 Sep 2012 12:46:12 -0700 (PDT) Received: from uda0273944.am.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id a6sm17041227oeh.1.2012.09.12.12.46.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 12:46:12 -0700 (PDT) From: Omar Ramirez Luna To: Tony Lindgren , Benoit Cousson , Ohad Ben-Cohen , Joerg Roedel Cc: Russell King , Omar Ramirez Luna , Rajendra Nayak , Peter Ujfalusi , Laurent Pinchart , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: [PATCH v2 6/9] ARM: OMAP: iommu: pm runtime save and restore context Date: Wed, 12 Sep 2012 14:45:49 -0500 Message-Id: <1347479152-588-7-git-send-email-omar.luna@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347479152-588-1-git-send-email-omar.luna@linaro.org> References: <1347479152-588-1-git-send-email-omar.luna@linaro.org> X-Gm-Message-State: ALoCoQkbb86FNEEWylr0wX624lO/yO0Epe+QQAA0M+SgnrZzDSLPar2ANvw77VqWkB4ZzDmOrx0c Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Save and restore context during pm runtime transitions. For now, the previous API for this purpose will trigger pm runtime functions, and will be left as exported symbol for compatibility with it's only user. Signed-off-by: Omar Ramirez Luna --- drivers/iommu/omap-iommu.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index 20ae946..c4de9a9 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -97,7 +97,7 @@ void omap_iommu_save_ctx(struct device *dev) { struct omap_iommu *obj = dev_to_omap_iommu(dev); - arch_iommu->save_ctx(obj); + pm_runtime_put_sync(obj->dev); } EXPORT_SYMBOL_GPL(omap_iommu_save_ctx); @@ -109,7 +109,7 @@ void omap_iommu_restore_ctx(struct device *dev) { struct omap_iommu *obj = dev_to_omap_iommu(dev); - arch_iommu->restore_ctx(obj); + pm_runtime_get_sync(obj->dev); } EXPORT_SYMBOL_GPL(omap_iommu_restore_ctx); @@ -1001,11 +1001,36 @@ static int __devexit omap_iommu_remove(struct platform_device *pdev) return 0; } +static int omap_iommu_runtime_suspend(struct device *dev) +{ + struct omap_iommu *obj = to_iommu(dev); + + arch_iommu->save_ctx(obj); + + return 0; +} + +static int omap_iommu_runtime_resume(struct device *dev) +{ + struct omap_iommu *obj = to_iommu(dev); + + arch_iommu->restore_ctx(obj); + + return 0; +} + +static const struct dev_pm_ops iommu_pm_ops = { + SET_RUNTIME_PM_OPS(omap_iommu_runtime_suspend, + omap_iommu_runtime_resume, + NULL) +}; + static struct platform_driver omap_iommu_driver = { .probe = omap_iommu_probe, .remove = __devexit_p(omap_iommu_remove), .driver = { .name = "omap-iommu", + .pm = &iommu_pm_ops, }, };