From: p.zabel@pengutronix.de (Philipp Zabel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] reset-socfpga: Fix nr_resets property
Date: Wed, 15 Feb 2017 15:57:00 +0100 [thread overview]
Message-ID: <1487170620.2433.43.camel@pengutronix.de> (raw)
In-Reply-To: <3302533.E0QKRXBlfc@pcimr>
[Added Dinh to Cc:]
On Wed, 2017-02-15 at 14:06 +0100, Rojhalat Ibrahim wrote:
> The SoC-FPGA reset controller driver defines NR_BANKS as 4 and uses that define
> for two unrelated purposes. It is used
> 1. as an increment for reset line banks which are 32-bit registers with 4-byte
> aligned addresses.
> 2. as the total number of reset line banks which together with the number of
> resets per bank (32) limits the total number of useable resets to 96 and the
> highest useable reset ID to 95.
> This is clearly wrong as there are resets with higher IDs than 95 defined in
128 and 127, respectively.
> include/dt-bindings/reset/altr,rst-mgr.h and altr,rst-mgr-a10.h.
>
> The patch introduces a new define BANK_INCREMENT for calculating the register
> addresses as before and increases NR_BANKS to 6 for useable reset IDs up to 191.
Actually, looking at the Arria 10 TRM, it looks like there are
mpumodrst, per0modrst, per1modrst, brgmodrst, sysmodrst, coldmodrst,
nrstmodrst, and dbgmodrst registers on that SoC, which would mean
NR_BANKS should be changed to 8. Dinh, what do you think?
regards
Philipp
> Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de>
> ---
> reset-socfpga.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
> index 43e4a9f..1c8e491 100644
> --- a/drivers/reset/reset-socfpga.c
> +++ b/drivers/reset/reset-socfpga.c
> @@ -25,7 +25,8 @@
> #include <linux/spinlock.h>
> #include <linux/types.h>
>
> -#define NR_BANKS 4
> +#define BANK_INCREMENT 4
> +#define NR_BANKS 6
>
> struct socfpga_reset_data {
> spinlock_t lock;
> @@ -46,8 +47,8 @@ static int socfpga_reset_assert(struct reset_controller_dev *rcdev,
>
> spin_lock_irqsave(&data->lock, flags);
>
> - reg = readl(data->membase + (bank * NR_BANKS));
> - writel(reg | BIT(offset), data->membase + (bank * NR_BANKS));
> + reg = readl(data->membase + (bank * BANK_INCREMENT));
> + writel(reg | BIT(offset), data->membase + (bank * BANK_INCREMENT));
> spin_unlock_irqrestore(&data->lock, flags);
>
> return 0;
> @@ -67,8 +68,8 @@ static int socfpga_reset_deassert(struct reset_controller_dev *rcdev,
>
> spin_lock_irqsave(&data->lock, flags);
>
> - reg = readl(data->membase + (bank * NR_BANKS));
> - writel(reg & ~BIT(offset), data->membase + (bank * NR_BANKS));
> + reg = readl(data->membase + (bank * BANK_INCREMENT));
> + writel(reg & ~BIT(offset), data->membase + (bank * BANK_INCREMENT));
>
> spin_unlock_irqrestore(&data->lock, flags);
>
> @@ -84,7 +85,7 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev,
> int offset = id % BITS_PER_LONG;
> u32 reg;
>
> - reg = readl(data->membase + (bank * NR_BANKS));
> + reg = readl(data->membase + (bank * BANK_INCREMENT));
>
> return !(reg & BIT(offset));
> }
>
> --
> 2.10.2
>
>
next prev parent reply other threads:[~2017-02-15 14:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 13:06 [PATCH] reset-socfpga: Fix nr_resets property Rojhalat Ibrahim
2017-02-15 14:57 ` Philipp Zabel [this message]
2017-02-15 15:57 ` Dinh Nguyen
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=1487170620.2433.43.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--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).