From patchwork Thu Mar 22 10:22:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 10301165 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3699160385 for ; Thu, 22 Mar 2018 10:23:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28C12287DB for ; Thu, 22 Mar 2018 10:23:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C833287CF; Thu, 22 Mar 2018 10:23:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5D28287CF for ; Thu, 22 Mar 2018 10:23:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753735AbeCVKXR (ORCPT ); Thu, 22 Mar 2018 06:23:17 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:51770 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753546AbeCVKWd (ORCPT ); Thu, 22 Mar 2018 06:22:33 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id CC78E60F6E; Thu, 22 Mar 2018 10:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521714152; bh=XRvDppR5SUyIWivz7C/ZMLoNfo4T2evqZdwnPCWqk8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZ6UK26GT43nKP32fbJQgeQzEJU70rhTuOYEgSkMrjj8uKGf/V/RAWpjTFp+A5hgW iC028c9oD/3ny+6DUfOReqAJxiQm6NcNMMIL7V8zJZMT3XeqIY2fSgU3aSXpA8lA5O WE8Wcn9Pw3FSe7kLnWDbOUE4bGsV+xm+xwLRZZD8= 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 68F8160C66; Thu, 22 Mar 2018 10:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521714152; bh=XRvDppR5SUyIWivz7C/ZMLoNfo4T2evqZdwnPCWqk8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZ6UK26GT43nKP32fbJQgeQzEJU70rhTuOYEgSkMrjj8uKGf/V/RAWpjTFp+A5hgW iC028c9oD/3ny+6DUfOReqAJxiQm6NcNMMIL7V8zJZMT3XeqIY2fSgU3aSXpA8lA5O WE8Wcn9Pw3FSe7kLnWDbOUE4bGsV+xm+xwLRZZD8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 68F8160C66 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, robin.murphy@arm.com, will.deacon@arm.com, iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: rjw@rjwysocki.net, robdclark@gmail.com, sboyd@codeaurora.org, sricharan@codeaurora.org, m.szyprowski@samsung.com, architt@codeaurora.org, lukas@wunner.de, tfiga@chromium.org, linux-arm-msm@vger.kernel.org, vivek.gautam@codeaurora.org Subject: [PATCH v11 3/4] iommu/arm-smmu: Add the device_link between masters and smmu Date: Thu, 22 Mar 2018 15:52:03 +0530 Message-Id: <20180322102204.14760-4-vivek.gautam@codeaurora.org> X-Mailer: git-send-email 2.16.1.72.g5be1f00a9a70 In-Reply-To: <20180322102204.14760-1-vivek.gautam@codeaurora.org> References: <20180322102204.14760-1-vivek.gautam@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sricharan R Finally add the device link between the master device and smmu, so that the smmu gets runtime enabled/disabled only when the master needs it. This is done from add_device callback which gets called once when the master is added to the smmu. Signed-off-by: Sricharan R Signed-off-by: Vivek Gautam Reviewed-by: Tomasz Figa --- drivers/iommu/arm-smmu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 3383c6657857..da50fd979d5f 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1461,8 +1461,20 @@ static int arm_smmu_add_device(struct device *dev) iommu_device_link(&smmu->iommu, dev); + if (pm_runtime_enabled(smmu->dev) && + !device_link_add(dev, smmu->dev, + DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE)) { + dev_err(smmu->dev, "Unable to add link to the consumer %s\n", + dev_name(dev)); + ret = -ENODEV; + goto out_unlink; + } + return 0; +out_unlink: + iommu_device_unlink(&smmu->iommu, dev); + arm_smmu_master_free_smes(fwspec); out_cfg_free: kfree(cfg); out_free: