ACPI patches for 2.6.25-rc7

ACPI patches for 2.6.25-rc7

[Len Brown]

Here is the queue for 2.6.25-rc7

thanks,
-Len

[PATCH 1/6] ACPI: SBS: remove typo from sbchc.c

[Len Brown]

From: Alexey Starikovskiy <astarikovskiy@suse.de>

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/sbshc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index a2cf300..bcf2c70 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -130,7 +130,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
 		goto end;
 	}
 	smb_hc_write(hc, ACPI_SMB_COMMAND, command);
-	smb_hc_write(hc, ACPI_SMB_COMMAND, command);
 	if (!(protocol & 0x01)) {
 		smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length);
 		for (i = 0; i < length; ++i)
-- 
1.5.5.rc1.6.g5cc8f

[PATCH 2/6] ACPI: fix Medion _PRT quirk (use "ISA_", not "ISA")

[Len Brown]

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

This fixes the builtin RTL8139 NIC on the Medion MD9580-F laptop.  The BIOS
reports the interrupt routing incorrectly.  I recently added a quirk to work
around this, and this patch fixes a typo in the quirk.

We pad every ACPI pathname component to four characters, so ".ISA." will never
match anything.  We need ".ISA_." instead.

Thank you Johann-Nikolaus Andreae for patiently testing this patch.

See http://bugzilla.kernel.org/show_bug.cgi?id=4773

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Johann-Nikolaus Andreae <johann-nikolaus.andreae@nacs.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/pci_irq.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 7af414a..89022a7 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -131,8 +131,8 @@ struct prt_quirk {
  */
 static struct prt_quirk prt_quirks[] = {
 	{ medion_md9580, 0, 0, 9, 'A',
-		"\\_SB_.PCI0.ISA.LNKA",
-		"\\_SB_.PCI0.ISA.LNKB"},
+		"\\_SB_.PCI0.ISA_.LNKA",
+		"\\_SB_.PCI0.ISA_.LNKB"},
 	{ dell_optiplex, 0, 0, 0xd, 'A',
 		"\\_SB_.LNKB",
 		"\\_SB_.LNKA"},
-- 
1.5.5.rc1.6.g5cc8f

[PATCH 3/6] ACPI: fix a regression of ACPI device driver autoloading

[Len Brown]

From: Zhang Rui <rui.zhang@intel.com>

commit 3620f2f2f39e7870cf1a4fb2e34063a142f28716 sets the cid of
ACPI video/dock/bay device and leaves the hid empty.
As a result, "modalias" should export the cid for
devices which don't have a hid.

ACPI Video driver is not autoloaded with
commit 3620f2f2f39e7870cf1a4fb2e34063a142f28716 applied.
"cat /sys/.../device:03(acpi video bus)/modalias" shows nothing.

ACPI Video driver is autoloaded after revert that commit.
"cat /sys/.../LNXVIDEO:0x/modalias" shows "acpi:LNXVIDEO:"

ACPI Video driver is autoloaded with commit
3620f2f2f39e7870cf1a4fb2e34063a142f28716 and this patch applied.
"cat /sys/.../device:03(acpi video bus)/modalias"
shows "acpi:LNXVIDEO:"

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/scan.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 57570ac..e6ce262 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -39,20 +39,26 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
 			   int size)
 {
 	int len;
+	int count;
 
-	if (!acpi_dev->flags.hardware_id)
+	if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids)
 		return -ENODEV;
 
-	len = snprintf(modalias, size, "acpi:%s:",
-		       acpi_dev->pnp.hardware_id);
-	if (len < 0 || len >= size)
-		return -EINVAL;
+	len = snprintf(modalias, size, "acpi:");
 	size -= len;
 
