]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
MIPS: Loongson-3: Reserve 32MB for RS780E integrated GPU
authorHuacai Chen <chenhc@lemote.com>
Thu, 17 Mar 2016 12:41:05 +0000 (20:41 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Jun 2016 01:14:31 +0000 (18:14 -0700)
commit 3484de7bcbed20ecbf2b8d80671619e7059e2dd7 upstream.

Due to datasheet, reserving 0xff800000~0xffffffff (8MB below 4GB) is
not enough for RS780E integrated GPU's TOM (top of memory) registers
and MSI/MSI-x memory region, so we reserve 0xfe000000~0xffffffff (32MB
below 4GB).

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Steven J . Hill <sjhill@realitydiluted.com>
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12889/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/loongson64/loongson-3/numa.c

index 6f9e010cec4d50f2cae8177c41d9ae95e0189b22..282c5a8c2fcd4c22649bea11219ec7665f67602f 100644 (file)
@@ -213,10 +213,10 @@ static void __init node_mem_init(unsigned int node)
                BOOTMEM_DEFAULT);
 
        if (node == 0 && node_end_pfn(0) >= (0xffffffff >> PAGE_SHIFT)) {
-               /* Reserve 0xff800000~0xffffffff for RS780E integrated GPU */
+               /* Reserve 0xfe000000~0xffffffff for RS780E integrated GPU */
                reserve_bootmem_node(NODE_DATA(node),
-                               (node_addrspace_offset | 0xff800000),
-                               8 << 20, BOOTMEM_DEFAULT);
+                               (node_addrspace_offset | 0xfe000000),
+                               32 << 20, BOOTMEM_DEFAULT);
        }
 
        sparse_memory_present_with_active_regions(node);