From patchwork Fri Aug 26 11:25:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 1102032 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7QBPkpe009302 for ; Fri, 26 Aug 2011 11:25:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751415Ab1HZLZl (ORCPT ); Fri, 26 Aug 2011 07:25:41 -0400 Received: from ch1ehsobe006.messaging.microsoft.com ([216.32.181.186]:43203 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983Ab1HZLZk (ORCPT ); Fri, 26 Aug 2011 07:25:40 -0400 Received: from mail199-ch1-R.bigfish.com (216.32.181.174) by CH1EHSOBE010.bigfish.com (10.43.70.60) with Microsoft SMTP Server id 14.1.225.22; Fri, 26 Aug 2011 11:25:39 +0000 Received: from mail199-ch1 (localhost.localdomain [127.0.0.1]) by mail199-ch1-R.bigfish.com (Postfix) with ESMTP id 4421EA60392; Fri, 26 Aug 2011 11:25:39 +0000 (UTC) X-SpamScore: -12 X-BigFish: VPS-12(zz98dKzz1202hzz15d4R8275bhz32i668h839h944h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:163.181.249.109; KIP:(null); UIP:(null); IPVD:NLI; H:ausb3twp02.amd.com; RD:none; EFVD:NLI Received: from mail199-ch1 (localhost.localdomain [127.0.0.1]) by mail199-ch1 (MessageSwitch) id 1314357938734633_20900; Fri, 26 Aug 2011 11:25:38 +0000 (UTC) Received: from CH1EHSMHS012.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.247]) by mail199-ch1.bigfish.com (Postfix) with ESMTP id A44A1161804B; Fri, 26 Aug 2011 11:25:38 +0000 (UTC) Received: from ausb3twp02.amd.com (163.181.249.109) by CH1EHSMHS012.bigfish.com (10.43.70.12) with Microsoft SMTP Server id 14.1.225.22; Fri, 26 Aug 2011 11:25:35 +0000 X-WSS-ID: 0LQJ92K-02-0F6-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Axway MailGate 3.8.1) with ESMTP id 2E4F1C839A; Fri, 26 Aug 2011 06:25:32 -0500 (CDT) Received: from SAUSEXDAG01.amd.com (163.181.55.1) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.106.1; Fri, 26 Aug 2011 06:25:51 -0500 Received: from storexhtp02.amd.com (172.24.4.4) by sausexdag01.amd.com (163.181.55.1) with Microsoft SMTP Server (TLS) id 14.1.289.1; Fri, 26 Aug 2011 06:25:33 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.3.83.0; Fri, 26 Aug 2011 07:25:32 -0400 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id 89FA949C0E9; Fri, 26 Aug 2011 12:25:31 +0100 (BST) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id 7452FFF9BB; Fri, 26 Aug 2011 13:25:31 +0200 (CEST) Date: Fri, 26 Aug 2011 13:25:31 +0200 From: "Roedel, Joerg" To: Ohad Ben-Cohen CC: "linux-omap@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Tony Lindgren , Hiroshi DOYU , Laurent Pinchart , Arnd Bergmann , "iommu@lists.linux-foundation.org" Subject: Re: [PATCH v2 0/7] omap: iommu migration, relocation and cleanups Message-ID: <20110826112531.GQ1923@amd.com> References: <1314205694-28935-1-git-send-email-ohad@wizery.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1314205694-28935-1-git-send-email-ohad@wizery.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: amd.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 (demeter2.kernel.org [140.211.167.43]); Fri, 26 Aug 2011 11:25:47 +0000 (UTC) On Wed, Aug 24, 2011 at 01:08:07PM -0400, Ohad Ben-Cohen wrote: > Ohad Ben-Cohen (7): > omap: iommu: migrate to the generic IOMMU API > omap: iommu/iovmm: move to dedicated iommu folder > omap: iommu: stop exporting local functions > omap: iommu: PREFETCH_IOTLB cleanup > omap: iovmm: remove unused functionality > omap: iommu: remove unused exported API > omap: iommu: omapify 'struct iommu' and exposed API Applied all to arm/omap, thanks Ohad. I also put a commit on-top which finished the mutex->spin_lock conversion. Looks like one call-place was missed. See attached patch. commit 4234541f1a64d9dc6d489cf8f614dc01c62360f6 Author: Joerg Roedel Date: Fri Aug 26 13:20:06 2011 +0200 omap: iommu: Fix up mutex->spin_lock conversion of iommu_lock The omap_iommu_set_isr() was still using the mutex functions but the iommu_lock was converted to a spin_lock. Fix that up. Signed-off-by: Joerg Roedel diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index dad45ab..90744af 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -918,14 +918,14 @@ int omap_iommu_set_isr(const char *name, return -ENODEV; obj = to_iommu(dev); - mutex_lock(&obj->iommu_lock); + spin_lock(&obj->iommu_lock); if (obj->refcount != 0) { - mutex_unlock(&obj->iommu_lock); + spin_unlock(&obj->iommu_lock); return -EBUSY; } obj->isr = isr; obj->isr_priv = isr_priv; - mutex_unlock(&obj->iommu_lock); + spin_unlock(&obj->iommu_lock); return 0; }