Commit 0da3e7f5 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/mm2' into x86/mm 

x86/mm2 is testing out fine, but has developed conflicts with x86/mm
due to patches in adjacent code.  Merge them so we can drop x86/mm2
and have a unified branch.

Resolved Conflicts:
	arch/x86/kernel/setup.c
parents 95c96084 68d00bbe

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			is selected automatically. Check

			Documentation/kdump/kdump.txt for further details.



	crashkernel_low=size[KMG]

			[KNL, x86] parts under 4G.



	crashkernel=range1:size1[,range2:size2,...][@offset]

			[KNL] Same as above, but depends on the memory

			in the running system. The syntax of range is

Documentation/x86/boot.txt

+64 −1
Original line number Diff line number Diff line
@@ -57,6 +57,10 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment 
Protocol 2.11:	(Kernel 3.6) Added a field for offset of EFI handover

		protocol entry point.



Protocol 2.12:	(Kernel 3.9) Added the xloadflags field and extension fields

	 	to struct boot_params for for loading bzImage and ramdisk

		above 4G in 64bit.



**** MEMORY LAYOUT



The traditional memory map for the kernel loader, used for Image or
@@ -182,7 +186,7 @@ Offset Proto Name Meaning 
0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0235/1	2.10+	min_alignment	Minimum alignment, as a power of two

0236/2	N/A	pad3		Unused

0236/2	2.12+	xloadflags	Boot protocol option flags

0238/4	2.06+	cmdline_size	Maximum size of the kernel command line

023C/4	2.07+	hardware_subarch Hardware subarchitecture

0240/8	2.07+	hardware_subarch_data Subarchitecture-specific data
@@ -582,6 +586,27 @@ Protocol: 2.10+ 
  misaligned kernel.  Therefore, a loader should typically try each

  power-of-two alignment from kernel_alignment down to this alignment.



Field name:     xloadflags

Type:           read

Offset/size:    0x236/2

Protocol:       2.12+



  This field is a bitmask.



  Bit 0 (read):	XLF_KERNEL_64

	- If 1, this kernel has the legacy 64-bit entry point at 0x200.



  Bit 1 (read): XLF_CAN_BE_LOADED_ABOVE_4G

        - If 1, kernel/boot_params/cmdline/ramdisk can be above 4G.



  Bit 2 (read):	XLF_EFI_HANDOVER_32

	- If 1, the kernel supports the 32-bit EFI handoff entry point

          given at handover_offset.



  Bit 3 (read): XLF_EFI_HANDOVER_64

	- If 1, the kernel supports the 64-bit EFI handoff entry point

          given at handover_offset + 0x200.



Field name:	cmdline_size

Type:		read

Offset/size:	0x238/4
@@ -1029,6 +1054,44 @@ must have read/write permission; CS must be __BOOT_CS and DS, ES, SS 
must be __BOOT_DS; interrupt must be disabled; %esi must hold the base

address of the struct boot_params; %ebp, %edi and %ebx must be zero.



**** 64-bit BOOT PROTOCOL



For machine with 64bit cpus and 64bit kernel, we could use 64bit bootloader

and we need a 64-bit boot protocol.



In 64-bit boot protocol, the first step in loading a Linux kernel

should be to setup the boot parameters (struct boot_params,

traditionally known as "zero page"). The memory for struct boot_params

could be allocated anywhere (even above 4G) and initialized to all zero.

Then, the setup header at offset 0x01f1 of kernel image on should be

loaded into struct boot_params and examined. The end of setup header

can be calculated as follows:



	0x0202 + byte value at offset 0x0201



In addition to read/modify/write the setup header of the struct

boot_params as that of 16-bit boot protocol, the boot loader should

also fill the additional fields of the struct boot_params as described

in zero-page.txt.



After setting up the struct boot_params, the boot loader can load

64-bit kernel in the same way as that of 16-bit boot protocol, but

kernel could be loaded above 4G.



In 64-bit boot protocol, the kernel is started by jumping to the

64-bit kernel entry point, which is the start address of loaded

64-bit kernel plus 0x200.



At entry, the CPU must be in 64-bit mode with paging enabled.

The range with setup_header.init_size from start address of loaded

kernel and zero page and command line buffer get ident mapping;

a GDT must be loaded with the descriptors for selectors

__BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat

segment; __BOOT_CS must have execute/read permission, and __BOOT_DS

must have read/write permission; CS must be __BOOT_CS and DS, ES, SS

must be __BOOT_DS; interrupt must be disabled; %rsi must hold the base

address of the struct boot_params.



**** EFI HANDOVER PROTOCOL



This protocol allows boot loaders to defer initialisation to the EFI

Documentation/x86/zero-page.txt

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ Offset Proto Name Meaning 
090/010	ALL	hd1_info	hd1 disk parameter, OBSOLETE!!

0A0/010	ALL	sys_desc_table	System description table (struct sys_desc_table)

0B0/010	ALL	olpc_ofw_header	OLPC's OpenFirmware CIF and friends

0C0/004	ALL	ext_ramdisk_image ramdisk_image high 32bits

0C4/004	ALL	ext_ramdisk_size  ramdisk_size high 32bits

0C8/004	ALL	ext_cmd_line_ptr  cmd_line_ptr high 32bits

140/080	ALL	edid_info	Video mode setup (struct edid_info)

1C0/020	ALL	efi_info	EFI 32 information (struct efi_info)

1E0/004	ALL	alk_mem_k	Alternative mem check, in KB
@@ -27,6 +30,7 @@ Offset Proto Name Meaning 
1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)

1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer

				(below)

1EF/001	ALL	sentinel	Used to detect broken bootloaders

290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures

2D0/A00	ALL	e820_map	E820 memory map table

				(array of struct e820entry)

arch/mips/cavium-octeon/dma-octeon.c

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ void __init plat_swiotlb_setup(void) 


	octeon_swiotlb = alloc_bootmem_low_pages(swiotlbsize);



	swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1);

	if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM)

		panic("Cannot allocate SWIOTLB buffer");



	mips_dma_map_ops = &octeon_linear_dma_map_ops.dma_map_ops;

}

arch/sparc/mm/init_64.c

+11 −13
Original line number Diff line number Diff line
@@ -2021,6 +2021,16 @@ static void __init patch_tlb_miss_handler_bitmap(void) 
	flushi(&valid_addr_bitmap_insn[0]);

}



static void __init register_page_bootmem_info(void)

{

#ifdef CONFIG_NEED_MULTIPLE_NODES

	int i;



	for_each_online_node(i)

		if (NODE_DATA(i)->node_spanned_pages)

			register_page_bootmem_info_node(NODE_DATA(i));

#endif

}

void __init mem_init(void)

{

	unsigned long codepages, datapages, initpages;
@@ -2038,20 +2048,8 @@ void __init mem_init(void) 


	high_memory = __va(last_valid_pfn << PAGE_SHIFT);



#ifdef CONFIG_NEED_MULTIPLE_NODES

	{

		int i;

		for_each_online_node(i) {

			if (NODE_DATA(i)->node_spanned_pages != 0) {

				totalram_pages +=

					free_all_bootmem_node(NODE_DATA(i));

			}

		}

		totalram_pages += free_low_memory_core_early(MAX_NUMNODES);

	}

#else

	register_page_bootmem_info();

	totalram_pages = free_all_bootmem();

#endif



	/* We subtract one to account for the mem_map_zero page

	 * allocated below.