From patchwork Tue Mar 8 12:46:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Cohen X-Patchwork-Id: 618211 X-Patchwork-Delegate: tony@atomide.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 p28CkR1Z012612 for ; Tue, 8 Mar 2011 12:46:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754378Ab1CHMq0 (ORCPT ); Tue, 8 Mar 2011 07:46:26 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:47005 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754038Ab1CHMqY (ORCPT ); Tue, 8 Mar 2011 07:46:24 -0500 Received: by mail-ey0-f174.google.com with SMTP id 24so1950557eyx.19 for ; Tue, 08 Mar 2011 04:46:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=luc4QAvdPYsM7KoDelbNszO0vwHonceCD3yxFhBBvtQ=; b=ft98whW/augb0RLZbDKRTJ5o5Q83/haXLilcYXSGU04ZvohtwpBJvLjXmiwz0E0bL3 Q9+6d8ivPOm374DQKtZ19OLGiaxxk1LD4CgBo6ciDNy1yjSs6oXBbRZVI89zuWpnhibu Jz/SRHOB8A6FkIZcDf53+pKFODGUx0IsH9obA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=N/M5TJ8yrgD1gxWreFW4I9hVrzvwI41zEMr3I1hw1o5+PgiY2h+dVXWe+DmVkQlA6F ilMjP9N8Jbh/vzdsDJaHqevXIFFu7BNCdPrCDEXHl3Q6Ky900eS+le/HL/vyLm3zht96 W1f6Gwr4ln08lzOeQokdFysdKVg/VthKdmq7k= Received: by 10.213.103.80 with SMTP id j16mr3549288ebo.70.1299588383501; Tue, 08 Mar 2011 04:46:23 -0800 (PST) Received: from localhost.localdomain (a91-152-72-10.elisa-laajakaista.fi [91.152.72.10]) by mx.google.com with ESMTPS id x54sm609369eeh.11.2011.03.08.04.46.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Mar 2011 04:46:20 -0800 (PST) From: David Cohen To: Hiroshi.DOYU@nokia.com Cc: linux-omap@vger.kernel.org, fernando.lugo@ti.com, linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, sakari.ailus@maxwell.research.nokia.com, David Cohen Subject: [PATCH 3/3] omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED/IOVMF_DA_ANON flags Date: Tue, 8 Mar 2011 14:46:05 +0200 Message-Id: <1299588365-2749-4-git-send-email-dacohen@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299588365-2749-1-git-send-email-dacohen@gmail.com> References: <1299588365-2749-1-git-send-email-dacohen@gmail.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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 08 Mar 2011 12:46:30 +0000 (UTC) diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index 11c9b76..dde9cb0 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -654,7 +654,8 @@ u32 iommu_vmap(struct iommu *obj, u32 da, const struct sg_table *sgt, flags &= IOVMF_HW_MASK; flags |= IOVMF_DISCONT; flags |= IOVMF_MMIO; - flags |= (da ? IOVMF_DA_FIXED : IOVMF_DA_ANON); + if (~flags & IOVMF_DA_FIXED) + flags |= IOVMF_DA_ANON; da = __iommu_vmap(obj, da, sgt, va, bytes, flags); if (IS_ERR_VALUE(da)) @@ -713,7 +714,8 @@ u32 iommu_vmalloc(struct iommu *obj, u32 da, size_t bytes, u32 flags) flags &= IOVMF_HW_MASK; flags |= IOVMF_DISCONT; flags |= IOVMF_ALLOC; - flags |= (da ? IOVMF_DA_FIXED : IOVMF_DA_ANON); + if (~flags & IOVMF_DA_FIXED) + flags |= IOVMF_DA_ANON; sgt = sgtable_alloc(bytes, flags, da, 0); if (IS_ERR(sgt)) { @@ -803,7 +805,8 @@ u32 iommu_kmap(struct iommu *obj, u32 da, u32 pa, size_t bytes, flags &= IOVMF_HW_MASK; flags |= IOVMF_LINEAR; flags |= IOVMF_MMIO; - flags |= (da ? IOVMF_DA_FIXED : IOVMF_DA_ANON); + if (~flags & IOVMF_DA_FIXED) + flags |= IOVMF_DA_ANON; da = __iommu_kmap(obj, da, pa, va, bytes, flags); if (IS_ERR_VALUE(da)) @@ -862,7 +865,8 @@ u32 iommu_kmalloc(struct iommu *obj, u32 da, size_t bytes, u32 flags) flags &= IOVMF_HW_MASK; flags |= IOVMF_LINEAR; flags |= IOVMF_ALLOC; - flags |= (da ? IOVMF_DA_FIXED : IOVMF_DA_ANON); + if (~flags & IOVMF_DA_FIXED) + flags |= IOVMF_DA_ANON; da = __iommu_kmap(obj, da, pa, va, bytes, flags); if (IS_ERR_VALUE(da))