From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756446Ab1EJMjJ (ORCPT ); Tue, 10 May 2011 08:39:09 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:57676 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756397Ab1EJMjI (ORCPT ); Tue, 10 May 2011 08:39:08 -0400 From: Laurent Pinchart To: Tony Lindgren Subject: Re: [URGENT - PATCH FOR 2.6.39] omap: iommu: Return IRQ_HANDLED in fault handler when no fault occured Date: Tue, 10 May 2011 14:39:56 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.37-gentoo-r3; KDE/4.6.2; x86_64; ; ) Cc: linux-omap@vger.kernel.org, David Cohen , Hiroshi DOYU , linux-kernel@vger.kernel.org References: <1303912982-10309-1-git-send-email-laurent.pinchart@ideasonboard.com> <201104291203.11174.laurent.pinchart@ideasonboard.com> In-Reply-To: <201104291203.11174.laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201105101439.56757.laurent.pinchart@ideasonboard.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Tony, On Friday 29 April 2011 12:03:10 Laurent Pinchart wrote: > Hi Tony, > > On Wednesday 27 April 2011 16:03:02 Laurent Pinchart wrote: > > The iommu shares an interrupt line with the OMAP3 ISP. The iommu > > interrupt handler must check the fault status and return IRQ_HANDLED > > when no fault occured. > > > > Signed-off-by: Laurent Pinchart > > Could you please pick this one up for 2.6.39 ? As far as I know David is on > holidays so he might not be able to review the patch before the 2.6.39 > release. Ping. Please. > > --- > > > > arch/arm/plat-omap/iommu.c | 2 ++ > > 1 files changed, 2 insertions(+), 0 deletions(-) > > > > The OMAP3 ISP IOMMU got broken in 2.6.39-rc1 by > > > > commit d594f1f31afe13edd8c02f3854a65cc58cfb3b74 > > Author: David Cohen > > Date: Wed Feb 16 19:35:51 2011 +0000 > > > > omap: IOMMU: add support to callback during fault handling > > > > Add support to register an isr for IOMMU fault situations and adapt > > it to allow such (*isr)() to be used as fault callback. Drivers > > using > > > > IOMMU module might want to be informed when errors happen in order to > > debug it or react. > > > > Signed-off-by: David Cohen > > Acked-by: Hiroshi DOYU > > Signed-off-by: Tony Lindgren > > > > This patch fixes it and should be pushed to mainline in 2.6.39. The OMAP3 > > ISP driver, new in 2.6.39, would otherwise be totally broken until > > 2.6.40. > > > > diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c > > index 8a51fd5..34fc31e 100644 > > --- a/arch/arm/plat-omap/iommu.c > > +++ b/arch/arm/plat-omap/iommu.c > > @@ -793,6 +793,8 @@ static irqreturn_t iommu_fault_handler(int irq, void > > *data) clk_enable(obj->clk); > > > > errs = iommu_report_fault(obj, &da); > > clk_disable(obj->clk); > > > > + if (errs == 0) > > + return IRQ_HANDLED; > > > > /* Fault callback or TLB/PTE Dynamic loading */ > > if (obj->isr && !obj->isr(obj, da, errs, obj->isr_priv)) -- Regards, Laurent Pinchart