+	if (acpi_dev->flags.hardware_id) {
+		count = snprintf(&modalias[len], size, "%s:",
+				 acpi_dev->pnp.hardware_id);
+		if (count < 0 || count >= size)
+			return -EINVAL;
+		len += count;
+		size -= count;
+	}
+
 	if (acpi_dev->flags.compatible_ids) {
 		struct acpi_compatible_id_list *cid_list;
 		int i;
-		int count;
 
 		cid_list = acpi_dev->pnp.cid_list;
 		for (i = 0; i < cid_list->count; i++) {
-- 
1.5.5.rc1.6.g5cc8f

[PATCH 4/6] ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry

[Len Brown]

From: Venki Pallipadi <venkatesh.pallipadi@intel.com>

This original patch
http://ussg.iu.edu/hypermail/linux/kernel/0712.2/1451.html
was intending to add acpi_unlazy_tlb() to acpi_idle_enter_bm(),
which is used for C3 entry.

But it was merged incorrectly as commmit

bde6f5f59c2b2b48a7a849c129d5b48838fe77ee
'x86: voluntary leave_mm before entering ACPI C3'

so the call was instead added to acpi_idle_enter_simple()
(which is C2 entry routine), probably due to identical
context in that function.

Move the call back to acpi_idle_enter_bm().

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/processor_idle.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index e8e2d88..1468f1e 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1487,7 +1487,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
 		return 0;
 	}
 
-	acpi_unlazy_tlb(smp_processor_id());
 	/*
 	 * Must be done before busmaster disable as we might need to
 	 * access HPET !
@@ -1577,6 +1576,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 		return 0;
 	}
 
+	acpi_unlazy_tlb(smp_processor_id());
+
 	/* Tell the scheduler that we are going deep-idle: */
 	sched_clock_idle_sleep_event();
 	/*
-- 
1.5.5.rc1.6.g5cc8f

[PATCH 5/6] cpuidle: fix cpuidle time and usage overflow

[Len Brown]

From: Yi Yang <yi.y.yang@intel.com>

cpuidle C-state sysfs node time and usage are very easy to overflow because
they are all of unsigned int type, time will overflow within about two hours,
usage will take longer time to overflow, but they are increasing for ever.

This patch will convert them to unsigned long long.

Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/cpuidle/cpuidle.c |    2 +-
 drivers/cpuidle/sysfs.c   |   10 ++++++++--
 include/linux/cpuidle.h   |    4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d73663a..d42deb3 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -67,7 +67,7 @@ static void cpuidle_idle_call(void)
 	/* enter the state and update stats */
 	dev->last_residency = target_state->enter(dev, target_state);
 	dev->last_state = target_state;
-	target_state->time += dev->last_residency;
+	target_state->time += (unsigned long long)dev->last_residency;
 	target_state->usage++;
 
 	/* give the governor an opportunity to reflect on the outcome */
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 69102ca..e949618 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
 	return sprintf(buf, "%u\n", state->_name);\
 }
 
