Eric Lee / smarc-uboot | Embedian Git Server

Commit f86bd769fd0624106ecd2c5d500518e8b83a4e27

Authored by Thomas RIENOESSL 2018-11-30 12:07:12 +0800

Committed by Bin Meng 2018-12-10 10:14:36 +0800

Exists in smarc_8mq_lf_v2020.04 and in 12 other branches

coreboot: only init usb if necessary

Up until now the call to initialize the USB subsystem was hardcoded
for U-Boot running as a coreboot payload. This was used to enable
the use of a USB keyboard in the U-Boot shell. However not all boards
might need this functionality. As initializing the USB subsystem can
take a considerable amount of time (several seconds on some boards),
we now initialize the USB subsystem only if U-Boot is configured to
use USB keyboards.

Signed-off-by: Thomas RIENOESSL <thomas.rienoessl@bachmann.info>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>

Showing 1 changed file with 2 additions and 1 deletions Inline Diff

arch/x86/cpu/coreboot/coreboot.c

arch/x86/cpu/coreboot/coreboot.c

Diff comments View file @ f86bd76

 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
  * (C) Copyright 2008
  * Graeme Russ, graeme.russ@gmail.com.
  */
 #include <common.h>
 #include <fdtdec.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <asm/arch/sysinfo.h>
 #include <asm/arch/timestamp.h>
 DECLARE_GLOBAL_DATA_PTR;
 int arch_cpu_init(void)
 {
 	int ret = get_coreboot_info(&lib_sysinfo);
 	if (ret != 0) {
 		printf("Failed to parse coreboot tables.\n");
 		return ret;
 	}
 	timestamp_init();
 	return x86_cpu_init_f();
 }
 int checkcpu(void)
 {
 	return 0;
 }
 int print_cpuinfo(void)
 {
 	return default_print_cpuinfo();
 }
 static void board_final_cleanup(void)
 {
 	/*
 	 * Un-cache the ROM so the kernel has one
 	 * more MTRR available.
 	 *
 	 * Coreboot should have assigned this to the
 	 * top available variable MTRR.
 	 */
 	u8 top_mtrr = (native_read_msr(MTRR_CAP_MSR) & 0xff) - 1;
 	u8 top_type = native_read_msr(MTRR_PHYS_BASE_MSR(top_mtrr)) & 0xff;
 	/* Make sure this MTRR is the correct Write-Protected type */
 	if (top_type == MTRR_TYPE_WRPROT) {
 		struct mtrr_state state;
 		mtrr_open(&state, true);
 		wrmsrl(MTRR_PHYS_BASE_MSR(top_mtrr), 0);
 		wrmsrl(MTRR_PHYS_MASK_MSR(top_mtrr), 0);
 		mtrr_close(&state, true);
 	}
 	if (!fdtdec_get_config_bool(gd->fdt_blob, "u-boot,no-apm-finalize")) {
 		/*
 		 * Issue SMI to coreboot to lock down ME and registers
 		 * when allowed via device tree
 		 */
 		printf("Finalizing coreboot\n");
 		outb(0xcb, 0xb2);
 	}
 }
 int last_stage_init(void)
 {
 	if (gd->flags & GD_FLG_COLD_BOOT)
 		timestamp_add_to_bootstage();
 	/* start usb so that usb keyboard can be used as input device */
-	usb_init();
+	if (CONFIG_IS_ENABLED(USB_KEYBOARD))
+		usb_init();
 	board_final_cleanup();
 	return 0;
 }