From patchwork Mon May 26 11:31:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 4241491 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C78AC9F32B for ; Mon, 26 May 2014 11:31:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E7DE220138 for ; Mon, 26 May 2014 11:31:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D60120160 for ; Mon, 26 May 2014 11:31:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751975AbaEZLbV (ORCPT ); Mon, 26 May 2014 07:31:21 -0400 Received: from 8bytes.org ([85.214.48.195]:35051 "EHLO mail.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbaEZLbU (ORCPT ); Mon, 26 May 2014 07:31:20 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.8bytes.org (Postfix) with SMTP id E1EDE12B185 for ; Mon, 26 May 2014 13:31:18 +0200 (CEST) Received: by mail.8bytes.org (Postfix, from userid 1000) id F117312B0D0; Mon, 26 May 2014 13:31:17 +0200 (CEST) Date: Mon, 26 May 2014 13:31:17 +0200 From: Joerg Roedel To: Laurent Pinchart Cc: iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org Subject: Re: [PATCH v2 02/10] iommu/ipmmu-vmsa: Cleanup failures of ARM mapping creation or attachment Message-ID: <20140526113117.GI17056@8bytes.org> References: <1400150451-13469-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> <1400150451-13469-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com> <20140526092310.GA11299@8bytes.org> <9405311.lnqBdrCsyu@avalon> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <9405311.lnqBdrCsyu@avalon> User-Agent: Mutt/1.5.21 (2010-09-15) X-DSPAM-Result: Whitelisted X-DSPAM-Processed: Mon May 26 13:31:18 2014 X-DSPAM-Confidence: 0.9995 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 5383260620861842110528 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, May 26, 2014 at 12:08:37PM +0200, Laurent Pinchart wrote: > > Thank you. I'll rebase the patch on top of your tree as soon as you publish > the related branch and resubmit. I also put this patch on-top to fix a compile error. From 720b0cef715ab97b21b33e7f3c328e2863411cab Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Mon, 26 May 2014 13:07:01 +0200 Subject: [PATCH] arm/ipmmu-vmsa: Fix compile error The function arm_iommu_create_mapping lost the order parameter. Remove it from this IOMMU driver too to make it build. Signed-off-by: Joerg Roedel --- drivers/iommu/ipmmu-vmsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 95b819a..53cde08 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -1087,7 +1087,7 @@ static int ipmmu_add_device(struct device *dev) struct dma_iommu_mapping *mapping; mapping = arm_iommu_create_mapping(&platform_bus_type, - SZ_1G, SZ_2G, 0); + SZ_1G, SZ_2G); if (IS_ERR(mapping)) { dev_err(mmu->dev, "failed to create ARM IOMMU mapping\n"); return PTR_ERR(mapping);