From patchwork Fri Jul 13 10:16:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 9984 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C2DC823E1B for ; Fri, 13 Jul 2012 10:19:22 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 92B2CA18243 for ; Fri, 13 Jul 2012 10:19:22 +0000 (UTC) Received: by yhpp61 with SMTP id p61so3807453yhp.11 for ; Fri, 13 Jul 2012 03:19:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=R+7LbXRESBE+3YTeimhn2KFHcitWnQ11Yft3qHACaDI=; b=S+E5W40FSMAT8DZIz02uHOlERTmqIZIYyaRXL45pT1GAuFw8KwSEB7KfGUm7HsDfW1 aQNmp1ybffeR0rz4iQ0SMc6DYGdbpZxLPwuoXGBlglmXYca4Em63x1+AOcAjlf9WjgA3 A3mycKbPxYVRvIxTBe83gdF8vDsTGndA9oZiFpYEMTTgjnMsHU6VE3oi5n+NjVixqpp6 kFqQoyX9y9EaHW6Lc2tAYKXI0KvsCnC06P4PeAnuHfbSjGCNkVUK+4Gz/9ipw8fiRgyL 7DOU/AEldic7uY6IMJbLthHgcyS/ACKPBWaOdYYpQllAVb2qtTS4deA4069m8fOuu/kd wcZg== Received: by 10.50.195.234 with SMTP id ih10mr464042igc.0.1342174761932; Fri, 13 Jul 2012 03:19:21 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.241.2 with SMTP id lc2csp13700ibb; Fri, 13 Jul 2012 03:19:21 -0700 (PDT) Received: by 10.66.83.33 with SMTP id n1mr1235191pay.7.1342174761280; Fri, 13 Jul 2012 03:19:21 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id pv10si13925349pbb.64.2012.07.13.03.19.21 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jul 2012 03:19:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by mail-pb0-f50.google.com with SMTP id rr4so6369113pbb.37 for ; Fri, 13 Jul 2012 03:19:21 -0700 (PDT) Received: by 10.68.195.202 with SMTP id ig10mr2385642pbc.37.1342174761063; Fri, 13 Jul 2012 03:19:21 -0700 (PDT) Received: from localhost (c-71-204-165-222.hsd1.ca.comcast.net. [71.204.165.222]) by mx.google.com with ESMTPS id tj4sm5753841pbc.33.2012.07.13.03.19.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jul 2012 03:19:20 -0700 (PDT) From: Anton Vorontsov To: Russell King , Jason Wessel Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Colin Cross , John Stultz , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com, kgdb-bugreport@lists.sourceforge.net Subject: [PATCH 6/8] ARM: VIC: Add a couple of low-level FIQ management helpers Date: Fri, 13 Jul 2012 03:16:46 -0700 Message-Id: <1342174608-22407-6-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120713101605.GA16139@lizard> References: <20120713101605.GA16139@lizard> X-Gm-Message-State: ALoCoQkCGYETTR1WjO1IWV5zjGfmbrUdu3hdtJWOYnXzP+k1OvI36D7HFiON+wYeAs/VzrBpwbK6 Just a couple of calls to manage VIC FIQ routing. We'll use them for KGDB FIQ support on ARM Versatile machines. Signed-off-by: Anton Vorontsov --- arch/arm/common/vic.c | 28 ++++++++++++++++++++++++++++ arch/arm/include/asm/hardware/vic.h | 2 ++ 2 files changed, 30 insertions(+) diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index e0d5388..df2fc82 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c @@ -66,6 +66,34 @@ static struct vic_device vic_devices[CONFIG_ARM_VIC_NR]; static int vic_id; +static void __iomem *vic_base(struct irq_data *d) +{ + return (void __iomem *)irq_data_get_irq_chip_data(d); +} + +void vic_fiq_select(unsigned int irq, bool on) +{ + void __iomem *base = vic_base(&irq_to_desc(irq)->irq_data); + void __iomem *sel = base + VIC_INT_SELECT; + u32 msk = 1 << irq; + u32 val; + + pr_debug("rerouting VIC vector %d to %s\n", irq, on ? "FIQ" : "IRQ"); + + val = readl(sel); + val &= ~msk; + if (on) + val |= msk; + writel(val, sel); +} + +bool vic_is_fiq_rised(unsigned int irq) +{ + void __iomem *base = vic_base(&irq_to_desc(irq)->irq_data); + + return readl(base + VIC_FIQ_STATUS) & (1 << irq); +} + /** * vic_init2 - common initialisation code * @base: Base of the VIC. diff --git a/arch/arm/include/asm/hardware/vic.h b/arch/arm/include/asm/hardware/vic.h index e14af1a..2728975 100644 --- a/arch/arm/include/asm/hardware/vic.h +++ b/arch/arm/include/asm/hardware/vic.h @@ -52,6 +52,8 @@ void __vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources); int vic_of_init(struct device_node *node, struct device_node *parent); void vic_handle_irq(struct pt_regs *regs); +void vic_fiq_select(unsigned int irq, bool on); +bool vic_is_fiq_rised(unsigned int irq); #endif /* __ASSEMBLY__ */ #endif