Merge branch '2020-05-15-kconfig-migrations'

[oweals/u-boot.git] / common / iotrace.c

diff --git a/common/iotrace.c b/common/iotrace.c
index 2f03a6082e893f0c2493c16c749a17e21442c692..295ee07b72473fc2c8b0ff3ff4ce811953f28a55 100644 (file)
--- a/common/iotrace.c
+++ b/common/iotrace.c
@@ -7,42 +7,18 @@
 
 #include <common.h>
 #include <mapmem.h>
+#include <time.h>
 #include <asm/io.h>
+#include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* Support up to the machine word length for now */
-typedef ulong iovalue_t;
-
-enum iotrace_flags {
-       IOT_8 = 0,
-       IOT_16,
-       IOT_32,
-
-       IOT_READ = 0 << 3,
-       IOT_WRITE = 1 << 3,
-};
-
-/**
- * struct iotrace_record - Holds a single I/O trace record
- *
- * @flags: I/O access type
- * @timestamp: Timestamp of access
- * @addr: Address of access
- * @value: Value written or read
- */
-struct iotrace_record {
-       enum iotrace_flags flags;
-       u64 timestamp;
-       phys_addr_t addr;
-       iovalue_t value;
-};
-
 /**
  * struct iotrace - current trace status and checksum
  *
  * @start:     Start address of iotrace buffer
- * @size:      Size of iotrace buffer in bytes
+ * @size:      Actual size of iotrace buffer in bytes
+ * @needed_size: Needed of iotrace buffer in bytes
  * @offset:    Current write offset into iotrace buffer
  * @region_start: Address of IO region to trace
  * @region_size: Size of region to trace. if 0 will trace all address space
@@ -52,6 +28,7 @@ struct iotrace_record {
 static struct iotrace {
        ulong start;
        ulong size;
+       ulong needed_size;
        ulong offset;
        ulong region_start;
        ulong region_size;
@@ -82,7 +59,12 @@ static void add_record(int flags, const void *ptr, ulong value)
                rec = (struct iotrace_record *)map_sysmem(
                                        iotrace.start + iotrace.offset,
                                        sizeof(value));
+       } else {
+               WARN_ONCE(1, "WARNING: iotrace buffer exhausted, please check needed length using \"iotrace stats\"\n");
+               iotrace.needed_size += sizeof(struct iotrace_record);
+               return;
        }
+
        rec->timestamp = timer_get_us();
        rec->flags = flags;
        rec->addr = map_to_sysmem(ptr);
@@ -92,6 +74,7 @@ static void add_record(int flags, const void *ptr, ulong value)
        iotrace.crc32 = crc32(iotrace.crc32, (unsigned char *)rec,
                              sizeof(*rec));
 
+       iotrace.needed_size += sizeof(struct iotrace_record);
        iotrace.offset += sizeof(struct iotrace_record);
 }
 
@@ -105,7 +88,7 @@ u32 iotrace_readl(const void *ptr)
        return v;
 }
 
-void iotrace_writel(ulong value, const void *ptr)
+void iotrace_writel(ulong value, void *ptr)
 {
        add_record(IOT_32 | IOT_WRITE, ptr, value);
        writel(value, ptr);
@@ -121,7 +104,7 @@ u16 iotrace_readw(const void *ptr)
        return v;
 }
 
-void iotrace_writew(ulong value, const void *ptr)
+void iotrace_writew(ulong value, void *ptr)
 {
        add_record(IOT_16 | IOT_WRITE, ptr, value);
        writew(value, ptr);
@@ -137,7 +120,7 @@ u8 iotrace_readb(const void *ptr)
        return v;
 }
 
-void iotrace_writeb(ulong value, const void *ptr)
+void iotrace_writeb(ulong value, void *ptr)
 {
        add_record(IOT_8 | IOT_WRITE, ptr, value);
        writeb(value, ptr);
@@ -189,10 +172,11 @@ void iotrace_set_buffer(ulong start, ulong size)
        iotrace.crc32 = 0;
 }
 
-void iotrace_get_buffer(ulong *start, ulong *size, ulong *offset, ulong *count)
+void iotrace_get_buffer(ulong *start, ulong *size, ulong *needed_size, ulong *offset, ulong *count)
 {
        *start = iotrace.start;
        *size = iotrace.size;
+       *needed_size = iotrace.needed_size;
        *offset = iotrace.offset;
        *count = iotrace.offset / sizeof(struct iotrace_record);
 }