From patchwork Fri Oct 1 03:08:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guzman Lugo, Fernando" X-Patchwork-Id: 222392 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o912ugJZ019841 for ; Fri, 1 Oct 2010 02:56:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752598Ab0JACz2 (ORCPT ); Thu, 30 Sep 2010 22:55:28 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:38623 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751927Ab0JACz1 (ORCPT ); Thu, 30 Sep 2010 22:55:27 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o912tOZk028339 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 30 Sep 2010 21:55:24 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o912tN9c024634; Thu, 30 Sep 2010 21:55:23 -0500 (CDT) Received: from localhost (x0095840-desktop.am.dhcp.ti.com [128.247.77.44]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o912tNf16731; Thu, 30 Sep 2010 21:55:23 -0500 (CDT) From: Fernando Guzman Lugo To: Cc: , , , , , Fernando Guzman Lugo 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 Message-Id: <1285902536-7043-3-git-send-email-x0095840@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1285902536-7043-2-git-send-email-x0095840@ti.com> References: <1285902536-7043-1-git-send-email-x0095840@ti.com> <1285902536-7043-2-git-send-email-x0095840@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 01 Oct 2010 02:56:43 +0000 (UTC) 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",