Skip to contentSkip to conversation

ACPI and power management fixes for v3.9-rc1

GIT PULL Superseded Rafael J. Wysocki 7 participants 16 messages Feb 24, 2013 – Mar 4, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from the git repository at

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm+acpi-fixes-3.9-rc1

to receive ACPI and power management fixes for v3.9-rc1 with top-most commit 4383822020c54c21eb2eb939a3233b44a51e8ca0

Merge branch 'acpi-pm' into fixes

on top of commit a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

The changes below fix problems introduced by the new ACPI and PM commits merged earlier and one older build issue.

Included are:

- Fixes for blackfin and microblaze build problems introduced by the removal of global pm_idle. From Lars-Peter Clausen.

- OPP core build fix from Shawn Guo.

- Error condition check fix for the new imx6q-cpufreq driver from Wei Yongjun.

- Fix for an AER driver crash related to the lack of APEI initialization for acpi=off. From yours truly.

- Fix for the USB breakage on Thinkpad T430 related to ACPI power resources and PCI wakeup reported by Dave and Fabio (you know about this one).

Thanks!

---------------

Lars-Peter Clausen (2):
blackfin idle: Fix compile error
microblaze idle: Fix compile error

Rafael J. Wysocki (2):
ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off ACPI / PM: Take unusual configurations of power resources into account

Shawn Guo (1):
PM / OPP: fix condition for empty of_init_opp_table()

Wei Yongjun (1):
imx6q-cpufreq: fix return value check in imx6q_cpufreq_probe()

---------------

 arch/blackfin/kernel/process.c   |    4 +-
 arch/microblaze/kernel/process.c |    5 +--
 drivers/acpi/apei/hest.c         |    5 +--
 drivers/acpi/internal.h          |    2 +-
 drivers/acpi/power.c             |  112 +++++++++++++++++++++++++++++++++++-----------
 drivers/acpi/scan.c              |    9 +++-
 drivers/cpufreq/imx6q-cpufreq.c  |    2 +-
 include/linux/opp.h              |   18 ++++----
 8 files changed, 107 insertions(+), 50 deletions(-)
Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
#1 lore raw

Hi Linus,

I wonder if this went unnoticed or there's anything wrong with it or it just needs to wait for some more time?

Rafael

Quoted 66 lines · Rafael J. Wysocki

Hi Linus,

Please pull from the git repository at

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm+acpi-fixes-3.9-rc1

to receive ACPI and power management fixes for v3.9-rc1 with top-most commit 4383822020c54c21eb2eb939a3233b44a51e8ca0

Merge branch 'acpi-pm' into fixes

on top of commit a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

The changes below fix problems introduced by the new ACPI and PM commits merged earlier and one older build issue.

Included are:

- Fixes for blackfin and microblaze build problems introduced by the removal of global pm_idle. From Lars-Peter Clausen.

- OPP core build fix from Shawn Guo.

- Error condition check fix for the new imx6q-cpufreq driver from Wei Yongjun.

- Fix for an AER driver crash related to the lack of APEI initialization for acpi=off. From yours truly.

- Fix for the USB breakage on Thinkpad T430 related to ACPI power resources and PCI wakeup reported by Dave and Fabio (you know about this one).

Thanks!

---------------

Lars-Peter Clausen (2):
blackfin idle: Fix compile error
microblaze idle: Fix compile error

Rafael J. Wysocki (2):
ACPI / APEI: Fix crash in apei_hest_parse() for acpi=off ACPI / PM: Take unusual configurations of power resources into account

Shawn Guo (1):
PM / OPP: fix condition for empty of_init_opp_table()

Wei Yongjun (1):
imx6q-cpufreq: fix return value check in imx6q_cpufreq_probe()

---------------

 arch/blackfin/kernel/process.c   |    4 +-
 arch/microblaze/kernel/process.c |    5 +--
 drivers/acpi/apei/hest.c         |    5 +--
 drivers/acpi/internal.h          |    2 +-
 drivers/acpi/power.c             |  112 +++++++++++++++++++++++++++++++++++-----------
 drivers/acpi/scan.c              |    9 +++-
 drivers/cpufreq/imx6q-cpufreq.c  |    2 +-
 include/linux/opp.h              |   18 ++++----
 8 files changed, 107 insertions(+), 50 deletions(-)
Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
#2 lore raw
Quoted 3 lines · Rafael J. Wysocki

