From patchwork Thu Sep 13 15:03:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 11400 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 6529723EB4 for ; Thu, 13 Sep 2012 15:06:54 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id A112AA26779 for ; Thu, 13 Sep 2012 15:06:53 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so2217144iaf.11 for ; Thu, 13 Sep 2012 08:06:53 -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=tvYWsK/dU8UJVmIG9wn3l+POQTaiYI0mxeqyr0f3WaI=; b=X8uP4dfT4Cs9hqV+es0u0Q/pyJ50E0dnbqP2MeSMzIec0YddLlSG4S23Btp8kj2BfE I6ygo6WfKkOkqm0vGtIB9b4I3Is6yIrXpBf1pqUNML7m1BkGIFK69TSpTp05wq5L7KDA korJw35rHntxsrMvPFtWYTwin07235JYmUUpC5615kCrX0j2+PHkBeBqln/k+C+6FMsR cSMbwa3MZ94V+iE3b9+Q5g3llyWAznE8j1vtOgBfxX7FcImgBW1seI1b0EZ9GEYAta0Z 3DVyrf/D5SbcnliowGkzhFGlUdUhK4oGaPYi7MH6wnMtvhLEnQmhAN6RZ414Jajn8G3S Z0xA== Received: by 10.50.237.41 with SMTP id uz9mr2828999igc.43.1347548813365; Thu, 13 Sep 2012 08:06:53 -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.50.184.232 with SMTP id ex8csp137363igc; Thu, 13 Sep 2012 08:06:52 -0700 (PDT) Received: by 10.68.216.136 with SMTP id oq8mr19770pbc.68.1347548810891; Thu, 13 Sep 2012 08:06:50 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id ip5si34517161pbc.318.2012.09.13.08.06.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 08:06:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.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-pz0-f50.google.com with SMTP id e7so2138480dad.37 for ; Thu, 13 Sep 2012 08:06:50 -0700 (PDT) Received: by 10.66.85.71 with SMTP id f7mr3928565paz.5.1347548810584; Thu, 13 Sep 2012 08:06:50 -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 kj10sm7038406pbc.72.2012.09.13.08.06.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 08:06:49 -0700 (PDT) From: Anton Vorontsov To: Andrew Morton , Russell King , Jason Wessel , Greg Kroah-Hartman , Alan Cox Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Colin Cross , Brian Swetland , John Stultz , Thomas Gleixner , 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, linux-serial@vger.kernel.org Subject: [PATCH 10/11] ARM: VIC: Add a couple of low-level FIQ management helpers Date: Thu, 13 Sep 2012 08:03:34 -0700 Message-Id: <1347548615-18227-10-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.11.5 In-Reply-To: <20120913150133.GA16238@lizard> References: <20120913150133.GA16238@lizard> X-Gm-Message-State: ALoCoQnTPA3BTaUmQfkMYpCBa6U8gfkn+QHAcXhqSuJwoBVl+LIXnel6aEgHfYW5cHJsfCgrhVZR 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