bcm64: set XN bits for kernel device mappings

[plan9front.git] / sys / src / 9 / bcm64 / dat.h

diff --git a/sys/src/9/bcm64/dat.h b/sys/src/9/bcm64/dat.h
index 7a1747029ef91dea5db8e07024e52d05826c10b7..2d38b31398983dfea34573dde42eaeffc6b5901e 100644 (file)
--- a/sys/src/9/bcm64/dat.h
+++ b/sys/src/9/bcm64/dat.h
@@ -24,6 +24,7 @@ typedef struct MMMU   MMMU;
 typedef struct Mach    Mach;
 typedef struct Page    Page;
 typedef struct PhysUart        PhysUart;
+typedef struct Pcidev  Pcidev;
 typedef struct PMMU    PMMU;
 typedef struct Proc    Proc;
 typedef u64int         PTE;
@@ -33,6 +34,7 @@ typedef struct Ureg   Ureg;
 typedef uvlong         Tval;
 typedef void           KMap;
 
+#pragma incomplete Pcidev
 #pragma incomplete Ureg
 
 #define MAXSYSARG      5       /* for mount(fd, mpt, flag, arg, srv) */
@@ -115,7 +117,7 @@ struct Conf
  */
 struct MMMU
 {
-       PTE*    mmul1;          /* l1 for this processor */
+       PTE*    mmutop;         /* first level user page table */
 };
 
 /*
@@ -241,17 +243,16 @@ struct DevConf
 
 struct Soc {                   /* SoC dependent configuration */
        ulong   dramsize;
-       uintptr physio;
        uintptr busdram;
+       ulong   iosize;
        uintptr busio;
+       uintptr physio;
+       uintptr virtio;
        uintptr armlocal;
-       u32int  l1ptedramattrs;
-       u32int  l2ptedramattrs;
+       uintptr pciwin;
 };
 extern Soc soc;
 
-#define BUSUNKNOWN -1
-
 /*
  * GPIO
  */