I wonder if this went unnoticed or there's anything wrong with it or it just needs to wait for some more time?

Just going through things slowly. It's merged in my tree now.

Oh, and a request: _please_ don't use unknown TLA's like OPP. This has become a huge problem, to the point that we have a "Documentation/power/opp.txt" file THAT NEVER CLEARLY STATES WHAT THE F*CK OPP ACTUALLY MEANS! What nice "documentation".

Ok, I can look up things like this and find that it is "Operating Performance Points". At least in this context. But no, it's not some kind of generic standard, and no, it's not something people should be expected to know in general. Please stop doing "explanations" of things that use TLA's like this. And people shouldn't have to even wonder.

Linus

#3 lore raw
Quoted 6 lines · Linus Torvalds
Quoted 3 lines · Rafael J. Wysocki

I wonder if this went unnoticed or there's anything wrong with it or it just needs to wait for some more time?

Just going through things slowly. It's merged in my tree now.

Thanks!

Quoted 1 line

Oh, and a request: _please_ don't use unknown TLA's like OPP.

Sure, sorry about that.

Quoted 3 lines

This has become a huge problem, to the point that we have a "Documentation/power/opp.txt" file THAT NEVER CLEARLY STATES WHAT THE F*CK OPP ACTUALLY MEANS! What nice "documentation".

It says that in "Introduction", but it would be clearer if the title of the doc was something like "Operating Performance Points (OPP) Library". Nishanth?

Quoted 6 lines

Ok, I can look up things like this and find that it is "Operating Performance Points". At least in this context. But no, it's not some kind of generic standard, and no, it's not something people should be expected to know in general. Please stop doing "explanations" of things that use TLA's like this. And people shouldn't have to even wonder.

I agree.

Rafael

Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
#4 lore raw
Quoted 2 lines · Rafael J. Wysocki
Quoted 1 line · Linus Torvalds

On Mon, Feb 25, 2013 at 7:17 PM, Rafael J. Wysocki <[email protected]> wrote:

[..]

Quoted 7 lines
Quoted 4 lines

This has become a huge problem, to the point that we have a "Documentation/power/opp.txt" file THAT NEVER CLEARLY STATES WHAT THE F*CK OPP ACTUALLY MEANS! What nice "documentation".

It says that in "Introduction", but it would be clearer if the title of the doc was something like "Operating Performance Points (OPP) Library". Nishanth?

Yes indeed. Will the following help? I can post it as an official patch if the direction is proper.

Documentation/power/opp.txt +13 -1
index 3035d00..4a17443 100644
@@ -1,5 +1,5 @@
 *=============*
-* OPP Library *
+* Operating Performance Points (OPP) Library *
 *=============*
 
 (C) 2009-2010 Nishanth Menon <[email protected]>, Texas Instruments Incorporated
@@ -16,6 +16,8 @@ Contents
 
 1. Introduction
 ===============
+1.1 What is an Operating Performance Point (OPP)?
+
 Complex SoCs of today consists of a multiple sub-modules working in conjunction.
 In an operational system executing varied use cases, not all modules in the SoC
 need to function at their highest performing frequency all the time. To
@@ -25,6 +27,16 @@ more. The set of discrete tuples consisting of frequency and voltage pairs that
 the device will support per domain are called Operating Performance Points or
 OPPs.
 
+As an example:
+MPU device supports {300MHz at minimum voltage of 1V}, {800MHz at minimum
+voltage of 1.2V}, {1GHz at minimum voltage of 1.3V}
+We can represent these as three OPPs
+{300000, 1000000}
+{800000, 1200000}
+{1000000, 1300000}
+
+1.2 Operating Performance Points Library
+
 OPP library provides a set of helper functions to organize and query the OPP
 information. The library is located in drivers/base/power/opp.c and the header
 is located in include/linux/opp.h. OPP library can be enabled by enabling
Signature · 2 lines
Regards,
Nishanth Menon
#5 lore raw
Quoted 7 lines · Nishanth Menon
Quoted 3 lines · Rafael J. Wysocki

It says that in "Introduction", but it would be clearer if the title of the doc was something like "Operating Performance Points (OPP) Library". Nishanth?

Yes indeed. Will the following help? I can post it as an official patch if the direction is proper

