mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Fernando Guzman Lugo <x0095840@ti.com>
To: <Hiroshi.DOYU@nokia.com>
Cc: <felipe.contreras@nokia.com>, <ameya.palande@nokia.com>,
	<linux-kernel@vger.kernel.org>, <andy.shevchenko@gmail.com>,
	<linux-omap@vger.kernel.org>,
	Fernando Guzman Lugo <x0095840@ti.com>
Subject: [PATCH 2/4] iovmm: fix roundup for next area and end check for the last area
Date: Thu, 30 Sep 2010 22:08:53 -0500	[thread overview]
Message-ID: <1285902536-7043-3-git-send-email-x0095840@ti.com> (raw)
In-Reply-To: <1285902536-7043-2-git-send-email-x0095840@ti.com>

As da_end does not belongs to the area the roundup should
be done to da_end and not to da_end + 1.
Also the end check for the last area should be
ULONG_MAX - start + 1 >= bytes.

Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
---
 arch/arm/plat-omap/iovmm.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c
index 24ca9c4..fc6b109 100644
--- a/arch/arm/plat-omap/iovmm.c
+++ b/arch/arm/plat-omap/iovmm.c
@@ -289,19 +289,19 @@ static struct iovm_struct *alloc_iovm_area(struct iommu *obj, u32 da,
 	prev_end = 0;
 	list_for_each_entry(tmp, &obj->mmap, list) {
 
-		if (prev_end >= start)
+		if (prev_end > start)
 			break;
 
 		if (start + bytes <= tmp->da_start)
 			goto found;
 
 		if (flags & IOVMF_DA_ANON)
-			start = roundup(tmp->da_end + 1, alignement);
+			start = roundup(tmp->da_end, alignement);
 
 		prev_end = tmp->da_end;
 	}
 
-	if ((start > prev_end) && (ULONG_MAX - start >= bytes))
+	if ((start >= prev_end) && (ULONG_MAX - start + 1 >= bytes))
 		goto found;
 
 	dev_dbg(obj->dev, "%s: no space to fit %08x(%x) flags: %08x\n",
-- 
1.6.3.3


  reply	other threads:[~2010-10-01  2:55 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-01  3:08 [PATCH 0/4] iovmm: fixes for iovmm module Fernando Guzman Lugo
2010-10-01  3:08 ` [PATCH 1/4] iommu: remove CONFIG_MPU_BRIDGE_IOMMU Fernando Guzman Lugo
2010-10-01  3:08   ` Fernando Guzman Lugo [this message]
2010-10-01  3:08     ` [PATCH 3/4] iovmm: add superpages support to fixed da address Fernando Guzman Lugo
2010-10-01  3:08       ` [PATCH 4/4] iovmm: replace __iounmap with omap_iounmap Fernando Guzman Lugo
2010-10-01 10:57     ` [PATCH 2/4] iovmm: fix roundup for next area and end check for the last area David Cohen
2010-10-01 16:10       ` Guzman Lugo, Fernando
2010-10-01 17:53         ` David Cohen
2010-10-01 19:21           ` Guzman Lugo, Fernando
2010-10-02  7:49             ` David Cohen
2010-10-04  3:17               ` Guzman Lugo, Fernando
2010-10-04 12:11                 ` David Cohen
2010-10-04 15:37                   ` Guzman Lugo, Fernando
2010-10-04 15:35                     ` David Cohen
2010-10-01  9:32   ` [PATCH 1/4] iommu: remove CONFIG_MPU_BRIDGE_IOMMU Marathe, Yogesh
2010-10-01 15:52     ` Guzman Lugo, Fernando

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=1285902536-7043-3-git-send-email-x0095840@ti.com \
    --to=x0095840@ti.com \
    --cc=Hiroshi.DOYU@nokia.com \
    --cc=ameya.palande@nokia.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=felipe.contreras@nokia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®