diff options
author | Mark Nelson <markn@au1.ibm.com> | 2010-05-18 18:51:00 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-21 03:31:12 -0400 |
commit | 32c96f7765b881ab1f6ab8ff04b733e4cf157239 (patch) | |
tree | 16414f6eead1f5e58efebd2ce26b80911264656b /arch | |
parent | bc8449cc57898bc9cf1ffc4619d026f77bf327c1 (diff) |
powerpc/pseries: Make request_ras_irqs() available to other pseries code
At the moment only the RAS code uses event-sources interrupts (for EPOW
events and internal errors) so request_ras_irqs() (which actually requests
the event-sources interrupts) is found in ras.c and is static.
We want to be able to use event-sources interrupts in other pseries code,
so let's rename request_ras_irqs() to request_event_sources_irqs() and
move it to event_sources.c.
This will be used in an upcoming patch that adds support for IO Event
interrupts that come through as event sources.
Signed-off-by: Mark Nelson <markn@au1.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/event_sources.c | 79 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/pseries.h | 7 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/ras.c | 62 |
4 files changed, 90 insertions, 60 deletions
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index 0ff5174ae4f..3dbef309bc8 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile | |||
@@ -7,7 +7,7 @@ EXTRA_CFLAGS += -DDEBUG | |||
7 | endif | 7 | endif |
8 | 8 | ||
9 | obj-y := lpar.o hvCall.o nvram.o reconfig.o \ | 9 | obj-y := lpar.o hvCall.o nvram.o reconfig.o \ |
10 | setup.o iommu.o ras.o \ | 10 | setup.o iommu.o event_sources.o ras.o \ |
11 | firmware.o power.o dlpar.o | 11 | firmware.o power.o dlpar.o |
12 | obj-$(CONFIG_SMP) += smp.o | 12 | obj-$(CONFIG_SMP) += smp.o |
13 | obj-$(CONFIG_XICS) += xics.o | 13 | obj-$(CONFIG_XICS) += xics.o |
diff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c new file mode 100644 index 00000000000..e889c9d9586 --- /dev/null +++ b/arch/powerpc/platforms/pseries/event_sources.c | |||
@@ -0,0 +1,79 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2001 Dave Engebretsen IBM Corporation | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | |||
19 | #include <asm/prom.h> | ||
20 | |||
21 | #include "pseries.h" | ||
22 | |||
23 | void request_event_sources_irqs(struct device_node *np, | ||
24 | irq_handler_t handler, | ||
25 | const char *name) | ||
26 | { | ||
27 | int i, index, count = 0; | ||
28 | struct of_irq oirq; | ||
29 | const u32 *opicprop; | ||
30 | unsigned int opicplen; | ||
31 | unsigned int virqs[16]; | ||
32 | |||
33 | /* Check for obsolete "open-pic-interrupt" property. If present, then | ||
34 | * map those interrupts using the default interrupt host and default | ||
35 | * trigger | ||
36 | */ | ||
37 | opicprop = of_get_property(np, "open-pic-interrupt", &opicplen); | ||
38 | if (opicprop) { | ||
39 | opicplen /= sizeof(u32); | ||
40 | for (i = 0; i < opicplen; i++) { | ||
41 | if (count > 15) | ||
42 | break; | ||
43 | virqs[count] = irq_create_mapping(NULL, *(opicprop++)); | ||
44 | if (virqs[count] == NO_IRQ) | ||
45 | printk(KERN_ERR "Unable to allocate interrupt " | ||
46 | "number for %s\n", np->full_name); | ||
47 | else | ||
48 | count++; | ||
49 | |||
50 | } | ||
51 | } | ||
52 | /* Else use normal interrupt tree parsing */ | ||
53 | else { | ||
54 | /* First try to do a proper OF tree parsing */ | ||
55 | for (index = 0; of_irq_map_one(np, index, &oirq) == 0; | ||
56 | index++) { | ||
57 | if (count > 15) | ||
58 | break; | ||
59 | virqs[count] = irq_create_of_mapping(oirq.controller, | ||
60 | oirq.specifier, | ||
61 | oirq.size); | ||
62 | if (virqs[count] == NO_IRQ) | ||
63 | printk(KERN_ERR "Unable to allocate interrupt " | ||
64 | "number for %s\n", np->full_name); | ||
65 | else | ||
66 | count++; | ||
67 | } | ||
68 | } | ||
69 | |||
70 | /* Now request them */ | ||
71 | for (i = 0; i < count; i++) { | ||
72 | if (request_irq(virqs[i], handler, 0, name, NULL)) { | ||
73 | printk(KERN_ERR "Unable to request interrupt %d for " | ||
74 | "%s\n", virqs[i], np->full_name); | ||
75 | return; | ||
76 | } | ||
77 | } | ||
78 | } | ||
79 | |||
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index 9e17c0d2a0c..40c93cad91d 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h | |||
@@ -10,6 +10,13 @@ | |||
10 | #ifndef _PSERIES_PSERIES_H | 10 | #ifndef _PSERIES_PSERIES_H |
11 | #define _PSERIES_PSERIES_H | 11 | #define _PSERIES_PSERIES_H |
12 | 12 | ||
13 | #include <linux/interrupt.h> | ||
14 | |||
15 | struct device_node; | ||
16 | |||
17 | extern void request_event_sources_irqs(struct device_node *np, | ||
18 | irq_handler_t handler, const char *name); | ||
19 | |||
13 | extern void __init fw_feature_init(const char *hypertas, unsigned long len); | 20 | extern void __init fw_feature_init(const char *hypertas, unsigned long len); |
14 | 21 | ||
15 | struct pt_regs; | 22 | struct pt_regs; |
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index db940d2c39a..41a3e9a039e 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c | |||
@@ -67,63 +67,6 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id); | |||
67 | static irqreturn_t ras_error_interrupt(int irq, void *dev_id); | 67 | static irqreturn_t ras_error_interrupt(int irq, void *dev_id); |
68 | 68 | ||
69 | 69 | ||
70 | static void request_ras_irqs(struct device_node *np, | ||
71 | irq_handler_t handler, | ||
72 | const char *name) | ||
73 | { | ||
74 | int i, index, count = 0; | ||
75 | struct of_irq oirq; | ||
76 | const u32 *opicprop; | ||
77 | unsigned int opicplen; | ||
78 | unsigned int virqs[16]; | ||
79 | |||
80 | /* Check for obsolete "open-pic-interrupt" property. If present, then | ||
81 | * map those interrupts using the default interrupt host and default | ||
82 | * trigger | ||
83 | */ | ||
84 | opicprop = of_get_property(np, "open-pic-interrupt", &opicplen); | ||
85 | if (opicprop) { | ||
86 | opicplen /= sizeof(u32); | ||
87 | for (i = 0; i < opicplen; i++) { | ||
88 | if (count > 15) | ||
89 | break; | ||
90 | virqs[count] = irq_create_mapping(NULL, *(opicprop++)); | ||
91 | if (virqs[count] == NO_IRQ) | ||
92 | printk(KERN_ERR "Unable to allocate interrupt " | ||
93 | "number for %s\n", np->full_name); | ||
94 | else | ||
95 | count++; | ||
96 | |||
97 | } | ||
98 | } | ||
99 | /* Else use normal interrupt tree parsing */ | ||
100 | else { | ||
101 | /* First try to do a proper OF tree parsing */ | ||
102 | for (index = 0; of_irq_map_one(np, index, &oirq) == 0; | ||
103 | index++) { | ||
104 | if (count > 15) | ||
105 | break; | ||
106 | virqs[count] = irq_create_of_mapping(oirq.controller, | ||
107 | oirq.specifier, | ||
108 | oirq.size); | ||
109 | if (virqs[count] == NO_IRQ) | ||
110 | printk(KERN_ERR "Unable to allocate interrupt " | ||
111 | "number for %s\n", np->full_name); | ||
112 | else | ||
113 | count++; | ||
114 | } | ||
115 | } | ||
116 | |||
117 | /* Now request them */ | ||
118 | for (i = 0; i < count; i++) { | ||
119 | if (request_irq(virqs[i], handler, 0, name, NULL)) { | ||
120 | printk(KERN_ERR "Unable to request interrupt %d for " | ||
121 | "%s\n", virqs[i], np->full_name); | ||
122 | return; | ||
123 | } | ||
124 | } | ||
125 | } | ||
126 | |||
127 | /* | 70 | /* |
128 | * Initialize handlers for the set of interrupts caused by hardware errors | 71 | * Initialize handlers for the set of interrupts caused by hardware errors |
129 | * and power system events. | 72 | * and power system events. |
@@ -138,14 +81,15 @@ static int __init init_ras_IRQ(void) | |||
138 | /* Internal Errors */ | 81 | /* Internal Errors */ |
139 | np = of_find_node_by_path("/event-sources/internal-errors"); | 82 | np = of_find_node_by_path("/event-sources/internal-errors"); |
140 | if (np != NULL) { | 83 | if (np != NULL) { |
141 | request_ras_irqs(np, ras_error_interrupt, "RAS_ERROR"); | 84 | request_event_sources_irqs(np, ras_error_interrupt, |
85 | "RAS_ERROR"); | ||
142 | of_node_put(np); | 86 | of_node_put(np); |
143 | } | 87 | } |
144 | 88 | ||
145 | /* EPOW Events */ | 89 | /* EPOW Events */ |
146 | np = of_find_node_by_path("/event-sources/epow-events"); | 90 | np = of_find_node_by_path("/event-sources/epow-events"); |
147 | if (np != NULL) { | 91 | if (np != NULL) { |
148 | request_ras_irqs(np, ras_epow_interrupt, "RAS_EPOW"); | 92 | request_event_sources_irqs(np, ras_epow_interrupt, "RAS_EPOW"); |
149 | of_node_put(np); | 93 | of_node_put(np); |
150 | } | 94 | } |
151 | 95 | ||