Changeset 0ab362c in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2012-11-22T14:36:04Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e32720ff

Parents:

1f7753a (diff), 0f2c80a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge support for BeagleBoard-xM (armv7).

Most of the changes outside arm arch are pio_* stuff (addition of pio_trace capability, header consolidation)

File:

• kernel/generic/src/console/cmd.c (modified) (4 diffs)

kernel/generic/src/console/cmd.c

@@ -56 +56 @@
 #include <cpu.h>
 #include <mm/tlb.h>
+#include <mm/km.h>
 #include <arch/mm/tlb.h>
 #include <mm/frame.h>
@@ -81 +82 @@
         .func = cmd_help,
         .argc = 0
+};
+
+/* Data and methods for pio_read_8 command */
+static int cmd_pio_read_8(cmd_arg_t *argv);
+static cmd_arg_t pio_read_8_argv[] = { { .type = ARG_TYPE_INT } };
+static cmd_info_t pio_read_8_info = {
+        .name = "pio_read_8",
+        .description = "pio_read_8 <address> Read 1 byte from memory (or port).",
+        .func = cmd_pio_read_8,
+        .argc = 1,
+        .argv = pio_read_8_argv
+};
+
+/* Data and methods for pio_read_16 command */
+static int cmd_pio_read_16(cmd_arg_t *argv);
+static cmd_arg_t pio_read_16_argv[] = { { .type = ARG_TYPE_INT } };
+static cmd_info_t pio_read_16_info = {
+        .name = "pio_read_16",
+        .description = "pio_read_16 <address> Read 2 bytes from memory (or port).",
+        .func = cmd_pio_read_16,
+        .argc = 1,
+        .argv = pio_read_16_argv
+};
+
+/* Data and methods for pio_read_32 command */
+static int cmd_pio_read_32(cmd_arg_t *argv);
+static cmd_arg_t pio_read_32_argv[] = { { .type = ARG_TYPE_INT } };
+static cmd_info_t pio_read_32_info = {
+        .name = "pio_read_32",
+        .description = "pio_read_32 <address> Read 4 bytes from memory (or port).",
+        .func = cmd_pio_read_32,
+        .argc = 1,
+        .argv = pio_read_32_argv
+};
+
+/* Data and methods for pio_write_8 command */
+static int cmd_pio_write_8(cmd_arg_t *argv);
+static cmd_arg_t pio_write_8_argv[] = {
+        { .type = ARG_TYPE_INT },
+        { .type = ARG_TYPE_INT }
+};
+static cmd_info_t pio_write_8_info = {
+        .name = "pio_write_8",
+        .description = "pio_write_8 <address> <value> Write 1 byte to memory (or port).",
+        .func = cmd_pio_write_8,
+        .argc = 2,
+        .argv = pio_write_8_argv
+};
+
+/* Data and methods for pio_write_16 command */
+static int cmd_pio_write_16(cmd_arg_t *argv);
+static cmd_arg_t pio_write_16_argv[] = {
+        { .type = ARG_TYPE_INT },
+        { .type = ARG_TYPE_INT }
+};
+static cmd_info_t pio_write_16_info = {
+        .name = "pio_write_16",
+        .description = "pio_write_16 <address> <value> Write 2 bytes to memory (or port).",
+        .func = cmd_pio_write_16,
+        .argc = 2,
+        .argv = pio_write_16_argv
+};
+
+/* Data and methods for pio_write_32 command */
+static int cmd_pio_write_32(cmd_arg_t *argv);
+static cmd_arg_t pio_write_32_argv[] = {
+        { .type = ARG_TYPE_INT },
+        { .type = ARG_TYPE_INT }
+};
+static cmd_info_t pio_write_32_info = {
+        .name = "pio_write_32",
+        .description = "pio_write_32 <address> <value> Write 4 bytes to memory (or port).",
+        .func = cmd_pio_write_32,
+        .argc = 2,
+        .argv = pio_write_32_argv
 };
 
@@ -531 +607 @@
         &btrace_info,
 #endif
+        &pio_read_8_info,
+        &pio_read_16_info,
+        &pio_read_32_info,
+        &pio_write_8_info,
+        &pio_write_16_info,
+        &pio_write_32_info,
         NULL
 };
@@ -601 +683 @@
         spinlock_unlock(&cmd_lock);
         
