fix commments by Etienne part OP-TEE#2

Fixed description in core_memprot.h Fixed range in tests/invoke.c Removed line in imx_uart.c Signed-off-by: Anton Rybakov <[email protected]>
a-rybakov · Jun 3, 2021 · f41a30a · f41a30a
1 parent 2f84815
commit f41a30a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/core/drivers/imx_uart.c b/core/drivers/imx_uart.c
@@ -52,7 +52,6 @@
 #define UTS   0xb4 /* UART Test Register (mx31) */
 #define USIZE 0xb8 /* UTS + sizeof(uint32_t) */
 
-
 /* UART Control Register Bit Fields.*/
 #define  URXD_CHARRDY    (1<<15)
 #define  URXD_ERR        (1<<14)

diff --git a/core/include/mm/core_memprot.h b/core/include/mm/core_memprot.h
@@ -71,15 +71,15 @@ bool core_vbuf_is(uint32_t flags, const void *vbuf, size_t len);
  * Also tries to find proper mapping which have counterpart translation
  * for specified length of data starting from given physical address.
  * Len parameter can be set to 1 if caller knows that requested (pa + len)
- * doesn`t cross granule boundary.
+ * doesn`t cross mapping granule boundary.
  * Returns NULL on failure or a valid virtual address on success.
  */
 void *phys_to_virt(paddr_t pa, enum teecore_memtypes m, size_t len);
 
 /*
  * Translate physical address to virtual address trying MEM_AREA_IO_SEC
  * first then MEM_AREA_IO_NSEC if not found. Like phys_to_virt() tries
- * to find proper mapping rely on length parameter.
+ * to find proper mapping relying on length parameter.
  * Returns NULL on failure or a valid virtual address on success.
  */
 void *phys_to_virt_io(paddr_t pa, size_t len);

diff --git a/core/pta/tests/invoke.c b/core/pta/tests/invoke.c
@@ -277,8 +277,8 @@ static TEE_Result test_inject_sdp(uint32_t type, TEE_Param p[TEE_NUM_PARAMS])
 		return TEE_SUCCESS;
 
 	/* Check that core can p2v and v2p over memory reference arguments */
-	if (test_v2p2v(src, sz) || test_v2p2v(src + sz - 1, 0) ||
-	    test_v2p2v(dst, sz) || test_v2p2v(dst + sz - 1, 0))
+	if (test_v2p2v(src, sz) || test_v2p2v(src + sz - 1, 1) ||
+	    test_v2p2v(dst, sz) || test_v2p2v(dst + sz - 1, 1))
 		return TEE_ERROR_SECURITY;
 
 	if (cache_operation(TEE_CACHEFLUSH, dst, sz) != TEE_SUCCESS)