From: jon-hunter@ti•com (Jon Hunter)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: cti: fix manipulation of debug lock registers
Date: Mon, 19 Nov 2012 12:21:34 -0600 [thread overview]
Message-ID: <50AA78AE.5050609@ti.com> (raw)
In-Reply-To: <1353015653-23711-1-git-send-email-will.deacon@arm.com>
On 11/15/2012 03:40 PM, Will Deacon wrote:
> The LOCKSTATUS register for memory-mapped coresight devices indicates
> whether or not the device in question implements hardware locking. If
> not, locking is not present (i.e. LSR.SLI == 0) and LAR is write-ignore,
> so software doesn't actually need to check the status register at all.
>
> This patch removes the broken LSR checks.
>
> Cc: Ming Lei <ming.lei@canonical•com>
> Reported-by: Mike Williams <michael.williams@arm•com>
> Signed-off-by: Will Deacon <will.deacon@arm•com>
> ---
> arch/arm/include/asm/cti.h | 20 ++------------------
> 1 files changed, 2 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/include/asm/cti.h b/arch/arm/include/asm/cti.h
> index a0ada3e..f2e5cad 100644
> --- a/arch/arm/include/asm/cti.h
> +++ b/arch/arm/include/asm/cti.h
> @@ -146,15 +146,7 @@ static inline void cti_irq_ack(struct cti *cti)
> */
> static inline void cti_unlock(struct cti *cti)
> {
> - void __iomem *base = cti->base;
> - unsigned long val;
> -
> - val = __raw_readl(base + LOCKSTATUS);
> -
> - if (val & 1) {
> - val = LOCKCODE;
> - __raw_writel(val, base + LOCKACCESS);
> - }
> + __raw_writel(LOCKCODE, cti->base + LOCKACCESS);
> }
>
> /**
> @@ -166,14 +158,6 @@ static inline void cti_unlock(struct cti *cti)
> */
> static inline void cti_lock(struct cti *cti)
> {
> - void __iomem *base = cti->base;
> - unsigned long val;
> -
> - val = __raw_readl(base + LOCKSTATUS);
> -
> - if (!(val & 1)) {
> - val = ~LOCKCODE;
> - __raw_writel(val, base + LOCKACCESS);
> - }
> + __raw_writel(~LOCKCODE, cti->base + LOCKACCESS);
> }
> #endif
I gave this a whirl on omap4430 and PMU is working fine with this, so ...
Tested-by: Jon Hunter <jon-hunter@ti•com>
Cheers
Jon
next prev parent reply other threads:[~2012-11-19 18:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 21:40 [PATCH] ARM: cti: fix manipulation of debug lock registers Will Deacon
2012-11-19 18:21 ` Jon Hunter [this message]
2012-11-20 13:55 ` Will Deacon
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=50AA78AE.5050609@ti.com \
--to=jon-hunter@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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