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

Commit e7a98675 authored by Kyle Moffett's avatar Kyle Moffett Committed by Benjamin Herrenschmidt
Browse files

powerpc/mpic: Save computed phys_addr for board-specific code 



The MPIC code can already perform an automatic OF address translation
step as part of mpic_alloc(), but several boards need to use that base
address when they perform mpic_assign_isu().

The easiest solution is to save the computed physical address into the
"struct mpic" for later use by the board code.

Signed-off-by: default avatarKyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5bdb6f2e

arch/powerpc/include/asm/mpic.h

+3 −0
Original line number Diff line number Diff line
@@ -293,6 +293,9 @@ struct mpic 
	/* Register access method */

	enum mpic_reg_type	reg_type;



	/* The physical base address of the MPIC */

	phys_addr_t paddr;



	/* The various ioremap'ed bases */

	struct mpic_reg_bank	gregs;

	struct mpic_reg_bank	tmregs;

arch/powerpc/platforms/embedded6xx/holly.c

+3 −12
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ static void __init holly_setup_arch(void) 
static void __init holly_init_IRQ(void)

{

	struct mpic *mpic;

	phys_addr_t mpic_paddr = 0;

	struct device_node *tsi_pic;

#ifdef CONFIG_PCI

	unsigned int cascade_pci_irq;
@@ -157,20 +156,12 @@ static void __init holly_init_IRQ(void) 
#endif



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

	if (tsi_pic) {

		unsigned int size;

		const void *prop = of_get_property(tsi_pic, "reg", &size);

		mpic_paddr = of_translate_address(tsi_pic, prop);

	}



	if (mpic_paddr == 0) {

	if (!tsi_pic) {

		printk(KERN_ERR "%s: No tsi108 PIC found !\n", __func__);

		return;

	}



	pr_debug("%s: tsi108 pic phys_addr = 0x%x\n", __func__, (u32) mpic_paddr);



	mpic = mpic_alloc(tsi_pic, mpic_paddr,

	mpic = mpic_alloc(tsi_pic, 0,

			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |

			MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,

			24,
@@ -179,7 +170,7 @@ static void __init holly_init_IRQ(void) 


	BUG_ON(mpic == NULL);



	mpic_assign_isu(mpic, 0, mpic_paddr + 0x100);

	mpic_assign_isu(mpic, 0, mpic->paddr + 0x100);



	mpic_init(mpic);

arch/powerpc/platforms/embedded6xx/linkstation.c

+4 −10
Original line number Diff line number Diff line
@@ -82,28 +82,22 @@ static void __init linkstation_init_IRQ(void) 
{

	struct mpic *mpic;

	struct device_node *dnp;

	const u32 *prop;

	int size;

	phys_addr_t paddr;



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

	if (dnp == NULL)

		return;



	prop = of_get_property(dnp, "reg", &size);

	paddr = (phys_addr_t)of_translate_address(dnp, prop);



	mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC     ");

	mpic = mpic_alloc(dnp, 0, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC     ");

	BUG_ON(mpic == NULL);



	/* PCI IRQs */

	mpic_assign_isu(mpic, 0, paddr + 0x10200);

	mpic_assign_isu(mpic, 0, mpic->paddr + 0x10200);



	/* I2C */

	mpic_assign_isu(mpic, 1, paddr + 0x11000);

	mpic_assign_isu(mpic, 1, mpic->paddr + 0x11000);



	/* ttyS0, ttyS1 */

	mpic_assign_isu(mpic, 2, paddr + 0x11100);

	mpic_assign_isu(mpic, 2, mpic->paddr + 0x11100);



	mpic_init(mpic);

}

arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c

+3 −13
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ static void __init mpc7448_hpc2_setup_arch(void) 
static void __init mpc7448_hpc2_init_IRQ(void)

{

	struct mpic *mpic;

	phys_addr_t mpic_paddr = 0;

	struct device_node *tsi_pic;

#ifdef CONFIG_PCI

	unsigned int cascade_pci_irq;
@@ -111,21 +110,12 @@ static void __init mpc7448_hpc2_init_IRQ(void) 
#endif



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

	if (tsi_pic) {

		unsigned int size;

		const void *prop = of_get_property(tsi_pic, "reg", &size);

		mpic_paddr = of_translate_address(tsi_pic, prop);

	}



	if (mpic_paddr == 0) {

	if (!tsi_pic) {

		printk("%s: No tsi108 PIC found !\n", __func__);

		return;

	}



	DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__,

	    (u32) mpic_paddr);



	mpic = mpic_alloc(tsi_pic, mpic_paddr,

	mpic = mpic_alloc(tsi_pic, 0,

			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |

			MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,

			24,
@@ -134,7 +124,7 @@ static void __init mpc7448_hpc2_init_IRQ(void) 


	BUG_ON(mpic == NULL);



	mpic_assign_isu(mpic, 0, mpic_paddr + 0x100);

	mpic_assign_isu(mpic, 0, mpic->paddr + 0x100);



	mpic_init(mpic);

arch/powerpc/platforms/embedded6xx/storcenter.c

+3 −13
Original line number Diff line number Diff line
@@ -84,22 +84,12 @@ static void __init storcenter_init_IRQ(void) 
{

	struct mpic *mpic;

	struct device_node *dnp;

	const void *prop;

	int size;

	phys_addr_t paddr;



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

	if (dnp == NULL)

		return;



	prop = of_get_property(dnp, "reg", &size);

	if (prop == NULL) {

		of_node_put(dnp);

		return;

	}



	paddr = (phys_addr_t)of_translate_address(dnp, prop);

	mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET,

	mpic = mpic_alloc(dnp, 0, MPIC_PRIMARY | MPIC_WANTS_RESET,

			16, 32, " OpenPIC  ");



	of_node_put(dnp);
@@ -110,8 +100,8 @@ static void __init storcenter_init_IRQ(void) 
	 * 16 Serial Interrupts followed by 16 Internal Interrupts.

	 * I2C is the second internal, so it is at 17, 0x11020.

	 */

	mpic_assign_isu(mpic, 0, paddr + 0x10200);

	mpic_assign_isu(mpic, 1, paddr + 0x11000);

	mpic_assign_isu(mpic, 0, mpic->paddr + 0x10200);

	mpic_assign_isu(mpic, 1, mpic->paddr + 0x11000);



	mpic_init(mpic);

}