* [PATCH 0/2] enable the coreint for the mpc85xx 64bit boards
@ 2013-04-11 1:32 Kevin Hao
2013-04-11 1:32 ` [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE Kevin Hao
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Kevin Hao @ 2013-04-11 1:32 UTC (permalink / raw)
To: Kumar Gala, Benjamin Herrenschmidt; +Cc: linuxppc
Hi,
With the rework of the lazy EE, it seems that 64bit kernel works pretty
well on mpc85xx 64bit boards with lazy EE enabled. So this patch series
tries to enable the coreint for these boards by default. This passed
the ltp test on a t4240qds board and is based on Kumar's next branch.
---
Kevin Hao (2):
powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE
powerpc/85xx: enable coreint for all the 64bit boards
arch/powerpc/include/asm/hw_irq.h | 1 -
arch/powerpc/kernel/exceptions-64e.S | 1 -
arch/powerpc/kernel/irq.c | 8 --------
arch/powerpc/platforms/85xx/p5020_ds.c | 5 -----
arch/powerpc/platforms/85xx/p5040_ds.c | 5 -----
arch/powerpc/platforms/85xx/t4240_qds.c | 5 -----
6 files changed, 25 deletions(-)
--
1.8.1.4
Thanks,
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE 2013-04-11 1:32 [PATCH 0/2] enable the coreint for the mpc85xx 64bit boards Kevin Hao @ 2013-04-11 1:32 ` Kevin Hao 2013-08-27 7:53 ` Benjamin Herrenschmidt 2013-04-11 1:32 ` [PATCH 2/2] powerpc/85xx: enable coreint for all the 64bit boards Kevin Hao 2013-04-11 13:21 ` [PATCH 0/2] enable the coreint for the mpc85xx " Kumar Gala 2 siblings, 1 reply; 8+ messages in thread From: Kevin Hao @ 2013-04-11 1:32 UTC (permalink / raw) To: Kumar Gala, Benjamin Herrenschmidt; +Cc: linuxppc In order to support the Book3E external proxy, the flag PACA_IRQ_EE_EDGE was introduced in patch 7230c564 (powerpc: Rework lazy-interrupt handling). But it turns out that this is not needed. And it is also not used by any code in the current kernel. According to the PowerISA 2.0.6, the content of EPR (External Proxy Register) is valid until MSR[EE] is set to 1. Since we never enable the hard irq before replaying a external interrupt. That means we still can get the valid interrupt vector from EPR when replaying irq. Signed-off-by: Kevin Hao <haokexin@gmail.com> --- arch/powerpc/include/asm/hw_irq.h | 1 - arch/powerpc/kernel/exceptions-64e.S | 1 - arch/powerpc/kernel/irq.c | 8 -------- 3 files changed, 10 deletions(-) diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index e45c494..8bf0789 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h @@ -24,7 +24,6 @@ #define PACA_IRQ_DBELL 0x02 #define PACA_IRQ_EE 0x04 #define PACA_IRQ_DEC 0x08 /* Or FIT */ -#define PACA_IRQ_EE_EDGE 0x10 /* BookE only */ #endif /* CONFIG_PPC64 */ diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index 42a756e..64f2fbd 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -701,7 +701,6 @@ kernel_dbg_exc: .endm masked_interrupt_book3e_0x500: - // XXX When adding support for EPR, use PACA_IRQ_EE_EDGE masked_interrupt_book3e PACA_IRQ_EE 1 masked_interrupt_book3e_0x900: diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 4f97fe3..dbc1c05 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -171,14 +171,6 @@ notrace unsigned int __check_irq_replay(void) return 0x500; #ifdef CONFIG_PPC_BOOK3E - /* Finally check if an EPR external interrupt happened - * this bit is typically set if we need to handle another - * "edge" interrupt from within the MPIC "EPR" handler - */ - local_paca->irq_happened &= ~PACA_IRQ_EE_EDGE; - if (happened & PACA_IRQ_EE_EDGE) - return 0x500; - local_paca->irq_happened &= ~PACA_IRQ_DBELL; if (happened & PACA_IRQ_DBELL) return 0x280; -- 1.8.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE 2013-04-11 1:32 ` [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE Kevin Hao @ 2013-08-27 7:53 ` Benjamin Herrenschmidt 2013-08-27 8:04 ` Kevin Hao 0 siblings, 1 reply; 8+ messages in thread From: Benjamin Herrenschmidt @ 2013-08-27 7:53 UTC (permalink / raw) To: Kevin Hao; +Cc: linuxppc On Thu, 2013-04-11 at 09:32 +0800, Kevin Hao wrote: > In order to support the Book3E external proxy, the flag > PACA_IRQ_EE_EDGE was introduced in patch 7230c564 (powerpc: Rework > lazy-interrupt handling). But it turns out that this is not needed. > And it is also not used by any code in the current kernel. According > to the PowerISA 2.0.6, the content of EPR (External Proxy Register) > is valid until MSR[EE] is set to 1. Since we never enable the hard irq > before replaying a external interrupt. That means we still can get > the valid interrupt vector from EPR when replaying irq. I assume you understand why that patch is broken and this is superseeded by your more recent series to actually make use of PACA_IRQ_EE_EDGE right ? :-) (Just making sure I can take that one out of patchwork). > Signed-off-by: Kevin Hao <haokexin@gmail.com> > --- > arch/powerpc/include/asm/hw_irq.h | 1 - > arch/powerpc/kernel/exceptions-64e.S | 1 - > arch/powerpc/kernel/irq.c | 8 -------- > 3 files changed, 10 deletions(-) > > diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h > index e45c494..8bf0789 100644 > --- a/arch/powerpc/include/asm/hw_irq.h > +++ b/arch/powerpc/include/asm/hw_irq.h > @@ -24,7 +24,6 @@ > #define PACA_IRQ_DBELL 0x02 > #define PACA_IRQ_EE 0x04 > #define PACA_IRQ_DEC 0x08 /* Or FIT */ > -#define PACA_IRQ_EE_EDGE 0x10 /* BookE only */ > > #endif /* CONFIG_PPC64 */ > > diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S > index 42a756e..64f2fbd 100644 > --- a/arch/powerpc/kernel/exceptions-64e.S > +++ b/arch/powerpc/kernel/exceptions-64e.S > @@ -701,7 +701,6 @@ kernel_dbg_exc: > .endm > > masked_interrupt_book3e_0x500: > - // XXX When adding support for EPR, use PACA_IRQ_EE_EDGE > masked_interrupt_book3e PACA_IRQ_EE 1 > > masked_interrupt_book3e_0x900: > diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c > index 4f97fe3..dbc1c05 100644 > --- a/arch/powerpc/kernel/irq.c > +++ b/arch/powerpc/kernel/irq.c > @@ -171,14 +171,6 @@ notrace unsigned int __check_irq_replay(void) > return 0x500; > > #ifdef CONFIG_PPC_BOOK3E > - /* Finally check if an EPR external interrupt happened > - * this bit is typically set if we need to handle another > - * "edge" interrupt from within the MPIC "EPR" handler > - */ > - local_paca->irq_happened &= ~PACA_IRQ_EE_EDGE; > - if (happened & PACA_IRQ_EE_EDGE) > - return 0x500; > - > local_paca->irq_happened &= ~PACA_IRQ_DBELL; > if (happened & PACA_IRQ_DBELL) > return 0x280; ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE 2013-08-27 7:53 ` Benjamin Herrenschmidt @ 2013-08-27 8:04 ` Kevin Hao 0 siblings, 0 replies; 8+ messages in thread From: Kevin Hao @ 2013-08-27 8:04 UTC (permalink / raw) To: Benjamin Herrenschmidt; +Cc: linuxppc [-- Attachment #1: Type: text/plain, Size: 963 bytes --] On Tue, Aug 27, 2013 at 05:53:24PM +1000, Benjamin Herrenschmidt wrote: > On Thu, 2013-04-11 at 09:32 +0800, Kevin Hao wrote: > > In order to support the Book3E external proxy, the flag > > PACA_IRQ_EE_EDGE was introduced in patch 7230c564 (powerpc: Rework > > lazy-interrupt handling). But it turns out that this is not needed. > > And it is also not used by any code in the current kernel. According > > to the PowerISA 2.0.6, the content of EPR (External Proxy Register) > > is valid until MSR[EE] is set to 1. Since we never enable the hard irq > > before replaying a external interrupt. That means we still can get > > the valid interrupt vector from EPR when replaying irq. > > I assume you understand why that patch is broken and this is superseeded > by your more recent series to actually make use of PACA_IRQ_EE_EDGE > right ? :-) Yes. > > (Just making sure I can take that one out of patchwork). Definitely. Thanks, Kevin [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] powerpc/85xx: enable coreint for all the 64bit boards 2013-04-11 1:32 [PATCH 0/2] enable the coreint for the mpc85xx 64bit boards Kevin Hao 2013-04-11 1:32 ` [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE Kevin Hao @ 2013-04-11 1:32 ` Kevin Hao 2013-05-11 7:00 ` Kevin Hao 2013-04-11 13:21 ` [PATCH 0/2] enable the coreint for the mpc85xx " Kumar Gala 2 siblings, 1 reply; 8+ messages in thread From: Kevin Hao @ 2013-04-11 1:32 UTC (permalink / raw) To: Kumar Gala, Benjamin Herrenschmidt; +Cc: linuxppc With the patch 7230c564 (powerpc: Rework lazy-interrupt handling), it seems that the coreint works pretty well on the 85xx 64bit kernel. So use the coreint by default for these boards. Signed-off-by: Kevin Hao <haokexin@gmail.com> --- arch/powerpc/platforms/85xx/p5020_ds.c | 5 ----- arch/powerpc/platforms/85xx/p5040_ds.c | 5 ----- arch/powerpc/platforms/85xx/t4240_qds.c | 5 ----- 3 files changed, 15 deletions(-) diff --git a/arch/powerpc/platforms/85xx/p5020_ds.c b/arch/powerpc/platforms/85xx/p5020_ds.c index 753a42c..39cfa40 100644 --- a/arch/powerpc/platforms/85xx/p5020_ds.c +++ b/arch/powerpc/platforms/85xx/p5020_ds.c @@ -75,12 +75,7 @@ define_machine(p5020_ds) { #ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, #endif -/* coreint doesn't play nice with lazy EE, use legacy mpic for now */ -#ifdef CONFIG_PPC64 - .get_irq = mpic_get_irq, -#else .get_irq = mpic_get_coreint_irq, -#endif .restart = fsl_rstcr_restart, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, diff --git a/arch/powerpc/platforms/85xx/p5040_ds.c b/arch/powerpc/platforms/85xx/p5040_ds.c index 1138185..f70e74c 100644 --- a/arch/powerpc/platforms/85xx/p5040_ds.c +++ b/arch/powerpc/platforms/85xx/p5040_ds.c @@ -66,12 +66,7 @@ define_machine(p5040_ds) { #ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, #endif -/* coreint doesn't play nice with lazy EE, use legacy mpic for now */ -#ifdef CONFIG_PPC64 - .get_irq = mpic_get_irq, -#else .get_irq = mpic_get_coreint_irq, -#endif .restart = fsl_rstcr_restart, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, diff --git a/arch/powerpc/platforms/85xx/t4240_qds.c b/arch/powerpc/platforms/85xx/t4240_qds.c index 5998e9f..91ead6b 100644 --- a/arch/powerpc/platforms/85xx/t4240_qds.c +++ b/arch/powerpc/platforms/85xx/t4240_qds.c @@ -75,12 +75,7 @@ define_machine(t4240_qds) { #ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, #endif -/* coreint doesn't play nice with lazy EE, use legacy mpic for now */ -#ifdef CONFIG_PPC64 - .get_irq = mpic_get_irq, -#else .get_irq = mpic_get_coreint_irq, -#endif .restart = fsl_rstcr_restart, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, -- 1.8.1.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] powerpc/85xx: enable coreint for all the 64bit boards 2013-04-11 1:32 ` [PATCH 2/2] powerpc/85xx: enable coreint for all the 64bit boards Kevin Hao @ 2013-05-11 7:00 ` Kevin Hao 0 siblings, 0 replies; 8+ messages in thread From: Kevin Hao @ 2013-05-11 7:00 UTC (permalink / raw) To: Kumar Gala, Benjamin Herrenschmidt; +Cc: Scott Wood, linuxppc [-- Attachment #1: Type: text/plain, Size: 3090 bytes --] On Thu, Apr 11, 2013 at 09:32:34AM +0800, Kevin Hao wrote: > With the patch 7230c564 (powerpc: Rework lazy-interrupt handling), > it seems that the coreint works pretty well on the 85xx 64bit kernel. > So use the coreint by default for these boards. Hi Kumar, Since the external proxy works pretty well with the lazy EE without any change to the current kernel, could you please pick this patch up? This has already been acked by Scott. I also think I got a implicit ack from Benjamin. I will try to use the PACA_IRQ_EE_EDGE to make the support for external proxy more better a little later as suggested by Benjamin. Thanks, Kevin > > Signed-off-by: Kevin Hao <haokexin@gmail.com> > --- > arch/powerpc/platforms/85xx/p5020_ds.c | 5 ----- > arch/powerpc/platforms/85xx/p5040_ds.c | 5 ----- > arch/powerpc/platforms/85xx/t4240_qds.c | 5 ----- > 3 files changed, 15 deletions(-) > > diff --git a/arch/powerpc/platforms/85xx/p5020_ds.c b/arch/powerpc/platforms/85xx/p5020_ds.c > index 753a42c..39cfa40 100644 > --- a/arch/powerpc/platforms/85xx/p5020_ds.c > +++ b/arch/powerpc/platforms/85xx/p5020_ds.c > @@ -75,12 +75,7 @@ define_machine(p5020_ds) { > #ifdef CONFIG_PCI > .pcibios_fixup_bus = fsl_pcibios_fixup_bus, > #endif > -/* coreint doesn't play nice with lazy EE, use legacy mpic for now */ > -#ifdef CONFIG_PPC64 > - .get_irq = mpic_get_irq, > -#else > .get_irq = mpic_get_coreint_irq, > -#endif > .restart = fsl_rstcr_restart, > .calibrate_decr = generic_calibrate_decr, > .progress = udbg_progress, > diff --git a/arch/powerpc/platforms/85xx/p5040_ds.c b/arch/powerpc/platforms/85xx/p5040_ds.c > index 1138185..f70e74c 100644 > --- a/arch/powerpc/platforms/85xx/p5040_ds.c > +++ b/arch/powerpc/platforms/85xx/p5040_ds.c > @@ -66,12 +66,7 @@ define_machine(p5040_ds) { > #ifdef CONFIG_PCI > .pcibios_fixup_bus = fsl_pcibios_fixup_bus, > #endif > -/* coreint doesn't play nice with lazy EE, use legacy mpic for now */ > -#ifdef CONFIG_PPC64 > - .get_irq = mpic_get_irq, > -#else > .get_irq = mpic_get_coreint_irq, > -#endif > .restart = fsl_rstcr_restart, > .calibrate_decr = generic_calibrate_decr, > .progress = udbg_progress, > diff --git a/arch/powerpc/platforms/85xx/t4240_qds.c b/arch/powerpc/platforms/85xx/t4240_qds.c > index 5998e9f..91ead6b 100644 > --- a/arch/powerpc/platforms/85xx/t4240_qds.c > +++ b/arch/powerpc/platforms/85xx/t4240_qds.c > @@ -75,12 +75,7 @@ define_machine(t4240_qds) { > #ifdef CONFIG_PCI > .pcibios_fixup_bus = fsl_pcibios_fixup_bus, > #endif > -/* coreint doesn't play nice with lazy EE, use legacy mpic for now */ > -#ifdef CONFIG_PPC64 > - .get_irq = mpic_get_irq, > -#else > .get_irq = mpic_get_coreint_irq, > -#endif > .restart = fsl_rstcr_restart, > .calibrate_decr = generic_calibrate_decr, > .progress = udbg_progress, > -- > 1.8.1.4 > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] enable the coreint for the mpc85xx 64bit boards 2013-04-11 1:32 [PATCH 0/2] enable the coreint for the mpc85xx 64bit boards Kevin Hao 2013-04-11 1:32 ` [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE Kevin Hao 2013-04-11 1:32 ` [PATCH 2/2] powerpc/85xx: enable coreint for all the 64bit boards Kevin Hao @ 2013-04-11 13:21 ` Kumar Gala 2013-04-11 20:45 ` Scott Wood 2 siblings, 1 reply; 8+ messages in thread From: Kumar Gala @ 2013-04-11 13:21 UTC (permalink / raw) To: Wood Scott-B07421; +Cc: Kevin Hao, linuxppc On Apr 10, 2013, at 8:32 PM, Kevin Hao wrote: > Hi, > > With the rework of the lazy EE, it seems that 64bit kernel works pretty > well on mpc85xx 64bit boards with lazy EE enabled. So this patch series > tries to enable the coreint for these boards by default. This passed > the ltp test on a t4240qds board and is based on Kumar's next branch. > > --- > Kevin Hao (2): > powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE > powerpc/85xx: enable coreint for all the 64bit boards > > arch/powerpc/include/asm/hw_irq.h | 1 - > arch/powerpc/kernel/exceptions-64e.S | 1 - > arch/powerpc/kernel/irq.c | 8 -------- > arch/powerpc/platforms/85xx/p5020_ds.c | 5 ----- > arch/powerpc/platforms/85xx/p5040_ds.c | 5 ----- > arch/powerpc/platforms/85xx/t4240_qds.c | 5 ----- > 6 files changed, 25 deletions(-) Scott, I'd appreciate your review and ack on this change. thanks - k ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] enable the coreint for the mpc85xx 64bit boards 2013-04-11 13:21 ` [PATCH 0/2] enable the coreint for the mpc85xx " Kumar Gala @ 2013-04-11 20:45 ` Scott Wood 0 siblings, 0 replies; 8+ messages in thread From: Scott Wood @ 2013-04-11 20:45 UTC (permalink / raw) To: Kumar Gala; +Cc: Wood Scott-B07421, Kevin Hao, linuxppc On 04/11/2013 08:21:24 AM, Kumar Gala wrote: >=20 > On Apr 10, 2013, at 8:32 PM, Kevin Hao wrote: >=20 > > Hi, > > > > With the rework of the lazy EE, it seems that 64bit kernel works =20 > pretty > > well on mpc85xx 64bit boards with lazy EE enabled. So this patch =20 > series > > tries to enable the coreint for these boards by default. This passed > > the ltp test on a t4240qds board and is based on Kumar's next =20 > branch. > > > > --- > > Kevin Hao (2): > > powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE > > powerpc/85xx: enable coreint for all the 64bit boards > > > > arch/powerpc/include/asm/hw_irq.h | 1 - > > arch/powerpc/kernel/exceptions-64e.S | 1 - > > arch/powerpc/kernel/irq.c | 8 -------- > > arch/powerpc/platforms/85xx/p5020_ds.c | 5 ----- > > arch/powerpc/platforms/85xx/p5040_ds.c | 5 ----- > > arch/powerpc/platforms/85xx/t4240_qds.c | 5 ----- > > 6 files changed, 25 deletions(-) >=20 > Scott, >=20 > I'd appreciate your review and ack on this change. ACK -Scott= ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-08-27 8:04 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-04-11 1:32 [PATCH 0/2] enable the coreint for the mpc85xx 64bit boards Kevin Hao 2013-04-11 1:32 ` [PATCH 1/2] powerpc/irq: remove the unneeded flag PACA_IRQ_EE_EDGE Kevin Hao 2013-08-27 7:53 ` Benjamin Herrenschmidt 2013-08-27 8:04 ` Kevin Hao 2013-04-11 1:32 ` [PATCH 2/2] powerpc/85xx: enable coreint for all the 64bit boards Kevin Hao 2013-05-11 7:00 ` Kevin Hao 2013-04-11 13:21 ` [PATCH 0/2] enable the coreint for the mpc85xx " Kumar Gala 2013-04-11 20:45 ` Scott Wood
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).