All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "Paul Burton" <paulburton@kernel.org>,
	"Krzysztof Kozlowski" <krzk@kernel.org>,
	周琰杰 <zhouyanjie@wanyeetech.com>,
	od@zcrc.me, linux-kernel@vger.kernel.org,
	linux-mips@vger.kernel.org,
	"Paul Cercueil" <paul@crapouillou.net>
Subject: [PATCH v2 07/13] MIPS: generic: Support booting with built-in or appended DTB
Date: Wed, 12 Aug 2020 02:15:04 +0200	[thread overview]
Message-ID: <20200812001510.460382-8-paul@crapouillou.net> (raw)
In-Reply-To: <20200812001510.460382-1-paul@crapouillou.net>

The plat_get_fdt() checked that the kernel was booted using UHI before
reading the 'fw_passed_dtb' variable. However, this variable is also set
when the kernel has been appended, or when it has been built into the
kernel.

Support these usecases by removing the UHI check.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---

Notes:
    v2: No change

 arch/mips/generic/init.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/mips/generic/init.c b/arch/mips/generic/init.c
index 029f47ea390c..66a19337d2ab 100644
--- a/arch/mips/generic/init.c
+++ b/arch/mips/generic/init.c
@@ -39,12 +39,11 @@ void __init *plat_get_fdt(void)
 		/* Already set up */
 		return (void *)fdt;
 
-	if ((fw_arg0 == -2) && !fdt_check_header((void *)fw_passed_dtb)) {
+	if (fw_passed_dtb && !fdt_check_header((void *)fw_passed_dtb)) {
 		/*
-		 * We booted using the UHI boot protocol, so we have been
-		 * provided with the appropriate device tree for the board.
-		 * Make use of it & search for any machine struct based upon
-		 * the root compatible string.
+		 * We have been provided with the appropriate device tree for
+		 * the board. Make use of it & search for any machine struct
+		 * based upon the root compatible string.
 		 */
 		fdt = (void *)fw_passed_dtb;
 
-- 
2.28.0


  parent reply	other threads:[~2020-08-12  0:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-12  0:14 [PATCH v2 00/13] Convert Ingenic to a generic board v2 Paul Cercueil
2020-08-12  0:14 ` [PATCH v2 01/13] MIPS: cpu-probe: Set Ingenic's writecombine to _CACHE_CACHABLE_WA Paul Cercueil
2020-08-12  0:14 ` [PATCH v2 02/13] MIPS: cpu-probe: Mark XBurst CPU as having vtagged caches Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 03/13] MIPS: cpu-probe: ingenic: Fix broken BUG_ON Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 04/13] MIPS: Kconfig: add MIPS_GENERIC_KERNEL symbol Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 05/13] MIPS: generic: Allow boards to set system type Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 06/13] MIPS: generic: Init command line with fw_init_cmdline() Paul Cercueil
2020-08-12  0:15 ` Paul Cercueil [this message]
2020-08-12  9:15   ` [PATCH v2 07/13] MIPS: generic: Support booting with built-in or appended DTB Sergei Shtylyov
2020-08-12  9:21     ` Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 08/13] MIPS: generic: Add support for zboot Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 09/13] MIPS: generic: Increase NR_IRQS to 256 Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 10/13] MIPS: generic: Add support for Ingenic SoCs Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 11/13] MIPS: jz4740: Drop folder Paul Cercueil
2020-08-12  0:15 ` [PATCH v2 12/13] MIPS: configs: Regenerate configs of Ingenic boards Paul Cercueil
2020-08-19 14:16   ` Zhou Yanjie
2020-08-12  0:15 ` [PATCH v2 13/13] MAINTAINERS: Update paths to Ingenic platform code Paul Cercueil
2020-08-19 14:12 ` [PATCH v2 00/13] Convert Ingenic to a generic board v2 Zhou Yanjie
2020-08-19 15:35   ` Paul Cercueil
2020-08-19 15:52     ` Paul Cercueil
2020-08-22 17:28     ` Zhou Yanjie

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=20200812001510.460382-8-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=krzk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=od@zcrc.me \
    --cc=paulburton@kernel.org \
    --cc=tsbogend@alpha.franken.de \
    --cc=zhouyanjie@wanyeetech.com \
    /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.