mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 16/19] video: simplefb-fixup: warn on framebuffers >= 4G
Date: Mon, 12 Jun 2023 15:02:37 +0200	[thread overview]
Message-ID: <20230612130239.1087599-17-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230612130239.1087599-1-a.fatoum@pengutronix.de>

Building simplefb-fixup for 64-bit has the compiler inform us that the
code doesn't handle 64-bit addresses as it should. Silence the warnings
and have the code return -ENOSYS if this happens.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/video/simplefb-fixup.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/video/simplefb-fixup.c b/drivers/video/simplefb-fixup.c
index a2c59de364a5..65e0281a189f 100644
--- a/drivers/video/simplefb-fixup.c
+++ b/drivers/video/simplefb-fixup.c
@@ -90,6 +90,7 @@ static int simplefb_create_node(struct device_node *root,
 				const struct fb_info *fbi, const char *format)
 {
 	struct device_node *node;
+	phys_addr_t screen_base;
 	u32 cells[2];
 	int ret;
 
@@ -105,7 +106,11 @@ static int simplefb_create_node(struct device_node *root,
 	if (ret)
 		return ret;
 
-	cells[0] = cpu_to_be32((u32)fbi->screen_base);
+	screen_base = virt_to_phys(fbi->screen_base);
+	if (upper_32_bits(screen_base))
+		return -ENOSYS;
+
+	cells[0] = cpu_to_be32(lower_32_bits(screen_base));
 	cells[1] = cpu_to_be32(fbi->line_length * fbi->yres);
 	ret = of_set_property(node, "reg", cells, sizeof(cells[0]) * 2, 1);
 	if (ret < 0)
@@ -130,8 +135,7 @@ static int simplefb_create_node(struct device_node *root,
 	if (ret < 0)
 		return ret;
 
-	of_add_reserve_entry((u32)fbi->screen_base,
-			(u32)fbi->screen_base + fbi->screen_size);
+	of_add_reserve_entry(screen_base, screen_base + fbi->screen_size);
 
 	return of_property_write_string(node, "status", "okay");
 }
-- 
2.39.2




  parent reply	other threads:[~2023-06-12 13:03 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-12 13:02 [PATCH 00/19] misc fixes building sandbox 64-bit allyesconfig Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 01/19] clk: always define clk_prepare_enable/disable Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 02/19] clk: define clk_get_parent stub Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 03/19] pci: disable building CONFIG_PCI when CONFIG_COMPILE_TEST Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 04/19] mci: tegra: fix base address constant to be hexadecimal Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 05/19] ata: ide-sff: fix warnings when compiling as 64-bit Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 06/19] video: bochs: remove dependency on PCI header in common part Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 07/19] commands: ubsan: hide pointer provenance used to trigger UB Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 08/19] test: self: printf: silence clang warnings Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 09/19] crypto: caam - fix pointer to u32 casts Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 10/19] crypto: imx-scc: fix u32 to pointer casts Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 11/19] mci: sdhci: dove: fix pointer to u32 casts Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 12/19] lib: make_directory: return -ENOMEM on allocation failure Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 13/19] include <linux/idr.h>: handle OOM gracefully inside idr_alloc_one Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 14/19] mci: tegra: use correct types for mmio and DMA address Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 15/19] mtd: spi-nor: cadence: fix types Ahmad Fatoum
2023-06-12 13:02 ` Ahmad Fatoum [this message]
2023-06-12 13:02 ` [PATCH 17/19] watchdog: imx28: use correct constant for computing timeout_max Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 18/19] firmware: mark firmware sections as having non-executable stack Ahmad Fatoum
2023-06-12 13:02 ` [PATCH 19/19] phy: stm32: usb: depend on COMMON_CLK Ahmad Fatoum
2023-06-13  7:49 ` [PATCH 00/19] misc fixes building sandbox 64-bit allyesconfig Sascha Hauer

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=20230612130239.1087599-17-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox