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

Commit 6ca2a88a 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 Ingo Molnar:
 "Various fixes:

   - reboot regression fix
   - build message spam fix
   - GPU quirk fix
   - 'make kvmconfig' fix

  plus the wire-up of the renameat2() system call on i386"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Remove the PCI reboot method from the default chain
  x86/build: Supress "Nothing to be done for ..." messages
  x86/gpu: Fix sign extension issue in Intel graphics stolen memory quirks
  x86/platform: Fix "make O=dir kvmconfig"
  i386: Wire up the renameat2() syscall
parents 2a83dc7e 5be44a6f

arch/x86/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ archclean: 
PHONY += kvmconfig

kvmconfig:

	$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config

	$(Q)yes "" | $(MAKE) oldconfig

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config

	$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig



define archhelp

  echo  '* bzImage      - Compressed kernel image (arch/x86/boot/bzImage)'

arch/x86/kernel/early-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static u32 __init intel_stolen_base(int num, int slot, int func, size_t stolen_s 
	return base;

}



#define KB(x)	((x) * 1024)

#define KB(x)	((x) * 1024UL)

#define MB(x)	(KB (KB (x)))

#define GB(x)	(MB (KB (x)))

arch/x86/kernel/reboot.c

+37 −35
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ EXPORT_SYMBOL(machine_real_restart); 
 */

static int __init set_pci_reboot(const struct dmi_system_id *d)

{

	if (reboot_type != BOOT_CF9) {

		reboot_type = BOOT_CF9;

	if (reboot_type != BOOT_CF9_FORCE) {

		reboot_type = BOOT_CF9_FORCE;

		pr_info("%s series board detected. Selecting %s-method for reboots.\n",

			d->ident, "PCI");

	}
@@ -458,20 +458,23 @@ void __attribute__((weak)) mach_reboot_fixups(void) 
}



/*

 * Windows compatible x86 hardware expects the following on reboot:

 * To the best of our knowledge Windows compatible x86 hardware expects

 * the following on reboot:

 *

 * 1) If the FADT has the ACPI reboot register flag set, try it

 * 2) If still alive, write to the keyboard controller

 * 3) If still alive, write to the ACPI reboot register again

 * 4) If still alive, write to the keyboard controller again

 * 5) If still alive, call the EFI runtime service to reboot

 * 6) If still alive, write to the PCI IO port 0xCF9 to reboot

 * 7) If still alive, inform BIOS to do a proper reboot

 * 6) If no EFI runtime service, call the BIOS to do a reboot

 *

 * If the machine is still alive at this stage, it gives up. We default to

 * following the same pattern, except that if we're still alive after (7) we'll

 * try to force a triple fault and then cycle between hitting the keyboard

 * controller and doing that

 * We default to following the same pattern. We also have

 * two other reboot methods: 'triple fault' and 'PCI', which

 * can be triggered via the reboot= kernel boot option or

 * via quirks.

 *

 * This means that this function can never return, it can misbehave

 * by not rebooting properly and hanging.

 */

static void native_machine_emergency_restart(void)

{
@@ -492,6 +495,11 @@ static void native_machine_emergency_restart(void) 
	for (;;) {

		/* Could also try the reset bit in the Hammer NB */

		switch (reboot_type) {

		case BOOT_ACPI:

			acpi_reboot();

			reboot_type = BOOT_KBD;

			break;



		case BOOT_KBD:

			mach_reboot_fixups(); /* For board specific fixups */
@@ -509,43 +517,29 @@ static void native_machine_emergency_restart(void) 
			}

			break;



		case BOOT_TRIPLE:

			load_idt(&no_idt);

			__asm__ __volatile__("int3");



			/* We're probably dead after this, but... */

			reboot_type = BOOT_KBD;

			break;



		case BOOT_BIOS:

			machine_real_restart(MRR_BIOS);



			/* We're probably dead after this, but... */

			reboot_type = BOOT_TRIPLE;

			break;



		case BOOT_ACPI:

			acpi_reboot();

			reboot_type = BOOT_KBD;

			break;



		case BOOT_EFI:

			if (efi_enabled(EFI_RUNTIME_SERVICES))

				efi.reset_system(reboot_mode == REBOOT_WARM ?

						 EFI_RESET_WARM :

						 EFI_RESET_COLD,

						 EFI_SUCCESS, 0, NULL);

			reboot_type = BOOT_CF9_COND;

			reboot_type = BOOT_BIOS;

			break;



		case BOOT_BIOS:

			machine_real_restart(MRR_BIOS);



			/* We're probably dead after this, but... */

			reboot_type = BOOT_CF9_SAFE;

			break;



		case BOOT_CF9:

		case BOOT_CF9_FORCE:

			port_cf9_safe = true;

			/* Fall through */



		case BOOT_CF9_COND:

		case BOOT_CF9_SAFE:

			if (port_cf9_safe) {

				u8 reboot_code = reboot_mode == REBOOT_WARM ?

					0x06 : 0x0E;

				u8 reboot_code = reboot_mode == REBOOT_WARM ?  0x06 : 0x0E;

				u8 cf9 = inb(0xcf9) & ~reboot_code;

				outb(cf9|2, 0xcf9); /* Request hard reset */

				udelay(50);
@@ -553,7 +547,15 @@ static void native_machine_emergency_restart(void) 
				outb(cf9|reboot_code, 0xcf9);

				udelay(50);

			}

			reboot_type = BOOT_BIOS;

			reboot_type = BOOT_TRIPLE;

			break;



		case BOOT_TRIPLE:

			load_idt(&no_idt);

			__asm__ __volatile__("int3");



			/* We're probably dead after this, but... */

			reboot_type = BOOT_KBD;

			break;

		}

	}

arch/x86/syscalls/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -54,5 +54,7 @@ syshdr-$(CONFIG_X86_64) += syscalls_64.h 


targets	+= $(uapisyshdr-y) $(syshdr-y)



PHONY += all

all: $(addprefix $(uapi)/,$(uapisyshdr-y))

all: $(addprefix $(out)/,$(syshdr-y))

	@:

arch/x86/syscalls/syscall_32.tbl

+1 −0
Original line number Diff line number Diff line
@@ -359,3 +359,4 @@ 
350	i386	finit_module		sys_finit_module

351	i386	sched_setattr		sys_sched_setattr

352	i386	sched_getattr		sys_sched_getattr

353	i386	renameat2		sys_renameat2