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

cmd: blk: Allow generic read/write operations to work in sandbox

Browse source 
Ensure that the memory destination/source addresses of block
read/write operations are mapped in before access. Currently, this is
only needed on sandbox builds.

Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Tobias Waldekranz 2023-02-16 16:33:48 +01:00 committed by Tom Rini
parent e45bba562f
commit 3d2fc79714
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cmd/blk_common.c
View file

@ -11,6 +11,7 @@
#include <common.h> #include <common.h>
#include <blk.h> #include <blk.h>
#include <command.h> #include <command.h>
#include <mapmem.h>
int blk_common_cmd(int argc, char *const argv[], enum uclass_id uclass_id, int blk_common_cmd(int argc, char *const argv[], enum uclass_id uclass_id,
int *cur_devnump) int *cur_devnump)
@ -63,31 +64,37 @@ int blk_common_cmd(int argc, char *const argv[], enum uclass_id uclass_id,
default: /* at least 4 args */ default: /* at least 4 args */
if (strcmp(argv[1], "read") == 0) { if (strcmp(argv[1], "read") == 0) {
ulong addr = hextoul(argv[2], NULL); phys_addr_t paddr = hextoul(argv[2], NULL);
lbaint_t blk = hextoul(argv[3], NULL); lbaint_t blk = hextoul(argv[3], NULL);
ulong cnt = hextoul(argv[4], NULL); ulong cnt = hextoul(argv[4], NULL);
void *vaddr;
ulong n; ulong n;
printf("\n%s read: device %d block # "LBAFU", count %lu ... ", printf("\n%s read: device %d block # "LBAFU", count %lu ... ",
if_name, *cur_devnump, blk, cnt); if_name, *cur_devnump, blk, cnt);
vaddr = map_sysmem(paddr, 512 * cnt);
n = blk_read_devnum(uclass_id, *cur_devnump, blk, cnt, n = blk_read_devnum(uclass_id, *cur_devnump, blk, cnt,
(ulong *)addr); vaddr);
unmap_sysmem(vaddr);
printf("%ld blocks read: %s\n", n, printf("%ld blocks read: %s\n", n,
n == cnt ? "OK" : "ERROR"); n == cnt ? "OK" : "ERROR");
return n == cnt ? 0 : 1; return n == cnt ? 0 : 1;
} else if (strcmp(argv[1], "write") == 0) { } else if (strcmp(argv[1], "write") == 0) {
ulong addr = hextoul(argv[2], NULL); phys_addr_t paddr = hextoul(argv[2], NULL);
lbaint_t blk = hextoul(argv[3], NULL); lbaint_t blk = hextoul(argv[3], NULL);
ulong cnt = hextoul(argv[4], NULL); ulong cnt = hextoul(argv[4], NULL);
void *vaddr;
ulong n; ulong n;
printf("\n%s write: device %d block # "LBAFU", count %lu ... ", printf("\n%s write: device %d block # "LBAFU", count %lu ... ",
if_name, *cur_devnump, blk, cnt); if_name, *cur_devnump, blk, cnt);
vaddr = map_sysmem(paddr, 512 * cnt);
n = blk_write_devnum(uclass_id, *cur_devnump, blk, cnt, n = blk_write_devnum(uclass_id, *cur_devnump, blk, cnt,
(ulong *)addr); vaddr);
unmap_sysmem(vaddr);
printf("%ld blocks written: %s\n", n, printf("%ld blocks written: %s\n", n,
n == cnt ? "OK" : "ERROR"); n == cnt ? "OK" : "ERROR");