From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 May 2017 06:00:21 +0000 (-0700)
Subject: Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~1040
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d6a31c394722c914c61292b457e1999c8bef5ea;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'x86-debug-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 debug updates from Ingo Molnar:
 "The biggest update is the addition of USB3 debug port based
  early-console.

  Greg was fine with the USB changes and with the routing of these
  patches:

    https://www.spinics.net/lists/linux-usb/msg155093.html"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  usb/doc: Add document for USB3 debug port usage
  usb/serial: Add DBC debug device support to usb_debug
  x86/earlyprintk: Add support for earlyprintk via USB3 debug port
  usb/early: Add driver for xhci debug capability
  x86/timers: Add simple udelay calibration
---

7d6a31c394722c914c61292b457e1999c8bef5ea
diff --cc arch/x86/kernel/setup.c
index 62a1c74855e5,2600b1d0043b..0b4d3c686b1e
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -1093,8 -1143,11 +1116,11 @@@ void __init setup_arch(char **cmdline_p
  	cleanup_highmap();
  
  	memblock_set_current_limit(ISA_END_ADDRESS);
 -	memblock_x86_fill();
 +	e820__memblock_setup();
  
+ 	if (!early_xdbc_setup_hardware())
+ 		early_xdbc_register_console();
+ 
  	reserve_bios_regions();
  
  	if (efi_enabled(EFI_MEMMAP)) {