From patchwork Thu Oct 3 16:03:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2984741 Return-Path: X-Original-To: patchwork-linux-arm@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 45D4F9F245 for ; Thu, 3 Oct 2013 16:09:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E6C2201C4 for ; Thu, 3 Oct 2013 16:08:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BE45201BF for ; Thu, 3 Oct 2013 16:08:54 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRlSL-0008IJ-4Y; Thu, 03 Oct 2013 16:08:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRlNP-0008Qm-A8; Thu, 03 Oct 2013 16:03:43 +0000 Received: from mail-ea0-f182.google.com ([209.85.215.182]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRlNL-0008OZ-Qb for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 16:03:40 +0000 Received: by mail-ea0-f182.google.com with SMTP id o10so1215792eaj.13 for ; Thu, 03 Oct 2013 09:03:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NvGNW9KLmtrh+rwXun+k87XVP5Bx3WGlWbDYDwzf/Rc=; b=icZeupZB1IKhDcEe4Skn6a3OHCSh8KsKVP2yfoQNd9Zmr8lX+51og5j30SNi5VjGvX xA1DEd4uQnsdMBQxnf2nBPoRkZOJyr+BlrTOBDM2M5hV0aB9f8MubeyBHyDYiD+J87pH hA0sgGQOlUiN1rBakhwC8YCX/VMvRRfTgIs1V6dkKC0VWOO3NHohUKVZ732T+JjsaFLP FI5nqNcLMDmHfGhpU+Il97HII/TAZFP9MZBpaX69ZMS6j4jXI4iwT1nvbnyjSoh29DkT +aR8wVUWbHX9lg5Fb+QeWmw8CfA2uJ7YDq1scvGKnSDkz11z8zs5kUH4v8RXcL0wznwT ltxw== X-Gm-Message-State: ALoCoQns+XA8h991WJ4KvbAokYUDa02Ytv8EmqN5JaSVmLjHq1bdmU2j5pLrq3qbrRt2hFJLILpa X-Received: by 10.14.0.6 with SMTP id 6mr3852417eea.76.1380816198128; Thu, 03 Oct 2013 09:03:18 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id f49sm17299207eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Oct 2013 09:03:17 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/6] ARM: integrator: print the Linux IRQ in LL_DEBUG code Date: Thu, 3 Oct 2013 18:03:13 +0200 Message-Id: <1380816193-3086-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131003_120340_022049_C7775DD3 X-CRM114-Status: GOOD ( 10.86 ) X-Spam-Score: -2.6 (--) Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The static HW irqs have no meaning in the interrupt handler and does not correlate to the /proc/interrupts IRQ numbers anymore, print the Linux IRQ number instead. Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/pci_v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index bef1005..2d10793 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -605,7 +605,7 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) return 1; } -static irqreturn_t v3_irq(int dummy, void *devid) +static irqreturn_t v3_irq(int irq, void *devid) { #ifdef CONFIG_DEBUG_LL struct pt_regs *regs = get_irq_regs(); @@ -615,7 +615,7 @@ static irqreturn_t v3_irq(int dummy, void *devid) extern void printascii(const char *); sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x " - "ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr, + "ISTAT=%02x\n", irq, pc, instr, __raw_readl(ap_syscon_base + INTEGRATOR_SC_LBFADDR_OFFSET), __raw_readl(ap_syscon_base + INTEGRATOR_SC_LBFCODE_OFFSET) & 255, v3_readb(V3_LB_ISTAT));