linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Khiem Nguyen <khiem.nguyen.xt@renesas.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH] ARM: shmobile: Fix wrong calculation in shmobile_init_delay()
Date: Fri, 12 Sep 2014 08:02:17 +0000	[thread overview]
Message-ID: <5412A889.2000209@renesas.com> (raw)

The processing to get CPU information loop on all available CPUs
and decide whether calculating preset_lpj for for CA15 or CA7/8/9.
The calculation will go for CA7/8/9 prior to CA15.

The commit 0dc50fd ARM: shmobile: support Cortex-A7 in shmobile_init_delay()
introduced wrong CPU selection in case CA15 and CA7/8/9 coexist, e.g R-CarH2.
At the end, it leads to the wrong calculation of preset_lpj for R-CarH2.

Fix it by selecting the first CPU in DTS file.

Signed-off-by: Khiem Nguyen <khiem.nguyen.xt@renesas.com>
---
 arch/arm/mach-shmobile/timer.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 87c6be1..9394cad 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -59,10 +59,14 @@ void __init shmobile_init_delay(void)
 
 		if (of_device_is_compatible(np, "arm,cortex-a7") ||
 		    of_device_is_compatible(np, "arm,cortex-a8") ||
-		    of_device_is_compatible(np, "arm,cortex-a9"))
+		    of_device_is_compatible(np, "arm,cortex-a9")) {
 			is_a7_a8_a9 = true;
-		else if (of_device_is_compatible(np, "arm,cortex-a15"))
+			break;
+		}
+		else if (of_device_is_compatible(np, "arm,cortex-a15")) {
 			is_a15 = true;
+			break;
+		}
 	}
 
 	of_node_put(cpus);
-- 
1.7.9.5

             reply	other threads:[~2014-09-12  8:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-12  8:02 Khiem Nguyen [this message]
2014-09-18  5:24 ` [PATCH] ARM: shmobile: Fix wrong calculation in shmobile_init_delay() Khiem Nguyen
2014-09-18  9:12 ` Simon Horman
2014-09-19  1:04 ` Magnus Damm
2014-09-19  1:57 ` Khiem Nguyen
2014-09-19  6:07 ` Magnus Damm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5412A889.2000209@renesas.com \
    --to=khiem.nguyen.xt@renesas.com \
    --cc=linux-sh@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).