+#define define_show_state_ull_function(_name) \
+static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
+{ \
+	return sprintf(buf, "%llu\n", state->_name);\
+}
+
 #define define_show_state_str_function(_name) \
 static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
 { \
@@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
 
 define_show_state_function(exit_latency)
 define_show_state_function(power_usage)
-define_show_state_function(usage)
-define_show_state_function(time)
+define_show_state_ull_function(usage)
+define_show_state_ull_function(time)
 define_show_state_str_function(name)
 define_show_state_str_function(desc)
 
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index 6b72a45..51e6b1e 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -38,8 +38,8 @@ struct cpuidle_state {
 	unsigned int	power_usage; /* in mW */
 	unsigned int	target_residency; /* in US */
 
-	unsigned int	usage;
-	unsigned int	time; /* in US */
+	unsigned long long	usage;
+	unsigned long long	time; /* in US */
 
 	int (*enter)	(struct cpuidle_device *dev,
 			 struct cpuidle_state *state);
-- 
1.5.5.rc1.6.g5cc8f

[PATCH 6/6] cpuidle: fix 100% C0 statistics regression

[Len Brown]

From: Venki Pallipadi <venkatesh.pallipadi@intel.com>

commit 9b12e18cdc1553de62d931e73443c806347cd974
'ACPI: cpuidle: Support C1 idle time accounting'
was implicated in a 100% C0 idle regression.
http://bugzilla.kernel.org/show_bug.cgi?id=10076

It pointed out a potential problem where the menu governor
may get confused by the C-state residency time from poll
idle or C1 idle, where this timing info is not accurate.
This inaccuracy is due to interrupts being handled
before we account for C-state exit.

Do not mark TIME_VALID for CO poll state.
Mark C1 time as valid only with the MWAIT (CSTATE_FFH) entry method.

This makes governors use the timing information only when it is correct and
eliminates any wrong policy decisions that may result from invalid timing
information.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/processor_idle.c |    4 +++-
 drivers/cpuidle/cpuidle.c     |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 1468f1e..788da97 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1693,7 +1693,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
 		switch (cx->type) {
 			case ACPI_STATE_C1:
 			state->flags |= CPUIDLE_FLAG_SHALLOW;
-			state->flags |= CPUIDLE_FLAG_TIME_VALID;
+			if (cx->entry_method == ACPI_CSTATE_FFH)
+				state->flags |= CPUIDLE_FLAG_TIME_VALID;
+
 			state->enter = acpi_idle_enter_c1;
 			dev->safe_state = state;
 			break;
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d42deb3..fc555a9 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -224,7 +224,7 @@ static void poll_idle_init(struct cpuidle_device *dev)
 	state->exit_latency = 0;
 	state->target_residency = 0;
 	state->power_usage = -1;
-	state->flags = CPUIDLE_FLAG_POLL | CPUIDLE_FLAG_TIME_VALID;
+	state->flags = CPUIDLE_FLAG_POLL;
 	state->enter = poll_idle;
 }
 #else
-- 
1.5.5.rc1.6.g5cc8f

[PATCH 7/6] pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."

[Len Brown]

From: Len Brown <len.brown@intel.com>

We have been printing these messages at KERN_ERR since 2.6.24,
per http://bugzilla.kernel.org/show_bug.cgi?id=9535

But KERN_ERR pops up on a console booted with "quiet"
and causes users to get alarmed and file bugs
about the message itself:
https://bugzilla.redhat.com/show_bug.cgi?id=436589

So reduce the severity of these messages to
KERN_WARNING, which is not printed by "quiet".

This message will still be seen without "quiet",
but a lot of messages are printed in that mode
and it will be less likely to cause undue alarm.

We could go all the way to KERN_DEBUG, but this
is a real warning after all, so it seems prudent
not to require "debug" to see it.

Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/pnp/pnpacpi/rsparser.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 6aa231e..2dcd196 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -85,7 +85,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
 	       i < PNP_MAX_IRQ)
 		i++;
 	if (i >= PNP_MAX_IRQ && !warned) {
-		printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
+		printk(KERN_WARNING "pnpacpi: exceeded the max number of IRQ "
 				"resources: %d \n", PNP_MAX_IRQ);
 		warned = 1;
 		return;
@@ -187,7 +187,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
 		res->dma_resource[i].start = dma;
 		res->dma_resource[i].end = dma;
 	} else if (!warned) {
-		printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
+		printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA "
 				"resources: %d \n", PNP_MAX_DMA);
 		warned = 1;
 	}
@@ -213,7 +213,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
 		res->port_resource[i].start = io;
 		res->port_resource[i].end = io + len - 1;
 	} else if (!warned) {
-		printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
+		printk(KERN_WARNING "pnpacpi: exceeded the max number of IO "
 				"resources: %d \n", PNP_MAX_PORT);
 		warned = 1;
 	}
@@ -241,7 +241,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
 		res->mem_resource[i].start = mem;
 		res->mem_resource[i].end = mem + len - 1;
 	} else if (!warned) {
-		printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
+		printk(KERN_WARNING "pnpacpi: exceeded the max number of mem "
 				"resources: %d\n", PNP_MAX_MEM);
 		warned = 1;
 	}
-- 
1.5.5.rc1.6.g5cc8f

Re: [PATCH 2/6] ACPI: fix Medion _PRT quirk (use "ISA_", not "ISA")

[Rafael J. Wysocki]

On Wednesday, 26 of March 2008, Len Brown wrote:
> From: Bjorn Helgaas <bjorn.helgaas@hp.com>
> 
> This fixes the builtin RTL8139 NIC on the Medion MD9580-F laptop.  The BIOS
> reports the interrupt routing incorrectly.  I recently added a quirk to work
> around this, and this patch fixes a typo in the quirk.
> 
> We pad every ACPI pathname component to four characters, so ".ISA." will never
> match anything.  We need ".ISA_." instead.
> 
> Thank you Johann-Nikolaus Andreae for patiently testing this patch.
> 
> See http://bugzilla.kernel.org/show_bug.cgi?id=4773

