From patchwork Tue Sep 2 17:56:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 36503 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C3168203BE for ; Tue, 2 Sep 2014 17:58:37 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id le20sf21482075vcb.4 for ; Tue, 02 Sep 2014 10:58:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=KaLA5JROpPPS3JAK4kva6fO0nHUvAXObNZ3gSHqUvoQ=; b=S4IvwF1Uq3mjOKZV2XhFAeKd94R3I1q57gzpkCADAT/ju+fmigEXxlXYEVpU0RemEc a7JeM6JeM6ukiL2pn0YGe8RownzuC/J8b9IDTNinkwT+1GDK6chB23jQtCS1xPMJlN6F iwnqJdkBxbg5mox+wF0BmdkC4OLQV1DkGqLdkgaPW1g60Yk/vlVV7LYyJkh1LV0O5WGU o0bka94wndKg9T77xHGYexyK+h11irFhHz5plJUzG7+EBPP6grfer+FM8gYzBcTVOmVX YrmT8oYYaMzP/anZlOaikkQeGMU5JVMZN4Fl1hBGh5fIiMGkR74p4cEFvDFoxNg8x6xK yfQw== X-Gm-Message-State: ALoCoQkM91mZNrUeJjEnmzt+L6ntL59OMd3WrszMy33/iVgKcFoBGS7Li8WfnWuuQ7bauD0NLCW5 X-Received: by 10.224.14.82 with SMTP id f18mr19907545qaa.2.1409680717572; Tue, 02 Sep 2014 10:58:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.105.247 with SMTP id c110ls2445435qgf.5.gmail; Tue, 02 Sep 2014 10:58:37 -0700 (PDT) X-Received: by 10.52.141.76 with SMTP id rm12mr1007339vdb.71.1409680717397; Tue, 02 Sep 2014 10:58:37 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id qh2si2628784vcb.81.2014.09.02.10.58.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Sep 2014 10:58:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id im17so7425146vcb.18 for ; Tue, 02 Sep 2014 10:58:37 -0700 (PDT) X-Received: by 10.52.249.66 with SMTP id ys2mr1503035vdc.41.1409680717209; Tue, 02 Sep 2014 10:58:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp565753vcb; Tue, 2 Sep 2014 10:58:36 -0700 (PDT) X-Received: by 10.68.69.71 with SMTP id c7mr49859274pbu.43.1409680715564; Tue, 02 Sep 2014 10:58:35 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ki10si7276316pbc.35.2014.09.02.10.58.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 10:58:35 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1XOsKW-0001Xh-4W; Tue, 02 Sep 2014 17:57:20 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XOsJw-0001BS-DQ; Tue, 02 Sep 2014 17:56:45 +0000 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.34]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s82Hu9wo015647; Tue, 2 Sep 2014 18:56:09 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 5F47E1AE08C4; Tue, 2 Sep 2014 18:56:33 +0100 (BST) From: Will Deacon To: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org Subject: [RFC PATCH v2 3/7] iommu: add new iommu_ops callback for adding an OF device Date: Tue, 2 Sep 2014 18:56:23 +0100 Message-Id: <1409680587-29818-4-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1409680587-29818-1-git-send-email-will.deacon@arm.com> References: <1409680587-29818-1-git-send-email-will.deacon@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140902_105644_851136_05EDB361 X-CRM114-Status: UNSURE ( 9.10 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.7 (------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-6.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.96.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: jroedel@suse.de, arnd@arndb.de, Will Deacon , thierry.reding@gmail.com, laurent.pinchart@ideasonboard.com, Varun.Sethi@freescale.com, m.szyprowski@samsung.com, dwmw2@infradead.org, hdoyu@nvidia.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: will.deacon@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This patch adds a new function to the iommu_ops structure to allow an OF device to be added to a specific IOMMU instance using the recently merged generic devicetree binding for IOMMUs. The callback (of_xlate) takes a struct device representing the master and an of_phandle_args representing the IOMMU and the correspondong IDs for the new master. Signed-off-by: Will Deacon --- include/linux/iommu.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index fdddb14cd8f5..3e766b85daa3 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -136,6 +137,10 @@ struct iommu_ops { /* Get the numer of window per domain */ u32 (*domain_get_windows)(struct iommu_domain *domain); +#ifdef CONFIG_OF_IOMMU + int (*of_xlate)(struct device *dev, struct of_phandle_args *args); +#endif + unsigned long pgsize_bitmap; };