Yes, this will definitely help. I didn't even find it in the introduction (Rafael is correct that it is indeed there), because it's hard to see when you don't know what to scan for and it's in a big block of text.

I am also happy to note that it is in the Kconfig help and single-line description. Which wasn't true for the new SATA_ZPODD ("Zero Power ODD" - what the heck is ODD?) which was another new entry I wondered about.

It turns out that ODD is an odd TLA for "Optical Disk Drive". I'm sure it makes perfect sense if you are a SATA person, but it sure doesn't for any normal human being, even otherwise highly technical ones.

Aaron, Tejun, Jeff, can I ask you to also not use specialized TLA's without explaining them? Especially in help text and "documentation", it's very unhelpful to have TLA's that aren't common.

We don't have to explain *all* TLA's, since there's a lot that really are rather widespread. But there's a big difference between something like CPU or TLB that have been in generic literature for decades, wrt OPP and ODD that are specialized terms used inside a very particular group and haven't been around for very long either.

Linus

#6 lore raw

Ugh. Forgot to actually add the ODD people to the list...

Linus

Quoted 34 lines · Linus Torvalds
Quoted 7 lines · Nishanth Menon
Quoted 3 lines · Rafael J. Wysocki

It says that in "Introduction", but it would be clearer if the title of the doc was something like "Operating Performance Points (OPP) Library". Nishanth?

Yes indeed. Will the following help? I can post it as an official patch if the direction is proper

Yes, this will definitely help. I didn't even find it in the introduction (Rafael is correct that it is indeed there), because it's hard to see when you don't know what to scan for and it's in a big block of text.

I am also happy to note that it is in the Kconfig help and single-line description. Which wasn't true for the new SATA_ZPODD ("Zero Power ODD" - what the heck is ODD?) which was another new entry I wondered about.

It turns out that ODD is an odd TLA for "Optical Disk Drive". I'm sure it makes perfect sense if you are a SATA person, but it sure doesn't for any normal human being, even otherwise highly technical ones.

Aaron, Tejun, Jeff, can I ask you to also not use specialized TLA's without explaining them? Especially in help text and "documentation", it's very unhelpful to have TLA's that aren't common.

We don't have to explain *all* TLA's, since there's a lot that really are rather widespread. But there's a big difference between something like CPU or TLB that have been in generic literature for decades, wrt OPP and ODD that are specialized terms used inside a very particular group and haven't been around for very long either.

Linus

#7 lore raw
Quoted 9 lines · Linus Torvalds
Quoted 9 lines

Aaron, Tejun, Jeff, can I ask you to also not use specialized TLA's without explaining them? Especially in help text and "documentation", it's very unhelpful to have TLA's that aren't common.

We don't have to explain *all* TLA's, since there's a lot that really are rather widespread. But there's a big difference between something like CPU or TLB that have been in generic literature for decades, wrt OPP and ODD that are specialized terms used inside a very particular group and haven't been around for very long either.

Aye aye, captain.

One interesting bit, for me (and possibly Aaron too), ODD is much more closer to an everyday term. For some reason, at least in Korea, ODD is a popular term. For exmple, the likes of newegg would use it along with CPU, SSD or VGA to label product categories, so that probably is why ODD never registered as something which needed explanation, and that we all are pretty familiar with ATA jargons. Anyways, yeah, no ODDs without expansion nearby.

Thanks.

Signature · 1 line
tejun
#8 lore raw
Quoted 5 lines · Tejun Heo

One interesting bit, for me (and possibly Aaron too), ODD is much more closer to an everyday term. For some reason, at least in Korea, ODD is a popular term. For exmple, the likes of newegg would use it along with CPU, SSD or VGA to label product categories

Just checked newegg in the US. If you look for "ODD" here, you get a very odd response.

For example,

Fairly Odd Parents By Nickelodeon Bubble Bath 7 Oz Model #: 692237016543

shows up fairly high. Not an actual optican disk drive in sight, but there are DVD's and "ODD bay"s there.

Searching for "optical disk drive" works. But then I never see anything called "ODD" anywhere. I did find it in the "Technical Specifications" for one of the drives, though.

Anyway, in the US it is definitely not a common term for normal people.

Linus

#9 lore raw
Quoted 1 line · Linus Torvalds

Anyway, in the US it is definitely not a common term for normal people.

