Changeset fa239ff2 in rtems

Timestamp:

06/19/16 13:41:45 (7 years ago)

Author:

Pavel Pisa <ppisa@…>

Branches:

5, master

Children:

7222a65

Parents:

3e2a3c4

git-author:

Pavel Pisa <ppisa@…> (06/19/16 13:41:45)

git-committer:

Pavel Pisa <ppisa@…> (06/20/16 15:01:19)

Message:

arm/raspberrypi: Ensure that buffers used for VC mail box communication are synchronized through cache.

Location:

c/src/lib/libbsp/arm/raspberrypi/misc

Files:

• vc.c (modified) (11 diffs)
• vc_defines.h (modified) (2 diffs)

c/src/lib/libbsp/arm/raspberrypi/misc/vc.c

@@ -23 +23 @@
 #include <bsp/mailbox.h>
 #include <bsp/vc.h>
+#include <libcpu/arm-cp15.h>
 #include "vc_defines.h"
 
@@ -46 +47 @@
 }
 
+/*
+ * When cache is enabled then content of buffer exchanged
+ * with VideoCore has to be propagated through ARM11/Cortex-A7
+ * caches
+ */
+static inline void
+bcm2835_mailbox_buffer_flush_and_invalidate(void *buf, size_t size)
+{
+  uint32_t sctlr_val;
+
+  sctlr_val = arm_cp15_get_control();
+
+  arm_cp15_drain_write_buffer();
+  if (sctlr_val & (ARM_CP15_CTRL_C | ARM_CP15_CTRL_M)) {
+    arm_cp15_drain_write_buffer();
+    rtems_cache_flush_multiple_data_lines(buf, size);
+    rtems_cache_invalidate_multiple_data_lines(buf, size);
+  }
+}
+
 #define BCM2835_MBOX_VAL_LENGTH_MASK(_val_len) \
   (_val_len&(~BCM2835_MBOX_TAG_VAL_LEN_RESPONSE))
@@ -56 +77 @@
     bcm2835_mbox_tag_display_size get_display_size;
     uint32_t end_tag;
-  }buffer __attribute__((aligned (16)));
+  }buffer BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE;
   BCM2835_MBOX_INIT_BUF(&buffer);
   BCM2835_MBOX_INIT_TAG_NO_REQ(&buffer.get_display_size,
     BCM2835_MAILBOX_TAG_GET_DISPLAY_SIZE);
+  bcm2835_mailbox_buffer_flush_and_invalidate(&buffer, sizeof(&buffer));
   if (bcm2835_mailbox_send_read_buffer(&buffer))
     return -1;
@@ -84 +106 @@
     bcm2835_mbox_tag_get_pitch get_pitch;
     uint32_t end_tag;
-  } buffer __attribute__((aligned (16)));
+  } buffer BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE;
   BCM2835_MBOX_INIT_BUF(&buffer);
   BCM2835_MBOX_INIT_TAG(&buffer.set_display_size,
@@ -118 +140 @@
   BCM2835_MBOX_INIT_TAG_NO_REQ(&buffer.get_pitch,
     BCM2835_MAILBOX_TAG_GET_PITCH);
+  bcm2835_mailbox_buffer_flush_and_invalidate(&buffer, sizeof(&buffer));
   if (bcm2835_mailbox_send_read_buffer(&buffer))
     return -1;
@@ -152 +175 @@
     bcm2835_mbox_tag_get_pitch get_pitch;
     uint32_t end_tag;
-  }buffer __attribute__((aligned (16)));
+  }buffer BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE;
   BCM2835_MBOX_INIT_BUF(&buffer);
   BCM2835_MBOX_INIT_TAG_NO_REQ(&buffer.get_pitch,
     BCM2835_MAILBOX_TAG_GET_PITCH);
+  bcm2835_mailbox_buffer_flush_and_invalidate(&buffer, sizeof(&buffer));
   if (bcm2835_mailbox_send_read_buffer(&buffer))
     return -1;
@@ -172 +196 @@
     bcm2835_mbox_tag_get_cmd_line get_cmd_line;
     uint32_t end_tag;
