[PATCH 5/7] iommu/msm: ->unmap() should return order of unmapped page

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Ohad Ben-Cohen <ohad@wizery.com>
To: <iommu@lists.linux-foundation.org>
Cc: <linux-omap@vger.kernel.org>,
	Hiroshi DOYU <Hiroshi.DOYU@nokia.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Joerg Roedel <Joerg.Roedel@amd.com>,
	David Woodhouse <dwmw2@infradead.org>,
	<linux-arm-kernel@lists.infradead.org>,
	David Brown <davidb@codeaurora.org>,
	Arnd Bergmann <arnd@arndb.de>, <linux-kernel@vger.kernel.org>,
	Ohad Ben-Cohen <ohad@wizery.com>,
	Stepan Moskovchenko <stepanm@codeaurora.org>
Subject: [PATCH 5/7] iommu/msm: ->unmap() should return order of unmapped page
Date: Fri,  2 Sep 2011 20:32:34 +0300	[thread overview]
Message-ID: <1314984756-4400-6-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1314984756-4400-1-git-send-email-ohad@wizery.com>

Users of the IOMMU API (kvm specifically) assume that iommu_unmap()
returns the order of the unmapped page (on success).

Fix msm_iommu_unmap() accordingly.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Cc: David Brown <davidb@codeaurora.org>
---
 drivers/iommu/msm_iommu.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 1a584e0..d1733f6 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -543,6 +543,13 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 	}
 
 	ret = __flush_iotlb(domain);
+
+	/*
+	 * the IOMMU API requires us to return the order of the unmapped
+	 * page (on success).
+	 */
+	if (!ret)
+		ret = order;
 fail:
 	spin_unlock_irqrestore(&msm_iommu_lock, flags);
 	return ret;
-- 
1.7.4.1

WARNING: multiple messages have this Message-ID (diff)

From: Ohad Ben-Cohen <ohad@wizery.com>
To: iommu@lists.linux-foundation.org
Cc: linux-omap@vger.kernel.org, Hiroshi DOYU <Hiroshi.DOYU@nokia.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Joerg Roedel <Joerg.Roedel@amd.com>,
	David Woodhouse <dwmw2@infradead.org>,
	linux-arm-kernel@lists.infradead.org,
	David Brown <davidb@codeaurora.org>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org, Ohad Ben-Cohen <ohad@wizery.com>,
	Stepan Moskovchenko <stepanm@codeaurora.org>
Subject: [PATCH 5/7] iommu/msm: ->unmap() should return order of unmapped page
Date: Fri,  2 Sep 2011 20:32:34 +0300	[thread overview]
Message-ID: <1314984756-4400-6-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1314984756-4400-1-git-send-email-ohad@wizery.com>

Users of the IOMMU API (kvm specifically) assume that iommu_unmap()
returns the order of the unmapped page (on success).

Fix msm_iommu_unmap() accordingly.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Cc: David Brown <davidb@codeaurora.org>
---
 drivers/iommu/msm_iommu.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 1a584e0..d1733f6 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -543,6 +543,13 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 	}
 
 	ret = __flush_iotlb(domain);
+
+	/*
+	 * the IOMMU API requires us to return the order of the unmapped
+	 * page (on success).
+	 */
+	if (!ret)
+		ret = order;
 fail:
 	spin_unlock_irqrestore(&msm_iommu_lock, flags);
 	return ret;
-- 
1.7.4.1

WARNING: multiple messages have this Message-ID (diff)

From: ohad@wizery.com (Ohad Ben-Cohen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/7] iommu/msm: ->unmap() should return order of unmapped page
Date: Fri,  2 Sep 2011 20:32:34 +0300	[thread overview]
Message-ID: <1314984756-4400-6-git-send-email-ohad@wizery.com> (raw)
In-Reply-To: <1314984756-4400-1-git-send-email-ohad@wizery.com>

Users of the IOMMU API (kvm specifically) assume that iommu_unmap()
returns the order of the unmapped page (on success).

