shell: modules: devmem: support 64-bit read & write

Add support for 64-bit devmem operations for 64-bit devices.

Signed-off-by: Sergii Vystoropskyi <[email protected]>
Signed-off-by: Yong Cong Sin <[email protected]>
Signed-off-by: Yong Cong Sin <[email protected]>

Author: ycsin

subsys/shell/modules/devmem_service.c

@@ -42,7 +42,7 @@ static bool littleendian;
 
 static int memory_dump(const struct shell *sh, mem_addr_t phys_addr, size_t size, uint8_t width)
 {
-	uint32_t value;
+	uint64_t value;
 	size_t data_offset;
 	mm_reg_t addr;
 	const size_t vsize = width / BITS_PER_BYTE;
@@ -82,6 +82,26 @@ static int memory_dump(const struct shell *sh, mem_addr_t phys_addr, size_t size
 				value >>= 8;
 				hex_data[data_offset + 3] = (uint8_t)value;
 				break;
+#ifdef CONFIG_64BIT
+			case 64:
+				value = sys_le64_to_cpu(sys_read64(addr + data_offset));
+				hex_data[data_offset] = (uint8_t)value;
+				value >>= 8;
+				hex_data[data_offset + 1] = (uint8_t)value;
+				value >>= 8;
+				hex_data[data_offset + 2] = (uint8_t)value;
+				value >>= 8;
+				hex_data[data_offset + 3] = (uint8_t)value;
+				value >>= 8;
+				hex_data[data_offset + 4] = (uint8_t)value;
+				value >>= 8;
+				hex_data[data_offset + 5] = (uint8_t)value;
+				value >>= 8;
+				hex_data[data_offset + 6] = (uint8_t)value;
+				value >>= 8;
+				hex_data[data_offset + 7] = (uint8_t)value;
+				break;
+#endif /* CONFIG_64BIT */
 			default:
 				shell_fprintf(sh, SHELL_NORMAL, "Incorrect data width\n");
 				return -EINVAL;
@@ -253,7 +273,7 @@ static int cmd_load(const struct shell *sh, size_t argc, char **argv)
 
 static int memory_read(const struct shell *sh, mem_addr_t addr, uint8_t width)
 {
-	uint32_t value;
+	uint64_t value;
 	int err = 0;
 
 	switch (width) {
@@ -266,14 +286,19 @@ static int memory_read(const struct shell *sh, mem_addr_t addr, uint8_t width)
 	case 32:
 		value = sys_read32(addr);
 		break;
+#ifdef CONFIG_64BIT
+	case 64:
+		value = sys_read64(addr);
+		break;
+#endif /* CONFIG_64BIT */
 	default:
 		shell_fprintf(sh, SHELL_NORMAL, "Incorrect data width\n");
 		err = -EINVAL;
 		break;
 	}
 
 	if (err == 0) {
-		shell_fprintf(sh, SHELL_NORMAL, "Read value 0x%x\n", value);
+		shell_fprintf(sh, SHELL_NORMAL, "Read value 0x%llx\n", value);
 	}
 
 	return err;
@@ -293,6 +318,11 @@ static int memory_write(const struct shell *sh, mem_addr_t addr, uint8_t width,
 	case 32:
 		sys_write32(value, addr);
 		break;
+#ifdef CONFIG_64BIT
+	case 64:
+		sys_write64(value, addr);
+		break;
+#endif /* CONFIG_64BIT */
 	default:
 		shell_fprintf(sh, SHELL_NORMAL, "Incorrect data width\n");
 		err = -EINVAL;
@@ -306,7 +336,7 @@ static int memory_write(const struct shell *sh, mem_addr_t addr, uint8_t width,
 static int cmd_devmem(const struct shell *sh, size_t argc, char **argv)
 {
 	mem_addr_t phys_addr, addr;
-	uint32_t value = 0;
+	uint64_t value = 0;
 	uint8_t width;
 
 	phys_addr = strtoul(argv[1], NULL, 16);
@@ -335,9 +365,9 @@ static int cmd_devmem(const struct shell *sh, size_t argc, char **argv)
 	 * this value at the address provided
 	 */
 
-	value = strtoul(argv[3], NULL, 16);
+	value = (uint64_t)strtoull(argv[3], NULL, 16);
 
-	shell_fprintf(sh, SHELL_NORMAL, "Writing value 0x%x\n", value);
+	shell_fprintf(sh, SHELL_NORMAL, "Writing value 0x%llx\n", value);
 
 	return memory_write(sh, addr, width, value);
 }