From: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
To: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Michal Simek <michal.simek@xilinx.com>,
Russell King <linux@arm.linux.org.uk>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 3/3] arm: zynq: slcr: Use read-modify-write for register writes
Date: Thu, 18 Jul 2013 08:45:03 -0700 [thread overview]
Message-ID: <a57f684c-8983-48d2-8e99-8c9712383091@TX2EHSMHS024.ehs.local> (raw)
In-Reply-To: <20130718072106.GB15514@pengutronix.de>
On Thu, Jul 18, 2013 at 09:21:06AM +0200, Steffen Trumtrar wrote:
> On Wed, Jul 17, 2013 at 10:10:15AM -0700, Sören Brinkmann wrote:
> > zynq_slcr_cpu_start/stop() ignored the current register state when
> > writing to a register. Fixing this by implementing proper
> > read-modify-write.
> >
> > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> > ---
> > arch/arm/mach-zynq/slcr.c | 16 ++++++++--------
> > 1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
> > index 44a4ab6..1836d5a 100644
> > --- a/arch/arm/mach-zynq/slcr.c
> > +++ b/arch/arm/mach-zynq/slcr.c
> > @@ -61,11 +61,11 @@ void zynq_slcr_system_reset(void)
> > */
> > void zynq_slcr_cpu_start(int cpu)
> > {
> > - /* enable CPUn */
> > - writel(SLCR_A9_CPU_CLKSTOP << cpu,
> > - zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > - /* enable CLK for CPUn */
> > - writel(0x0 << cpu, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + reg &= ~(SLCR_A9_CPU_RST << cpu);
> > + writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + reg &= ~(SLCR_A9_CPU_CLKSTOP << cpu);
> > + writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > }
> >
> > /**
> > @@ -74,9 +74,9 @@ void zynq_slcr_cpu_start(int cpu)
> > */
> > void zynq_slcr_cpu_stop(int cpu)
> > {
> > - /* stop CLK and reset CPUn */
> > - writel((SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu,
> > - zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + reg |= (SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu;
> > + writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > }
> >
>
> Hi!
>
> Why do you also remove the comments? In my opinion they can stay.
I found the #defines descriptive enough
Sören
WARNING: multiple messages have this Message-ID (diff)
From: soren.brinkmann@xilinx.com (Sören Brinkmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] arm: zynq: slcr: Use read-modify-write for register writes
Date: Thu, 18 Jul 2013 08:45:03 -0700 [thread overview]
Message-ID: <a57f684c-8983-48d2-8e99-8c9712383091@TX2EHSMHS024.ehs.local> (raw)
In-Reply-To: <20130718072106.GB15514@pengutronix.de>
On Thu, Jul 18, 2013 at 09:21:06AM +0200, Steffen Trumtrar wrote:
> On Wed, Jul 17, 2013 at 10:10:15AM -0700, S?ren Brinkmann wrote:
> > zynq_slcr_cpu_start/stop() ignored the current register state when
> > writing to a register. Fixing this by implementing proper
> > read-modify-write.
> >
> > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> > ---
> > arch/arm/mach-zynq/slcr.c | 16 ++++++++--------
> > 1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
> > index 44a4ab6..1836d5a 100644
> > --- a/arch/arm/mach-zynq/slcr.c
> > +++ b/arch/arm/mach-zynq/slcr.c
> > @@ -61,11 +61,11 @@ void zynq_slcr_system_reset(void)
> > */
> > void zynq_slcr_cpu_start(int cpu)
> > {
> > - /* enable CPUn */
> > - writel(SLCR_A9_CPU_CLKSTOP << cpu,
> > - zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > - /* enable CLK for CPUn */
> > - writel(0x0 << cpu, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + reg &= ~(SLCR_A9_CPU_RST << cpu);
> > + writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + reg &= ~(SLCR_A9_CPU_CLKSTOP << cpu);
> > + writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > }
> >
> > /**
> > @@ -74,9 +74,9 @@ void zynq_slcr_cpu_start(int cpu)
> > */
> > void zynq_slcr_cpu_stop(int cpu)
> > {
> > - /* stop CLK and reset CPUn */
> > - writel((SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu,
> > - zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > + reg |= (SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu;
> > + writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
> > }
> >
>
> Hi!
>
> Why do you also remove the comments? In my opinion they can stay.
I found the #defines descriptive enough
S?ren
next prev parent reply other threads:[~2013-07-18 15:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 17:10 [PATCH 0/3] arm: zynq: SLCR clean up Soren Brinkmann
2013-07-17 17:10 ` Soren Brinkmann
2013-07-17 17:10 ` [PATCH 1/3] arm: zynq: slcr: Remove redundant header #includes Soren Brinkmann
2013-07-17 17:10 ` Soren Brinkmann
2013-07-17 17:10 ` [PATCH 2/3] arm: zynq: slcr: Clean up #defines Soren Brinkmann
2013-07-17 17:10 ` Soren Brinkmann
2013-07-17 17:10 ` [PATCH 3/3] arm: zynq: slcr: Use read-modify-write for register writes Soren Brinkmann
2013-07-17 17:10 ` Soren Brinkmann
2013-07-18 7:21 ` Steffen Trumtrar
2013-07-18 7:21 ` Steffen Trumtrar
2013-07-18 15:45 ` Sören Brinkmann [this message]
2013-07-18 15:45 ` Sören Brinkmann
2013-07-26 12:15 ` [PATCH 0/3] arm: zynq: SLCR clean up Michal Simek
2013-07-26 12:15 ` Michal Simek
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=a57f684c-8983-48d2-8e99-8c9712383091@TX2EHSMHS024.ehs.local \
--to=soren.brinkmann@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=michal.simek@xilinx.com \
--cc=s.trumtrar@pengutronix.de \
/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.