arch/nios2: Port nios2 kernel to v3.13

- add asm/preempt.h and posix_types.h to Kbuild
- remove kernel/time/Kconfig from Kconfig
- handle pgtable_page_ctor() fail
- remove PREEMPT_ACTIVE and use generic
- remove duplicated arch/nios2/include/uapi/asm/setup.h
- convert to use new early_init_dt_scan function
- convert to use new of_flat_dt_get_machine function
- use boot_command_line instead of private cmd_line
- use unflatten_and_copy_device_tree
- use early_init_dt_scan
- remove unnecessary prom.c includes

Signed-off-by: Ley Foon Tan <[email protected]>

Author: Ley Foon Tan

arch/nios2/Kconfig

@@ -60,8 +60,6 @@ source "kernel/Kconfig.freezer"
 
 source "kernel/Kconfig.hz"
 
-source "kernel/time/Kconfig"
-
 source "mm/Kconfig"
 
 config FORCE_MAX_ZONEORDER

arch/nios2/include/asm/Kbuild

@@ -34,6 +34,8 @@ generic-y += module.h
 generic-y += msgbuf.h
 generic-y += param.h
 generic-y += percpu.h
+generic-y += posix_types.h
+generic-y += preempt.h
 generic-y += resource.h
 generic-y += scatterlist.h
 generic-y += sections.h

arch/nios2/include/asm/pgalloc.h

@@ -59,8 +59,11 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
 
 	pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
 	if (pte) {
+		if (!pgtable_page_ctor(pte)) {
+			__free_page(pte);
+			return NULL;
+		}
 		clear_highpage(pte);
-		pgtable_page_ctor(pte);
 	}
 	return pte;
 }

arch/nios2/include/asm/prom.h

@@ -23,6 +23,4 @@ extern int __dtb_start;
 
 extern unsigned long early_altera_uart_or_juart_console(void);
 
-extern void device_tree_init(void);
-
 #endif /* _ASM_NIOS2_PROM_H */

arch/nios2/include/asm/setup.h

@@ -24,8 +24,6 @@
 #ifndef __ASSEMBLY__
 # ifdef __KERNEL__
 
-extern char cmd_line[COMMAND_LINE_SIZE];
-
 extern char exception_handler_hook[];
 extern char fast_handler[];
 extern char fast_handler_end[];

arch/nios2/include/asm/thread_info.h

@@ -88,8 +88,6 @@ static inline struct thread_info *current_thread_info(void)
 }
 #endif /* !__ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE		0x10000000
-
 /*
  * thread information flags
  * - these are process state flags that various assembly files may need to

arch/nios2/include/uapi/asm/posix_types.h

@@ -24,22 +24,14 @@
  */
 
 #include <linux/init.h>
-#include <linux/export.h>
-#include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/bootmem.h>
-#include <linux/initrd.h>
-#include <linux/debugfs.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
-#include <linux/of_irq.h>
-#include <linux/of_platform.h>
 #include <linux/io.h>
 
-#include <asm/page.h>
 #include <asm/prom.h>
 #include <asm/sections.h>
-#include <asm/setup.h>
 
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
@@ -57,15 +49,6 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
 	return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-	initrd_start = (unsigned long)__va(start);
-	initrd_end = (unsigned long)__va(end);
-	initrd_below_start_ok = 1;
-}
-#endif
-
 void __init early_init_devtree(void *params)
 {
 	if (params && be32_to_cpup((__be32 *)params) == OF_DT_HEADER)
@@ -80,59 +63,7 @@ void __init early_init_devtree(void *params)
 	else
 		return;
 
-	/* Retrieve various informations from the /chosen node of the
-	 * device-tree, including the platform type, initrd location and
-	 * size, and more ...
-	 */
-	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);
-
-	/* Scan memory nodes */
-	of_scan_flat_dt(early_init_dt_scan_root, NULL);
-	of_scan_flat_dt(early_init_dt_scan_memory, NULL);
-}
-
-void __init device_tree_init(void)
-{
-	unsigned long base, size;
-	void *fdt_copy;
-
-	if (!initial_boot_params)
-		return;
-
-	base = virt_to_phys((void *)initial_boot_params);
-	size = be32_to_cpu(initial_boot_params->totalsize);
-
-	/*
-	 * If the supplied DTB is located in the kernel, it is
-	 * in __init memory and will eventually be destroyed
-	 * ('Freeing unused kernel memory: ...').
-	 *
-	 * If the DTB is located in the available system RAM
-	 * (between memory_start and memory_end), it will also
-	 * eventually be destroyed if that memory is allocated by
-	 * applications. The DTB might get placed there by a boot-
-	 * loader from not directly addressable memory such as a
-	 * SPI EEPROM sector.
-	 *
-	 * Usually, the DT will already have served its
-	 * purpose when the kernel starts. However, if drivers are
-	 * loaded as modules, they must still be able to access the
-	 * DTB entries after the kernel has started.
-	 *
-	 * Therefore, in these 2 cases, the DTB is moved to a new
-	 * bootmem-allocator allocated area. It has the added
-	 * benefit of reducing memory fragmentation.
-	 */
-
-	if ((base >= __pa(_text)) && (base < memory_end)) {
-		reserve_bootmem(base, size, BOOTMEM_DEFAULT);
-		fdt_copy = alloc_bootmem(size);
-		memcpy(fdt_copy, initial_boot_params, size);
-		initial_boot_params = fdt_copy;
-		free_bootmem(base, size);
-	}
-
-	unflatten_device_tree();
+	early_init_dt_scan(initial_boot_params);
 }
 
 #ifdef CONFIG_EARLY_PRINTK

arch/nios2/include/uapi/asm/setup.h

@@ -35,8 +35,6 @@ EXPORT_SYMBOL(memory_end);
 
 unsigned long memory_size;
 
-char cmd_line[COMMAND_LINE_SIZE] = { 0, };
-
 /*				r1  r2  r3  r4  r5  r6  r7  r8  r9 r10 r11*/
 /*				r12 r13 r14 r15 or2 ra  fp  sp  gp es  ste  ea*/
 static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -131,10 +129,10 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6,
 
 #ifndef CONFIG_CMDLINE_FORCE
 	if (cmdline_passed[0])
-		strncpy(cmd_line, cmdline_passed, COMMAND_LINE_SIZE);
+		strncpy(boot_command_line, cmdline_passed, COMMAND_LINE_SIZE);
 #ifdef CONFIG_CMDLINE_IGNORE_DTB
 	else
-		strncpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
+		strncpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
 #endif
 #endif
 }
@@ -159,10 +157,7 @@ void __init setup_arch(char **cmdline_p)
 	init_task.thread.kregs = &fake_regs;
 
 	/* Keep a copy of command line */
-	*cmdline_p = &cmd_line[0];
-
-	memcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
-	boot_command_line[COMMAND_LINE_SIZE-1] = 0;
+	*cmdline_p = boot_command_line;
 
 	/*
 	 * give all the memory to the bootmap allocator,  tell it to put the
@@ -202,7 +197,7 @@ void __init setup_arch(char **cmdline_p)
 	}
 #endif /* CONFIG_BLK_DEV_INITRD */
 
-	device_tree_init();
+	unflatten_and_copy_device_tree();
 
 	setup_cpuinfo();