All of lore.kernel.org
 help / color / mirror / Atom feed
From: broonie@kernel.org (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: Fix conversion to early_init_dt_scan() for non-DT platforms
Date: Thu,  3 Oct 2013 13:50:33 +0100	[thread overview]
Message-ID: <1380804633-14130-1-git-send-email-broonie@kernel.org> (raw)

From: Mark Brown <broonie@linaro.org>

Commit 67a964490bfd14 (arm: use early_init_dt_scan) in the OF tree in
-next converts ARM to use early_init_dt_scan(), factoring out some common
code. However it ignores the return value of the function meaning that on
non-DT platforms the kernel fails to boot as it attempts to configure
itself using DT.

Fix this by adding the appropriate return value check.

Signed-off-by: Mark Brown <broonie@linaro.org>
---
 arch/arm/kernel/devtree.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 04050f7..67f4ebe 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -198,7 +198,8 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 	if (!dt_phys)
 		return NULL;
 
-	early_init_dt_scan(phys_to_virt(dt_phys));
+	if (!early_init_dt_scan(phys_to_virt(dt_phys)))
+		return NULL;
 
 	/* Search the mdescs for the 'best' compatible value match */
 	dt_root = of_get_flat_dt_root();
-- 
1.8.4.rc3

WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>,
	Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Mark Brown <broonie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH] arm: Fix conversion to early_init_dt_scan() for non-DT platforms
Date: Thu,  3 Oct 2013 13:50:33 +0100	[thread overview]
Message-ID: <1380804633-14130-1-git-send-email-broonie@kernel.org> (raw)

From: Mark Brown <broonie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

Commit 67a964490bfd14 (arm: use early_init_dt_scan) in the OF tree in
-next converts ARM to use early_init_dt_scan(), factoring out some common
code. However it ignores the return value of the function meaning that on
non-DT platforms the kernel fails to boot as it attempts to configure
itself using DT.

Fix this by adding the appropriate return value check.

Signed-off-by: Mark Brown <broonie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 arch/arm/kernel/devtree.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 04050f7..67f4ebe 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -198,7 +198,8 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 	if (!dt_phys)
 		return NULL;
 
-	early_init_dt_scan(phys_to_virt(dt_phys));
+	if (!early_init_dt_scan(phys_to_virt(dt_phys)))
+		return NULL;
 
 	/* Search the mdescs for the 'best' compatible value match */
 	dt_root = of_get_flat_dt_root();
-- 
1.8.4.rc3

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

             reply	other threads:[~2013-10-03 12:50 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-03 12:50 Mark Brown [this message]
2013-10-03 12:50 ` [PATCH] arm: Fix conversion to early_init_dt_scan() for non-DT platforms Mark Brown
2013-10-03 16:37 ` Rob Herring
2013-10-03 16:37   ` Rob Herring
2013-10-03 18:20   ` Mark Brown
2013-10-03 18:20     ` Mark Brown
2013-10-03 16:39 ` Olof Johansson
2013-10-03 16:39   ` Olof Johansson

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=1380804633-14130-1-git-send-email-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.