reset-socfpga: Fix nr_resets property
PATCH v2 1/1 reset-socfpga: Fix nr_resets property
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 128 and the highest useable reset ID to 127.
This is clearly wrong as there are resets with higher IDs than 127 defined in 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 8 for useable reset IDs up to 255.
---
v2: change NR_BANKS to 8
reset-socfpga.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/reset/reset-socfpga.c +7 -6
@@ -25,7 +25,8 @@#include <linux/spinlock.h> #include <linux/types.h> -#define NR_BANKS 4 +#define BANK_INCREMENT 4 +#define NR_BANKS 8struct 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
Quoted 11 lines · Rojhalat Ibrahim
The SoC-FPGA reset controller driver defines
NR_BANKSas 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 128 and the highest useable reset ID to 127.This is clearly wrong as there are resets with higher IDs than 127 defined in
include/dt-bindings/reset/altr,rst-mgr.hand altr,rst-mgr-a10.h.
Quoted 6 lines
The patch introduces a new define
BANK_INCREMENTfor calculating the register addresses as before and increasesNR_BANKSto 8 for useable reset IDs up to 255.Signed-off-by Rojhalat Ibrahim <[email protected]>---
v2: changeNR_BANKSto 8
Applied, thank you.
regards
Philipp
Quoted 54 lines
reset-socfpga.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/reset/reset-socfpga.c +7
-7@@ -25,7 +25,8 @@#include <linux/spinlock.h> #include <linux/types.h> -#define NR_BANKS 4 +#define BANK_INCREMENT 4 +#define NR_BANKS 8struct 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