* [PATCH v2] powerpc: pseries: use of_irq_get helper in request_event_sources_irqs
@ 2018-02-01 17:59 Rob Herring
2018-10-04 6:14 ` [v2] " Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: Rob Herring @ 2018-02-01 17:59 UTC (permalink / raw)
To: Michael Ellerman
Cc: linux-kernel, Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
Instead of calling both of_irq_parse_one and irq_create_of_mapping, call
of_irq_get instead which does essentially the same thing. of_irq_get
also calls irq_find_host for deferred probe support, but this should be
fine as irq_create_of_mapping also calls that internally. This gets us
closer to making the former 2 functions static.
In the process of simplifying request_event_sources_irqs, combine the
the pr_err and WARN_ON calls to just a WARN().
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
v2:
- Fix infinite loop
- Use of_irq_get instead to irq_of_parse_and_map to preserve handling of
errors
- Combine pr_err and WARN_ON calls to single WARN
arch/powerpc/platforms/pseries/event_sources.c | 40 +++++++++-----------------
1 file changed, 13 insertions(+), 27 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c
index 6eeb0d4bab61..446ef104fb3a 100644
--- a/arch/powerpc/platforms/pseries/event_sources.c
+++ b/arch/powerpc/platforms/pseries/event_sources.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <asm/prom.h>
+#include <linux/interrupt.h>
+#include <linux/of_irq.h>
#include "pseries.h"
@@ -24,34 +25,19 @@ void request_event_sources_irqs(struct device_node *np,
irq_handler_t handler,
const char *name)
{
- int i, index, count = 0;
- struct of_phandle_args oirq;
- unsigned int virqs[16];
+ int i, virq, rc;
- /* First try to do a proper OF tree parsing */
- for (index = 0; of_irq_parse_one(np, index, &oirq) == 0;
- index++) {
- if (count > 15)
- break;
- virqs[count] = irq_create_of_mapping(&oirq);
- if (!virqs[count]) {
- pr_err("event-sources: Unable to allocate "
- "interrupt number for %pOF\n",
- np);
- WARN_ON(1);
- } else {
- count++;
- }
- }
+ for (i = 0; i < 16; i++) {
+ virq = of_irq_get(np, i);
+ if (virq < 0)
+ return;
+ if (WARN(!virq, "event-sources: Unable to allocate "
+ "interrupt number for %pOF\n", np))
+ continue;
- /* Now request them */
- for (i = 0; i < count; i++) {
- if (request_irq(virqs[i], handler, 0, name, NULL)) {
- pr_err("event-sources: Unable to request interrupt "
- "%d for %pOF\n", virqs[i], np);
- WARN_ON(1);
+ rc = request_irq(virq, handler, 0, name, NULL);
+ if (WARN(rc, "event-sources: Unable to request interrupt %d for %pOF\n",
+ virq, np))
return;
- }
}
}
-
--
2.14.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [v2] powerpc: pseries: use of_irq_get helper in request_event_sources_irqs
2018-02-01 17:59 [PATCH v2] powerpc: pseries: use of_irq_get helper in request_event_sources_irqs Rob Herring
@ 2018-10-04 6:14 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2018-10-04 6:14 UTC (permalink / raw)
To: Rob Herring; +Cc: linuxppc-dev, Paul Mackerras, linux-kernel
On Thu, 2018-02-01 at 17:59:22 UTC, Rob Herring wrote:
> Instead of calling both of_irq_parse_one and irq_create_of_mapping, call
> of_irq_get instead which does essentially the same thing. of_irq_get
> also calls irq_find_host for deferred probe support, but this should be
> fine as irq_create_of_mapping also calls that internally. This gets us
> closer to making the former 2 functions static.
>
> In the process of simplifying request_event_sources_irqs, combine the
> the pr_err and WARN_ON calls to just a WARN().
>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Rob Herring <robh@kernel.org>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/c417596d2409125b1814c05e994a21
cheers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-04 6:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-01 17:59 [PATCH v2] powerpc: pseries: use of_irq_get helper in request_event_sources_irqs Rob Herring
2018-10-04 6:14 ` [v2] " Michael Ellerman
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).