x86, realmode: Separate real_mode reserve and setup (4f7b9226) · Commits · 戴 / test

arch/x86/include/asm/realmode.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,7 @@ extern unsigned char boot_gdt[];
	extern unsigned char secondary_startup_64[];		extern unsigned char secondary_startup_64[];
	#endif		#endif

	extern void __init setup_real_mode(void);		void reserve_real_mode(void);
			void setup_real_mode(void);

	#endif /* _ARCH_X86_REALMODE_H */		#endif /* _ARCH_X86_REALMODE_H */

arch/x86/kernel/setup.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -999,12 +999,14 @@ void __init setup_arch(char **cmdline_p)
	printk(KERN_DEBUG "initial memory mapped: [mem 0x00000000-%#010lx]\n",		printk(KERN_DEBUG "initial memory mapped: [mem 0x00000000-%#010lx]\n",
	(max_pfn_mapped<<PAGE_SHIFT) - 1);		(max_pfn_mapped<<PAGE_SHIFT) - 1);

	setup_real_mode();		reserve_real_mode();

	trim_platform_memory_ranges();		trim_platform_memory_ranges();

	init_mem_mapping();		init_mem_mapping();

			setup_real_mode();

	memblock.current_limit = get_max_mapped();		memblock.current_limit = get_max_mapped();
	dma_contiguous_reserve(0);		dma_contiguous_reserve(0);

arch/x86/realmode/init.c

+20 −12

Original line number	Original line	Diff line number	Diff line
	@@ -8,9 +8,26 @@
	struct real_mode_header *real_mode_header;		struct real_mode_header *real_mode_header;
	u32 *trampoline_cr4_features;		u32 *trampoline_cr4_features;

	void __init setup_real_mode(void)		void __init reserve_real_mode(void)
	{		{
	phys_addr_t mem;		phys_addr_t mem;
			unsigned char *base;
			size_t size = PAGE_ALIGN(real_mode_blob_end - real_mode_blob);

			/* Has to be under 1M so we can execute real-mode AP code. */
			mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);
			if (!mem)
			panic("Cannot allocate trampoline\n");

			base = __va(mem);
			memblock_reserve(mem, size);
			real_mode_header = (struct real_mode_header *) base;
			printk(KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n",
			base, (unsigned long long)mem, size);
			}

			void __init setup_real_mode(void)
			{
	u16 real_mode_seg;		u16 real_mode_seg;
	u32 *rel;		u32 *rel;
	u32 count;		u32 count;
	@@ -25,16 +42,7 @@ void __init setup_real_mode(void)
	u64 efer;		u64 efer;
	#endif		#endif

	/* Has to be in very low memory so we can execute real-mode AP code. */		base = (unsigned char *)real_mode_header;
	mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);
	if (!mem)
	panic("Cannot allocate trampoline\n");

	base = __va(mem);
	memblock_reserve(mem, size);
	real_mode_header = (struct real_mode_header *) base;
	printk(KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n",
	base, (unsigned long long)mem, size);

	memcpy(base, real_mode_blob, size);		memcpy(base, real_mode_blob, size);

	@@ -84,7 +92,7 @@ void __init setup_real_mode(void)
	}		}

	/*		/*
	* setup_real_mode() gets called very early, to guarantee the		* reserve_real_mode() gets called very early, to guarantee the
	* availability of low memory. This is before the proper kernel page		* availability of low memory. This is before the proper kernel page
	* tables are set up, so we cannot set page permissions in that		* tables are set up, so we cannot set page permissions in that
	* function. Also trampoline code will be executed by APs so we		* function. Also trampoline code will be executed by APs so we

Admin message