summaryrefslogtreecommitdiffstats
path: root/freebsd/sys/x86
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-06-05 11:35:39 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-06-05 14:16:00 +0200
commit705e362ea5d6f711e987f5d370467b8873fc2255 (patch)
treebb2152c95b76783069419dcd1c24014ba0eb3a1b /freebsd/sys/x86
parentAdd RTEMS-specific getcredhostuuid() (diff)
downloadrtems-libbsd-705e362ea5d6f711e987f5d370467b8873fc2255.tar.bz2
Update to FreeBSD stable/12 2019-06-05
Git mirror commit 78576620f2689e23144a1cf1bf55106cc6abe2b7.
Diffstat (limited to 'freebsd/sys/x86')
-rw-r--r--freebsd/sys/x86/include/machine/bus.h4
-rw-r--r--freebsd/sys/x86/include/machine/pci_cfgreg.h9
2 files changed, 13 insertions, 0 deletions
diff --git a/freebsd/sys/x86/include/machine/bus.h b/freebsd/sys/x86/include/machine/bus.h
index 297b5edc..2427ae51 100644
--- a/freebsd/sys/x86/include/machine/bus.h
+++ b/freebsd/sys/x86/include/machine/bus.h
@@ -114,7 +114,11 @@
#define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF
#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
+#if defined(__amd64__)
+#define BUS_SPACE_MAXSIZE 0xFFFFFFFFFFFFFFFFULL
+#else
#define BUS_SPACE_MAXSIZE 0xFFFFFFFF
+#endif
#define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF
#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF
#if defined(__amd64__) || defined(PAE)
diff --git a/freebsd/sys/x86/include/machine/pci_cfgreg.h b/freebsd/sys/x86/include/machine/pci_cfgreg.h
index 8083eb0e..85d6485c 100644
--- a/freebsd/sys/x86/include/machine/pci_cfgreg.h
+++ b/freebsd/sys/x86/include/machine/pci_cfgreg.h
@@ -48,6 +48,15 @@
#define CONF2_ENABLE_CHK 0x0e
#define CONF2_ENABLE_RES 0x0e
+enum {
+ CFGMECH_NONE = 0,
+ CFGMECH_1,
+ CFGMECH_2,
+ CFGMECH_PCIE,
+};
+
+extern int cfgmech;
+
rman_res_t hostb_alloc_start(int type, rman_res_t start, rman_res_t end, rman_res_t count);
int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus);
int pci_cfgregopen(void);