Revert "x86-64/efi: Use EFI to deal with platform wall clock" (f026cfa8) · Commits · 戴 / test

arch/x86/mm/pageattr.c

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -919,13 +919,11 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,

	/*		/*
	* On success we use clflush, when the CPU supports it to		* On success we use clflush, when the CPU supports it to
	* avoid the wbindv. If the CPU does not support it, in the		* avoid the wbindv. If the CPU does not support it and in the
	* error case, and during early boot (for EFI) we fall back		* error case we fall back to cpa_flush_all (which uses
	* to cpa_flush_all (which uses wbinvd):		* wbindv):
	*/		*/
	if (early_boot_irqs_disabled)		if (!ret && cpu_has_clflush) {
	__cpa_flush_all((void *)(long)cache);
	else if (!ret && cpu_has_clflush) {
	if (cpa.flags & (CPA_PAGES_ARRAY \| CPA_ARRAY)) {		if (cpa.flags & (CPA_PAGES_ARRAY \| CPA_ARRAY)) {
	cpa_flush_array(addr, numpages, cache,		cpa_flush_array(addr, numpages, cache,
	cpa.flags, pages);		cpa.flags, pages);

arch/x86/platform/efi/efi.c

+26 −4

Original line number	Original line	Diff line number	Diff line
	@@ -234,7 +234,22 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
	return status;		return status;
	}		}

	static int efi_set_rtc_mmss(unsigned long nowtime)		static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
			efi_time_cap_t *tc)
			{
			unsigned long flags;
			efi_status_t status;

			spin_lock_irqsave(&rtc_lock, flags);
			efi_call_phys_prelog();
			status = efi_call_phys2(efi_phys.get_time, virt_to_phys(tm),
			virt_to_phys(tc));
			efi_call_phys_epilog();
			spin_unlock_irqrestore(&rtc_lock, flags);
			return status;
			}

			int efi_set_rtc_mmss(unsigned long nowtime)
	{		{
	int real_seconds, real_minutes;		int real_seconds, real_minutes;
	efi_status_t status;		efi_status_t status;
	@@ -263,7 +278,7 @@ static int efi_set_rtc_mmss(unsigned long nowtime)
	return 0;		return 0;
	}		}

	static unsigned long efi_get_time(void)		unsigned long efi_get_time(void)
	{		{
	efi_status_t status;		efi_status_t status;
	efi_time_t eft;		efi_time_t eft;
	@@ -606,13 +621,18 @@ static int __init efi_runtime_init(void)
	}		}
	/*		/*
	* We will only need early access to the following		* We will only need early access to the following
	* EFI runtime service before set_virtual_address_map		* two EFI runtime services before set_virtual_address_map
	* is invoked.		* is invoked.
	*/		*/
			efi_phys.get_time = (efi_get_time_t *)runtime->get_time;
	efi_phys.set_virtual_address_map =		efi_phys.set_virtual_address_map =
	(efi_set_virtual_address_map_t *)		(efi_set_virtual_address_map_t *)
	runtime->set_virtual_address_map;		runtime->set_virtual_address_map;
			/*
			* Make efi_get_time can be called before entering
			* virtual mode.
			*/
			efi.get_time = phys_efi_get_time;
	early_iounmap(runtime, sizeof(efi_runtime_services_t));		early_iounmap(runtime, sizeof(efi_runtime_services_t));

	return 0;		return 0;
	@@ -700,10 +720,12 @@ void __init efi_init(void)
	efi_enabled = 0;		efi_enabled = 0;
	return;		return;
	}		}
			#ifdef CONFIG_X86_32
	if (efi_native) {		if (efi_native) {
	x86_platform.get_wallclock = efi_get_time;		x86_platform.get_wallclock = efi_get_time;
	x86_platform.set_wallclock = efi_set_rtc_mmss;		x86_platform.set_wallclock = efi_set_rtc_mmss;
	}		}
			#endif

	#if EFI_DEBUG		#if EFI_DEBUG
	print_efi_memmap();		print_efi_memmap();

include/linux/efi.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -503,6 +503,8 @@ extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size);
	extern int __init efi_uart_console_only (void);		extern int __init efi_uart_console_only (void);
	extern void efi_initialize_iomem_resources(struct resource *code_resource,		extern void efi_initialize_iomem_resources(struct resource *code_resource,
	struct resource data_resource, struct resource bss_resource);		struct resource data_resource, struct resource bss_resource);
			extern unsigned long efi_get_time(void);
			extern int efi_set_rtc_mmss(unsigned long nowtime);
	extern void efi_reserve_boot_services(void);		extern void efi_reserve_boot_services(void);
	extern struct efi_memory_map memmap;		extern struct efi_memory_map memmap;

init/main.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -461,10 +461,6 @@ static void __init mm_init(void)
	percpu_init_late();		percpu_init_late();
	pgtable_cache_init();		pgtable_cache_init();
	vmalloc_init();		vmalloc_init();
	#ifdef CONFIG_X86
	if (efi_enabled)
	efi_enter_virtual_mode();
	#endif
	}		}

	asmlinkage void __init start_kernel(void)		asmlinkage void __init start_kernel(void)
	@@ -606,6 +602,10 @@ asmlinkage void __init start_kernel(void)
	calibrate_delay();		calibrate_delay();
	pidmap_init();		pidmap_init();
	anon_vma_init();		anon_vma_init();
			#ifdef CONFIG_X86
			if (efi_enabled)
			efi_enter_virtual_mode();
			#endif
	thread_info_cache_init();		thread_info_cache_init();
	cred_init();		cred_init();
	fork_init(totalram_pages);		fork_init(totalram_pages);

Admin message