Eric Lee / smarc-uboot

12
Download as
Browse Code ยป

Commit c96a9844cd3342f6e31627ccc4f3e63544ffd78e

Authored by Peng Fan
1 parent e1610fa574
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

MLK-20373-4 imx8: update mem map table 

Update mem map table for xen uboot.
xen console and some magic pages needs to be mappe as normal memory.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Flynn xu <flynn.xu@nxp.com>

Showing 1 changed file with 20 additions and 9 deletions Side-by-side Diff

arch/arm/mach-imx/imx8/cpu.c
Diff comments   View file @ c96a984
... ... @@ -1549,18 +1549,29 @@
1549 1549 if (IS_ENABLED(CONFIG_XEN)) {
1550 1550 imx8_mem_map[0].virt = 0x00000000UL;
1551 1551 imx8_mem_map[0].phys = 0x00000000UL;
1552   - imx8_mem_map[0].size = 0x80000000UL;
  1552 + imx8_mem_map[0].size = 0x39000000UL;
1553 1553 imx8_mem_map[0].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
1554 1554 PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN;
1555   - imx8_mem_map[1].virt = 0x80000000UL;
1556   - imx8_mem_map[1].phys = 0x80000000UL;
1557   - imx8_mem_map[1].size = 0x80000000UL;
1558   - imx8_mem_map[1].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE);
  1555 + imx8_mem_map[1].virt = 0x39000000UL;
  1556 + imx8_mem_map[1].phys = 0x39000000UL;
  1557 + imx8_mem_map[1].size = 0x01000000UL;
  1558 + imx8_mem_map[1].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE);
1559 1559  
1560   - imx8_mem_map[2].virt = 0x100000000UL;
1561   - imx8_mem_map[2].phys = 0x100000000UL;
1562   - imx8_mem_map[2].size = 0x100000000UL;
  1560 + imx8_mem_map[2].virt = 0x40000000UL;
  1561 + imx8_mem_map[2].phys = 0x40000000UL;
  1562 + imx8_mem_map[2].size = 0x40000000UL;
1563 1563 imx8_mem_map[2].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
  1564 + PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN;
  1565 +
  1566 + imx8_mem_map[3].virt = 0x80000000UL;
  1567 + imx8_mem_map[3].phys = 0x80000000UL;
  1568 + imx8_mem_map[3].size = 0x80000000UL;
  1569 + imx8_mem_map[3].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE);
  1570 +
  1571 + imx8_mem_map[4].virt = 0x100000000UL;
  1572 + imx8_mem_map[4].phys = 0x100000000UL;
  1573 + imx8_mem_map[4].size = 0x100000000UL;
  1574 + imx8_mem_map[4].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
1564 1575 PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN;
1565 1576  
1566 1577 icache_enable();