Googling "odd" doesn't give anything on optical drives on the first page. On the other hand, >70% is about optical drives on naver.com. The discrepancy is funny given that most computer terms in Korea come from US. Maybe it's because the character combination "odd" doesn't have any other meaning. Even then, I'm surprised there's no optical drive result at all in the first page of google search. Definitely doesn't seem like a common term in US.

Signature · 1 line
tejun
#10 lore raw
Quoted 10 lines · Tejun Heo
Quoted 1 line · Linus Torvalds

Anyway, in the US it is definitely not a common term for normal people.

Googling "odd" doesn't give anything on optical drives on the first page. On the other hand, >70% is about optical drives on naver.com. The discrepancy is funny given that most computer terms in Korea come from US. Maybe it's because the character combination "odd" doesn't have any other meaning. Even then, I'm surprised there's no optical drive result at all in the first page of google search. Definitely doesn't seem like a common term in US.

There is just a lot more "odd" goings-on in the US. Korea is simply less odd than the US :)

Will send a patch to fix...

Jeff

#11 lore raw

PATCH 1/1 Avoid specialized TLA's in ZPODD's Kconfig

ODD is not a common TLA for non-ATA people so they will get confused by its meaning when they are configuring the kernel. This patch fixed this problem by using ODD only after stating what it is.

---
 drivers/ata/Kconfig | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/ata/Kconfig +7 -6
index 3e751b7..d7d210e 100644
@@ -59,15 +59,16 @@ config ATA_ACPI
 	  option libata.noacpi=1
 
 config SATA_ZPODD
-	bool "SATA Zero Power ODD Support"
+	bool "SATA Zero Power Optical Disc Drive(ZPODD) support"
 	depends on ATA_ACPI
 	default n
 	help
-	  This option adds support for SATA ZPODD. It requires both
-	  ODD and the platform support, and if enabled, will automatically
-	  power on/off the ODD when certain condition is satisfied. This
-	  does not impact user's experience of the ODD, only power is saved
-	  when ODD is not in use(i.e. no disc inside).
+	  This option adds support for SATA Zero Power Optical Disc
+	  Drive(ZPODD). It requires both the ODD and the platform
+	  support, and if enabled, will automatically power on/off the
+	  ODD when certain condition is satisfied. This does not impact
+	  end user's experience of the ODD, only power is saved when
+	  the ODD is not in use(i.e. no disc inside).
 
 	  If unsure, say N.
 
Signature · 1 line
1.8.1.2
#12 lore raw

Re: [PATCH] [libata] Avoid specialized TLA's in ZPODD's Kconfig

Hello.

Quoted 14 lines · Aaron Lu

ODD is not a common TLA for non-ATA people so they will get confused by its meaning when they are configuring the kernel. This patch fixed this problem by using ODD only after stating what it is.

---
  drivers/ata/Kconfig | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
drivers/ata/Kconfig +0 -0
index 3e751b7..d7d210e 100644

drivers/ata/Kconfig config ATA_ACPI · line 62

Quoted 5 lines
drivers/ata/Kconfig +1 -1
@@ -59,15 +59,16 @@ config ATA_ACPI
  	  option libata.noacpi=1
 
  config SATA_ZPODD
-	bool "SATA Zero Power ODD Support"
+	bool "SATA Zero Power Optical Disc Drive(ZPODD) support"

Need a space before open paren.

drivers/ata/Kconfig config ATA_ACPI · line 67

Quoted 10 lines
drivers/ata/Kconfig +2 -5
  	depends on ATA_ACPI
  	default n
  	help
-	  This option adds support for SATA ZPODD. It requires both
-	  ODD and the platform support, and if enabled, will automatically
-	  power on/off the ODD when certain condition is satisfied. This
-	  does not impact user's experience of the ODD, only power is saved
-	  when ODD is not in use(i.e. no disc inside).
+	  This option adds support for SATA Zero Power Optical Disc
+	  Drive(ZPODD). It requires both the ODD and the platform

Same here.

drivers/ata/Kconfig config ATA_ACPI · line 71

Quoted 4 lines
drivers/ata/Kconfig +4 -0
+	  support, and if enabled, will automatically power on/off the
+	  ODD when certain condition is satisfied. This does not impact
+	  end user's experience of the ODD, only power is saved when
+	  the ODD is not in use(i.e. no disc inside).

And here.

MBR, Sergei

#13 lore raw

PATCH v2 1/1 Avoid specialized TLA's in ZPODD's Kconfig