Fix msm_iommu_unmap() accordingly.

Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Cc: David Brown <davidb@codeaurora.org>
---
 drivers/iommu/msm_iommu.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 1a584e0..d1733f6 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -543,6 +543,13 @@ static int msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 	}
 
 	ret = __flush_iotlb(domain);
+
+	/*
+	 * the IOMMU API requires us to return the order of the unmapped
+	 * page (on success).
+	 */
+	if (!ret)
+		ret = order;
 fail:
 	spin_unlock_irqrestore(&msm_iommu_lock, flags);
 	return ret;
-- 
1.7.4.1

next prev parent reply	other threads:[~2011-09-02 17:33 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-02 17:32 [PATCH/RFC 0/7] iommu: fixes & extensions Ohad Ben-Cohen
2011-09-02 17:32 ` Ohad Ben-Cohen
2011-09-02 17:32 ` Ohad Ben-Cohen
2011-09-02 17:32 ` [PATCH 1/7] iommu/omap-iovmm: support non page-aligned buffers in iommu_vmap Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32 ` [PATCH 2/7] iommu/omap: cleanup: remove a redundant statement Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32 ` [PATCH 3/7] iommu/core: use the existing IS_ALIGNED macro Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32 ` [PATCH 4/7] iommu/omap: ->unmap() should return order of unmapped page Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32 ` Ohad Ben-Cohen [this message]
2011-09-02 17:32   ` [PATCH 5/7] iommu/msm: " Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 18:36   ` David Brown
2011-09-02 18:36     ` David Brown
2011-09-02 18:36     ` David Brown
2011-09-02 17:32 ` [RFC 6/7] iommu/core: add fault reporting Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-05 10:00   ` Roedel, Joerg
2011-09-05 10:00     ` Roedel, Joerg
2011-09-05 10:00     ` Roedel, Joerg
2011-09-07 16:36     ` Ohad Ben-Cohen
2011-09-07 16:36       ` Ohad Ben-Cohen
2011-09-07 16:36       ` Ohad Ben-Cohen
2011-09-02 17:32 ` [RFC 7/7] iommu/core: split mapping to page sizes as supported by the hardware Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-02 17:32   ` Ohad Ben-Cohen
2011-09-07  1:30   ` KyongHo Cho
2011-09-07  1:30     ` KyongHo Cho
2011-09-07  6:01     ` Ohad Ben-Cohen
2011-09-07  6:01       ` Ohad Ben-Cohen
2011-09-07  8:05       ` KyongHo Cho
2011-09-07  8:05         ` KyongHo Cho
2011-09-07  9:16         ` Ohad Ben-Cohen
2011-09-07  9:16           ` Ohad Ben-Cohen
2011-09-08 12:51           ` KyongHo Cho
2011-09-08 12:51             ` KyongHo Cho
2011-09-08 14:03             ` Ohad Ben-Cohen
2011-09-08 14:03               ` Ohad Ben-Cohen
2011-09-07  9:49         ` Ohad Ben-Cohen
2011-09-07  9:49           ` Ohad Ben-Cohen
2011-09-06 10:15 ` [PATCH/RFC 0/7] iommu: fixes & extensions Roedel, Joerg
2011-09-06 10:15   ` Roedel, Joerg
2011-09-06 10:15   ` Roedel, Joerg
2011-09-06 11:28   ` Ohad Ben-Cohen
2011-09-06 11:28     ` Ohad Ben-Cohen
2011-09-06 11:28     ` Ohad Ben-Cohen

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:1a584e0 dfblob:1a584e0 dfblob:1a584e0 dfblob:d1733f6
dfblob:d1733f6 dfblob:d1733f6
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1314984756-4400-6-git-send-email-ohad@wizery.com \
    --to=ohad@wizery.com \
    --cc=Hiroshi.DOYU@nokia.com \
    --cc=Joerg.Roedel@amd.com \
    --cc=arnd@arndb.de \
    --cc=davidb@codeaurora.org \
    --cc=dwmw2@infradead.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=stepanm@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.