From: jean.pihet@newoldbits.com (Jean Pihet)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/19] ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
Date: Tue, 31 Jan 2012 10:58:19 +0100 [thread overview]
Message-ID: <1328003912-11709-7-git-send-email-j-pihet@ti.com> (raw)
In-Reply-To: <1328003912-11709-1-git-send-email-j-pihet@ti.com>
From: Nishanth Menon <nm@ti.com>
ERRCONFIG register has status bits that were intended not to
be destroyed by bad modification. We cleanup and simplify the
handling the status in the modify path.
Reported-by: Vincent Bour <v-bour@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Jean Pihet <j-pihet@ti.com>
---
arch/arm/mach-omap2/smartreflex.c | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index f384c19..ba6ad09 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -74,10 +74,6 @@ static inline void sr_modify_reg(struct omap_sr *sr, unsigned offset, u32 mask,
u32 value)
{
u32 reg_val;
- u32 errconfig_offs = 0, errconfig_mask = 0;
-
- reg_val = __raw_readl(sr->base + offset);
- reg_val &= ~mask;
/*
* Smartreflex error config register is special as it contains
@@ -88,16 +84,15 @@ static inline void sr_modify_reg(struct omap_sr *sr, unsigned offset, u32 mask,
* if they are currently set, but does allow the caller to write
* those bits.
*/
- if (sr->ip_type == SR_TYPE_V1) {
- errconfig_offs = ERRCONFIG_V1;
- errconfig_mask = ERRCONFIG_STATUS_V1_MASK;
- } else if (sr->ip_type == SR_TYPE_V2) {
- errconfig_offs = ERRCONFIG_V2;
- errconfig_mask = ERRCONFIG_VPBOUNDINTST_V2;
- }
+ if (sr->ip_type == SR_TYPE_V1 && offset == ERRCONFIG_V1)
+ mask |= ERRCONFIG_STATUS_V1_MASK;
+ else if (sr->ip_type == SR_TYPE_V2 && offset == ERRCONFIG_V2)
+ mask |= ERRCONFIG_VPBOUNDINTST_V2;
+
+ reg_val = __raw_readl(sr->base + offset);
+ reg_val &= ~mask;
- if (offset == errconfig_offs)
- reg_val &= ~errconfig_mask;
+ value &= mask;
reg_val |= value;
--
1.7.5.4
next prev parent reply other threads:[~2012-01-31 9:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 9:58 [PATCH v2 00/19] ARM: OMAP3+: SmartReflex: bugfixes Jean Pihet
2012-01-31 9:58 ` [PATCH 01/19] ARM: OMAP3+: SmartReflex: Layer Cleanup [V4] Jean Pihet
2012-01-31 9:58 ` [PATCH 02/19] ARM: OMAP3+: SmartReflex: add missing error-handling code Jean Pihet
2012-01-31 9:58 ` [PATCH 03/19] ARM: OMAP3+: SmartReflex: fix err interrupt disable sequence Jean Pihet
2012-01-31 9:58 ` [PATCH 04/19] ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP Jean Pihet
2012-01-31 9:58 ` [PATCH 05/19] ARM: OMAP3+: SmartReflex: Add a shutdown hook Jean Pihet
2012-01-31 9:58 ` Jean Pihet [this message]
2012-01-31 9:58 ` [PATCH 07/19] ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need Jean Pihet
2012-01-31 9:58 ` [PATCH 08/19] ARM: OMAP3+: hwmod: add SmartReflex IRQs Jean Pihet
2012-01-31 9:58 ` [PATCH 09/19] ARM: OMAP3+: SmartReflex: introduce class init, deinit and priv data Jean Pihet
2012-01-31 9:58 ` [PATCH 10/19] ARM: OMAP3+: SmartReflex: introduce notifiers flags Jean Pihet
2012-01-31 9:58 ` [PATCH 11/19] ARM: OMAP3+: SmartReflex: introduce notifier_control Jean Pihet
2012-01-31 9:58 ` [PATCH 12/19] ARM: OMAP3+: SmartReflex: disable spamming interrupts Jean Pihet
2012-01-31 9:58 ` [PATCH 13/19] ARM: OMAP3+: SmartReflex: introduce class private data per voltage domain Jean Pihet
2012-01-31 9:58 ` [PATCH 14/19] ARM: OMAP3+: SmartReflex Class3: restrict CPU to run on Jean Pihet
2012-01-31 9:58 ` [PATCH 15/19] ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata() Jean Pihet
2012-01-31 9:58 ` [PATCH 16/19] ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument Jean Pihet
2012-01-31 9:58 ` [PATCH 17/19] ARM: OMAP3+: SmartReflex: misc cleanups Jean Pihet
2012-01-31 9:58 ` [PATCH 18/19] ARM: OMAP3+: SmartReflex: micro-optimization for sanity check Jean Pihet
2012-01-31 9:58 ` [PATCH 19/19] ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API Jean Pihet
2012-01-31 17:08 ` [PATCH v2 00/19] ARM: OMAP3+: SmartReflex: bugfixes Tony Lindgren
2012-01-31 17:15 ` Pihet-XID, Jean
2012-01-31 17:20 ` Tony Lindgren
2012-01-31 17:24 ` Jean Pihet
2012-01-31 17:33 ` Tony Lindgren
2012-01-31 21:59 ` Kevin Hilman
2012-01-31 23:58 ` Tony Lindgren
2012-02-01 8:54 ` Jean Pihet
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=1328003912-11709-7-git-send-email-j-pihet@ti.com \
--to=jean.pihet@newoldbits.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).