From patchwork Tue Aug 26 10:03:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 35968 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5960420565 for ; Tue, 26 Aug 2014 10:05:35 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf116234198pdj.4 for ; Tue, 26 Aug 2014 03:05:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=7W/yKbqdRdIncklYcbfEmdSSBDsor/sRjzSrhQN+s8o=; b=G5Hvx/j24rHfz/dtSwfHif6bm/lZQxsvvYZ1ShetPHox6TaMmWZdCM9lXwkaXQXjeE jloyvSOcir+BCdf/ZoGBQHDWetRDxKSwfzD5JMfOE00R18apfdPEZmFcepfxIeXPECeN Hz5rJFFPceBrsDPtt/vew2+r9lvJ+lCgDIfNs2wtce5ySZKpKxhTl23LaqCbvvnE0Vst YlHLNqAuUuygC73f5QJSFJhZ2Vue4HIBYDJ4CXjlMDh77nO/uZd3KaeGK5jg5pp/8q8Z aEXX2Lkoo6z5UvYVeVoDaxbv4iJX7VgNDOzBxDxbhuBwNUFn82F/o/VsB6si8VBggcqR BmoQ== X-Gm-Message-State: ALoCoQm46k2lrOi5VYuvHxJkNZV1sm1z3Rs/KzC+eyC3XGdZzw+nTvnoJvu0faFJF4vJdXhpD9Md X-Received: by 10.66.141.70 with SMTP id rm6mr17995093pab.37.1409047533921; Tue, 26 Aug 2014 03:05:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.237 with SMTP id r100ls929965qgr.49.gmail; Tue, 26 Aug 2014 03:05:33 -0700 (PDT) X-Received: by 10.52.248.42 with SMTP id yj10mr8876521vdc.50.1409047533755; Tue, 26 Aug 2014 03:05:33 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id sm14si1154929vdb.78.2014.08.26.03.05.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 03:05:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so16464868vcb.35 for ; Tue, 26 Aug 2014 03:05:33 -0700 (PDT) X-Received: by 10.52.245.101 with SMTP id xn5mr9575476vdc.32.1409047533682; Tue, 26 Aug 2014 03:05:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp185046vcb; Tue, 26 Aug 2014 03:05:33 -0700 (PDT) X-Received: by 10.68.69.7 with SMTP id a7mr5413417pbu.49.1409047532837; Tue, 26 Aug 2014 03:05:32 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ti10si3191070pab.206.2014.08.26.03.05.31 for ; Tue, 26 Aug 2014 03:05:32 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934648AbaHZKEy (ORCPT + 26 others); Tue, 26 Aug 2014 06:04:54 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:21038 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934630AbaHZKEu (ORCPT ); Tue, 26 Aug 2014 06:04:50 -0400 Received: from e102391-lin.cambridge.arm.com (e102391-lin.cambridge.arm.com [10.1.209.143]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 1AEFC13FB6A; Tue, 26 Aug 2014 05:04:46 -0500 (CDT) From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux@lists.openrisc.net Cc: linux@arm.linux.org.uk, shawn.guo@freescale.com, kernel@pengutronix.de, tony@atomide.com, catalin.marinas@arm.com, will.deacon@arm.com, jonas@southpole.se, tglx@linutronix.de, jason@lakedaemon.net, shc_work@mail.ru, baohua@kernel.org, maxime.ripard@free-electrons.com, marc.zyngier@arm.com, khilman@linaro.org, sboyd@codeaurora.org, lorenzo.pieralisi@arm.com, larry.bassel@linaro.org, mark.rutland@arm.com, sudeep.holla@arm.com, stefan.kristiansson@saunalahti.fi, vkale@apm.com, schwidefsky@de.ibm.com Subject: [PATCH v2 18/26] irqchip: GICv3: convert to handle_domain_irq Date: Tue, 26 Aug 2014 11:03:33 +0100 Message-Id: <1409047421-27649-19-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1409047421-27649-1-git-send-email-marc.zyngier@arm.com> References: <1409047421-27649-1-git-send-email-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: marc.zyngier@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Use the new handle_domain_irq method to handle interrupts. Signed-off-by: Marc Zyngier --- drivers/irqchip/irq-gic-v3.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 57eaa5a..9e31449 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -274,14 +274,13 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs irqnr = gic_read_iar(); if (likely(irqnr > 15 && irqnr < 1020)) { - u64 irq = irq_find_mapping(gic_data.domain, irqnr); - if (likely(irq)) { - handle_IRQ(irq, regs); - continue; + int err; + err = handle_domain_irq(gic_data.domain, irqnr, regs); + if (err) { + WARN_ONCE(true, "Unexpected SPI received!\n"); + gic_write_eoir(irqnr); } - - WARN_ONCE(true, "Unexpected SPI received!\n"); - gic_write_eoir(irqnr); + continue; } if (irqnr < 16) { gic_write_eoir(irqnr);