From e3665ba9d7c82f75c4dbd2057276a6990929be40 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 27 Jun 2019 16:39:57 +0900 Subject: fdt: make fdt_get_base_address() return OF_BAD_ADDR when "reg" not found Currently, fdt_get_base_address() returns 0 if the "reg" property is missing. Since 0 is a valid value, it is not suitable for the error handling. Return OF_BAD_ADDR instead. Signed-off-by: Masahiro Yamada Reviewed-by: Bin Meng --- common/fdt_support.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/fdt_support.c b/common/fdt_support.c index a23367b54a..699d4a2d0e 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1552,7 +1552,7 @@ u64 fdt_get_base_address(const void *fdt, int node) prop = fdt_getprop(fdt, node, "reg", &size); - return prop ? fdt_translate_address(fdt, node, prop) : 0; + return prop ? fdt_translate_address(fdt, node, prop) : OF_BAD_ADDR; } /* -- cgit v1.2.3 From 867aaf6806d9518366141b332ec42af8bcf95fff Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 9 Jul 2019 02:49:29 +0200 Subject: common: fdt_support: Add missing cpu_to_fdt32() to fdt_pci_dma_ranges() The fdt_pci_dma_ranges() cannot work on e.g. ARM, since the DT entries endianness is not adjusted at all. Fix this. Signed-off-by: Marek Vasut Cc: Tom Rini --- common/fdt_support.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'common') diff --git a/common/fdt_support.c b/common/fdt_support.c index 699d4a2d0e..86de5b8f05 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -671,30 +671,33 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose) { dma_range[0] = 0; if (size >= 0x100000000ull) - dma_range[0] |= FDT_PCI_MEM64; + dma_range[0] |= cpu_to_fdt32(FDT_PCI_MEM64); else - dma_range[0] |= FDT_PCI_MEM32; + dma_range[0] |= cpu_to_fdt32(FDT_PCI_MEM32); if (hose->regions[r].flags & PCI_REGION_PREFETCH) - dma_range[0] |= FDT_PCI_PREFETCH; + dma_range[0] |= cpu_to_fdt32(FDT_PCI_PREFETCH); #ifdef CONFIG_SYS_PCI_64BIT - dma_range[1] = bus_start >> 32; + dma_range[1] = cpu_to_fdt32(bus_start >> 32); #else dma_range[1] = 0; #endif - dma_range[2] = bus_start & 0xffffffff; + dma_range[2] = cpu_to_fdt32(bus_start & 0xffffffff); if (addrcell == 2) { - dma_range[3] = phys_start >> 32; - dma_range[4] = phys_start & 0xffffffff; + dma_range[3] = cpu_to_fdt32(phys_start >> 32); + dma_range[4] = cpu_to_fdt32(phys_start & 0xffffffff); } else { - dma_range[3] = phys_start & 0xffffffff; + dma_range[3] = cpu_to_fdt32(phys_start & 0xffffffff); } if (sizecell == 2) { - dma_range[3 + addrcell + 0] = size >> 32; - dma_range[3 + addrcell + 1] = size & 0xffffffff; + dma_range[3 + addrcell + 0] = + cpu_to_fdt32(size >> 32); + dma_range[3 + addrcell + 1] = + cpu_to_fdt32(size & 0xffffffff); } else { - dma_range[3 + addrcell + 0] = size & 0xffffffff; + dma_range[3 + addrcell + 0] = + cpu_to_fdt32(size & 0xffffffff); } dma_range += (3 + addrcell + sizecell); -- cgit v1.2.3