* [PATCH 2/6] ACPI: fix Medion _PRT quirk (use "ISA_", not "ISA")
2008-03-26 5:13 ` [PATCH 1/6] ACPI: SBS: remove typo from sbchc.c Len Brown
@ 2008-03-26 5:13 ` Len Brown
2008-03-26 21:20 ` Rafael J. Wysocki
2008-03-26 5:13 ` [PATCH 3/6] ACPI: fix a regression of ACPI device driver autoloading Len Brown
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Len Brown @ 2008-03-26 5:13 UTC (permalink / raw)
To: linux-acpi
Cc: Bjorn Helgaas, Johann-Nikolaus Andreae, Andrew Morton, 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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/6] ACPI: fix Medion _PRT quirk (use "ISA_", not "ISA")
2008-03-26 5:13 ` [PATCH 2/6] ACPI: fix Medion _PRT quirk (use "ISA_", not "ISA") Len Brown
@ 2008-03-26 21:20 ` Rafael J. Wysocki
0 siblings, 0 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2008-03-26 21:20 UTC (permalink / raw)
To: Len Brown
Cc: linux-acpi, Bjorn Helgaas, Johann-Nikolaus Andreae, Andrew Morton,
Len Brown
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/6] ACPI: fix a regression of ACPI device driver autoloading
2008-03-26 5:13 ` [PATCH 1/6] ACPI: SBS: remove typo from sbchc.c Len Brown
2008-03-26 5:13 ` [PATCH 2/6] ACPI: fix Medion _PRT quirk (use "ISA_", not "ISA") Len Brown
@ 2008-03-26 5:13 ` Len Brown
2008-03-26 5:13 ` [PATCH 4/6] ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry Len Brown
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Len Brown @ 2008-03-26 5:13 UTC (permalink / raw)
To: linux-acpi; +Cc: Zhang Rui, 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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/6] ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
2008-03-26 5:13 ` [PATCH 1/6] ACPI: SBS: remove typo from sbchc.c Len Brown
2008-03-26 5:13 ` [PATCH 2/6] ACPI: fix Medion _PRT quirk (use "ISA_", not "ISA") Len Brown
2008-03-26 5:13 ` [PATCH 3/6] ACPI: fix a regression of ACPI device driver autoloading Len Brown
@ 2008-03-26 5:13 ` Len Brown
2008-03-26 5:13 ` [PATCH 5/6] cpuidle: fix cpuidle time and usage overflow Len Brown
2008-03-26 5:13 ` [PATCH 6/6] cpuidle: fix 100% C0 statistics regression Len Brown
4 siblings, 0 replies; 9+ messages in thread
From: Len Brown @ 2008-03-26 5:13 UTC (permalink / raw)
To: linux-acpi; +Cc: Venki Pallipadi, 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/6] cpuidle: fix cpuidle time and usage overflow
2008-03-26 5:13 ` [PATCH 1/6] ACPI: SBS: remove typo from sbchc.c Len Brown
` (2 preceding siblings ...)
2008-03-26 5:13 ` [PATCH 4/6] ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry Len Brown
@ 2008-03-26 5:13 ` Len Brown
2008-03-26 5:13 ` [PATCH 6/6] cpuidle: fix 100% C0 statistics regression Len Brown
4 siblings, 0 replies; 9+ messages in thread
From: Len Brown @ 2008-03-26 5:13 UTC (permalink / raw)
To: linux-acpi; +Cc: Yi Yang, 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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6] cpuidle: fix 100% C0 statistics regression
2008-03-26 5:13 ` [PATCH 1/6] ACPI: SBS: remove typo from sbchc.c Len Brown
` (3 preceding siblings ...)
2008-03-26 5:13 ` [PATCH 5/6] cpuidle: fix cpuidle time and usage overflow Len Brown
@ 2008-03-26 5:13 ` Len Brown
4 siblings, 0 replies; 9+ messages in thread
From: Len Brown @ 2008-03-26 5:13 UTC (permalink / raw)
To: linux-acpi; +Cc: Venki Pallipadi, 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
^ permalink raw reply related [flat|nested] 9+ messages in thread