supress-warnings: fix gcc warnings
-Set defines to ull
-Use correct type
-Use Cast
Signed-off-by: Oliver Scott <Oliver.Scott@data61.csiro.au>
diff --git a/libsel4vmmplatsupport/plat_include/exynos5/sel4vmmplatsupport/plat/vpci.h b/libsel4vmmplatsupport/plat_include/exynos5/sel4vmmplatsupport/plat/vpci.h
index 5ee439e..13436a4 100644
--- a/libsel4vmmplatsupport/plat_include/exynos5/sel4vmmplatsupport/plat/vpci.h
+++ b/libsel4vmmplatsupport/plat_include/exynos5/sel4vmmplatsupport/plat/vpci.h
@@ -24,7 +24,7 @@
/* Size of PCI IO space */
#define PCI_IO_REGION_SIZE 0x10000
/* PCI memory space */
-#define PCI_MEM_REGION_ADDR 0x3F000000
+#define PCI_MEM_REGION_ADDR 0x3F000000ull
/* PCI memory space size */
#define PCI_MEM_REGION_SIZE 0x1000000
diff --git a/libsel4vmmplatsupport/plat_include/odroidc2/sel4vmmplatsupport/plat/vpci.h b/libsel4vmmplatsupport/plat_include/odroidc2/sel4vmmplatsupport/plat/vpci.h
index 8b19401..6b29699 100644
--- a/libsel4vmmplatsupport/plat_include/odroidc2/sel4vmmplatsupport/plat/vpci.h
+++ b/libsel4vmmplatsupport/plat_include/odroidc2/sel4vmmplatsupport/plat/vpci.h
@@ -24,7 +24,7 @@
/* Size of PCI IO space */
#define PCI_IO_REGION_SIZE 0x10000
/* PCI memory space */
-#define PCI_MEM_REGION_ADDR 0x3F000000
+#define PCI_MEM_REGION_ADDR 0x3F000000ull
/* PCI memory space size */
#define PCI_MEM_REGION_SIZE 0x1000000
diff --git a/libsel4vmmplatsupport/plat_include/qemu-arm-virt/sel4vmmplatsupport/plat/vpci.h b/libsel4vmmplatsupport/plat_include/qemu-arm-virt/sel4vmmplatsupport/plat/vpci.h
index c892ffa..4b713aa 100644
--- a/libsel4vmmplatsupport/plat_include/qemu-arm-virt/sel4vmmplatsupport/plat/vpci.h
+++ b/libsel4vmmplatsupport/plat_include/qemu-arm-virt/sel4vmmplatsupport/plat/vpci.h
@@ -24,7 +24,7 @@
/* Size of PCI IO space */
#define PCI_IO_REGION_SIZE 0x10000
/* PCI memory space */
-#define PCI_MEM_REGION_ADDR 0xDF000000
+#define PCI_MEM_REGION_ADDR 0xDF000000ull
/* PCI memory space size */
#define PCI_MEM_REGION_SIZE 0x1000000
diff --git a/libsel4vmmplatsupport/plat_include/tk1/sel4vmmplatsupport/plat/vpci.h b/libsel4vmmplatsupport/plat_include/tk1/sel4vmmplatsupport/plat/vpci.h
index 5ee439e..13436a4 100644
--- a/libsel4vmmplatsupport/plat_include/tk1/sel4vmmplatsupport/plat/vpci.h
+++ b/libsel4vmmplatsupport/plat_include/tk1/sel4vmmplatsupport/plat/vpci.h
@@ -24,7 +24,7 @@
/* Size of PCI IO space */
#define PCI_IO_REGION_SIZE 0x10000
/* PCI memory space */
-#define PCI_MEM_REGION_ADDR 0x3F000000
+#define PCI_MEM_REGION_ADDR 0x3F000000ull
/* PCI memory space size */
#define PCI_MEM_REGION_SIZE 0x1000000
diff --git a/libsel4vmmplatsupport/plat_include/tx1/sel4vmmplatsupport/plat/vpci.h b/libsel4vmmplatsupport/plat_include/tx1/sel4vmmplatsupport/plat/vpci.h
index 1a3a8d1..735d312 100644
--- a/libsel4vmmplatsupport/plat_include/tx1/sel4vmmplatsupport/plat/vpci.h
+++ b/libsel4vmmplatsupport/plat_include/tx1/sel4vmmplatsupport/plat/vpci.h
@@ -24,7 +24,7 @@
/* Size of PCI IO space */
#define PCI_IO_REGION_SIZE 0x10000
/* PCI memory space */
-#define PCI_MEM_REGION_ADDR 0x3EF000000
+#define PCI_MEM_REGION_ADDR 0x3EF000000ull
/* PCI memory space size */
#define PCI_MEM_REGION_SIZE 0x1000000
diff --git a/libsel4vmmplatsupport/plat_include/tx2/sel4vmmplatsupport/plat/vpci.h b/libsel4vmmplatsupport/plat_include/tx2/sel4vmmplatsupport/plat/vpci.h
index 1a3a8d1..735d312 100644
--- a/libsel4vmmplatsupport/plat_include/tx2/sel4vmmplatsupport/plat/vpci.h
+++ b/libsel4vmmplatsupport/plat_include/tx2/sel4vmmplatsupport/plat/vpci.h
@@ -24,7 +24,7 @@
/* Size of PCI IO space */
#define PCI_IO_REGION_SIZE 0x10000
/* PCI memory space */
-#define PCI_MEM_REGION_ADDR 0x3EF000000
+#define PCI_MEM_REGION_ADDR 0x3EF000000ull
/* PCI memory space size */
#define PCI_MEM_REGION_SIZE 0x1000000
diff --git a/libsel4vmmplatsupport/src/arch/arm/devices/vpci.c b/libsel4vmmplatsupport/src/arch/arm/devices/vpci.c
index 9ed1ce3..03cf6d8 100644
--- a/libsel4vmmplatsupport/src/arch/arm/devices/vpci.c
+++ b/libsel4vmmplatsupport/src/arch/arm/devices/vpci.c
@@ -80,7 +80,7 @@
static void pci_cfg_read_fault(struct device *d, vm_t *vm, vm_vcpu_t *vcpu, vmm_pci_address_t pci_addr,
uint8_t offset, vmm_pci_entry_t *dev)
{
- seL4_Word data = 0;
+ uint32_t data = 0;
int err = 0;
err = dev->ioread((void *)dev->cookie, offset, get_vcpu_fault_size(vcpu), &data);
@@ -280,7 +280,7 @@
struct pci_fdt_address pci_mem_range_addr;
pci_mem_range_addr.hi = cpu_to_fdt32(PCI_RANGE_MEM32 << 24);
pci_mem_range_addr.mid = cpu_to_fdt32(PCI_MEM_REGION_ADDR >> 32);
- pci_mem_range_addr.low = cpu_to_fdt32(PCI_MEM_REGION_ADDR);
+ pci_mem_range_addr.low = cpu_to_fdt32((uint32_t)PCI_MEM_REGION_ADDR);
FDT_OP(fdt_appendprop(fdt, pci_node, "ranges", &pci_mem_range_addr, sizeof(pci_mem_range_addr)));
FDT_OP(append_prop_with_cells(fdt, pci_node, PCI_MEM_REGION_ADDR, address_cells, "ranges"));
FDT_OP(fdt_appendprop_u64(fdt, pci_node, "ranges", PCI_MEM_REGION_SIZE));
