Commit 98384c6c authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/86xx: Refactor pic init 



Moved the pic initialization into its own common file and out of the board
code.  Also fixed the OF reference counting on the mpic node.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent a5d28c8e

arch/powerpc/platforms/86xx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Makefile for the PowerPC 86xx linux kernel.

#



obj-y				:= pic.o

obj-$(CONFIG_SMP)		+= mpc86xx_smp.o

obj-$(CONFIG_MPC8641_HPCN)	+= mpc86xx_hpcn.o

obj-$(CONFIG_SBC8641D)		+= sbc8641d.o

arch/powerpc/platforms/86xx/mpc8610_hpcd.c

+3 −23
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include <sysdev/fsl_pci.h>

#include <sysdev/fsl_soc.h>



#include "mpc86xx.h"



static unsigned char *pixis_bdcfg0, *pixis_arch;



static struct of_device_id __initdata mpc8610_ids[] = {
@@ -56,28 +58,6 @@ static int __init mpc8610_declare_of_platform_devices(void) 
}

machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);



static void __init mpc86xx_hpcd_init_irq(void)

{

	struct mpic *mpic1;

	struct device_node *np;

	struct resource res;



	/* Determine PIC address. */

	np = of_find_node_by_type(NULL, "open-pic");

	if (np == NULL)

		return;

	of_address_to_resource(np, 0, &res);



	/* Alloc mpic structure and per isu has 16 INT entries. */

	mpic1 = mpic_alloc(np, res.start,

			MPIC_PRIMARY | MPIC_WANTS_RESET |

			MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,

			0, 256, " MPIC     ");

	BUG_ON(mpic1 == NULL);



	mpic_init(mpic1);

}



#ifdef CONFIG_PCI

static void __devinit quirk_uli1575(struct pci_dev *dev)

{
@@ -405,7 +385,7 @@ define_machine(mpc86xx_hpcd) { 
	.name			= "MPC86xx HPCD",

	.probe			= mpc86xx_hpcd_probe,

	.setup_arch		= mpc86xx_hpcd_setup_arch,

	.init_IRQ		= mpc86xx_hpcd_init_irq,

	.init_IRQ		= mpc86xx_init_irq,

	.get_irq		= mpic_get_irq,

	.restart		= fsl_rstcr_restart,

	.time_init		= mpc86xx_time_init,

arch/powerpc/platforms/86xx/mpc86xx.h

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * mpc86xx_* files. Mostly for use by mpc86xx_setup().

 */



extern void __init mpc86xx_smp_init(void);

extern void mpc86xx_smp_init(void);

extern void mpc86xx_init_irq(void);



#endif	/* __MPC86XX_H__ */

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+1 −63
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <asm/prom.h>

#include <mm/mmu_decl.h>

#include <asm/udbg.h>

#include <asm/i8259.h>



#include <asm/mpic.h>
@@ -45,67 +44,6 @@ 
#define DBG(fmt...) do { } while(0)

#endif



#ifdef CONFIG_PCI

static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)

{

	unsigned int cascade_irq = i8259_irq();

	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq);

	desc->chip->eoi(irq);

}

#endif	/* CONFIG_PCI */



static void __init

mpc86xx_hpcn_init_irq(void)

{

	struct mpic *mpic1;

	struct device_node *np;

	struct resource res;

#ifdef CONFIG_PCI

	struct device_node *cascade_node = NULL;

	int cascade_irq;

#endif



	/* Determine PIC address. */

	np = of_find_node_by_type(NULL, "open-pic");

	if (np == NULL)

		return;

	of_address_to_resource(np, 0, &res);



	/* Alloc mpic structure and per isu has 16 INT entries. */

	mpic1 = mpic_alloc(np, res.start,

			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,

			0, 256, " MPIC     ");

	BUG_ON(mpic1 == NULL);



	mpic_init(mpic1);



#ifdef CONFIG_PCI

	/* Initialize i8259 controller */

	for_each_node_by_type(np, "interrupt-controller")

		if (of_device_is_compatible(np, "chrp,iic")) {

			cascade_node = np;

			break;

		}

	if (cascade_node == NULL) {

		printk(KERN_DEBUG "mpc86xxhpcn: no ISA interrupt controller\n");

		return;

	}



	cascade_irq = irq_of_parse_and_map(cascade_node, 0);

	if (cascade_irq == NO_IRQ) {

		printk(KERN_ERR "mpc86xxhpcn: failed to map cascade interrupt");

		return;

	}

	DBG("mpc86xxhpcn: cascade mapped to irq %d\n", cascade_irq);



	i8259_init(cascade_node, 0);

	of_node_put(cascade_node);



	set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);

#endif

}



#ifdef CONFIG_PCI

extern int uses_fsl_uli_m1575;

extern int uli_exclude_device(struct pci_controller *hose,
@@ -237,7 +175,7 @@ define_machine(mpc86xx_hpcn) { 
	.name			= "MPC86xx HPCN",

	.probe			= mpc86xx_hpcn_probe,

	.setup_arch		= mpc86xx_hpcn_setup_arch,

	.init_IRQ		= mpc86xx_hpcn_init_irq,

	.init_IRQ		= mpc86xx_init_irq,

	.show_cpuinfo		= mpc86xx_hpcn_show_cpuinfo,

	.get_irq		= mpic_get_irq,

	.restart		= fsl_rstcr_restart,

arch/powerpc/platforms/86xx/pic.c

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

 * Copyright 2008 Freescale Semiconductor, Inc.

 *

 * 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.

 */



#include <linux/stddef.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/of_platform.h>



#include <asm/system.h>

#include <asm/mpic.h>

#include <asm/i8259.h>



#ifdef CONFIG_PPC_I8259

static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)

{

	unsigned int cascade_irq = i8259_irq();

	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq);

	desc->chip->eoi(irq);

}

#endif	/* CONFIG_PPC_I8259 */



void __init mpc86xx_init_irq(void)

{

	struct mpic *mpic;

	struct device_node *np;

	struct resource res;

#ifdef CONFIG_PPC_I8259

	struct device_node *cascade_node = NULL;

	int cascade_irq;

#endif



	/* Determine PIC address. */

	np = of_find_node_by_type(NULL, "open-pic");

	if (np == NULL)

		return;

	of_address_to_resource(np, 0, &res);



	mpic = mpic_alloc(np, res.start,

			MPIC_PRIMARY | MPIC_WANTS_RESET |

			MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,

			0, 256, " MPIC     ");

	of_node_put(np);

	BUG_ON(mpic == NULL);



	mpic_init(mpic);



#ifdef CONFIG_PPC_I8259

	/* Initialize i8259 controller */

	for_each_node_by_type(np, "interrupt-controller")

		if (of_device_is_compatible(np, "chrp,iic")) {

			cascade_node = np;

			break;

		}



	if (cascade_node == NULL) {

		printk(KERN_DEBUG "Could not find i8259 PIC\n");

		return;

	}



	cascade_irq = irq_of_parse_and_map(cascade_node, 0);

	if (cascade_irq == NO_IRQ) {

		printk(KERN_ERR "Failed to map cascade interrupt\n");

		return;

	}



	i8259_init(cascade_node, 0);

	of_node_put(cascade_node);



	set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);

#endif

}