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

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

powerpc/mpic: Remove MPIC_BROKEN_FRR_NIRQS and duplicate irq_count 



The mpic->irq_count variable is only used as a software error-checking
limit to determine whether or not an IRQ number is valid.  In board code
which does not manually specify an IRQ count to mpic_alloc(), i.e. 0, it
is automatically detected from the number of ISUs and the ISU size.

In practice, all hardware ends up with irq_count == num_sources, so all
of the runtime checks on mpic->irq_count should just check the value of
mpic->num_sources instead.

When platform hardware does not correctly report the number of IRQs,
which only happens on the MPC85xx/MPC86xx, the MPIC_BROKEN_FRR_NIRQS
flag is used to override the detected value of num_sources with the
manual irq_count parameter.  Since there's no need to manually specify
the number of IRQs except in this case, the extra flag can be eliminated
and the test changed to "irq_count != 0".

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

arch/powerpc/include/asm/mpic.h

+0 −3
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ struct mpic 
	unsigned int		isu_size;

	unsigned int		isu_shift;

	unsigned int		isu_mask;

	unsigned int		irq_count;

	/* Number of sources */

	unsigned int		num_sources;

	/* default senses array */
@@ -363,8 +362,6 @@ struct mpic 
#define MPIC_ENABLE_MCK			0x00000200

/* Disable bias among target selection, spread interrupts evenly */

#define MPIC_NO_BIAS			0x00000400

/* Ignore NIRQS as reported by FRR */

#define MPIC_BROKEN_FRR_NIRQS		0x00000800

/* Destination only supports a single CPU at a time */

#define MPIC_SINGLE_DEST_CPU		0x00001000

/* Enable CoreInt delivery of interrupts */

arch/powerpc/platforms/85xx/corenet_ds.c

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ 
void __init corenet_ds_pic_init(void)

{

	struct mpic *mpic;

	unsigned int flags = MPIC_BIG_ENDIAN |

				MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU;

	unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;



	if (ppc_md.get_irq == mpic_get_coreint_irq)

		flags |= MPIC_ENABLE_COREINT;

arch/powerpc/platforms/85xx/mpc8536_ds.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void __init mpc8536_ds_pic_init(void) 
{

	struct mpic *mpic = mpic_alloc(NULL, 0,

			  MPIC_WANTS_RESET |

			  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,

			  MPIC_BIG_ENDIAN,

			0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);

	mpic_init(mpic);

arch/powerpc/platforms/85xx/mpc85xx_ds.c

+2 −2
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ void __init mpc85xx_ds_pic_init(void) 


	if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) {

		mpic = mpic_alloc(NULL, 0,

			MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |

			MPIC_BIG_ENDIAN |

			MPIC_SINGLE_DEST_CPU,

			0, 256, " OpenPIC  ");

	} else {

		mpic = mpic_alloc(NULL, 0,

			  MPIC_WANTS_RESET |

			  MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |

			  MPIC_BIG_ENDIAN |

			  MPIC_SINGLE_DEST_CPU,

			0, 256, " OpenPIC  ");

	}

arch/powerpc/platforms/85xx/mpc85xx_mds.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static void __init mpc85xx_mds_pic_init(void) 
{

	struct mpic *mpic = mpic_alloc(NULL, 0,

			MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |

			MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU,

			MPIC_SINGLE_DEST_CPU,

			0, 256, " OpenPIC  ");

	BUG_ON(mpic == NULL);