+        return 1;
+}
+
+/** Read 1 byte from phys memory or io port.
+ *
+ * @param argv Argument vector.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+static int cmd_pio_read_8(cmd_arg_t *argv)
+{
+        uint8_t *ptr = NULL;
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                ptr = argv[0].intval;
+        else
+#endif
+                ptr = (uint8_t*)km_map(argv[0].intval, sizeof(uint8_t), PAGE_NOT_CACHEABLE);
+        const uint8_t val = pio_read_8(ptr);
+        printf("read %x: %"PRIx8"\n", argv[0].intval, val);
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                return 1;
+#endif
+        km_unmap((uintptr_t)ptr, sizeof(uint8_t));
+        return 1;
+}
+
+/** Read 2 bytes from phys memory or io port.
+ *
+ * @param argv Argument vector.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+static int cmd_pio_read_16(cmd_arg_t *argv)
+{
+        uint16_t *ptr = NULL;
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                ptr = argv[0].intval;
+        else
+#endif
+                ptr = (uint16_t*)km_map(argv[0].intval, sizeof(uint16_t), PAGE_NOT_CACHEABLE);
+        const uint16_t val = pio_read_16(ptr);
+        printf("read %x: %"PRIx16"\n", argv[0].intval, val);
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                return 1;
+#endif
+        km_unmap((uintptr_t)ptr, sizeof(uint16_t));
+        return 1;
+}
+
+/** Read 4 bytes from phys memory or io port.
+ *
+ * @param argv Argument vector.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+static int cmd_pio_read_32(cmd_arg_t *argv)
+{
+        uint32_t *ptr = NULL;
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                ptr = argv[0].intval;
+        else
+#endif
+                ptr = (uint32_t*)km_map(argv[0].intval, sizeof(uint32_t), PAGE_NOT_CACHEABLE);
+        const uint32_t val = pio_read_32(ptr);
+        printf("read %#x: %#"PRIx32"\n", argv[0].intval, val);
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                return 1;
+#endif
+        km_unmap((uintptr_t)ptr, sizeof(uint32_t));
+        return 1;
+}
+
+/** Write 1 byte to phys memory or io port.
+ *
+ * @param argv Argument vector.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+static int cmd_pio_write_8(cmd_arg_t *argv)
+{
+        uint8_t *ptr = NULL;
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                ptr = argv[0].intval;
+        else
+#endif
+                ptr = (uint8_t*)km_map(argv[0].intval, sizeof(uint8_t), PAGE_NOT_CACHEABLE);
+        printf("write %x: %"PRIx8"\n", argv[0].intval, (uint8_t)argv[1].intval);
+        pio_write_8(ptr, (uint8_t)argv[1].intval);
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                return 1;
+#endif
+        km_unmap((uintptr_t)ptr, sizeof(uint8_t));
+        return 1;
+}
+
+/** Write 2 bytes to phys memory or io port.
+ *
+ * @param argv Argument vector.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+static int cmd_pio_write_16(cmd_arg_t *argv)
+{
+        uint16_t *ptr = NULL;
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                ptr = argv[0].intval;
+        else
+#endif
+                ptr = (uint16_t*)km_map(argv[0].intval, sizeof(uint16_t), PAGE_NOT_CACHEABLE);
+        printf("write %x: %"PRIx16"\n", argv[0].intval, (uint16_t)argv[1].intval);
+        pio_write_16(ptr, (uint16_t)argv[1].intval);
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                return 1;
+#endif
+        km_unmap((uintptr_t)ptr, sizeof(uint16_t));
+        return 1;
+}
+
+/** Write 4 bytes to phys memory or io port.
+ *
+ * @param argv Argument vector.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+static int cmd_pio_write_32(cmd_arg_t *argv)
+{
+        uint32_t *ptr = NULL;
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                ptr = argv[0].intval;
+        else
+#endif
+                ptr = (uint32_t*)km_map(argv[0].intval, sizeof(uint32_t), PAGE_NOT_CACHEABLE);
+        printf("write %x: %"PRIx32"\n", argv[0].intval, (uint32_t)argv[1].intval);
+        pio_write_32(ptr, (uint32_t)argv[1].intval);
+#ifdef IO_SPACE_BOUNDARY
+        if (argv->intval < IO_SPACE_BOUNDARY)
+                return 1;
+#endif
+        km_unmap((uintptr_t)ptr, sizeof(uint32_t));
         return 1;
 }