From patchwork Fri Nov 23 00:42: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: 1793181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id C6F4F3FC64 for ; Fri, 23 Nov 2012 00:51:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbhRi-0004pT-IP; Fri, 23 Nov 2012 00:48:42 +0000 Received: from mail-oa0-f49.google.com ([209.85.219.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbhRH-0004mR-TB for linux-arm-kernel@lists.infradead.org; Fri, 23 Nov 2012 00:48:19 +0000 Received: by mail-oa0-f49.google.com with SMTP id l10so8318764oag.36 for ; Thu, 22 Nov 2012 16:48:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=lU3fcSfi5gq0qmvGSLTAmXimeyTKiJ0nVjSCVzzFowU=; b=CLefSBGJIuaC4hQNWq3IIStnU76kQcn860UtAUzicZzPzCZKquPf+FOG3OR8dBywI5 beXJ2yPMTNDCpZzVrwmlrPqCW14tje8ajSpVSm0S0eWTgYccY9b3O11JTIsdfrDm8jL3 FvmK3nCmSCJihPnaTNbSYjzsLL/OKThpNkDyTMClVcLBELtPG3lPsxzb/7tlYc5e5muY Hk7RP2lsZscI/mMPo/I3+4yrhDt1KZl7kTWmUX06xKFAbvyCRtifVc7vas49YzzgcjnX ieI1ZYYyR2Jibvzon/P2iXH8DnW5Nsmfle4a4sKAslOplf8XE97hfLFaGuGYBEDdKEej OOzg== Received: by 10.182.194.70 with SMTP id hu6mr1703633obc.4.1353631695418; Thu, 22 Nov 2012 16:48:15 -0800 (PST) Received: from localhost (ip-64-134-239-153.public.wayport.net. [64.134.239.153]) by mx.google.com with ESMTPS id nd14sm4454326obb.14.2012.11.22.16.48.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 16:48:14 -0800 (PST) From: Anton Vorontsov To: Andrew Morton Subject: [PATCH 3/4] ARM: VIC: Add a couple of low-level FIQ management helpers Date: Thu, 22 Nov 2012 16:42:46 -0800 Message-Id: <1353631367-4107-3-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.8.0 In-Reply-To: <20121123002957.GA31679@lizard.mcd25758.sjc.wayport.net> References: <20121123002957.GA31679@lizard.mcd25758.sjc.wayport.net> X-Gm-Message-State: ALoCoQkH92/qu0PHI3mXfmOj6zL+TZyjkp0nY1mf697AZtiF06F18dRJwbMxi7kmwx+w34W+YWfq X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121122_194816_012310_72117CFB X-CRM114-Status: GOOD ( 12.91 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linaro-kernel@lists.linaro.org, Russell King , patches@linaro.org, linux-kernel@vger.kernel.org, John Stultz , Jason Wessel , kernel-team@android.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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