From: Andres Salomon <dilinger@queued.net>
To: devicetree-discuss@lists.ozlabs.org
Cc: sparclinux@vger.kernel.org, x86@kernel.org, tglx@linutronix.de,
mingo@redhat.com, hpa@zytor.com, cjb@laptop.org,
Mitch Bradley <wmb@laptop.org>,
pgf@laptop.org, linux-kernel@vger.kernel.org,
davem@davemloft.net, grant.likely@secretlab.ca,
Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Subject: [PATCH 8/9] x86: of: irq additions to make drivers/of/* build on x86
Date: Mon, 30 Aug 2010 00:06:14 -0400 [thread overview]
Message-ID: <20100830000614.0d571f10@debxo> (raw)
In-Reply-To: <20100829235100.6dcedcb8@debxo>
This functionality overlaps with patches previously submitted
by Stephen Neuendorffer. I don't care whose eventually get applied,
so long as drivers/of/* becomes buildable on x86.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
arch/x86/include/asm/irq.h | 5 +++++
arch/x86/kernel/irq.c | 8 ++++++++
include/linux/of_irq.h | 1 +
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index 5458380..0a656b9 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -10,6 +10,11 @@
#include <asm/apicdef.h>
#include <asm/irq_vectors.h>
+#define NO_IRQ 0
+
+/* Even though we don't support this, supply it to appease OF */
+static inline void irq_dispose_mapping(unsigned int virq) { }
+
static inline int irq_canonicalize(int irq)
{
return ((irq == 2) ? 9 : irq);
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 91fd0c7..d53f639 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -7,6 +7,7 @@
#include <linux/seq_file.h>
#include <linux/smp.h>
#include <linux/ftrace.h>
+#include <linux/of.h>
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -275,6 +276,13 @@ void smp_x86_platform_ipi(struct pt_regs *regs)
EXPORT_SYMBOL_GPL(vector_used_by_percpu_irq);
+unsigned int irq_create_of_mapping(struct device_node *controller,
+ const u32 *intspec, unsigned int intsize)
+{
+ return intspec[0] + 1;
+}
+EXPORT_SYMBOL_GPL(irq_create_of_mapping);
+
#ifdef CONFIG_HOTPLUG_CPU
/* A cpu has been removed from cpu_online_mask. Reset irq affinities. */
void fixup_irqs(void)
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 5929781..05ad27b 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -5,6 +5,7 @@
struct of_irq;
#include <linux/types.h>
#include <linux/errno.h>
+#include <linux/irq.h>
#include <linux/ioport.h>
#include <linux/of.h>
--
1.5.6.5
next prev parent reply other threads:[~2010-08-30 4:04 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-29 1:54 [PATCH 0/4] RFC: OLPC/x86 device tree code Andres Salomon
2010-06-29 2:00 ` [PATCH 1/4] x86: OLPC: constify an olpc_ofw() arg Andres Salomon
2010-07-31 1:10 ` [tip:x86/olpc] x86, olpc: Constify " tip-bot for Andres Salomon
2010-06-29 2:00 ` [PATCH 2/4] sparc: break out some prom device-tree building code out into drivers/of Andres Salomon
2010-06-29 3:11 ` David Miller
2010-06-29 6:15 ` Stephen Rothwell
2010-06-29 7:50 ` Grant Likely
2010-06-29 15:03 ` Andres Salomon
2010-06-29 21:42 ` Grant Likely
2010-06-29 23:36 ` Andres Salomon
2010-06-30 21:52 ` Grant Likely
2010-07-07 4:07 ` Andres Salomon
2010-07-06 2:22 ` David Miller
2010-07-06 7:00 ` Grant Likely
2010-07-06 7:16 ` David Miller
2010-07-06 8:17 ` Grant Likely
2010-07-07 5:15 ` Andres Salomon
2010-07-06 10:17 ` Benjamin Herrenschmidt
2010-07-06 8:17 ` Grant Likely
2010-07-06 9:21 ` Grant Likely
2010-07-06 21:54 ` Andres Salomon
2010-07-06 22:06 ` Grant Likely
2010-07-07 1:15 ` Andres Salomon
2010-06-29 2:00 ` [PATCH 3/4] proc: unify PROC_DEVICETREE config Andres Salomon
2010-06-29 7:33 ` Grant Likely
2010-06-29 2:00 ` [PATCH 4/4] x86: OLPC: add OLPC device-tree support Andres Salomon
2010-06-29 8:12 ` Grant Likely
2010-06-29 8:33 ` Stephen Rothwell
2010-06-29 14:23 ` Andres Salomon
2010-06-30 21:13 ` Grant Likely
2010-06-30 21:32 ` Andres Salomon
2010-08-30 3:51 ` [PATCH 0/9] " Andres Salomon
2010-08-30 3:53 ` [PATCH 1/9] of: move phandle/ihandle into types.h Andres Salomon
2010-08-30 5:06 ` Sam Ravnborg
2010-09-03 8:17 ` Andres Salomon
2010-09-05 6:22 ` Sam Ravnborg
2010-08-30 3:55 ` [PATCH 2/9] sparc: convert various prom_* functions to use phandle Andres Salomon
2010-08-30 3:57 ` [PATCH 3/9] sparc: break out some PROM device-tree building code out into drivers/of Andres Salomon
2010-08-30 3:59 ` [PATCH 4/9] sparc: make drivers/of/pdt.c no longer sparc-only Andres Salomon
2010-08-30 4:00 ` [PATCH 5/9] of: no longer call prom_ functions directly; use an ops structure Andres Salomon
2010-08-30 4:02 ` [PATCH 6/9] of: add of_pdt namespace to pdt code Andres Salomon
2010-08-30 4:04 ` [PATCH 7/9] of: add package-to-path support to pdt Andres Salomon
2010-08-30 4:06 ` Andres Salomon [this message]
2010-08-30 15:58 ` [PATCH 8/9] x86: of: irq additions to make drivers/of/* build on x86 Stephen Neuendorffer
2010-08-30 17:31 ` Grant Likely
2010-08-30 4:07 ` [PATCH 9/9] x86: OLPC: add OLPC device-tree support Andres Salomon
2010-08-30 18:14 ` Grant Likely
2010-08-30 18:49 ` Andres Salomon
2010-08-31 5:49 ` Grant Likely
2010-08-30 17:58 ` [PATCH 0/9] " Grant Likely
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=20100830000614.0d571f10@debxo \
--to=dilinger@queued.net \
--cc=cjb@laptop.org \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pgf@laptop.org \
--cc=sparclinux@vger.kernel.org \
--cc=stephen.neuendorffer@xilinx.com \
--cc=tglx@linutronix.de \
--cc=wmb@laptop.org \
--cc=x86@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).