iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next/misc2' into for-next

Browse Source
This commit is contained in:
Paul Walmsley 2019-11-22 18:59:17 -08:00
commit 8eace9fb39
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/riscv/Kconfig.socs
View File

@ -1,13 +1,13 @@
menu "SoC selection" menu "SoC selection"
config SOC_SIFIVE config SOC_SIFIVE
bool "SiFive SoCs" bool "SiFive SoCs"
select SERIAL_SIFIVE select SERIAL_SIFIVE
select SERIAL_SIFIVE_CONSOLE select SERIAL_SIFIVE_CONSOLE
select CLK_SIFIVE select CLK_SIFIVE
select CLK_SIFIVE_FU540_PRCI select CLK_SIFIVE_FU540_PRCI
select SIFIVE_PLIC select SIFIVE_PLIC
help help
This enables support for SiFive SoC platform hardware. This enables support for SiFive SoC platform hardware.
endmenu endmenu

32
arch/riscv/mm/init.c
View File

@ -46,6 +46,37 @@ static void setup_zero_page(void)
memset((void *)empty_zero_page, 0, PAGE_SIZE); memset((void *)empty_zero_page, 0, PAGE_SIZE);
} }
#ifdef CONFIG_DEBUG_VM
static inline void print_mlk(char *name, unsigned long b, unsigned long t)
{
pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t,
(((t) - (b)) >> 10));
}
static inline void print_mlm(char *name, unsigned long b, unsigned long t)
{
pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld MB)\n", name, b, t,
(((t) - (b)) >> 20));
}
static void print_vm_layout(void)
{
pr_notice("Virtual kernel memory layout:\n");
print_mlk("fixmap", (unsigned long)FIXADDR_START,
(unsigned long)FIXADDR_TOP);
print_mlm("pci io", (unsigned long)PCI_IO_START,
(unsigned long)PCI_IO_END);
print_mlm("vmemmap", (unsigned long)VMEMMAP_START,
(unsigned long)VMEMMAP_END);
print_mlm("vmalloc", (unsigned long)VMALLOC_START,
(unsigned long)VMALLOC_END);
print_mlm("lowmem", (unsigned long)PAGE_OFFSET,
(unsigned long)high_memory);
}
#else
static void print_vm_layout(void) { }
#endif /* CONFIG_DEBUG_VM */
void __init mem_init(void) void __init mem_init(void)
{ {
#ifdef CONFIG_FLATMEM #ifdef CONFIG_FLATMEM
@ -56,6 +87,7 @@ void __init mem_init(void)
memblock_free_all(); memblock_free_all();
mem_init_print_info(NULL); mem_init_print_info(NULL);
print_vm_layout();
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD