From patchwork Mon Apr 28 15:52:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 4079871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7AE2FBFF02 for ; Mon, 28 Apr 2014 15:56:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3247202AE for ; Mon, 28 Apr 2014 15:56:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF17A20268 for ; Mon, 28 Apr 2014 15:56:52 +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 1Wenso-0002fF-7c; Mon, 28 Apr 2014 15:54:18 +0000 Received: from mail-we0-f173.google.com ([74.125.82.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wensm-0002XZ-4A for linux-arm-kernel@lists.infradead.org; Mon, 28 Apr 2014 15:54:16 +0000 Received: by mail-we0-f173.google.com with SMTP id w61so6619468wes.32 for ; Mon, 28 Apr 2014 08:53:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NUdsMdG8YkWH2RpMPnnd31cUIRh2My2t+J5IwY+hiAk=; b=KRpbnckOXzZKGWqGwuG7WkdBHdzxXE7xibJW2YqGM9B1O+gy8JilVLy6HRK4BQt+0Z JsM+s0wxq40sGUudrBOkil33iURz70VjqEZEhms/gG9VAzbP2y4duvhFGLZhlj8hEchz gIOFmwFCGTa4d+qVKrRv3oXfsrn1beKdIniZmin9qzBLzieMWVpP8Q+73vfKMVTP/Cdj U0BwAYrtGNa4rORNHQUKpdAEzQA068YjsgED1yXT6g8xiMTZcIIBlxdOm3yELm/Dc/kS 0UqOzjn5AVJ+t3UyQQac3mED4SAmjmQsAGCjhBdGK0F100CgmiHY4adC0zLiJXAAyyiV q/Ug== X-Gm-Message-State: ALoCoQmliNEaFqPjkQjlr5WCEC7XebKCHzXY5qwfJfZu3pXTQLQ6C4Lwkgu3k7eYVUyRDFBJnWm0 X-Received: by 10.194.78.77 with SMTP id z13mr2414076wjw.64.1398700429313; Mon, 28 Apr 2014 08:53:49 -0700 (PDT) Received: from localhost.localdomain (home.tvelocity.eu. [82.67.68.96]) by mx.google.com with ESMTPSA id gi8sm18546053wib.8.2014.04.28.08.53.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 08:53:48 -0700 (PDT) From: Antonios Motakis To: alex.williamson@redhat.com, kvmarm@lists.cs.columbia.edu, iommu@lists.linux-foundation.org Subject: [RFC PATCH v5 02/11] ARM SMMU: Add capability IOMMU_CAP_DMA_EXEC Date: Mon, 28 Apr 2014 17:52:42 +0200 Message-Id: <1398700371-20096-3-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1398700371-20096-1-git-send-email-a.motakis@virtualopensystems.com> References: <1398700371-20096-1-git-send-email-a.motakis@virtualopensystems.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140428_085416_312529_57E4CC59 X-CRM114-Status: GOOD ( 11.52 ) X-Spam-Score: -0.7 (/) Cc: Shuah Khan , kim.phillips@freescale.com, "Upinder Malhi \(umalhi\)" , kvm@vger.kernel.org, Alexey Kardashevskiy , open list , Joerg Roedel , will.deacon@arm.com, a.rigo@virtualopensystems.com, stuart.yoder@freescale.com, "moderated list:ARM SMMU DRIVER" , Varun Sethi , Antonios Motakis , tech@virtualopensystems.com, christoffer.dall@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,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 The ARM SMMU can take an IOMMU_EXEC protection flag in addition to IOMMU_READ and IOMMU_WRITE. Expose this as an IOMMU capability. Signed-off-by: Antonios Motakis --- drivers/iommu/arm-smmu.c | 2 ++ include/linux/iommu.h | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 1d9ab39..abf802f 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1509,6 +1509,8 @@ static int arm_smmu_domain_has_cap(struct iommu_domain *domain, if (smmu_domain->root_cfg.smmu->features & ARM_SMMU_FEAT_COHERENT_WALK) caps |= IOMMU_CAP_CACHE_COHERENCY; + caps |= IOMMU_CAP_DMA_EXEC; + return !!(cap & caps); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index b96a5b2..4f547f3 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -57,8 +57,9 @@ struct iommu_domain { struct iommu_domain_geometry geometry; }; -#define IOMMU_CAP_CACHE_COHERENCY 0x1 -#define IOMMU_CAP_INTR_REMAP 0x2 /* isolates device intrs */ +#define IOMMU_CAP_CACHE_COHERENCY (1 << 0) +#define IOMMU_CAP_INTR_REMAP (1 << 1) /* isolates device intrs */ +#define IOMMU_CAP_DMA_EXEC (1 << 2) /* EXEC protection flag */ /* * Following constraints are specifc to FSL_PAMUV1: