Parse /soc/dma-ranges to populate the openbsd,dma-constraint property.

On the MNT Reform, which uses a i.MX8MQ with 4 GB of memory, this makes
sure that we don't allocate DMA buffers above the 32-bit boundary.  As
it turns out the i.MX8MQ's I/O devices are limited to 32-bit addresses.
The i.MX8MP seems to be better in that regard, though at least the USB
controller is still limited.  That's a bit harder to fix in a dynamic
fashion, but we'll take care of that as soon as someone shows up with
an i.MX8MP with that much memory.

ok kettenis@

diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c
index e9e62ad..5a12daf 100644 (file)
--- a/sys/arch/arm64/stand/efiboot/conf.c
+++ b/sys/arch/arm64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: conf.c,v 1.33 2021/06/02 15:31:15 kettenis Exp $      */
+/*     $OpenBSD: conf.c,v 1.34 2021/07/09 20:19:46 patrick Exp $       */
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -46,7 +46,7 @@
 #include "efipxe.h"
 #include "softraid_arm64.h"
 
-const char version[] = "1.5";
+const char version[] = "1.6";
 int    debug = 0;
 
 struct fs_ops file_system[] = {

diff --git a/sys/arch/arm64/stand/efiboot/efiboot.c b/sys/arch/arm64/stand/efiboot/efiboot.c
index b446bea..5cb52d9 100644 (file)
--- a/sys/arch/arm64/stand/efiboot/efiboot.c
+++ b/sys/arch/arm64/stand/efiboot/efiboot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: efiboot.c,v 1.33 2021/06/06 23:56:55 krw Exp $        */
+/*     $OpenBSD: efiboot.c,v 1.34 2021/07/09 20:19:46 patrick Exp $    */
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -465,6 +465,46 @@ void
 efi_dma_constraint(void)
 {
        void *node;
+       char *prop;
+       uint32_t *propint;
+       uint64_t base, size;
+       uint32_t pacells, pscells;
+       uint32_t acells, scells;
+       int len;
+
+       node = fdt_find_node("/");
+       if (fdt_node_property_int(node, "#address-cells", &pacells) != 1)
+               pacells = 1;
+       if (fdt_node_property_int(node, "#size-cells", &pscells) != 1)
+               pscells = 1;
+       if (pacells > 2 || pscells > 2)
+               return;
+
+       node = fdt_find_node("/soc");
+       if (node != NULL) {
+               if (fdt_node_property_int(node, "#address-cells", &acells) != 1)
+                       acells = pacells;
+               if (fdt_node_property_int(node, "#size-cells", &scells) != 1)
+                       scells = pscells;
+               if (acells > 2 || scells > 2)
+                       return;
+
+               len = fdt_node_property(node, "dma-ranges", &prop);
+               propint = (uint32_t *)prop;
+               if (len == (acells + pacells + scells) * sizeof(uint32_t)) {
+                       base = betoh32(propint[acells]);
+                       if (pacells == 2)
+                               base = (base << 32) |
+                                   betoh32(propint[acells + 1]);
+                       size = betoh32(propint[acells + pacells]);
+                       if (scells == 2)
+                               size = (size << 32) |
+                                   betoh32(propint[acells + pacells + 1]);
+
+                       dma_constraint[0] = htobe64(base);
+                       dma_constraint[1] = htobe64(base + size - 1);
+               }
+       }
 
        /* Raspberry Pi 4 is "special". */
        node = fdt_find_node("/");