From: Anton Vorontsov <anton.vorontsov@linaro.org> To: Andrew Morton <akpm@linux-foundation.org>, Russell King <linux@arm.linux.org.uk>, Jason Wessel <jason.wessel@windriver.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Alan Cox <alan@linux.intel.com> Cc: "Arve Hjønnevåg" <arve@android.com>, "Colin Cross" <ccross@android.com>, "Brian Swetland" <swetland@google.com>, "John Stultz" <john.stultz@linaro.org>, 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 13/14] ARM: VIC: Add a couple of low-level FIQ management helpers Date: Sun, 9 Sep 2012 21:14:36 -0700 [thread overview] Message-ID: <20120910041436.GM29537@lizard> (raw) In-Reply-To: <20120910040802.GA1261@lizard> 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 <anton.vorontsov@linaro.org> --- 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 -- 1.7.11.5
WARNING: multiple messages have this Message-ID (diff)
From: anton.vorontsov@linaro.org (Anton Vorontsov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/14] ARM: VIC: Add a couple of low-level FIQ management helpers Date: Sun, 9 Sep 2012 21:14:36 -0700 [thread overview] Message-ID: <20120910041436.GM29537@lizard> (raw) In-Reply-To: <20120910040802.GA1261@lizard> 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 <anton.vorontsov@linaro.org> --- 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 -- 1.7.11.5
next prev parent reply other threads:[~2012-09-10 4:17 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-10 4:08 [PATCH v5 0/14] KGDB/KDB FIQ (NMI) debugger Anton Vorontsov 2012-09-10 4:08 ` Anton Vorontsov 2012-09-10 4:11 ` [PATCH 01/14] serial/amba-pl011: fix ages old copy-paste errors Anton Vorontsov 2012-09-10 4:11 ` Anton Vorontsov 2012-09-10 4:12 ` [PATCH 02/14] drivers/tty/serial/amba-pl0{10,11}.c: use clk_prepare_enable and clk_disable_unprepare Anton Vorontsov 2012-09-10 4:12 ` Anton Vorontsov 2012-09-10 4:12 ` [PATCH 03/14] kernel/debug: Mask KGDB NMI upon entry Anton Vorontsov 2012-09-10 4:12 ` Anton Vorontsov 2012-09-10 4:13 ` [PATCH 04/14] kdb: Implement disable_nmi command Anton Vorontsov 2012-09-10 4:13 ` Anton Vorontsov 2012-09-10 4:13 ` [PATCH 05/14] kdb: Turn KGDB_KDB=n stubs into static inlines Anton Vorontsov 2012-09-10 4:13 ` Anton Vorontsov 2012-09-10 4:13 ` [PATCH 06/14] tty/serial/core: Introduce poll_init callback Anton Vorontsov 2012-09-10 4:13 ` Anton Vorontsov 2012-09-10 11:13 ` Alan Cox 2012-09-10 11:13 ` Alan Cox 2012-09-10 17:57 ` Anton Vorontsov 2012-09-10 17:57 ` Anton Vorontsov 2012-09-10 19:18 ` Alan Cox 2012-09-10 19:18 ` Alan Cox 2012-09-10 4:13 ` [PATCH 07/14] tty/serial/amba-pl011: Implement " Anton Vorontsov 2012-09-10 4:13 ` Anton Vorontsov 2012-09-10 4:13 ` [PATCH 08/14] tty/serial/kgdboc: Add and wire up clear_irqs callback Anton Vorontsov 2012-09-10 4:13 ` Anton Vorontsov 2012-09-10 11:16 ` Alan Cox 2012-09-10 11:16 ` Alan Cox 2012-09-10 17:57 ` Anton Vorontsov 2012-09-10 17:57 ` Anton Vorontsov 2012-09-10 19:19 ` Alan Cox 2012-09-10 19:19 ` Alan Cox 2012-09-10 20:13 ` Anton Vorontsov 2012-09-10 20:13 ` Anton Vorontsov 2012-09-10 4:14 ` [PATCH 09/14] tty/serial/amba-pl011: Implement " Anton Vorontsov 2012-09-10 4:14 ` Anton Vorontsov 2012-09-10 11:17 ` Alan Cox 2012-09-10 11:17 ` Alan Cox 2012-09-10 17:56 ` Anton Vorontsov 2012-09-10 17:56 ` Anton Vorontsov 2012-09-10 4:14 ` [PATCH 10/14] tty/serial: Add kgdb_nmi driver Anton Vorontsov 2012-09-10 4:14 ` Anton Vorontsov 2012-09-10 11:11 ` Alan Cox 2012-09-10 11:11 ` Alan Cox 2012-09-10 17:54 ` Anton Vorontsov 2012-09-10 17:54 ` Anton Vorontsov 2012-09-10 4:14 ` [PATCH 11/14] ARM: Move some macros from entry-armv to entry-header Anton Vorontsov 2012-09-10 4:14 ` Anton Vorontsov 2012-09-10 4:14 ` [PATCH 12/14] ARM: Add KGDB/KDB FIQ debugger generic code Anton Vorontsov 2012-09-10 4:14 ` Anton Vorontsov 2012-09-10 4:14 ` Anton Vorontsov [this message] 2012-09-10 4:14 ` [PATCH 13/14] ARM: VIC: Add a couple of low-level FIQ management helpers Anton Vorontsov 2012-09-10 4:14 ` [PATCH 14/14] ARM: versatile: Make able to use UART ports for KGDB FIQ debugger Anton Vorontsov 2012-09-10 4:14 ` Anton Vorontsov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120910041436.GM29537@lizard \ --to=anton.vorontsov@linaro.org \ --cc=akpm@linux-foundation.org \ --cc=alan@linux.intel.com \ --cc=arve@android.com \ --cc=ccross@android.com \ --cc=gregkh@linuxfoundation.org \ --cc=jason.wessel@windriver.com \ --cc=john.stultz@linaro.org \ --cc=kernel-team@android.com \ --cc=kgdb-bugreport@lists.sourceforge.net \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=patches@linaro.org \ --cc=swetland@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.