-  }buffer __attribute__((aligned (16)));
+  }buffer BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE;
   BCM2835_MBOX_INIT_BUF(&buffer);
   BCM2835_MBOX_INIT_TAG_NO_REQ(&buffer.get_cmd_line,
     BCM2835_MAILBOX_TAG_GET_CMD_LINE);
+  bcm2835_mailbox_buffer_flush_and_invalidate(&buffer, sizeof(&buffer));
   if (bcm2835_mailbox_send_read_buffer(&buffer))
     return -1;
@@ -197 +222 @@
     bcm2835_mbox_tag_power_state set_power_state;
     uint32_t end_tag;
-  }buffer __attribute__((aligned (16)));
+  }buffer BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE;
   BCM2835_MBOX_INIT_BUF(&buffer);
   BCM2835_MBOX_INIT_TAG(&buffer.set_power_state,
@@ -203 +228 @@
   buffer.set_power_state.body.req.dev_id = _entries->dev_id;
   buffer.set_power_state.body.req.state = _entries->state;
+  bcm2835_mailbox_buffer_flush_and_invalidate(&buffer, sizeof(&buffer));
   if (bcm2835_mailbox_send_read_buffer(&buffer))
     return -1;
@@ -219 +245 @@
     bcm2835_mbox_tag_get_arm_memory get_arm_memory;
     uint32_t end_tag;
-  }buffer __attribute__((aligned (16)));
+  }buffer BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE;
   BCM2835_MBOX_INIT_BUF(&buffer);
   BCM2835_MBOX_INIT_TAG_NO_REQ(&buffer.get_arm_memory,
     BCM2835_MAILBOX_TAG_GET_ARM_MEMORY);
+  bcm2835_mailbox_buffer_flush_and_invalidate(&buffer, sizeof(&buffer));
   if (bcm2835_mailbox_send_read_buffer(&buffer))
     return -1;
@@ -239 +266 @@
     bcm2835_mbox_tag_get_vc_memory get_vc_memory;
     uint32_t end_tag;
-  }buffer __attribute__((aligned (16)));
+  }buffer BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE;
   BCM2835_MBOX_INIT_BUF(&buffer);
   BCM2835_MBOX_INIT_TAG_NO_REQ(&buffer.get_vc_memory,
     BCM2835_MAILBOX_TAG_GET_VC_MEMORY);
+  bcm2835_mailbox_buffer_flush_and_invalidate(&buffer, sizeof(&buffer));
   if (bcm2835_mailbox_send_read_buffer(&buffer))
     return -1;

c/src/lib/libbsp/arm/raspberrypi/misc/vc_defines.h

@@ -115 +115 @@
     (_t_)->tag_hdr.val_len = 0; \
   }
+
+/*
+ * Mailbox buffers has to be aligned to 16 bytes because
+ * 4 LSB bits of the BCM2835_MBOX_WRITE and BCM2835_MBOX_READ
+ * registers are used to pass channel number.
+ *
+ * But there is another requirement for buffer allocation
+ * as well when interface is called after cache is enabled.
+ * The buffer should not share cache line with another variable
+ * which can be updated during data exchange with VideoCore.
+ * If cache is filled to satisfy another variable update
+ * during VideoCore output is stored into main memory then
+ * part of received data can be lost.
+ *
+ * Cache line length is 64 bytes for RPi2 Cortex-A7 data cache
+ * so align buffers to this value.
+ */
+#define BCM2835_MBOX_BUF_ALIGN_ATTRIBUTE __attribute__((aligned (64)))
 
 /* Video Core */
@@ -245 +263 @@
 #define BCM2835_MAILBOX_TAG_SET_TURBO           0x00038009
 
+#define BCM2835_MAILBOX_TAG_GET_DOMAIN_STATE    0x00030030
+#define BCM2835_MAILBOX_TAG_SET_DOMAIN_STATE    0x00038030
+
 /* Voltage */
 #define BCM2835_MAILBOX_VOLTAGE_RESERVED_UVID        0x000000000