From patchwork Thu Jul 6 09:37:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 9827913 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 3EECD602BD for ; Thu, 6 Jul 2017 09:54:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E4AC28590 for ; Thu, 6 Jul 2017 09:54:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 220F7285D3; Thu, 6 Jul 2017 09:54:47 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A2D1628590 for ; Thu, 6 Jul 2017 09:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=69VVAW0hT/HVxAL6BeZn64ynzBCCLWt/bjXWg1GKb1s=; b=iOuS0KcF/T6OGQn37X18pYUk76 9sARJvAijzXdRYZ1AqkAyYIRxhjJQeDuVRHYEMEjg7SiMKzY7tGTqBewofntqohCi51YUUH2jqDxL 8gikjeD0H9YD868ZIqMLjvEx3SMmwhCrHVivUemPQ2gKTgpuUK5topRFXKLrW9j/iNfYVcFfMNSQP z7zL0G5Z94A/YzNJVjcscPpsaXdTzvGSDLLpRb+/mADxgm6MZJ2XT3EOqFyOxjFaaMoJte0e0TjXO RcQgn/yA0blYCfJ60sCyPg9JJjs/msuHzjOqb2I6IZrGshxefy1p6thR56kSMB5fBe45RqGn1iDEx S/ce4CNg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dT3Uh-0007KM-2f; Thu, 06 Jul 2017 09:54:43 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dT3Uf-0007IL-CX for linux-arm-kernel@bombadil.infradead.org; Thu, 06 Jul 2017 09:54:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5iuY04WY/hOLA6E2QRX5tM3R7KO2ibPn5TJloxoYNx8=; b=uGDHb1R9sAKOM7p98zYys8Xt/ NqNA+EQckzPlU3M77GmI5mLCuf2NLpGCA9+HkH3iiykAfln8ToXuPei+S/L/v2OErCilSYOs9WJvb P3D46Ojm4tBTXc7yiyTCOjvXKS9HNHMWptDPOOLOcyfgGaTUKGyOUF2r5s/fj5DsZ+JAFV8m5hjTo jPAZ6DRb63sbuJFAtfPhYDmQUTIv6xXw/aJyp9sqkDxMKVSB7dp3KF0h3TB7PaRTvIVicW6NESkuo wzpphhjtx9Qclwqc89v/MRvjTsYS5lSRnclyEorz/1PQ+m8xIwnL3SVWGc+flMqtT+wICMfwZAzvq 3bHpFAVKg==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dT3F2-0002tM-3h for linux-arm-kernel@lists.infradead.org; Thu, 06 Jul 2017 09:38:39 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1735B60861; Thu, 6 Jul 2017 09:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499333890; bh=zwmERIm0F3l6510MWJIUy8swaQzKUc8ahCV2BnleqzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XgA3/OxvVRxqfzM74JnjsU8yTHOw+0RDGS3UADQVPL/Jyvb0ywxphA8hqR9wINzj7 pJCPxaYTtuBKkwdYHAs1FpTDin9nK5PTpt9+PnJ27zAyknbznqGBDAvBzVhaDDDy/X hUJd000u6Ou1cfoOfe83L43/7ttB3YhaL2Tmwpo8= 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 5CC0A60AD7; Thu, 6 Jul 2017 09:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499333871; bh=zwmERIm0F3l6510MWJIUy8swaQzKUc8ahCV2BnleqzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DgktjKjnxo8vWAbkeNXcl+MBLtAYgStHOm7xxO2IzMdKz1pAuj4ztfCtBY8NSXEDX xIITLok544XNFShN5D+QbzZwx3ycsKGsVkRb6Kx7XQKMhmlPaBrM+2skSLawpKk3t0 385RGXq6txuP39phHYuleXo0lLvyORr4l672/m5w= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5CC0A60AD7 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, robin.murphy@arm.com, robh+dt@kernel.org, mark.rutland@arm.com, will.deacon@arm.com, m.szyprowski@samsung.com, sboyd@codeaurora.org, robdclark@gmail.com, iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH V4 6/6] iommu/arm-smmu: Add support for qcom, msm8996-smmu-v2 clocks Date: Thu, 6 Jul 2017 15:07:05 +0530 Message-Id: <1499333825-7658-7-git-send-email-vivek.gautam@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1499333825-7658-1-git-send-email-vivek.gautam@codeaurora.org> References: <1499333825-7658-1-git-send-email-vivek.gautam@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170706_103832_424907_D4B2BF25 X-CRM114-Status: GOOD ( 18.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: architt@codeaurora.org, linux-arm-msm@vger.kernel.org, stanimir.varbanov@linaro.org, vivek.gautam@codeaurora.org, sricharan@codeaurora.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP qcom,msm8996-smmu-v2 is an arm,smmu-v2 implementation with specific clock and power requirements. This smmu core is used with multiple masters on msm8996, viz. mdss, video, etc. Add bindings for the same. Signed-off-by: Vivek Gautam --- Documentation/devicetree/bindings/iommu/arm,smmu.txt | 18 ++++++++++++++++++ drivers/iommu/arm-smmu.c | 13 +++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 00331752d355..5d8e79775fae 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -17,6 +17,7 @@ conditions. "arm,mmu-401" "arm,mmu-500" "cavium,smmu-v2" + "qcom,msm8996-smmu-v2" depending on the particular implementation and/or the version of the architecture implemented. @@ -74,11 +75,16 @@ conditions. - clock-names: Should be "tcu" and "iface" for "arm,mmu-400", "arm,mmu-401" and "arm,mmu-500" + Should be "bus", and "iface" for "qcom,msm8996-smmu-v2" + implementation. + "tcu" clock is required for smmu's register access using the programming interface and ptw for downstream bus access. This clock is also used for access to the TBU connected to the master locally. Sometimes however, TBU is clocked along with the master. + "bus" clock for "qcom,msm8996-smmu-v2" is requierd for downstream + bus access and for the smmu ptw. "iface" clock is required to access the TCU's programming interface, apart from the "tcu" clock. @@ -161,3 +167,15 @@ conditions. iommu-map = <0 &smmu3 0 0x400>; ... }; + + /* Qcom's arm,smmu-v2 implementation for msm8996 */ + smmu4: iommu { + compatible = "qcom,msm8996-smmu-v2"; + ... + #iommu-cells = <1>; + power-domains = <&mmcc MDSS_GDSC>; + + clocks = <&mmcc SMMU_MDP_AXI_CLK>, + <&mmcc SMMU_MDP_AHB_CLK>; + clock-names = "bus", "iface"; + }; diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 7bb09280fa11..fe8e7fd61282 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -110,6 +110,7 @@ enum arm_smmu_implementation { GENERIC_SMMU, ARM_MMU500, CAVIUM_SMMUV2, + QCOM_MSM8996_SMMUV2, }; /* Until ACPICA headers cover IORT rev. C */ @@ -1960,6 +1961,17 @@ struct arm_smmu_match_data { .num_clks = ARRAY_SIZE(arm_mmu500_clks), }; +static const char * const qcom_msm8996_smmuv2_clks[] = { + "bus", "iface", +}; + +static const struct arm_smmu_match_data qcom_msm8996_smmuv2 = { + .version = ARM_SMMU_V2, + .model = QCOM_MSM8996_SMMUV2, + .clks = qcom_msm8996_smmuv2_clks, + .num_clks = ARRAY_SIZE(qcom_msm8996_smmuv2_clks), +}; + static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,smmu-v1", .data = &smmu_generic_v1 }, { .compatible = "arm,smmu-v2", .data = &smmu_generic_v2 }, @@ -1967,6 +1979,7 @@ struct arm_smmu_match_data { { .compatible = "arm,mmu-401", .data = &arm_mmu401 }, { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, + { .compatible = "qcom,msm8996-smmu-v2", .data = &qcom_msm8996_smmuv2 }, { }, }; MODULE_DEVICE_TABLE(of, arm_smmu_of_match);