From patchwork Mon Nov 23 03:40:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 7677521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AFF49BF90C for ; Mon, 23 Nov 2015 03:42:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9F33206C0 for ; Mon, 23 Nov 2015 03:42:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09AE0206BD for ; Mon, 23 Nov 2015 03:42:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a0hzS-0006eN-H2; Mon, 23 Nov 2015 03:40:30 +0000 Received: from mail-qk0-x229.google.com ([2607:f8b0:400d:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a0hzO-0006F0-Qz for linux-arm-kernel@lists.infradead.org; Mon, 23 Nov 2015 03:40:27 +0000 Received: by qkfo3 with SMTP id o3so54017739qkf.1 for ; Sun, 22 Nov 2015 19:40:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:user-agent:mime-version :content-type; bh=D5Zt7Dd+9xUbcU7BALd+dXClXHOi6f82LoYVTFnUlQM=; b=BRgo6ts7qqG+spp+mZxB3G/2Hu8MNSXf/D+/ZAJuDA6ywMVarftj57pmoMy5w9GZfi 7zbXUOX5evhiH6Tt4UdnNeADIfSlDElTIUzhXamImx159B4UHEsxI+k6NFgHcRDiaEE6 8K6V2sVdv6+NMqmK+wmwx2VZD+HONolhj90xpufbZUnPwJDmRzvmfRx6L/HtVJhIqZ7Q mqnEhwHdMymWu+g8DZVOSUEP17/o45swBQlsOAPE0nysWMkI34xqQZXDcjh4OA+yebRD vXdaqSs5Z6JqHvgJ1hzwSoRi95/o57rpfwMV19L621avFJONkSUdFAtG0cQGQ4A0U0ka 7fIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=D5Zt7Dd+9xUbcU7BALd+dXClXHOi6f82LoYVTFnUlQM=; b=mGk9eM5H7cgPVBsimGU/Yb0ocXonx5cnIz1wms6YFr1urF9ebvIHI4O9LNfuQvU6Dw Jpl24Jcip2jD8wSavgvENDYs3FZ7wUtysvx/g8nn25z3cT6UhuDu7vsHINoui1wjxJjq lavxHSBfsfDPofr0K1TVZD3FGGk6gkOZXbyBxF2FmTuZsc5Z5KupW9dtymkQ7qmHnQ/P x6P8Y3rvaBdrnST4hQSMyLyCQPY6YpwFm53XQGkfw2aHAwXmFdTanGiWCyZ/JnmMcfrL fYFRs/L6Iwa/WrNPFlqiFSKTZZo42jz9GixIvoUTuhP9nc0zKF+lEbfpROjhDw+BtFn6 nOQw== X-Gm-Message-State: ALoCoQn0pPvQ5NmHDphWpsnHKCzN6leXcS1lvHEwQ/acW4HWukA3Peggm3SWGUCZu67CMZ5Ku7we X-Received: by 10.140.170.131 with SMTP id q125mr26881159qhq.84.1448250005659; Sun, 22 Nov 2015 19:40:05 -0800 (PST) Received: from xanadu.home (modemcable065.157-23-96.mc.videotron.ca. [96.23.157.65]) by smtp.gmail.com with ESMTPSA id 16sm2572507qhe.9.2015.11.22.19.40.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Nov 2015 19:40:04 -0800 (PST) Date: Sun, 22 Nov 2015 22:40:03 -0500 (EST) From: Nicolas Pitre To: Jason Cooper , Andrew Lunn , Gregory CLEMENT Subject: ARM: mach-dove: fix legacy get_irqnr_and_base Message-ID: User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151122_194027_003550_E0A21EFA X-CRM114-Status: UNSURE ( 8.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org 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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Commit 5d6bed2a9c ("ARM: dove: fix legacy dove IRQ numbers") shifted IRQ numbers by one but didn't update the get_irqnr_and_base macro accordingly. This macro is involved when CONFIG_MULTI_IRQ_HANDLER is not defined. Signed-off-by: Nicolas Pitre diff --git a/arch/arm/mach-dove/include/mach/entry-macro.S b/arch/arm/mach-dove/include/mach/entry-macro.S index 72d622baaa..df1d44bdc3 100644 --- a/arch/arm/mach-dove/include/mach/entry-macro.S +++ b/arch/arm/mach-dove/include/mach/entry-macro.S @@ -18,13 +18,13 @@ @ check low interrupts ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF] ldr \tmp, [\base, #IRQ_MASK_LOW_OFF] - mov \irqnr, #31 + mov \irqnr, #32 ands \irqstat, \irqstat, \tmp @ if no low interrupts set, check high interrupts ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF] ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF] - moveq \irqnr, #63 + moveq \irqnr, #64 andeqs \irqstat, \irqstat, \tmp @ find first active interrupt source