From patchwork Tue Apr 8 08:00:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 28026 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E955C20553 for ; Tue, 8 Apr 2014 17:00:17 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id oz11sf3606410veb.9 for ; Tue, 08 Apr 2014 10:00:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=OwyBxOqam+ZM8E7Jjmyukihkms/ebeisHB3o6beFI48=; b=cSIaSpPHzrc5b2Mr4sc8dqWVgbNKXSL/biz3YNYrKwk+/l2r9j2y4wg+dlRL3V08zF o1qw20sJqyWh4OZMEm0kKCYESM1nNhUwSrhh5tJd4fj98me9MvgjoMtfwIf4aO8uJXie jHXHwG4q7wvy3/t4PFAlNdCpWMsLhkRcLEq+tXDtkzsrTsbFZY8H2NQMt9f5RSbjiFED JKyL8VYDCtPOvVqRzWLKqo32ZMdnf2ZjlR430IMOrmyT5HnN8CVlAV1dhmaH0jEalNGx WOe6KBWfgE0qn4xMV/czB+0JwNFgu541mwK7vqjSsziEqrfQ0q9KoihI7LuKNHIsH0A+ KQFg== X-Gm-Message-State: ALoCoQmJ+azhUxpRvHisUt4UahbNh+hiiseVjRMm6sUBJJUvhc87YinspsphJW1pHlfds8RcCkyv X-Received: by 10.52.29.171 with SMTP id l11mr2014357vdh.0.1396976417539; Tue, 08 Apr 2014 10:00:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.201 with SMTP id f67ls267123qgd.91.gmail; Tue, 08 Apr 2014 10:00:17 -0700 (PDT) X-Received: by 10.220.249.6 with SMTP id mi6mr953041vcb.33.1396976417401; Tue, 08 Apr 2014 10:00:17 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id w10si503719vei.124.2014.04.08.10.00.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 10:00:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so1000436veb.8 for ; Tue, 08 Apr 2014 10:00:17 -0700 (PDT) X-Received: by 10.220.92.135 with SMTP id r7mr4110082vcm.11.1396976417315; Tue, 08 Apr 2014 10:00:17 -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.220.12.8 with SMTP id v8csp262247vcv; Tue, 8 Apr 2014 10:00:16 -0700 (PDT) X-Received: by 10.194.94.39 with SMTP id cz7mr2865429wjb.78.1396976415982; Tue, 08 Apr 2014 10:00:15 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id ho3si1124035wjb.208.2014.04.08.10.00.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Apr 2014 10:00:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXXxN-0007tM-W3; Tue, 08 Apr 2014 15:29:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXXwp-0005iA-Tl; Tue, 08 Apr 2014 15:28:27 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXXk0-0003gg-29 for linux-arm-kernel@merlin.infradead.org; Tue, 08 Apr 2014 15:15:12 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WXQyd-0000sn-00 for linux-arm-kernel@lists.infradead.org; Tue, 08 Apr 2014 08:01:51 +0000 Received: by mail-pd0-f179.google.com with SMTP id w10so670266pde.10 for ; Tue, 08 Apr 2014 01:01:28 -0700 (PDT) X-Received: by 10.68.196.202 with SMTP id io10mr2617676pbc.149.1396944088457; Tue, 08 Apr 2014 01:01:28 -0700 (PDT) Received: from localhost.localdomain ([162.243.130.63]) by mx.google.com with ESMTPSA id it4sm2764630pbd.48.2014.04.08.01.01.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 01:01:26 -0700 (PDT) From: Haojian Zhuang To: linux-arm-kernel@lists.infradead.org, tglx@linutronix.de, linux@arm.linux.org.uk, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, xuwei5@hisilicon.com Subject: [PATCH v2 04/12] irq: gic: use mask field in GICC_IAR Date: Tue, 8 Apr 2014 16:00:44 +0800 Message-Id: <1396944052-9887-5-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1396944052-9887-1-git-send-email-haojian.zhuang@linaro.org> References: <1396944052-9887-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140408_010151_059375_56EAF42E X-CRM114-Status: GOOD ( 11.04 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.179 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: Haojian Zhuang 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: haojian.zhuang@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 Bit[9:0] is interrupt ID field in GICC_IAR. Bit[12:10] is CPU ID field, and others are reserved. So we should use GICC_IAR_INTID to get interrupt ID. It's not a good way to use ~0x1c00 (CPU ID field) to get interrupt ID. Signed-off-by: Haojian Zhuang --- drivers/irqchip/irq-gic.c | 2 +- include/linux/irqchip/arm-gic.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 4300b66..8fd27bf 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -287,7 +287,7 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) do { irqstat = readl_relaxed(cpu_base + GIC_CPU_INTACK); - irqnr = irqstat & ~0x1c00; + irqnr = irqstat & GICC_IAR_INTID; if (likely(irqnr > 15 && irqnr < 1021)) { irqnr = irq_find_mapping(gic->domain, irqnr); diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 7ed92d0..55933aa 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -21,6 +21,8 @@ #define GIC_CPU_ACTIVEPRIO 0xd0 #define GIC_CPU_IDENT 0xfc +#define GICC_IAR_INTID 0x3ff + #define GIC_DIST_CTRL 0x000 #define GIC_DIST_CTR 0x004 #define GIC_DIST_IGROUP 0x080