Changeset 1b7b7af in mainline

Timestamp:

2021-06-22T19:36:39Z (3 years ago)

Author:

Maurizio Lombardi <mlombard@…>

Branches:

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

Children:

37d0dd4

Parents:

73abf49

git-author:

Maurizio Lombardi <mlombard@…> (2021-06-22 19:26:24)

git-committer:

Maurizio Lombardi <mlombard@…> (2021-06-22 19:36:39)

Message:

raspberrypi: map the mbox address to memory

We should memory-map the mbox to memory
before trying to access it.
bcm2835_prop_get_memory() is an exception
because it's called early during the boot process
and we can't use km_map().

Signed-off-by: Maurizio Lombardi <mlombard@…>

File:

• kernel/genarch/src/drivers/bcm2835/mbox.c (modified) (3 diffs)

kernel/genarch/src/drivers/bcm2835/mbox.c

@@ -132 +132 @@
         bool r;
         MBOX_BUFF_ALLOC(msg, mbox_getfbsize_buf_t);
+        bcm2835_mbox_t *mbox;
+
+        mbox = (void *) km_map(BCM2835_MBOX0_ADDR, sizeof(bcm2835_mbox_t),
+            KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
+        assert(mbox);
 
         msg->buf_hdr.size = sizeof(mbox_getfbsize_buf_t);
@@ -140 +145 @@
         msg->zero = 0;
 
-        mbox_write((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR,
+        mbox_write(mbox,
             MBOX_CHAN_PROP_A2V, KA2VCA((uint32_t)msg));
-        mbox_read((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR,
-            MBOX_CHAN_PROP_A2V);
+        mbox_read(mbox, MBOX_CHAN_PROP_A2V);
 
         r = msg->buf_hdr.code == MBOX_PROP_CODE_RESP_OK;
@@ -151 +155 @@
         }
 
+        km_unmap((uintptr_t) mbox, sizeof(bcm2835_mbox_t));
         return r;
 }