Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core: fdtaddr: use map_sysmem() as cast for the return

Browse source 
For the devfdt_get_addr_index_ptr() and devfdt_get_addr_size_index_ptr()
function use map_sysmem() function as cast for the return for use in
sandbox. Also fix sandbox test.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Drop second hunk:
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Johan Jonker 2023-04-23 11:19:41 +02:00 committed by Simon Glass
parent de65b122a2
commit 37937aba35
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/core/fdtaddr.c
View file

@ -12,6 +12,7 @@
#include <dm.h> #include <dm.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <log.h> #include <log.h>
#include <mapmem.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
@ -97,7 +98,10 @@ void *devfdt_get_addr_index_ptr(const struct udevice *dev, int index)
{ {
fdt_addr_t addr = devfdt_get_addr_index(dev, index); fdt_addr_t addr = devfdt_get_addr_index(dev, index);
return (addr == FDT_ADDR_T_NONE) ? NULL : (void *)(uintptr_t)addr; if (addr == FDT_ADDR_T_NONE)
return NULL;
return map_sysmem(addr, 0);
} }
fdt_addr_t devfdt_get_addr_size_index(const struct udevice *dev, int index, fdt_addr_t devfdt_get_addr_size_index(const struct udevice *dev, int index,

5
test/dm/test-fdt.c
View file

@ -617,6 +617,7 @@ static int dm_test_fdt_get_addr_ptr_flat(struct unit_test_state *uts)
{ {
struct udevice *gpio, *dev; struct udevice *gpio, *dev;
void *ptr; void *ptr;
void *paddr;
/* Test for missing reg property */ /* Test for missing reg property */
ut_assertok(uclass_first_device_err(UCLASS_GPIO, &gpio)); ut_assertok(uclass_first_device_err(UCLASS_GPIO, &gpio));
@ -624,7 +625,9 @@ static int dm_test_fdt_get_addr_ptr_flat(struct unit_test_state *uts)
ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, &dev)); ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, &dev));
ptr = devfdt_get_addr_ptr(dev); ptr = devfdt_get_addr_ptr(dev);
ut_asserteq_ptr((void *)0x8000, ptr);
paddr = map_sysmem(0x8000, 0);
ut_asserteq_ptr(paddr, ptr);
return 0; return 0;
} }