From patchwork Tue Aug 28 11:43:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Doyu X-Patchwork-Id: 11002 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A650823F70 for ; Tue, 28 Aug 2012 11:44:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 53FDBA18FB8 for ; Tue, 28 Aug 2012 11:43:45 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so7714205iaf.11 for ; Tue, 28 Aug 2012 04:44:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :x-pgp-universal:from:to:date:message-id:x-mailer:in-reply-to :references:mime-version:cc:subject:x-beenthere:x-mailman-version :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:content-type:content-transfer-encoding :sender:errors-to:x-gm-message-state; bh=XAwWN8DSz1PDAWFiK4SZGxDv444lvHp70Bkh714B3OQ=; b=Wa/yKZFuHYZhNo4GyrjFN9isHeqsslaRswBWmhxaI/CvpHAUV4ckQZq8OPKQvifpDK ELPpDGjlDvZYr2ZkCmT7qvHXTfRZxC2y3/nOFagEWpFyvIMuW0Bmk18oL1k3xJwugESI nITSexkBzP005eaCuyLwUKanL6qI1IhWe81bPsEDZPl286/LcLhxAp/Brvues6ezHvgx h1uI4akWUlcno0KJJcFZyTn9sBBf2LE+Hjcgyr4b5ZkUSVq8GBizyUZZbSFS73KHljHS RNs+yHxNHJYAQtQu5Sw7847CL1EgAS810z0Gr/IbnNRrJGM4muxzKFPf9hIgiKkOC3Gs A1fg== Received: by 10.50.217.227 with SMTP id pb3mr13392822igc.28.1346154254184; Tue, 28 Aug 2012 04:44:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp21077igc; Tue, 28 Aug 2012 04:44:13 -0700 (PDT) Received: by 10.204.145.90 with SMTP id c26mr4896999bkv.34.1346154252377; Tue, 28 Aug 2012 04:44:12 -0700 (PDT) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id fo13si12666727bkc.52.2012.08.28.04.44.11; Tue, 28 Aug 2012 04:44:12 -0700 (PDT) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T6KDJ-0006DV-P4; Tue, 28 Aug 2012 11:44:10 +0000 Received: from hqemgate04.nvidia.com ([216.228.121.35]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T6KDH-0006Cl-QS for linaro-mm-sig@lists.linaro.org; Tue, 28 Aug 2012 11:44:08 +0000 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Tue, 28 Aug 2012 04:43:28 -0700 Received: from hqemhub02.nvidia.com ([172.17.108.22]) by hqnvupgp08.nvidia.com (PGP Universal service); Tue, 28 Aug 2012 04:44:06 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Tue, 28 Aug 2012 04:44:06 -0700 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by hqemhub02.nvidia.com (172.20.150.31) with Microsoft SMTP Server id 8.3.264.0; Tue, 28 Aug 2012 04:44:06 -0700 Received: from daphne.nvidia.com (Not Verified[172.16.212.96]) by hqnvemgw02.nvidia.com with MailMarshal (v6,7,2,8378) id ; Tue, 28 Aug 2012 04:44:13 -0700 Received: from oreo.Nvidia.com (dhcp-10-21-25-186.nvidia.com [10.21.25.186]) by daphne.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id q7SBhw8u007357; Tue, 28 Aug 2012 04:44:05 -0700 (PDT) From: Hiroshi Doyu To: Date: Tue, 28 Aug 2012 14:43:52 +0300 Message-ID: <1346154232-13299-4-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1346154232-13299-1-git-send-email-hdoyu@nvidia.com> References: <1346154232-13299-1-git-send-email-hdoyu@nvidia.com> MIME-Version: 1.0 Cc: linaro-mm-sig@lists.linaro.org, linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [Linaro-mm-sig] [PATCH 4/4] ARM: dma-mapping: Skip cache maint for invalid page X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQnw6MiXiAOX6ObfV07+ktQyNs0J8cBVG/0doU52WxXSHEOkDFVdF7fYuep1fD1n2T+U5D0D Skip cache maint for invalid page but warn it. Signed-off-by: Hiroshi Doyu --- arch/arm/mm/dma-mapping.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 2621282..0368702 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1589,6 +1589,9 @@ static void arm_iommu_unmap_page(struct device *dev, dma_addr_t handle, if (!iova) return; + if (WARN_ON(!pfn_valid(page_to_pfn(page)))) + return; + if (!dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs)) __dma_page_dev_to_cpu(page, offset, size, dir); @@ -1607,6 +1610,9 @@ static void arm_iommu_sync_single_for_cpu(struct device *dev, if (!iova) return; + if (WARN_ON(!pfn_valid(page_to_pfn(page)))) + return; + __dma_page_dev_to_cpu(page, offset, size, dir); } @@ -1621,6 +1627,9 @@ static void arm_iommu_sync_single_for_device(struct device *dev, if (!iova) return; + if (WARN_ON(!pfn_valid(page_to_pfn(page)))) + return; + __dma_page_cpu_to_dev(page, offset, size, dir); }