This seems to have been applied already:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b97d4803400a4442b0e4ae14d0bd8e83994b9004
 
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> Cc: Johann-Nikolaus Andreae <johann-nikolaus.andreae@nacs.de>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Len Brown <len.brown@intel.com>
> ---
>  drivers/acpi/pci_irq.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
> index 7af414a..89022a7 100644
> --- a/drivers/acpi/pci_irq.c
> +++ b/drivers/acpi/pci_irq.c
> @@ -131,8 +131,8 @@ struct prt_quirk {
>   */
>  static struct prt_quirk prt_quirks[] = {
>  	{ medion_md9580, 0, 0, 9, 'A',
> -		"\\_SB_.PCI0.ISA.LNKA",
> -		"\\_SB_.PCI0.ISA.LNKB"},
> +		"\\_SB_.PCI0.ISA_.LNKA",
> +		"\\_SB_.PCI0.ISA_.LNKB"},
>  	{ dell_optiplex, 0, 0, 0xd, 'A',
>  		"\\_SB_.LNKB",
>  		"\\_SB_.LNKA"},

Thanks,
Rafael

ACPI patches for 2.6.25-rc7

[Len Brown]

Hi Linus,

please pull from: 

git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release

Note that I generated the diffstat below with
git diff -b -M --stat linus..release

I've not used "-b" until now.  I added it because Julia's patch was simple,
but since it changed indenting of a couple of blocks its diffstat was otherwise large.

thanks!

-Len

ps. individual patches are available on linux-acpi@vger.kernel.org
and a consolidated plain patch is available here:
ftp://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.6.25/acpi-release-20070126-2.6.25-rc7.diff.gz

 drivers/acpi/fan.c             |    2 --
 drivers/acpi/processor_core.c  |    2 --
 drivers/acpi/processor_idle.c  |    5 ++++-
 drivers/acpi/sbshc.c           |    1 -
 drivers/acpi/scan.c            |   16 +++++++++++-----
 drivers/acpi/video.c           |    2 --
 drivers/cpuidle/cpuidle.c      |    4 ++--
 drivers/cpuidle/sysfs.c        |   10 ++++++++--
 drivers/pnp/pnpacpi/rsparser.c |    8 ++++----
 include/linux/cpuidle.h        |    4 ++--
 10 files changed, 31 insertions(+), 23 deletions(-)

through these commits:

Alexey Starikovskiy (1):
      ACPI: SBS: remove typo from sbchc.c

Julia Lawall (1):
      ACPI: drivers/acpi: elide a non-zero test on a result that is never 0

Len Brown (1):
      pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."

Venki Pallipadi (2):
      ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
      cpuidle: fix 100% C0 statistics regression

Yi Yang (1):
      cpuidle: fix cpuidle time and usage overflow

Zhang Rui (1):
      ACPI: fix a regression of ACPI device driver autoloading

with this log:

commit 1192aeb957402b45f311895f124e4ca41206843c
Author: Julia Lawall <julia@diku.dk>
Date:   Thu Mar 27 01:48:22 2008 -0400

    ACPI: drivers/acpi: elide a non-zero test on a result that is never 0
    
    The function thermal_cooling_device_register always returns either a valid
    pointer or a value made with ERR_PTR, so a test for non-zero on the result
    will always succeed.
    
    The problem was found using the following semantic match.
    (http://www.emn.fr/x-info/coccinelle/)
    
    //<smpl>
    @a@
    expression E, E1;
    statement S,S1;
    position p;
    @@
    
    E = thermal_cooling_device_register(...)
    ... when != E = E1
    if@p (E) S else S1
    
    @n@
    position a.p;
    expression E,E1;
    statement S,S1;
    @@
    
    E = NULL
    ... when != E = E1
    if@p (E) S else S1
    
    @depends on !n@
    expression E;
    statement S,S1;
    position a.p;
    @@
    
    * if@p (E)
      S else S1
    //</smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 86d9fc1293aa9456677eab94e9fd2d3a10920548
Merge: 08dcf29... 8e92b66... 33fd7af... 7642d21... 5c9fcb5...
Author: Len Brown <len.brown@intel.com>
Date:   Wed Mar 26 22:50:09 2008 -0400

    Merge branches 'release', 'idle', 'redhat-bugzilla-436589', 'sbs' and 'video' into release

commit 33fd7afd66ffdc6addf1b085fe6403b6af532f8e
Author: Len Brown <len.brown@intel.com>
Date:   Wed Mar 26 13:29:32 2008 -0400

    pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."
    
    We have been printing these messages at KERN_ERR since 2.6.24,
    per http://bugzilla.kernel.org/show_bug.cgi?id=9535
    
    But KERN_ERR pops up on a console booted with "quiet"
    and causes users to get alarmed and file bugs
    about the message itself:
    https://bugzilla.redhat.com/show_bug.cgi?id=436589
    
    So reduce the severity of these messages to
    KERN_WARNING, which is not printed by "quiet".
    
    This message will still be seen without "quiet",
    but a lot of messages are printed in that mode
    and it will be less likely to cause undue alarm.
    
    We could go all the way to KERN_DEBUG, but this
    is a real warning after all, so it seems prudent
    not to require "debug" to see it.
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 8e92b6605da989c0aa8ff7e33306f36f0efd957c
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Fri Feb 29 10:24:32 2008 -0800

    cpuidle: fix 100% C0 statistics regression
    
    commit 9b12e18cdc1553de62d931e73443c806347cd974
    'ACPI: cpuidle: Support C1 idle time accounting'
    was implicated in a 100% C0 idle regression.
    http://bugzilla.kernel.org/show_bug.cgi?id=10076
    
    It pointed out a potential problem where the menu governor
    may get confused by the C-state residency time from poll
    idle or C1 idle, where this timing info is not accurate.
    This inaccuracy is due to interrupts being handled
    before we account for C-state exit.
    
    Do not mark TIME_VALID for CO poll state.
    Mark C1 time as valid only with the MWAIT (CSTATE_FFH) entry method.
    
    This makes governors use the timing information only when it is correct and
    eliminates any wrong policy decisions that may result from invalid timing
    information.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 8b78cf602fd3bd97c0080edd22fe8fd5d0fa7832
Author: Yi Yang <yi.y.yang@intel.com>
Date:   Mon Feb 25 08:46:12 2008 +0800

    cpuidle: fix cpuidle time and usage overflow
    
    cpuidle C-state sysfs node time and usage are very easy to overflow because
    they are all of unsigned int type, time will overflow within about two hours,
    usage will take longer time to overflow, but they are increasing for ever.
    
    This patch will convert them to unsigned long long.
    
    Signed-off-by: Yi Yang <yi.y.yang@intel.com>
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 996520c1fdd2948addb629be56c9febf2967e02b
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Mon Mar 24 14:24:10 2008 -0700

    ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
    
    This original patch
    http://ussg.iu.edu/hypermail/linux/kernel/0712.2/1451.html
    was intending to add acpi_unlazy_tlb() to acpi_idle_enter_bm(),
    which is used for C3 entry.
    
    But it was merged incorrectly as commmit
    
    bde6f5f59c2b2b48a7a849c129d5b48838fe77ee
    'x86: voluntary leave_mm before entering ACPI C3'
    
    so the call was instead added to acpi_idle_enter_simple()
    (which is C2 entry routine), probably due to identical
    context in that function.
    
    Move the call back to acpi_idle_enter_bm().
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 5c9fcb5deef4d3a49798d76c48b726d2e3c7df72
Author: Zhang Rui <rui.zhang@intel.com>
Date:   Thu Mar 20 16:40:32 2008 +0800

    ACPI: fix a regression of ACPI device driver autoloading
    
    commit 3620f2f2f39e7870cf1a4fb2e34063a142f28716 sets the cid of
    ACPI video/dock/bay device and leaves the hid empty.
    As a result, "modalias" should export the cid for
    devices which don't have a hid.
    
    ACPI Video driver is not autoloaded with
    commit 3620f2f2f39e7870cf1a4fb2e34063a142f28716 applied.
    "cat /sys/.../device:03(acpi video bus)/modalias" shows nothing.
    
    ACPI Video driver is autoloaded after revert that commit.
    "cat /sys/.../LNXVIDEO:0x/modalias" shows "acpi:LNXVIDEO:"
    
    ACPI Video driver is autoloaded with commit
    3620f2f2f39e7870cf1a4fb2e34063a142f28716 and this patch applied.
    "cat /sys/.../device:03(acpi video bus)/modalias"
    shows "acpi:LNXVIDEO:"
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Acked-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 7642d2113098f1270e9f9f0120f44d0035091636
Author: Alexey Starikovskiy <astarikovskiy@suse.de>
Date:   Thu Feb 28 19:17:39 2008 +0300

    ACPI: SBS: remove typo from sbchc.c
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

ACPI patches for 2.6.25-rc7

[Len Brown]

Hi Linus,

please pull from: 

git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release

Note that I generated the diffstat below with
git diff -b -M --stat linus..release

I've not used "-b" until now.  I added it because Julia's patch was simple,
but since it changed indenting of a couple of blocks its diffstat was otherwise large.

thanks!

-Len

ps. individual patches are available on linux-acpi@vger.kernel.org
and a consolidated plain patch is available here:
ftp://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.6.25/acpi-release-20070126-2.6.25-rc7.diff.gz

 drivers/acpi/fan.c             |    2 --
 drivers/acpi/processor_core.c  |    2 --
 drivers/acpi/processor_idle.c  |    5 ++++-
 drivers/acpi/sbshc.c           |    1 -
 drivers/acpi/scan.c            |   16 +++++++++++-----
 drivers/acpi/video.c           |    2 --
 drivers/cpuidle/cpuidle.c      |    4 ++--
 drivers/cpuidle/sysfs.c        |   10 ++++++++--
 drivers/pnp/pnpacpi/rsparser.c |    8 ++++----
 include/linux/cpuidle.h        |    4 ++--
 10 files changed, 31 insertions(+), 23 deletions(-)

through these commits:

Alexey Starikovskiy (1):
      ACPI: SBS: remove typo from sbchc.c

Julia Lawall (1):
      ACPI: drivers/acpi: elide a non-zero test on a result that is never 0

Len Brown (1):
      pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."

Venki Pallipadi (2):
      ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
      cpuidle: fix 100% C0 statistics regression

Yi Yang (1):
      cpuidle: fix cpuidle time and usage overflow

Zhang Rui (1):
      ACPI: fix a regression of ACPI device driver autoloading

with this log:

commit 1192aeb957402b45f311895f124e4ca41206843c
Author: Julia Lawall <julia@diku.dk>
Date:   Thu Mar 27 01:48:22 2008 -0400

    ACPI: drivers/acpi: elide a non-zero test on a result that is never 0
    
    The function thermal_cooling_device_register always returns either a valid
    pointer or a value made with ERR_PTR, so a test for non-zero on the result
    will always succeed.
    
    The problem was found using the following semantic match.
    (http://www.emn.fr/x-info/coccinelle/)
    
    //<smpl>
    @a@
    expression E, E1;
    statement S,S1;
    position p;
    @@
    
    E = thermal_cooling_device_register(...)
    ... when != E = E1
    if@p (E) S else S1
    
    @n@
    position a.p;
    expression E,E1;
    statement S,S1;
    @@
    
    E = NULL
    ... when != E = E1
    if@p (E) S else S1
    
    @depends on !n@
    expression E;
    statement S,S1;
    position a.p;
    @@
    
    * if@p (E)
      S else S1
    //</smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 86d9fc1293aa9456677eab94e9fd2d3a10920548
Merge: 08dcf29... 8e92b66... 33fd7af... 7642d21... 5c9fcb5...
Author: Len Brown <len.brown@intel.com>
Date:   Wed Mar 26 22:50:09 2008 -0400

    Merge branches 'release', 'idle', 'redhat-bugzilla-436589', 'sbs' and 'video' into release

commit 33fd7afd66ffdc6addf1b085fe6403b6af532f8e
Author: Len Brown <len.brown@intel.com>
Date:   Wed Mar 26 13:29:32 2008 -0400

    pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."
    
    We have been printing these messages at KERN_ERR since 2.6.24,
    per http://bugzilla.kernel.org/show_bug.cgi?id=9535
    
    But KERN_ERR pops up on a console booted with "quiet"
    and causes users to get alarmed and file bugs
    about the message itself:
    https://bugzilla.redhat.com/show_bug.cgi?id=436589
    
    So reduce the severity of these messages to
    KERN_WARNING, which is not printed by "quiet".
    
    This message will still be seen without "quiet",
    but a lot of messages are printed in that mode
    and it will be less likely to cause undue alarm.
    
    We could go all the way to KERN_DEBUG, but this
    is a real warning after all, so it seems prudent
    not to require "debug" to see it.
    
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 8e92b6605da989c0aa8ff7e33306f36f0efd957c
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Fri Feb 29 10:24:32 2008 -0800

    cpuidle: fix 100% C0 statistics regression
    
    commit 9b12e18cdc1553de62d931e73443c806347cd974
    'ACPI: cpuidle: Support C1 idle time accounting'
    was implicated in a 100% C0 idle regression.
    http://bugzilla.kernel.org/show_bug.cgi?id=10076
    
    It pointed out a potential problem where the menu governor
    may get confused by the C-state residency time from poll
    idle or C1 idle, where this timing info is not accurate.
    This inaccuracy is due to interrupts being handled
    before we account for C-state exit.
    
    Do not mark TIME_VALID for CO poll state.
    Mark C1 time as valid only with the MWAIT (CSTATE_FFH) entry method.
    
    This makes governors use the timing information only when it is correct and
    eliminates any wrong policy decisions that may result from invalid timing
    information.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 8b78cf602fd3bd97c0080edd22fe8fd5d0fa7832
Author: Yi Yang <yi.y.yang@intel.com>
Date:   Mon Feb 25 08:46:12 2008 +0800

    cpuidle: fix cpuidle time and usage overflow
    
    cpuidle C-state sysfs node time and usage are very easy to overflow because
    they are all of unsigned int type, time will overflow within about two hours,
    usage will take longer time to overflow, but they are increasing for ever.
    
    This patch will convert them to unsigned long long.
    
    Signed-off-by: Yi Yang <yi.y.yang@intel.com>
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 996520c1fdd2948addb629be56c9febf2967e02b
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Mon Mar 24 14:24:10 2008 -0700

    ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
    
    This original patch
    http://ussg.iu.edu/hypermail/linux/kernel/0712.2/1451.html
    was intending to add acpi_unlazy_tlb() to acpi_idle_enter_bm(),
    which is used for C3 entry.
    
    But it was merged incorrectly as commmit
    
    bde6f5f59c2b2b48a7a849c129d5b48838fe77ee
    'x86: voluntary leave_mm before entering ACPI C3'
    
    so the call was instead added to acpi_idle_enter_simple()
    (which is C2 entry routine), probably due to identical
    context in that function.
    
    Move the call back to acpi_idle_enter_bm().
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 5c9fcb5deef4d3a49798d76c48b726d2e3c7df72
Author: Zhang Rui <rui.zhang@intel.com>
Date:   Thu Mar 20 16:40:32 2008 +0800

    ACPI: fix a regression of ACPI device driver autoloading
    
    commit 3620f2f2f39e7870cf1a4fb2e34063a142f28716 sets the cid of
    ACPI video/dock/bay device and leaves the hid empty.
    As a result, "modalias" should export the cid for
    devices which don't have a hid.
    
    ACPI Video driver is not autoloaded with
    commit 3620f2f2f39e7870cf1a4fb2e34063a142f28716 applied.
    "cat /sys/.../device:03(acpi video bus)/modalias" shows nothing.
    
    ACPI Video driver is autoloaded after revert that commit.
    "cat /sys/.../LNXVIDEO:0x/modalias" shows "acpi:LNXVIDEO:"
    
    ACPI Video driver is autoloaded with commit
    3620f2f2f39e7870cf1a4fb2e34063a142f28716 and this patch applied.
    "cat /sys/.../device:03(acpi video bus)/modalias"
    shows "acpi:LNXVIDEO:"
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Acked-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

commit 7642d2113098f1270e9f9f0120f44d0035091636
Author: Alexey Starikovskiy <astarikovskiy@suse.de>
Date:   Thu Feb 28 19:17:39 2008 +0300

    ACPI: SBS: remove typo from sbchc.c
    
    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>