ODD is not a common TLA for non-ATA people so they will get confused by its meaning when they are configuring the kernel. This patch fixed this problem by using ODD only after stating what it is.

---
v2:
Add a space before open paren as suggested by Sergei Shtylyov.

 drivers/ata/Kconfig | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/ata/Kconfig +7 -6
index 3e751b7..a5a3ebc 100644
@@ -59,15 +59,16 @@ config ATA_ACPI
 	  option libata.noacpi=1
 
 config SATA_ZPODD
-	bool "SATA Zero Power ODD Support"
+	bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
 	depends on ATA_ACPI
 	default n
 	help
-	  This option adds support for SATA ZPODD. It requires both
-	  ODD and the platform support, and if enabled, will automatically
-	  power on/off the ODD when certain condition is satisfied. This
-	  does not impact user's experience of the ODD, only power is saved
-	  when ODD is not in use(i.e. no disc inside).
+	  This option adds support for SATA Zero Power Optical Disc
+	  Drive (ZPODD). It requires both the ODD and the platform
+	  support, and if enabled, will automatically power on/off the
+	  ODD when certain condition is satisfied. This does not impact
+	  end user's experience of the ODD, only power is saved when
+	  the ODD is not in use (i.e. no disc inside).
 
 	  If unsure, say N.
 
Signature · 1 line
1.8.1.2
Applied
#14 lore raw

Re: [PATCH v2] [libata] Avoid specialized TLA's in ZPODD's Kconfig

Quoted 11 lines · Aaron Lu

ODD is not a common TLA for non-ATA people so they will get confused by its meaning when they are configuring the kernel. This patch fixed this problem by using ODD only after stating what it is.

---
v2:
Add a space before open paren as suggested by Sergei Shtylyov.

  drivers/ata/Kconfig | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)

applied

#15 lore raw
In reply to Linus Torvalds
Quoted 24 lines · Linus Torvalds

Ugh. Forgot to actually add the ODD people to the list...

Linus

Quoted 18 lines · Linus Torvalds
Quoted 7 lines · Nishanth Menon
Quoted 3 lines · Rafael J. Wysocki

It says that in "Introduction", but it would be clearer if the title of the doc was something like "Operating Performance Points (OPP) Library". Nishanth?

Yes indeed. Will the following help? I can post it as an official patch if the direction is proper

Yes, this will definitely help. I didn't even find it in the introduction (Rafael is correct that it is indeed there), because it's hard to see when you don't know what to scan for and it's in a big block of text.

I am also happy to note that it is in the Kconfig help and single-line description. Which wasn't true for the new SATA_ZPODD ("Zero Power ODD" - what the heck is ODD?) which was another new entry I wondered about.

Sorry about this.

Quoted 8 lines
Quoted 8 lines

It turns out that ODD is an odd TLA for "Optical Disk Drive". I'm sure it makes perfect sense if you are a SATA person, but it sure doesn't for any normal human being, even otherwise highly technical ones.

Aaron, Tejun, Jeff, can I ask you to also not use specialized TLA's without explaining them? Especially in help text and "documentation", it's very unhelpful to have TLA's that aren't common.

OK.
I hope the following is better, if so, I'll send out a patch.

drivers/ata/Kconfig +7 -6
index 9b58d32..b75efb0b 100644
@@ -59,15 +59,16 @@ config ATA_ACPI
 	  option libata.noacpi=1
 
 config SATA_ZPODD
-	bool "SATA Zero Power ODD Support"
+	bool "SATA Zero Power Optical Disc Drive(ZPODD) support"
 	depends on ATA_ACPI
 	default n
 	help
-	  This option adds support for SATA ZPODD. It requires both
-	  ODD and the platform support, and if enabled, will automatically
-	  power on/off the ODD when certain condition is satisfied. This
-	  does not impact user's experience of the ODD, only power is saved
-	  when ODD is not in use(i.e. no disc inside).
+	  This option adds support for SATA Zero Power Optical Disc
+	  Drive(ZPODD). It requires both the ODD and the platform
+	  support, and if enabled, will automatically power on/off the
+	  ODD when certain condition is satisfied. This does not impact
+	  end user's experience of the ODD, only power is saved when
+	  the ODD is not in use(i.e. no disc inside).
 
 	  If unsure, say N.
 

Thanks,
Aaron