From patchwork Tue Jan 25 20:54:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Cross X-Patchwork-Id: 506981 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0PKtW6d009394 for ; Tue, 25 Jan 2011 20:55:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753862Ab1AYUzE (ORCPT ); Tue, 25 Jan 2011 15:55:04 -0500 Received: from smtp-out.google.com ([74.125.121.67]:7366 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752707Ab1AYUzC convert rfc822-to-8bit (ORCPT ); Tue, 25 Jan 2011 15:55:02 -0500 Received: from kpbe11.cbf.corp.google.com (kpbe11.cbf.corp.google.com [172.25.105.75]) by smtp-out.google.com with ESMTP id p0PKsum1014115 for ; Tue, 25 Jan 2011 12:54:57 -0800 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1295988900; bh=nX8cLsSCEPyQEKODwK4Txyx0LiY=; h=MIME-Version:Sender:In-Reply-To:References:Date:Message-ID: Subject:From:To:Cc:Content-Type:Content-Transfer-Encoding; b=ixc3jb/eYyKT+N8/y1qbkWrvaDMDzICmefactk5e+FfTKKuBakLqLIxYddjRqUySc io2KFClv9Qy6DdRaBOxRg== Received: from qyk12 (qyk12.prod.google.com [10.241.83.140]) by kpbe11.cbf.corp.google.com with ESMTP id p0PKsSHx008909 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT) for ; Tue, 25 Jan 2011 12:54:56 -0800 Received: by qyk12 with SMTP id 12so216817qyk.19 for ; Tue, 25 Jan 2011 12:54:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=beta; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=oGTmuBiFuTUWc/qrLLdX2yo3ORSdhTkt6R9BMcgRdBg=; b=GkBdB/1C+MCTQPYEH0LB9N9weBa9NQys0R50RyUaPxj9bNy82RFi9Gs9wOBLMY88LN vdirccRaKQlsiSdm+Ebw== DomainKey-Signature: a=rsa-sha1; c=nofws; d=google.com; s=beta; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=uvHdXyYQ8cl2aBmsTiG8uFCwqbFomJnz9YzzA0w0KrTdP1FZYHk2ceVamRZrT6MBTn ExAnPMA81X1XmscNi48Q== MIME-Version: 1.0 Received: by 10.224.47.75 with SMTP id m11mr5675470qaf.249.1295988896038; Tue, 25 Jan 2011 12:54:56 -0800 (PST) Received: by 10.220.187.197 with HTTP; Tue, 25 Jan 2011 12:54:55 -0800 (PST) In-Reply-To: References: <1295859080-15259-1-git-send-email-santosh.shilimkar@ti.com> <1295859080-15259-2-git-send-email-santosh.shilimkar@ti.com> Date: Tue, 25 Jan 2011 12:54:55 -0800 X-Google-Sender-Auth: nAb7oBC8YdQi6UszUphL0cep6LQ Message-ID: Subject: Re: [PATCH 1/5] ARM: gic: Add hooks for architecture specific extensions From: Colin Cross To: Santosh Shilimkar Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, catalin.marinas@arm.com, linux@arm.linux.org.uk, linus.ml.walleij@gmail.com, Russell King 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 (demeter1.kernel.org [140.211.167.41]); Tue, 25 Jan 2011 20:55:33 +0000 (UTC) diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 0b6c043..7993f07 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -90,6 +90,8 @@ static inline unsigned int gic_irq(struct irq_data *d) static void gic_ack_irq(struct irq_data *d) { spin_lock(&irq_controller_lock); + if (gic_arch_extn.irq_ack) + gic_arch_extn.irq_ack(d); writel(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI); spin_unlock(&irq_controller_lock); } @@ -161,6 +163,14 @@ static int gic_set_type(struct irq_data *d, unsigned int type) return 0; } +static int gic_retrigger(struct irq_data *d) +{ + if (gic_arch_extn.irq_retrigger) + return gic_arch_extn.irq_retrigger(d); + + return 0; +} + #ifdef CONFIG_SMP static int