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

Commit 4f19b880 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 apic updates from Ingo Molnar:
 "The main changes in this cycle were:

   - introduce optimized single IPI sending methods on modern APICs
     (Linus Torvalds, Thomas Gleixner)

   - kexec/crash APIC handling fixes and enhancements (Hidehiro Kawai)

   - extend lapic vector saving/restoring to the CMCI (MCE) vector as
     well (Juergen Gross)

   - various fixes and enhancements (Jake Oshins, Len Brown)"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
  x86/irq: Export functions to allow MSI domains in modules
  Documentation: Document kernel.panic_on_io_nmi sysctl
  x86/nmi: Save regs in crash dump on external NMI
  x86/apic: Introduce apic_extnmi command line parameter
  kexec: Fix race between panic() and crash_kexec()
  panic, x86: Allow CPUs to save registers even if looping in NMI context
  panic, x86: Fix re-entrance problem due to panic on NMI
  x86/apic: Fix the saving and restoring of lapic vectors during suspend/resume
  x86/smpboot: Re-enable init_udelay=0 by default on modern CPUs
  x86/smp: Remove single IPI wrapper
  x86/apic: Use default send single IPI wrapper
  x86/apic: Provide default send single IPI wrapper
  x86/apic: Implement single IPI for apic_noop
  x86/apic: Wire up single IPI for apic_numachip
  x86/apic: Wire up single IPI for x2apic_uv
  x86/apic: Implement single IPI for x2apic_phys
  x86/apic: Wire up single IPI for bigsmp_apic
  x86/apic: Remove pointless indirections from bigsmp_apic
  x86/apic: Wire up single IPI for apic_physflat
  x86/apic: Remove pointless indirections from apic_physflat
  ...
parents af345201 c8f3e518

Documentation/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -472,6 +472,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Change the amount of debugging information output

			when initialising the APIC and IO-APIC components.



	apic_extnmi=	[APIC,X86] External NMI delivery setting

			Format: { bsp (default) | all | none }

			bsp:  External NMI is delivered only to CPU 0

			all:  External NMIs are broadcast to all CPUs as a

			      backup of CPU 0

			none: External NMI is masked for all CPUs. This is

			      useful so that a dump capture kernel won't be

			      shot down by NMI



	autoconf=	[IPV6]

			See Documentation/networking/ipv6.txt.

Documentation/sysctl/kernel.txt

+15 −0
Original line number Diff line number Diff line
@@ -551,6 +551,21 @@ the recommended setting is 60. 


==============================================================



panic_on_io_nmi:



Controls the kernel's behavior when a CPU receives an NMI caused by

an IO error.



0: try to continue operation (default)



1: panic immediately. The IO error triggered an NMI. This indicates a

   serious system condition which could result in IO data corruption.

   Rather than continuing, panicking might be a better choice. Some

   servers issue this sort of NMI when the dump button is pushed,

   and you can use this option to take a crash dump.



==============================================================



panic_on_oops:



Controls the kernel's behaviour when an oops or BUG is encountered.

arch/x86/include/asm/apic.h

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ 
#define APIC_VERBOSE 1

#define APIC_DEBUG   2



/* Macros for apic_extnmi which controls external NMI masking */

#define APIC_EXTNMI_BSP		0 /* Default */

#define APIC_EXTNMI_ALL		1

#define APIC_EXTNMI_NONE	2



/*

 * Define the default level of output to be very little

 * This can be turned up by using apic=verbose for more
@@ -303,6 +308,7 @@ struct apic { 
				      unsigned int *apicid);



	/* ipi */

	void (*send_IPI)(int cpu, int vector);

	void (*send_IPI_mask)(const struct cpumask *mask, int vector);

	void (*send_IPI_mask_allbutself)(const struct cpumask *mask,

					 int vector);

arch/x86/include/asm/ipi.h

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ static inline void 
	native_apic_mem_write(APIC_ICR, cfg);

}



extern void default_send_IPI_single(int cpu, int vector);

extern void default_send_IPI_single_phys(int cpu, int vector);

extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask,

						 int vector);

extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,

arch/x86/include/asm/msi.h

+6 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MSI_H

#define _ASM_X86_MSI_H

#include <asm/hw_irq.h>

#include <asm/irqdomain.h>



typedef struct irq_alloc_info msi_alloc_info_t;



int pci_msi_prepare(struct irq_domain *domain, struct device *dev, int nvec,

		    msi_alloc_info_t *arg);



void pci_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc);



#endif /* _ASM_X86_MSI_H */