| Message ID | 1439409416-32673-2-git-send-email-balbi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 12, 2015 at 02:56:53PM -0500, Felipe Balbi wrote: > This reverts commit 904464b91eca8c665acea033489225af02eeb75a. > > The problem pointed out by commit 904464b91eca ("ARM: 7655/1: > smp_twd: make twd_local_timer_of_register() no-op for nosmp") > doesn't exist anymore. > > We can safely boot with nosmp and the warning won't show up. > > The other side benefit of this patch is that TWD has a chance > to probe on single-core A9 systems such as AM437x which sport > TWD. I don't remember all the details from Feb 2013 on why we made that change. If this is proven safe, then I guess it's okay.
On Thu, Aug 13, 2015 at 04:37:07PM +0100, Russell King - ARM Linux wrote: > On Wed, Aug 12, 2015 at 02:56:53PM -0500, Felipe Balbi wrote: > > This reverts commit 904464b91eca8c665acea033489225af02eeb75a. > > > > The problem pointed out by commit 904464b91eca ("ARM: 7655/1: > > smp_twd: make twd_local_timer_of_register() no-op for nosmp") > > doesn't exist anymore. > > > > We can safely boot with nosmp and the warning won't show up. > > > > The other side benefit of this patch is that TWD has a chance > > to probe on single-core A9 systems such as AM437x which sport > > TWD. > > I don't remember all the details from Feb 2013 on why we made that > change. If this is proven safe, then I guess it's okay. Do you want me to upload to your patch system and, perhaps, keep in linux-next for v4.4 merge window ? (too late for v4.3 I guess).
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index e9035cda1485..662ed88bc1f9 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -23,7 +23,6 @@ #include <linux/of_irq.h> #include <linux/of_address.h> -#include <asm/smp_plat.h> #include <asm/smp_twd.h> /* set up by the platform code */ @@ -392,9 +391,6 @@ static void __init twd_local_timer_of_register(struct device_node *np) { int err; - if (!is_smp() || !setup_max_cpus) - return; - twd_ppi = irq_of_parse_and_map(np, 0); if (!twd_ppi) { err = -EINVAL;
This reverts commit 904464b91eca8c665acea033489225af02eeb75a. The problem pointed out by commit 904464b91eca ("ARM: 7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp") doesn't exist anymore. We can safely boot with nosmp and the warning won't show up. The other side benefit of this patch is that TWD has a chance to probe on single-core A9 systems such as AM437x which sport TWD. Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Dirk Behme <dirk.behme@de.bosch.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Felipe Balbi <balbi@ti.com> --- arch/arm/kernel/smp_twd.c | 4 ---- 1 file changed, 4 deletions(-)