rpi4: Update memory map to accommodate scb devices 16/224416/1
authorAmit Singh Tomar <amittomer25@gmail.com>
Mon, 27 Jan 2020 01:14:43 +0000 (01:14 +0000)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 10 Feb 2020 10:56:12 +0000 (11:56 +0100)
Some of the devices(for instance, pcie and gnet controller) sitting on
SCB bus falls behind/below the memory range that we currenty have.

This patch updates the memory range to map those devices correctly.

Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
[backport of mainline commit fff5d5499d28dda0b22b44bb57c4525ad7d0a89d]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ic93d9d00e57f134b1386cd5da17f29d997854d91

arch/arm/mach-bcm283x/init.c

index 6fb41a9..cbe6451 100644 (file)
@@ -41,9 +41,9 @@ static struct mm_region bcm2711_mem_map[] = {
                .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
                         PTE_BLOCK_INNER_SHARE
        }, {
-               .virt = 0xfe000000UL,
-               .phys = 0xfe000000UL,
-               .size = 0x01800000UL,
+               .virt = 0xfc000000UL,
+               .phys = 0xfc000000UL,
+               .size = 0x03800000UL,
                .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
                         PTE_BLOCK_NON_SHARE |
                         PTE_BLOCK_PXN | PTE_BLOCK_UXN