hwrng: iproc-rng200: Fix disable of the block.
PATCH v2 1/2 hwrng: iproc-rng200: Fix disable of the block.
From: Matthias Brugger <[email protected]>
When trying to disable the block we bitwise or the control register with value zero. This is confusing as using bitwise or with value zero doesn't have any effect at all. Drop this as we already set the enable bit to zero by appling inverted RNG_RBGEN_MASK.
---
Changes in v2:
- fix commit message, dropping Fixes tag
- drop inverted RNT_RBGEN_ENABLE in disable case
drivers/char/hw_random/iproc-rng200.c | 3 --- 1 file changed, 3 deletions(-)
drivers/char/hw_random/iproc-rng200.c +0 -3
@@ -28,7 +28,6 @@#define RNG_CTRL_OFFSET 0x00#define RNG_CTRL_RNG_RBGEN_MASK 0x00001FFF#define RNG_CTRL_RNG_RBGEN_ENABLE 0x00000001 -#define RNG_CTRL_RNG_RBGEN_DISABLE 0x00000000#define RNG_SOFT_RESET_OFFSET 0x04#define RNG_SOFT_RESET 0x00000001
@@ -61,7 +60,6 @@ static void iproc_rng200_restart(void __iomem *rng_base)/* Disable RBG */ val =ioread32 (rng_base +RNG_CTRL_OFFSET ); val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_DISABLE ;iowrite32 (val, rng_base +RNG_CTRL_OFFSET );/* Clear all interrupt status */
@@ -174,7 +172,6 @@ static void iproc_rng200_cleanup(struct hwrng *rng)/* Disable RNG hardware */ val =ioread32 (priv->base +RNG_CTRL_OFFSET ); val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_DISABLE ;iowrite32 (val, priv->base +RNG_CTRL_OFFSET ); }
Signature · 1 line
2.29.2
PATCH v2 2/2 hwrng: iproc-rng200: Move enable/disable in separate function
From: Matthias Brugger <[email protected]>
We are calling the same code for enable and disable the block in various parts of the driver. Put that code into a new function to reduce code duplication.
---
Changes in v2:
- rename function to iproc_rng200_enable_set()
- use u32 value instead of uint32_t
drivers/char/hw_random/iproc-rng200.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/char/hw_random/iproc-rng200.c +16 -19
@@ -53,14 +53,24 @@ struct iproc_rng200_dev {#define to_rng_priv (rng) container_of(rng, struct iproc_rng200_dev, rng) -static void iproc_rng200_restart (void __iomem *rng_base) +static void iproc_rng200_enable_set (void __iomem *rng_base,bool enable) { -uint32_t val; +u32 val; -/* Disable RBG */ val =ioread32 (rng_base +RNG_CTRL_OFFSET ); val &= ~RNG_CTRL_RNG_RBGEN_MASK ; + +if (enable) + val |=RNG_CTRL_RNG_RBGEN_ENABLE ; +iowrite32 (val, rng_base +RNG_CTRL_OFFSET ); +} + +static void iproc_rng200_restart (void __iomem *rng_base) +{ +uint32_t val; + +iproc_rng200_enable_set (rng_base, false);/* Clear all interrupt status */ iowrite32 (0xFFFFFFFFUL , rng_base +RNG_INT_STATUS_OFFSET );
@@ -82,11 +92,7 @@ static void iproc_rng200_restart(void __iomem *rng_base) val &= ~RBG_SOFT_RESET ;iowrite32 (val, rng_base +RBG_SOFT_RESET_OFFSET ); -/* Enable RBG */ - val =ioread32 (rng_base +RNG_CTRL_OFFSET ); - val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_ENABLE ; -iowrite32 (val, rng_base +RNG_CTRL_OFFSET ); +iproc_rng200_enable_set (rng_base, true); } static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max,
@@ -153,13 +159,8 @@ static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max,static int iproc_rng200_init (struct hwrng *rng) {struct iproc_rng200_dev *priv =to_rng_priv (rng); -uint32_t val; -/* Setup RNG. */ - val =ioread32 (priv->base +RNG_CTRL_OFFSET ); - val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_ENABLE ; -iowrite32 (val, priv->base +RNG_CTRL_OFFSET ); +iproc_rng200_enable_set (priv->base, true);return 0 ; }
@@ -167,12 +168,8 @@ static int iproc_rng200_init(struct hwrng *rng)static void iproc_rng200_cleanup (struct hwrng *rng) {struct iproc_rng200_dev *priv =to_rng_priv (rng); -uint32_t val; -/* Disable RNG hardware */ - val =ioread32 (priv->base +RNG_CTRL_OFFSET ); - val &= ~RNG_CTRL_RNG_RBGEN_MASK ; -iowrite32 (val, priv->base +RNG_CTRL_OFFSET ); +iproc_rng200_enable_set (priv->base, false); }static int iproc_rng200_probe (struct platform_device *pdev)
Signature · 1 line
2.29.2
Quoted 8 lines · On 12/18/20 2:57 AM, [email protected] wrote:
From: Matthias Brugger <[email protected]>
When trying to disable the block we bitwise or the control register with value zero. This is confusing as using bitwise or with value zero doesn't have any effect at all. Drop this as we already set the enable bit to zero by appling inverted
RNG_RBGEN_MASK.Signed-off-by Matthias Brugger <[email protected]>
Signature · 1 line
Florian
Quoted 8 lines · On 2020-12-18 2:57 a.m., [email protected] wrote:
From: Matthias Brugger <[email protected]>
When trying to disable the block we bitwise or the control register with value zero. This is confusing as using bitwise or with value zero doesn't have any effect at all. Drop this as we already set the enable bit to zero by appling inverted
RNG_RBGEN_MASK.Signed-off-by Matthias Brugger <[email protected]>
Quoted 38 lines
---
Changes in v2:
- fix commit message, dropping Fixes tag
- drop invertedRNT_RBGEN_ENABLEin disable casedrivers/char/hw_random/iproc-rng200.c | 3 --- 1 file changed, 3 deletions(-)drivers/char/hw_random/iproc-rng200.c +0
-3@@ -28,7 +28,6 @@#define RNG_CTRL_OFFSET 0x00#define RNG_CTRL_RNG_RBGEN_MASK 0x00001FFF#define RNG_CTRL_RNG_RBGEN_ENABLE 0x00000001 -#define RNG_CTRL_RNG_RBGEN_DISABLE 0x00000000#define RNG_SOFT_RESET_OFFSET 0x04#define RNG_SOFT_RESET 0x00000001@@ -61,7 +60,6 @@ static void iproc_rng200_restart(void __iomem *rng_base)/* Disable RBG */ val =ioread32 (rng_base +RNG_CTRL_OFFSET ); val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_DISABLE ;iowrite32 (val, rng_base +RNG_CTRL_OFFSET );/* Clear all interrupt status */ @@ -174,7 +172,6 @@ static void iproc_rng200_cleanup(struct hwrng *rng)/* Disable RNG hardware */ val =ioread32 (priv->base +RNG_CTRL_OFFSET ); val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_DISABLE ;iowrite32 (val, priv->base +RNG_CTRL_OFFSET ); }
Re: [PATCH v2 2/2] hwrng: iproc-rng200: Move enable/disable in separate function
In reply to [email protected]Quoted 8 lines · On 2020-12-18 2:57 a.m., [email protected] wrote:
From: Matthias Brugger <[email protected]>
We are calling the same code for enable and disable the block in various parts of the driver. Put that code into a new function to reduce code duplication.
Signed-off-by Matthias Brugger <[email protected]>Acked-by Florian Fainelli <[email protected]>
Quoted 84 lines
---
Changes in v2:
- rename function toiproc_rng200_enable_set()
- use u32 value instead ofuint32_tdrivers/char/hw_random/iproc-rng200.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-)drivers/char/hw_random/iproc-rng200.c +16
-19@@ -53,14 +53,24 @@ struct iproc_rng200_dev {#define to_rng_priv (rng) container_of(rng, struct iproc_rng200_dev, rng) -static void iproc_rng200_restart (void __iomem *rng_base) +static void iproc_rng200_enable_set (void __iomem *rng_base,bool enable) { -uint32_t val; +u32 val; -/* Disable RBG */ val =ioread32 (rng_base +RNG_CTRL_OFFSET ); val &= ~RNG_CTRL_RNG_RBGEN_MASK ; + +if (enable) + val |=RNG_CTRL_RNG_RBGEN_ENABLE ; +iowrite32 (val, rng_base +RNG_CTRL_OFFSET ); +} + +static void iproc_rng200_restart (void __iomem *rng_base) +{ +uint32_t val; + +iproc_rng200_enable_set (rng_base, false);/* Clear all interrupt status */ iowrite32 (0xFFFFFFFFUL , rng_base +RNG_INT_STATUS_OFFSET );@@ -82,11 +92,7 @@ static void iproc_rng200_restart(void __iomem *rng_base) val &= ~RBG_SOFT_RESET ;iowrite32 (val, rng_base +RBG_SOFT_RESET_OFFSET ); -/* Enable RBG */ - val =ioread32 (rng_base +RNG_CTRL_OFFSET ); - val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_ENABLE ; -iowrite32 (val, rng_base +RNG_CTRL_OFFSET ); +iproc_rng200_enable_set (rng_base, true); } static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max,@@ -153,13 +159,8 @@ static int iproc_rng200_read(struct hwrng *rng, void *buf, size_t max,static int iproc_rng200_init (struct hwrng *rng) {struct iproc_rng200_dev *priv =to_rng_priv (rng); -uint32_t val; -/* Setup RNG. */ - val =ioread32 (priv->base +RNG_CTRL_OFFSET ); - val &= ~RNG_CTRL_RNG_RBGEN_MASK ; - val |=RNG_CTRL_RNG_RBGEN_ENABLE ; -iowrite32 (val, priv->base +RNG_CTRL_OFFSET ); +iproc_rng200_enable_set (priv->base, true);return 0 ; }@@ -167,12 +168,8 @@ static int iproc_rng200_init(struct hwrng *rng)static void iproc_rng200_cleanup (struct hwrng *rng) {struct iproc_rng200_dev *priv =to_rng_priv (rng); -uint32_t val; -/* Disable RNG hardware */ - val =ioread32 (priv->base +RNG_CTRL_OFFSET ); - val &= ~RNG_CTRL_RNG_RBGEN_MASK ; -iowrite32 (val, priv->base +RNG_CTRL_OFFSET ); +iproc_rng200_enable_set (priv->base, false); }static int iproc_rng200_probe (struct platform_device *pdev)
Herbert Xu
maintainerQuoted 9 lines · On Fri, Dec 18, 2020 at 11:57:07AM +0100, [email protected] wrote:
From: Matthias Brugger <[email protected]>
When trying to disable the block we bitwise or the control register with value zero. This is confusing as using bitwise or with value zero doesn't have any effect at all. Drop this as we already set the enable bit to zero by appling inverted
RNG_RBGEN_MASK.Signed-off-by Matthias Brugger <[email protected]>
Quoted 8 lines
---
Changes in v2:
- fix commit message, dropping Fixes tag
- drop invertedRNT_RBGEN_ENABLEin disable casedrivers/char/hw_random/iproc-rng200.c | 3 --- 1 file changed, 3 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert Xu
maintainerRe: [PATCH v2 2/2] hwrng: iproc-rng200: Move enable/disable in separate function
In reply to [email protected]Quoted 9 lines · On Fri, Dec 18, 2020 at 11:57:08AM +0100, [email protected] wrote:
From: Matthias Brugger <[email protected]>
We are calling the same code for enable and disable the block in various parts of the driver. Put that code into a new function to reduce code duplication.
Signed-off-by Matthias Brugger <[email protected]>Acked-by Florian Fainelli <[email protected]>
Quoted 8 lines
---
Changes in v2:
- rename function toiproc_rng200_enable_set()
- use u32 value instead ofuint32_tdrivers/char/hw_random/iproc-rng200.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt