Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c5a778 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingol Molnar:
 "Misc fixes:

   - EFI crash fix

   - Xen PV fixes

   - do not allow PTI on 2-level 32-bit kernels for now

   - documentation fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/APM: Fix build warning when PROC_FS is not enabled
  Revert "x86/mm/legacy: Populate the user page-table with user pgd's"
  x86/efi: Load fixmap GDT in efi_call_phys_epilog() before setting %cr3
  x86/xen: Disable CPU0 hotplug for Xen PV
  x86/EISA: Don't probe EISA bus for Xen PV guests
  x86/doc: Fix Documentation/x86/earlyprintk.txt
parents 4314daa5 002b87d2

Documentation/x86/earlyprintk.txt

+15 −10
Original line number Diff line number Diff line
@@ -35,25 +35,25 @@ and two USB cables, connected like this: 
( If your system does not list a debug port capability then you probably

  won't be able to use the USB debug key. )



 b.) You also need a Netchip USB debug cable/key:

 b.) You also need a NetChip USB debug cable/key:



        http://www.plxtech.com/products/NET2000/NET20DC/default.asp



     This is a small blue plastic connector with two USB connections,

     This is a small blue plastic connector with two USB connections;

     it draws power from its USB connections.



 c.) You need a second client/console system with a high speed USB 2.0

     port.



 d.) The Netchip device must be plugged directly into the physical

 d.) The NetChip device must be plugged directly into the physical

     debug port on the "host/target" system.  You cannot use a USB hub in

     between the physical debug port and the "host/target" system.



     The EHCI debug controller is bound to a specific physical USB

     port and the Netchip device will only work as an early printk

     port and the NetChip device will only work as an early printk

     device in this port.  The EHCI host controllers are electrically

     wired such that the EHCI debug controller is hooked up to the

     first physical and there is no way to change this via software.

     first physical port and there is no way to change this via software.

     You can find the physical port through experimentation by trying

     each physical port on the system and rebooting.  Or you can try

     and use lsusb or look at the kernel info messages emitted by the
@@ -65,9 +65,9 @@ and two USB cables, connected like this: 
     to the hardware vendor, because there is no reason not to wire

     this port into one of the physically accessible ports.



 e.) It is also important to note, that many versions of the Netchip

 e.) It is also important to note, that many versions of the NetChip

     device require the "client/console" system to be plugged into the

     right and side of the device (with the product logo facing up and

     right hand side of the device (with the product logo facing up and

     readable left to right).  The reason being is that the 5 volt

     power supply is taken from only one side of the device and it

     must be the side that does not get rebooted.
@@ -81,13 +81,18 @@ and two USB cables, connected like this: 
      CONFIG_EARLY_PRINTK_DBGP=y



    And you need to add the boot command line: "earlyprintk=dbgp".



    (If you are using Grub, append it to the 'kernel' line in

     /etc/grub.conf)

     /etc/grub.conf.  If you are using Grub2 on a BIOS firmware system,

     append it to the 'linux' line in /boot/grub2/grub.cfg. If you are

     using Grub2 on an EFI firmware system, append it to the 'linux'

     or 'linuxefi' line in /boot/grub2/grub.cfg or

     /boot/efi/EFI/<distro>/grub.cfg.)



    On systems with more than one EHCI debug controller you must

    specify the correct EHCI debug controller number.  The ordering

    comes from the PCI bus enumeration of the EHCI controllers.  The

    default with no number argument is "0" the first EHCI debug

    default with no number argument is "0" or the first EHCI debug

    controller.  To use the second EHCI debug controller, you would

    use the command line: "earlyprintk=dbgp1"
@@ -111,7 +116,7 @@ and two USB cables, connected like this: 
    see the raw output.



 c.) On Nvidia Southbridge based systems: the kernel will try to probe

     and find out which port has debug device connected.

     and find out which port has a debug device connected.



3. Testing that it works fine:

arch/x86/include/asm/pgtable-2level.h

+0 −9
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte) 


static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)

{

#ifdef CONFIG_PAGE_TABLE_ISOLATION

	pmd.pud.p4d.pgd = pti_set_user_pgtbl(&pmdp->pud.p4d.pgd, pmd.pud.p4d.pgd);

#endif

	*pmdp = pmd;

}
@@ -61,9 +58,6 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp) 
#ifdef CONFIG_SMP

static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)

{

#ifdef CONFIG_PAGE_TABLE_ISOLATION

	pti_set_user_pgtbl(&xp->pud.p4d.pgd, __pgd(0));

#endif

	return __pmd(xchg((pmdval_t *)xp, 0));

}

#else
@@ -73,9 +67,6 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp) 
#ifdef CONFIG_SMP

static inline pud_t native_pudp_get_and_clear(pud_t *xp)

{

#ifdef CONFIG_PAGE_TABLE_ISOLATION

	pti_set_user_pgtbl(&xp->p4d.pgd, __pgd(0));

#endif

	return __pud(xchg((pudval_t *)xp, 0));

}

#else

arch/x86/kernel/apm_32.c

+2 −0
Original line number Diff line number Diff line
@@ -1640,6 +1640,7 @@ static int do_open(struct inode *inode, struct file *filp) 
	return 0;

}



#ifdef CONFIG_PROC_FS

static int proc_apm_show(struct seq_file *m, void *v)

{

	unsigned short	bx;
@@ -1719,6 +1720,7 @@ static int proc_apm_show(struct seq_file *m, void *v) 
		   units);

	return 0;

}

#endif



static int apm(void *unused)

{

arch/x86/kernel/eisa.c

+8 −2
Original line number Diff line number Diff line
@@ -7,11 +7,17 @@ 
#include <linux/eisa.h>

#include <linux/io.h>



#include <xen/xen.h>



static __init int eisa_bus_probe(void)

{

	void __iomem *p = ioremap(0x0FFFD9, 4);

	void __iomem *p;



	if (xen_pv_domain() && !xen_initial_domain())

		return 0;



	if (readl(p) == 'E' + ('I'<<8) + ('S'<<16) + ('A'<<24))

	p = ioremap(0x0FFFD9, 4);

	if (p && readl(p) == 'E' + ('I' << 8) + ('S' << 16) + ('A' << 24))

		EISA_bus = 1;

	iounmap(p);

	return 0;

arch/x86/kernel/topology.c

+3 −1
Original line number Diff line number Diff line
@@ -111,8 +111,10 @@ int arch_register_cpu(int num) 
	/*

	 * Currently CPU0 is only hotpluggable on Intel platforms. Other

	 * vendors can add hotplug support later.

	 * Xen PV guests don't support CPU0 hotplug at all.

	 */

	if (c->x86_vendor != X86_VENDOR_INTEL)

	if (c->x86_vendor != X86_VENDOR_INTEL ||

	    boot_cpu_has(X86_FEATURE_XENPV))

		cpu0_hotpluggable = 0;



	/*