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

Commit 7c24af49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: remove CONFIG_ACPI_SYSTEM
  fujitsu-laptop: Use RFKILL support bitmask from firmware
  x86_64: Fix S3 fail path
  x86_64: acpi/wakeup_64 cleanup
  battery: don't assume we are fully charged when not charging or discharging
  ACPI: EC: Add delay for slow MSI controller
parents f8a1af6b 5acfac5a

arch/x86/kernel/acpi/wakeup_64.S

+10 −20
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
	 * Hooray, we are in Long 64-bit mode (but still running in low memory)

	 */

ENTRY(wakeup_long64)

wakeup_long64:

	movq	saved_magic, %rax

	movq	$0x123456789abcdef0, %rdx

	cmpq	%rdx, %rax
@@ -34,16 +33,12 @@ wakeup_long64: 


	movq	saved_rip, %rax

	jmp	*%rax

ENDPROC(wakeup_long64)



bogus_64_magic:

	jmp	bogus_64_magic



	.align 2

	.p2align 4,,15

.globl do_suspend_lowlevel

	.type	do_suspend_lowlevel,@function

do_suspend_lowlevel:

.LFB5:

ENTRY(do_suspend_lowlevel)

	subq	$8, %rsp

	xorl	%eax, %eax

	call	save_processor_state
@@ -67,7 +62,7 @@ do_suspend_lowlevel: 
	pushfq

	popq	pt_regs_flags(%rax)



	movq	$.L97, saved_rip(%rip)

	movq	$resume_point, saved_rip(%rip)



	movq	%rsp, saved_rsp

	movq	%rbp, saved_rbp
@@ -78,14 +73,12 @@ do_suspend_lowlevel: 
	addq	$8, %rsp

	movl	$3, %edi

	xorl	%eax, %eax

	jmp	acpi_enter_sleep_state

.L97:

	.p2align 4,,7

.L99:

	.align 4

	movl	$24, %eax

	movw	%ax, %ds

	call	acpi_enter_sleep_state

	/* in case something went wrong, restore the machine status and go on */

	jmp	resume_point



	.align 4

resume_point:

	/* We don't restore %rax, it must be 0 anyway */

	movq	$saved_context, %rax

	movq	saved_context_cr4(%rax), %rbx
@@ -117,12 +110,9 @@ do_suspend_lowlevel: 
	xorl	%eax, %eax

	addq	$8, %rsp

	jmp	restore_processor_state

.LFE5:

.Lfe5:

	.size	do_suspend_lowlevel, .Lfe5-do_suspend_lowlevel

ENDPROC(do_suspend_lowlevel)



.data

ALIGN

ENTRY(saved_rbp)	.quad	0

ENTRY(saved_rsi)	.quad	0

ENTRY(saved_rdi)	.quad	0

drivers/acpi/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -254,13 +254,6 @@ config ACPI_PCI_SLOT 
	  help you correlate PCI bus addresses with the physical geography

	  of your slots. If you are unsure, say N.



config ACPI_SYSTEM

	bool

	default y

	help

	  This driver will enable your system to shut down using ACPI, and

	  dump your ACPI DSDT table using /proc/acpi/dsdt.



config X86_PM_TIMER

	bool "Power Management Timer Support" if EMBEDDED

	depends on X86

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ obj-$(CONFIG_ACPI_PROCESSOR) += processor.o 
obj-$(CONFIG_ACPI_CONTAINER)	+= container.o

obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o

obj-y				+= power.o

obj-$(CONFIG_ACPI_SYSTEM)	+= system.o event.o

obj-y				+= system.o event.o

obj-$(CONFIG_ACPI_DEBUG)	+= debug.o

obj-$(CONFIG_ACPI_NUMA)		+= numa.o

obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)	+= acpi_memhotplug.o

drivers/acpi/battery.c

+24 −1
Original line number Diff line number Diff line
@@ -138,6 +138,29 @@ static int acpi_battery_technology(struct acpi_battery *battery) 


static int acpi_battery_get_state(struct acpi_battery *battery);



static int acpi_battery_is_charged(struct acpi_battery *battery)

{

	/* either charging or discharging */

	if (battery->state != 0)

		return 0;



	/* battery not reporting charge */

	if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN ||

	    battery->capacity_now == 0)

		return 0;



	/* good batteries update full_charge as the batteries degrade */

	if (battery->full_charge_capacity == battery->capacity_now)

		return 1;



	/* fallback to using design values for broken batteries */

	if (battery->design_capacity == battery->capacity_now)

		return 1;



	/* we don't do any sort of metric based on percentages */

	return 0;

}



static int acpi_battery_get_property(struct power_supply *psy,

				     enum power_supply_property psp,

				     union power_supply_propval *val)
@@ -155,7 +178,7 @@ static int acpi_battery_get_property(struct power_supply *psy, 
			val->intval = POWER_SUPPLY_STATUS_DISCHARGING;

		else if (battery->state & 0x02)

			val->intval = POWER_SUPPLY_STATUS_CHARGING;

		else if (battery->state == 0)

		else if (acpi_battery_is_charged(battery))

			val->intval = POWER_SUPPLY_STATUS_FULL;

		else

			val->intval = POWER_SUPPLY_STATUS_UNKNOWN;

drivers/acpi/ec.c

+9 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ static struct acpi_ec { 
	spinlock_t curr_lock;

} *boot_ec, *first_ec;



static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */



/* --------------------------------------------------------------------------

                             Transaction Management

   -------------------------------------------------------------------------- */
@@ -259,6 +261,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, 
		clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);

		acpi_disable_gpe(NULL, ec->gpe);

	}

	if (EC_FLAGS_MSI)

		udelay(ACPI_EC_DELAY);

	/* start transaction */

	spin_lock_irqsave(&ec->curr_lock, tmp);

	/* following two actions should be kept atomic */
@@ -967,6 +971,11 @@ int __init acpi_ec_ecdt_probe(void) 
	/*

	 * Generate a boot ec context

	 */

	if (dmi_name_in_vendors("Micro-Star") ||

	    dmi_name_in_vendors("Notebook")) {

		pr_info(PREFIX "Enabling special treatment for EC from MSI.\n");

		EC_FLAGS_MSI = 1;

	}

	status = acpi_get_table(ACPI_SIG_ECDT, 1,

				(struct acpi_table_header **)&ecdt_ptr);

	if (ACPI_SUCCESS(status)) {