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

Commit 212f3000 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 idle updates from Ingo Molnar:
 "There were two bigger changes in this development cycle:

   - remove idle notifiers:

       32 files changed, 74 insertions(+), 803 deletions(-)

     These notifiers were of questionable value and the main usecase,
     the i7300 driver, was essentially unmaintained and can be removed,
     plus modern power management concepts don't need the callback - so
     use this golden opportunity and get rid of this opaque and fragile
     callback from a latency sensitive code path.

     (Len Brown, Thomas Gleixner)

   - improve the AMD Erratum 400 workaround that used high overhead MSR
     polling in the idle loop (Borisla Petkov, Thomas Gleixner)"

* 'x86-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Remove empty idle.h header
  x86/amd: Simplify AMD E400 aware idle routine
  x86/amd: Check for the C1E bug post ACPI subsystem init
  x86/bugs: Separate AMD E400 erratum and C1E bug
  x86/cpufeature: Provide helper to set bugs bits
  x86/idle: Remove enter_idle(), exit_idle()
  x86: Remove x86_test_and_clear_bit_percpu()
  x86/idle: Remove is_idle flag
  x86/idle: Remove idle_notifier
  i7300_idle: Remove this driver
parents 6f3be0f0 34bc3560

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -6104,12 +6104,6 @@ S: Maintained 
F:	Documentation/cdrom/ide-cd

F:	drivers/ide/ide-cd*



IDLE-I7300

M:	Andy Henroid <andrew.d.henroid@intel.com>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	drivers/idle/i7300_idle.c



IEEE 802.15.4 SUBSYSTEM

M:	Alexander Aring <aar@pengutronix.de>

M:	Stefan Schmidt <stefan@osg.samsung.com>

arch/x86/include/asm/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate) 
	    boot_cpu_data.x86_model <= 0x05 &&

	    boot_cpu_data.x86_mask < 0x0A)

		return 1;

	else if (amd_e400_c1e_detected)

	else if (boot_cpu_has(X86_BUG_AMD_APIC_C1E))

		return 1;

	else

		return max_cstate;

arch/x86/include/asm/apic.h

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <asm/fixmap.h>

#include <asm/mpspec.h>

#include <asm/msr.h>

#include <asm/idle.h>



#define ARCH_APICTIMER_STOPS_ON_C3	1
@@ -640,7 +639,6 @@ extern void irq_exit(void); 
static inline void entering_irq(void)

{

	irq_enter();

	exit_idle();

}



static inline void entering_ack_irq(void)

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ static __always_inline __pure bool _static_cpu_has(u16 bit) 


#define static_cpu_has_bug(bit)		static_cpu_has((bit))

#define boot_cpu_has_bug(bit)		cpu_has_bug(&boot_cpu_data, (bit))

#define boot_cpu_set_bug(bit)		set_cpu_cap(&boot_cpu_data, (bit))



#define MAX_CPU_FEATURES		(NCAPINTS * 32)

#define cpu_have_feature		boot_cpu_has

arch/x86/include/asm/cpufeatures.h

+2 −0
Original line number Diff line number Diff line
@@ -314,4 +314,6 @@ 
#define X86_BUG_NULL_SEG	X86_BUG(10) /* Nulling a selector preserves the base */

#define X86_BUG_SWAPGS_FENCE	X86_BUG(11) /* SWAPGS without input dep on GS */

#define X86_BUG_MONITOR		X86_BUG(12) /* IPI required to wake up remote CPU */

#define X86_BUG_AMD_E400	X86_BUG(13) /* CPU is among the affected by Erratum 400 */



#endif /* _ASM_X86_CPUFEATURES_H */