From patchwork Tue Jan 29 12:57:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Doyu X-Patchwork-Id: 14334 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 2FE5623F8B for ; Tue, 29 Jan 2013 12:57:35 +0000 (UTC) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by fiordland.canonical.com (Postfix) with ESMTP id 84A80A1948D for ; Tue, 29 Jan 2013 12:57:34 +0000 (UTC) Received: by mail-vc0-f181.google.com with SMTP id d16so233862vcd.40 for ; Tue, 29 Jan 2013 04:57:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :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=stmbjTtD6LYGYC0gcENNRxRDeMAefWW6DQb5JHu5mPg=; b=iLd7kmSqlKsTOfn3ZzlC6UPK4U/NNnnSIyWfBMa9JOjWbDwdcASlOeIahn6hc1Y9fQ EDKiWpHpU+AO8IzgxPYeJtcfsv4Lby0gNGpr58biBmBvliWjinBaqHt0PUntxKu+A28m G/UxZJkxa/eWU/3oSri2myyUk4+adMFd6d8CQrRBl644yciVyTPz5HtZY4E4sWcDFUbq ElMSX74e3gBfjCiNvw6jH6e3BPxwX9r4nMh6mmxVIUBjMFxkYdicXky3jnCrhjq5jtu/ USP3EQfLQEdqaTwFLW5XNTCIwpVXiz/ruY9X/XEQurAkuC3u60XXHWEDeM0RXeL8deth 6PTA== X-Received: by 10.52.176.6 with SMTP id ce6mr719729vdc.57.1359464253860; Tue, 29 Jan 2013 04:57:33 -0800 (PST) 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.58.145.101 with SMTP id st5csp134596veb; Tue, 29 Jan 2013 04:57:33 -0800 (PST) X-Received: by 10.14.174.198 with SMTP id x46mr2993571eel.23.1359464245297; Tue, 29 Jan 2013 04:57:25 -0800 (PST) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id x41si22361906eeo.82.2013.01.29.04.57.24; Tue, 29 Jan 2013 04:57:25 -0800 (PST) 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 1U0Akc-0007Yk-LX; Tue, 29 Jan 2013 12:57:22 +0000 Received: from hqemgate04.nvidia.com ([216.228.121.35]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1U0Akb-0007Yf-4v for linaro-mm-sig@lists.linaro.org; Tue, 29 Jan 2013 12:57:21 +0000 Received: from hqnvupgp06.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Tue, 29 Jan 2013 04:57:01 -0800 Received: from hqemhub03.nvidia.com ([172.17.108.22]) by hqnvupgp06.nvidia.com (PGP Universal service); Tue, 29 Jan 2013 04:55:22 -0800 X-PGP-Universal: processed; by hqnvupgp06.nvidia.com on Tue, 29 Jan 2013 04:55:22 -0800 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.297.1; Tue, 29 Jan 2013 04:57:13 -0800 Received: from thelma.nvidia.com (Not Verified[172.16.212.77]) by hqnvemgw01.nvidia.com with MailMarshal (v6,7,2,8378) id ; Tue, 29 Jan 2013 04:58:21 -0800 Received: from oreo.Nvidia.com (dhcp-10-21-25-186.nvidia.com [10.21.25.186]) by thelma.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id r0TCvAWY028486; Tue, 29 Jan 2013 04:57:11 -0800 (PST) From: Hiroshi Doyu To: Date: Tue, 29 Jan 2013 14:57:07 +0200 Message-ID: <1359464227-19669-1-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <5107C4DE.7060607@samsung.com> References: <5107C4DE.7060607@samsung.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] [v3 1/1] ARM: dma-mapping: Set arm_dma_set_mask() for iommu->set_dma_mask() 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: ALoCoQki6cOHzxo93jWag+5vL3MYg21wyGTGf8RBZgoPgb9ypd+lpVJrDY3zc2s8djMSyXiMRXnr struct dma_map_ops iommu_ops doesn't have ->set_dma_mask, which causes crash when dma_set_mask() is called from some driver. Signed-off-by: Hiroshi Doyu --- arch/arm/mm/dma-mapping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 6b2fb87..5dfc71f 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1730,6 +1730,8 @@ struct dma_map_ops iommu_ops = { .unmap_sg = arm_iommu_unmap_sg, .sync_sg_for_cpu = arm_iommu_sync_sg_for_cpu, .sync_sg_for_device = arm_iommu_sync_sg_for_device, + + .set_dma_mask = arm_dma_set_mask, }; struct dma_map_ops iommu_coherent_ops = { @@ -1743,6 +1745,8 @@ struct dma_map_ops iommu_coherent_ops = { .map_sg = arm_coherent_iommu_map_sg, .unmap_sg = arm_coherent_iommu_unmap_sg, + + .set_dma_mask = arm_dma_set_mask, }; /**