All of lore.kernel.org
 help / color / mirror / Atom feed
From: Xiang W <wxjstz@126.com>
To: opensbi@lists.infradead.org
Subject: [PATCH 1/4] include: sbi_utils: fixup fdt_get_address
Date: Thu,  6 Jun 2024 17:17:13 +0800	[thread overview]
Message-ID: <20240606091723.896477-2-wxjstz@126.com> (raw)
In-Reply-To: <20240606091723.896477-1-wxjstz@126.com>

root.next_arg1 will be NULL before sbi_domain_init, which will cause
fdt address to be NULL before sbi_domain is initialized. This patch
fixes this.

Signed-off-by: Xiang W <wxjstz@126.com>
---
 include/sbi_utils/fdt/fdt_helper.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/sbi_utils/fdt/fdt_helper.h b/include/sbi_utils/fdt/fdt_helper.h
index ab4a80f..67e6dc7 100644
--- a/include/sbi_utils/fdt/fdt_helper.h
+++ b/include/sbi_utils/fdt/fdt_helper.h
@@ -116,7 +116,9 @@ int fdt_parse_compat_addr(void *fdt, uint64_t *addr,
 
 static inline void *fdt_get_address(void)
 {
-	return (void *)root.next_arg1;
+	if (root.next_arg1)
+		return (void *)root.next_arg1;
+	return sbi_scratch_thishart_arg1_ptr();
 }
 
 #endif /* __FDT_HELPER_H__ */
-- 
2.43.0



  reply	other threads:[~2024-06-06  9:17 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-06  9:17 [PATCH 0/4] Initialize the console as early as possible Xiang W
2024-06-06  9:17 ` Xiang W [this message]
2024-06-06  9:17 ` [PATCH 2/4] lib: sbi: Add domains_init to sbi_console_device Xiang W
2024-06-06  9:17 ` [PATCH 3/4] lib: utils/serial: add domains_init for 8250 Xiang W
2024-06-06  9:17 ` [PATCH 4/4] lib: sbi: Initialize the console as early as possible Xiang W
2024-06-21 12:07 ` [PATCH 0/4] " Anup Patel
2024-06-21 14:02   ` Andrew Jones
2024-06-21 14:55     ` Xiang W
2024-06-21 14:52   ` Xiang W

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=20240606091723.896477-2-wxjstz@126.com \
    --to=wxjstz@126.com \
    --cc=opensbi@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.