Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32c96f77 authored by Mark Nelson's avatar Mark Nelson Committed by Benjamin Herrenschmidt
Browse files

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: default avatarMark Nelson <markn@au1.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent bc8449cc

arch/powerpc/platforms/pseries/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ EXTRA_CFLAGS += -DDEBUG 
endif



obj-y			:= lpar.o hvCall.o nvram.o reconfig.o \

			   setup.o iommu.o ras.o \

			   setup.o iommu.o event_sources.o ras.o \

			   firmware.o power.o dlpar.o

obj-$(CONFIG_SMP)	+= smp.o

obj-$(CONFIG_XICS)	+= xics.o

arch/powerpc/platforms/pseries/event_sources.c

0 → 100644
+79 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2001 Dave Engebretsen IBM Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */



#include <asm/prom.h>



#include "pseries.h"



void request_event_sources_irqs(struct device_node *np,

				irq_handler_t handler,

				const char *name)

{

	int i, index, count = 0;

	struct of_irq oirq;

	const u32 *opicprop;

	unsigned int opicplen;

	unsigned int virqs[16];



	/* Check for obsolete "open-pic-interrupt" property. If present, then

	 * map those interrupts using the default interrupt host and default

	 * trigger

	 */

	opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);

	if (opicprop) {

		opicplen /= sizeof(u32);

		for (i = 0; i < opicplen; i++) {

			if (count > 15)

				break;

			virqs[count] = irq_create_mapping(NULL, *(opicprop++));

			if (virqs[count] == NO_IRQ)

				printk(KERN_ERR "Unable to allocate interrupt "

				       "number for %s\n", np->full_name);

			else

				count++;



		}

	}

	/* Else use normal interrupt tree parsing */

	else {

		/* First try to do a proper OF tree parsing */

		for (index = 0; of_irq_map_one(np, index, &oirq) == 0;

		     index++) {

			if (count > 15)

				break;

			virqs[count] = irq_create_of_mapping(oirq.controller,

							    oirq.specifier,

							    oirq.size);

			if (virqs[count] == NO_IRQ)

				printk(KERN_ERR "Unable to allocate interrupt "

				       "number for %s\n", np->full_name);

			else

				count++;

		}

	}



	/* Now request them */

	for (i = 0; i < count; i++) {

		if (request_irq(virqs[i], handler, 0, name, NULL)) {

			printk(KERN_ERR "Unable to request interrupt %d for "

			       "%s\n", virqs[i], np->full_name);

			return;

		}

	}

}

arch/powerpc/platforms/pseries/pseries.h

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,13 @@ 
#ifndef _PSERIES_PSERIES_H

#define _PSERIES_PSERIES_H



#include <linux/interrupt.h>



struct device_node;



extern void request_event_sources_irqs(struct device_node *np,

				       irq_handler_t handler, const char *name);



extern void __init fw_feature_init(const char *hypertas, unsigned long len);



struct pt_regs;

arch/powerpc/platforms/pseries/ras.c

+3 −59
Original line number Diff line number Diff line
@@ -67,63 +67,6 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id); 
static irqreturn_t ras_error_interrupt(int irq, void *dev_id);





static void request_ras_irqs(struct device_node *np,

			irq_handler_t handler,

			const char *name)

{

	int i, index, count = 0;

	struct of_irq oirq;

	const u32 *opicprop;

	unsigned int opicplen;

	unsigned int virqs[16];



	/* Check for obsolete "open-pic-interrupt" property. If present, then

	 * map those interrupts using the default interrupt host and default

	 * trigger

	 */

	opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);

	if (opicprop) {

		opicplen /= sizeof(u32);

		for (i = 0; i < opicplen; i++) {

			if (count > 15)

				break;

			virqs[count] = irq_create_mapping(NULL, *(opicprop++));

			if (virqs[count] == NO_IRQ)

				printk(KERN_ERR "Unable to allocate interrupt "

				       "number for %s\n", np->full_name);

			else

				count++;



		}

	}

	/* Else use normal interrupt tree parsing */

	else {

		/* First try to do a proper OF tree parsing */

		for (index = 0; of_irq_map_one(np, index, &oirq) == 0;

		     index++) {

			if (count > 15)

				break;

			virqs[count] = irq_create_of_mapping(oirq.controller,

							    oirq.specifier,

							    oirq.size);

			if (virqs[count] == NO_IRQ)

				printk(KERN_ERR "Unable to allocate interrupt "

				       "number for %s\n", np->full_name);

			else

				count++;

		}

	}



	/* Now request them */

	for (i = 0; i < count; i++) {

		if (request_irq(virqs[i], handler, 0, name, NULL)) {

			printk(KERN_ERR "Unable to request interrupt %d for "

			       "%s\n", virqs[i], np->full_name);

			return;

		}

	}

}



/*

 * Initialize handlers for the set of interrupts caused by hardware errors

 * and power system events.
@@ -138,14 +81,15 @@ static int __init init_ras_IRQ(void) 
	/* Internal Errors */

	np = of_find_node_by_path("/event-sources/internal-errors");

	if (np != NULL) {

		request_ras_irqs(np, ras_error_interrupt, "RAS_ERROR");

		request_event_sources_irqs(np, ras_error_interrupt,

					   "RAS_ERROR");

		of_node_put(np);

	}



	/* EPOW Events */

	np = of_find_node_by_path("/event-sources/epow-events");

	if (np != NULL) {

		request_ras_irqs(np, ras_epow_interrupt, "RAS_EPOW");

		request_event_sources_irqs(np, ras_epow_interrupt, "RAS_EPOW");

		of_node_put(np);

	}