From patchwork Mon Feb 8 05:17:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 8246771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C1E939F1C1 for ; Mon, 8 Feb 2016 05:19:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5A8E201C8 for ; Mon, 8 Feb 2016 05:19:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 03B592017E for ; Mon, 8 Feb 2016 05:19:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aSeDh-0002xO-Gv; Mon, 08 Feb 2016 05:18:41 +0000 Received: from 5520-maca-inet1-outside.broadcom.com ([216.31.211.11] helo=mail-irv-18.broadcom.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aSeDG-0002fh-Nc for linux-arm-kernel@lists.infradead.org; Mon, 08 Feb 2016 05:18:16 +0000 Received: from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com [10.11.16.103]) by mail-irv-18.broadcom.com (Postfix) with ESMTP id 4296382032; Sun, 7 Feb 2016 21:17:59 -0800 (PST) Received: from anup-HP-Compaq-8100-Elite-CMT-PC.ban.broadcom.com (unknown [10.131.91.107]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id EB93840FE5; Sun, 7 Feb 2016 21:17:50 -0800 (PST) From: Anup Patel To: Catalin Marinas , Joerg Roedel , Will Deacon , Robin Murphy , Sricharan R , Linux IOMMU , Linux ARM Kernel Subject: [PATCH v2 4/4] iommu/arm-smmu: Add stub of_xlate() operation in SMMUv1/SMMUv2 driver Date: Mon, 8 Feb 2016 10:47:32 +0530 Message-Id: <1454908652-15317-5-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454908652-15317-1-git-send-email-anup.patel@broadcom.com> References: <1454908652-15317-1-git-send-email-anup.patel@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160207_211814_895577_1FE74004 X-CRM114-Status: GOOD ( 11.74 ) X-Spam-Score: -2.2 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Device Tree , Scott Branden , Pawel Moll , Ian Campbell , Ray Jui , Linux Kernel , Vikram Prakash , Rob Herring , BCM Kernel Feedback , Kumar Gala , Anup Patel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To allow use of large memory (> 4Gb) with 32bit devices we need to use IOMMU based DMA mappings for such 32bit devices. The IOMMU dt-bindings allows us do this by specifying 'iommus' attribute in 32bit device DT node. Unfortunately, specifying 'iommus' attribute does not work with current SMMUv1/SMMUv2 driver because it requires of_xlate() operation to be implemented by the driver. This patch adds a stub implementation of of_xlate() in SMMUv1/SMMUv2 driver to allow usage of 'iommus' attribute in DT for 32bit devices. Signed-off-by: Anup Patel Reviewed-by: Ray Jui Reviewed-by: Scott Branden --- drivers/iommu/arm-smmu.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 02cd67d..8e090d8 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1398,6 +1398,16 @@ static int arm_smmu_init_platform_device(struct device *dev, return 0; } +int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) +{ + /* + * Nothing to do here because SMMU is already aware of all + * MMU masters and their stream IDs using mmu-master attibute + * SMMU DT node. + */ + return 0; +} + static int arm_smmu_add_device(struct device *dev) { struct iommu_group *group; @@ -1495,6 +1505,7 @@ static struct iommu_ops arm_smmu_ops = { .unmap = arm_smmu_unmap, .map_sg = default_iommu_map_sg, .iova_to_phys = arm_smmu_iova_to_phys, + .of_xlate = arm_smmu_of_xlate, .add_device = arm_smmu_add_device, .remove_device = arm_smmu_remove_device, .device_group = arm_smmu_device_group,