From: Jean Pihet <jean.pihet@newoldbits.com>
To: linux-omap@vger.kernel.org, paul@pwsan.com,
linux-arm-kernel@lists.infradead.org, khilman@ti.com,
Rajendra Nayak <rnayak@ti.com>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
Nishanth Menon <nm@ti.com>
Subject: [PATCH 7/8] ARM: OMAP2+: powerdomain: add error logs
Date: Wed, 15 Aug 2012 12:02:47 +0200 [thread overview]
Message-ID: <1345024968-28951-8-git-send-email-j-pihet@ti.com> (raw)
In-Reply-To: <1345024968-28951-1-git-send-email-j-pihet@ti.com>
From: Nishanth Menon <nm@ti.com>
Silent failure makes debug hard. So, provide rate limited error
messages in functional and oft-used code to prevent spam
when something goes wrong..
Signed-off-by: Nishanth Menon <nm@ti.com>
---
arch/arm/mach-omap2/powerdomain.c | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 06a566b..691247e 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -19,6 +19,7 @@
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/string.h>
+#include <linux/ratelimit.h>
#include <trace/events/power.h>
#include "cm2xxx_3xxx.h"
@@ -146,8 +147,12 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
int prev, next, state, trace_state;
- if (pwrdm == NULL)
+ if (pwrdm == NULL) {
+ WARN_ONCE(1, "null pwrdm\n");
+ pr_err_ratelimited("%s: powerdomain: null pwrdm param\n",
+ __func__);
return -EINVAL;
+ }
state = pwrdm_read_fpwrst(pwrdm);
@@ -174,6 +179,8 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
}
break;
default:
+ pr_err_ratelimited("%s: powerdomain %s: bad flag %d\n",
+ __func__, pwrdm->name, flag);
return -EINVAL;
}
@@ -690,7 +697,8 @@ int pwrdm_set_next_fpwrst(struct powerdomain *pwrdm,
unsigned long flags;
if (!pwrdm || IS_ERR(pwrdm)) {
- pr_debug("%s: invalid params: pwrdm=%p\n", __func__, pwrdm);
+ pr_err_ratelimited("%s: invalid params: pwrdm=%p\n",
+ __func__, pwrdm);
return -EINVAL;
}
@@ -775,8 +783,11 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (!(pwrdm->pwrsts & (1 << pwrst)))
+ if (!(pwrdm->pwrsts & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bad pwrst %d\n",
+ __func__, pwrdm->name, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next powerstate for %s to %0x\n",
pwrdm->name, pwrst);
@@ -924,8 +935,11 @@ int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (!(pwrdm->pwrsts_logic_ret & (1 << pwrst)))
+ if (!(pwrdm->pwrsts_logic_ret & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bad pwrst %d\n",
+ __func__, pwrdm->name, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next logic powerstate for %s to %0x\n",
pwrdm->name, pwrst);
@@ -958,11 +972,17 @@ int pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return -EEXIST;
+ }
- if (!(pwrdm->pwrsts_mem_on[bank] & (1 << pwrst)))
+ if (!(pwrdm->pwrsts_mem_on[bank] & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bank %d bad pwrst %d\n",
+ __func__, pwrdm->name, bank, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next memory powerstate for domain %s "
"bank %0x while pwrdm-ON to %0x\n", pwrdm->name, bank, pwrst);
@@ -996,11 +1016,17 @@ int pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return -EEXIST;
+ }
- if (!(pwrdm->pwrsts_mem_ret[bank] & (1 << pwrst)))
+ if (!(pwrdm->pwrsts_mem_ret[bank] & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bank %d bad pwrst %d\n",
+ __func__, pwrdm->name, bank, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next memory powerstate for domain %s "
"bank %0x while pwrdm-RET to %0x\n", pwrdm->name, bank, pwrst);
@@ -1092,8 +1118,11 @@ int pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
if (!pwrdm)
return ret;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return ret;
+ }
if (pwrdm->flags & PWRDM_HAS_MPU_QUIRK)
bank = 1;
@@ -1122,8 +1151,11 @@ int pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
if (!pwrdm)
return ret;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return ret;
+ }
if (pwrdm->flags & PWRDM_HAS_MPU_QUIRK)
bank = 1;
@@ -1151,8 +1183,11 @@ int pwrdm_read_mem_retst(struct powerdomain *pwrdm, u8 bank)
if (!pwrdm)
return ret;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return ret;
+ }
if (arch_pwrdm && arch_pwrdm->pwrdm_read_mem_retst)
ret = arch_pwrdm->pwrdm_read_mem_retst(pwrdm, bank);
@@ -1208,8 +1243,11 @@ int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm)
if (!pwrdm)
return ret;
- if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR))
+ if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR)) {
+ pr_err_ratelimited("%s: powerdomain %s: no HDSAR in flag %d\n",
+ __func__, pwrdm->name, pwrdm->flags);
return ret;
+ }
pr_debug("powerdomain: %s: setting SAVEANDRESTORE bit\n",
pwrdm->name);
@@ -1238,8 +1276,11 @@ int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm)
if (!pwrdm)
return ret;
- if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR))
+ if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR)) {
+ pr_err_ratelimited("%s: powerdomain %s: no HDSAR in flag %d\n",
+ __func__, pwrdm->name, pwrdm->flags);
return ret;
+ }
pr_debug("powerdomain: %s: clearing SAVEANDRESTORE bit\n",
pwrdm->name);
@@ -1279,8 +1320,11 @@ int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)
if (!pwrdm)
return -EINVAL;
- if (!(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE))
+ if (!(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) {
+ pr_err_ratelimited("%s: powerdomain %s:no lowpwrch in flag%d\n",
+ __func__, pwrdm->name, pwrdm->flags);
return -EINVAL;
+ }
pr_debug("powerdomain: %s: setting LOWPOWERSTATECHANGE bit\n",
pwrdm->name);
--
1.7.7.6
WARNING: multiple messages have this Message-ID (diff)
From: jean.pihet@newoldbits.com (Jean Pihet)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/8] ARM: OMAP2+: powerdomain: add error logs
Date: Wed, 15 Aug 2012 12:02:47 +0200 [thread overview]
Message-ID: <1345024968-28951-8-git-send-email-j-pihet@ti.com> (raw)
In-Reply-To: <1345024968-28951-1-git-send-email-j-pihet@ti.com>
From: Nishanth Menon <nm@ti.com>
Silent failure makes debug hard. So, provide rate limited error
messages in functional and oft-used code to prevent spam
when something goes wrong..
Signed-off-by: Nishanth Menon <nm@ti.com>
---
arch/arm/mach-omap2/powerdomain.c | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 06a566b..691247e 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -19,6 +19,7 @@
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/string.h>
+#include <linux/ratelimit.h>
#include <trace/events/power.h>
#include "cm2xxx_3xxx.h"
@@ -146,8 +147,12 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
int prev, next, state, trace_state;
- if (pwrdm == NULL)
+ if (pwrdm == NULL) {
+ WARN_ONCE(1, "null pwrdm\n");
+ pr_err_ratelimited("%s: powerdomain: null pwrdm param\n",
+ __func__);
return -EINVAL;
+ }
state = pwrdm_read_fpwrst(pwrdm);
@@ -174,6 +179,8 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
}
break;
default:
+ pr_err_ratelimited("%s: powerdomain %s: bad flag %d\n",
+ __func__, pwrdm->name, flag);
return -EINVAL;
}
@@ -690,7 +697,8 @@ int pwrdm_set_next_fpwrst(struct powerdomain *pwrdm,
unsigned long flags;
if (!pwrdm || IS_ERR(pwrdm)) {
- pr_debug("%s: invalid params: pwrdm=%p\n", __func__, pwrdm);
+ pr_err_ratelimited("%s: invalid params: pwrdm=%p\n",
+ __func__, pwrdm);
return -EINVAL;
}
@@ -775,8 +783,11 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (!(pwrdm->pwrsts & (1 << pwrst)))
+ if (!(pwrdm->pwrsts & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bad pwrst %d\n",
+ __func__, pwrdm->name, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next powerstate for %s to %0x\n",
pwrdm->name, pwrst);
@@ -924,8 +935,11 @@ int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (!(pwrdm->pwrsts_logic_ret & (1 << pwrst)))
+ if (!(pwrdm->pwrsts_logic_ret & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bad pwrst %d\n",
+ __func__, pwrdm->name, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next logic powerstate for %s to %0x\n",
pwrdm->name, pwrst);
@@ -958,11 +972,17 @@ int pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return -EEXIST;
+ }
- if (!(pwrdm->pwrsts_mem_on[bank] & (1 << pwrst)))
+ if (!(pwrdm->pwrsts_mem_on[bank] & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bank %d bad pwrst %d\n",
+ __func__, pwrdm->name, bank, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next memory powerstate for domain %s "
"bank %0x while pwrdm-ON to %0x\n", pwrdm->name, bank, pwrst);
@@ -996,11 +1016,17 @@ int pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)
if (!pwrdm)
return -EINVAL;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return -EEXIST;
+ }
- if (!(pwrdm->pwrsts_mem_ret[bank] & (1 << pwrst)))
+ if (!(pwrdm->pwrsts_mem_ret[bank] & (1 << pwrst))) {
+ pr_err_ratelimited("%s: powerdomain %s: bank %d bad pwrst %d\n",
+ __func__, pwrdm->name, bank, pwrst);
return -EINVAL;
+ }
pr_debug("powerdomain: setting next memory powerstate for domain %s "
"bank %0x while pwrdm-RET to %0x\n", pwrdm->name, bank, pwrst);
@@ -1092,8 +1118,11 @@ int pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
if (!pwrdm)
return ret;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return ret;
+ }
if (pwrdm->flags & PWRDM_HAS_MPU_QUIRK)
bank = 1;
@@ -1122,8 +1151,11 @@ int pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank)
if (!pwrdm)
return ret;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return ret;
+ }
if (pwrdm->flags & PWRDM_HAS_MPU_QUIRK)
bank = 1;
@@ -1151,8 +1183,11 @@ int pwrdm_read_mem_retst(struct powerdomain *pwrdm, u8 bank)
if (!pwrdm)
return ret;
- if (pwrdm->banks < (bank + 1))
+ if (pwrdm->banks < (bank + 1)) {
+ pr_err_ratelimited("%s: powerdomain %s: bad bank %d\n",
+ __func__, pwrdm->name, bank);
return ret;
+ }
if (arch_pwrdm && arch_pwrdm->pwrdm_read_mem_retst)
ret = arch_pwrdm->pwrdm_read_mem_retst(pwrdm, bank);
@@ -1208,8 +1243,11 @@ int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm)
if (!pwrdm)
return ret;
- if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR))
+ if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR)) {
+ pr_err_ratelimited("%s: powerdomain %s: no HDSAR in flag %d\n",
+ __func__, pwrdm->name, pwrdm->flags);
return ret;
+ }
pr_debug("powerdomain: %s: setting SAVEANDRESTORE bit\n",
pwrdm->name);
@@ -1238,8 +1276,11 @@ int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm)
if (!pwrdm)
return ret;
- if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR))
+ if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR)) {
+ pr_err_ratelimited("%s: powerdomain %s: no HDSAR in flag %d\n",
+ __func__, pwrdm->name, pwrdm->flags);
return ret;
+ }
pr_debug("powerdomain: %s: clearing SAVEANDRESTORE bit\n",
pwrdm->name);
@@ -1279,8 +1320,11 @@ int pwrdm_set_lowpwrstchange(struct powerdomain *pwrdm)
if (!pwrdm)
return -EINVAL;
- if (!(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE))
+ if (!(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) {
+ pr_err_ratelimited("%s: powerdomain %s:no lowpwrch in flag%d\n",
+ __func__, pwrdm->name, pwrdm->flags);
return -EINVAL;
+ }
pr_debug("powerdomain: %s: setting LOWPOWERSTATECHANGE bit\n",
pwrdm->name);
--
1.7.7.6
next prev parent reply other threads:[~2012-08-15 10:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-15 10:02 [PATCH v5 0/8] ARM: OMAP2+: PM: introduce the power domains functional states Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 10:02 ` [PATCH 1/8] ARM: OMAP2+: PM: introduce " Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 10:02 ` [PATCH 2/8] ARM: OMAP2+: PM: introduce power domains achievable " Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 10:02 ` [PATCH 3/8] ARM: OMAP2+: PM: add a lock to protect the powerdomains next state Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 10:02 ` [PATCH 4/8] ARM: OMAP2+: PM: use the functional power states API Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 10:02 ` [PATCH 5/8] ARM: OMAP2+: PM: use power domain functional state in stats counters Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 10:02 ` [PATCH 6/8] ARM: OMAP2+: PM debug: trace the functional power domains states Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 10:02 ` Jean Pihet [this message]
2012-08-15 10:02 ` [PATCH 7/8] ARM: OMAP2+: powerdomain: add error logs Jean Pihet
2012-08-15 10:02 ` [PATCH 8/8] ARM: OMAP2+: PM: reorganize the powerdomain API in public and private parts Jean Pihet
2012-08-15 10:02 ` Jean Pihet
2012-08-15 17:05 ` [PATCH v5 0/8] ARM: OMAP2+: PM: introduce the power domains functional states Shilimkar, Santosh
2012-08-15 17:05 ` Shilimkar, Santosh
2012-08-16 0:48 ` Paul Walmsley
2012-08-16 0:48 ` Paul Walmsley
2012-08-16 5:50 ` Shilimkar, Santosh
2012-08-16 5:50 ` Shilimkar, Santosh
2012-09-10 15:09 ` Tero Kristo
2012-09-10 15:09 ` Tero Kristo
2012-09-11 7:50 ` Pihet-XID, Jean
2012-09-11 7:50 ` Pihet-XID, Jean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345024968-28951-8-git-send-email-j-pihet@ti.com \
--to=jean.pihet@newoldbits.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=paul@pwsan.com \
--cc=rnayak@ti.com \
--cc=santosh.shilimkar@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.