Skip to contentSkip to conversation

rng: npcm: add Arbel NPCM8XX support

PATCH Superseded Tomer Maimon 2 participants 7 messages Sep 22, 2022

Subsystems (4)
Device tree bindings Crypto API Hardware random number generator core Arm/nuvoton npcm architecture

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Tomer Maimon

author maintainer
#0 lore raw

cover rng: npcm: add Arbel NPCM8XX support

This patch set adds Arbel NPCM8XX Random Number Generator(RNG) support to RNG NPCM driver.

The NPCM8XX RNG uses different prescalar clock value.

The NPCM RNG driver was tested on the NPCM845 evaluation board.

Tomer Maimon (2):
dt-bindings: rng: nuvoton,npcm-rng: Add npcm845 compatible string
hwrng: npcm: Add NPCM8XX support

 .../bindings/rng/nuvoton,npcm-rng.yaml        |  4 +++-
 drivers/char/hw_random/npcm-rng.c             | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)
Signature · 1 line
2.33.0
author maintainer
#1 lore raw

PATCH 1/2 dt-bindings: rng: nuvoton,npcm-rng: Add npcm845 compatible string

Add a compatible string for Nuvoton BMC NPCM845 RNG.

Signed-off-by Tomer Maimon <[email protected]>
---
 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.yaml +3 -1
index abd134c9d400..e0071faa00f0 100644
@@ -16,7 +16,9 @@ maintainers:
 
 properties:
   compatible:
-    const: nuvoton,npcm750-rng
+    enum:
+        - nuvoton,npcm750-rng
+        - nuvoton,npcm845-rng
 
   reg:
     maxItems: 1
Signature · 1 line
2.33.0
#3 lore raw

Re: [PATCH v1 1/2] dt-bindings: rng: nuvoton,npcm-rng: Add npcm845 compatible string

Quoted 9 lines · Krzysztof Kozlowski
Quoted 5 lines · Tomer Maimon

Add a compatible string for Nuvoton BMC NPCM845 RNG.

Signed-off-by Tomer Maimon <[email protected]>
---
 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.yaml | 4 +++-
Acked-by Krzysztof Kozlowski <[email protected]>

And un-acked. Test your patches.

Please run make dt_binding_check (see Documentation/devicetree/bindings/writing-schema.rst for instructions).

Best regards,
Krzysztof

#4 lore raw

Re: [PATCH v1 1/2] dt-bindings: rng: nuvoton,npcm-rng: Add npcm845 compatible string

In reply to Tomer Maimon
Quoted 7 lines · Tomer Maimon

Add a compatible string for Nuvoton BMC NPCM845 RNG.

Signed-off-by Tomer Maimon <[email protected]>
---
 Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):

yamllint warnings/errors:
./Documentation/devicetree/bindings/rng/nuvoton,npcm-rng.yaml:20:9: [warning] wrong indentation: expected 6 but found 8 (indentation)

dtschema/dtc warnings/errors:

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/patch/1681163

This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.

If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:

pip3 install dtschema --upgrade

Please check and re-submit.

author maintainer
#5 lore raw

PATCH 2/2 hwrng: npcm: Add NPCM8XX support

In reply to Tomer Maimon

Adding RNG NPCM8XX support to NPCM RNG driver.
RNG NPCM8XX uses a different clock prescaler.

As part of adding NPCM8XX support:
- Add NPCM8XX specific compatible string.
- Add NPCM8XX specific clock prescaler.

Signed-off-by Tomer Maimon <[email protected]>
---
 drivers/char/hw_random/npcm-rng.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/char/hw_random/npcm-rng.c +14 -7
index 1ec5f267a656..705be9ccae31 100644
@@ -18,10 +18,11 @@
 #define NPCM_RNGD_REG		0x04	/* Data register */
 #define NPCM_RNGMODE_REG	0x08	/* Mode register */
 
-#define NPCM_RNG_CLK_SET_25MHZ	GENMASK(4, 3) /* 20-25 MHz */
-#define NPCM_RNG_DATA_VALID	BIT(1)
-#define NPCM_RNG_ENABLE		BIT(0)
-#define NPCM_RNG_M1ROSEL	BIT(1)
+#define NPCM_RNG_CLK_SET_25MHZ		GENMASK(4, 3) /* 20-25 MHz */
+#define NPCM_RNG_CLK_SET_62_5MHZ	BIT(2) /* 60-80 MHz */
+#define NPCM_RNG_DATA_VALID		BIT(1)
+#define NPCM_RNG_ENABLE			BIT(0)
+#define NPCM_RNG_M1ROSEL		BIT(1)
 
 #define NPCM_RNG_TIMEOUT_USEC	20000
 #define NPCM_RNG_POLL_USEC	1000

@@ -31,14 +32,14 @@
 struct npcm_rng {
 	void __iomem *base;
 	struct hwrng rng;
+	u32 clkp;
 };
 
 static int npcm_rng_init(struct hwrng *rng)
 {
 	struct npcm_rng *priv = to_npcm_rng(rng);
 
-	writel(NPCM_RNG_CLK_SET_25MHZ | NPCM_RNG_ENABLE,
-	       priv->base + NPCM_RNGCS_REG);
+	writel(priv->clkp | NPCM_RNG_ENABLE, priv->base + NPCM_RNGCS_REG);
 
 	return 0;
 }

@@ -47,7 +48,7 @@ static void npcm_rng_cleanup(struct hwrng *rng)
 {
 	struct npcm_rng *priv = to_npcm_rng(rng);
 
-	writel(NPCM_RNG_CLK_SET_25MHZ, priv->base + NPCM_RNGCS_REG);
+	writel(priv->clkp, priv->base + NPCM_RNGCS_REG);
 }
 
 static int npcm_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)

@@ -102,6 +103,11 @@ static int npcm_rng_probe(struct platform_device *pdev)
 	pm_runtime_use_autosuspend(&pdev->dev);
 	pm_runtime_enable(&pdev->dev);
 
+	if (of_device_is_compatible(pdev->dev.of_node, "nuvoton,npcm750-rng"))
+		priv->clkp = NPCM_RNG_CLK_SET_25MHZ;
+	if (of_device_is_compatible(pdev->dev.of_node, "nuvoton,npcm845-rng"))
+		priv->clkp = NPCM_RNG_CLK_SET_62_5MHZ;
+
 #ifndef CONFIG_PM
 	priv->rng.init = npcm_rng_init;
 	priv->rng.cleanup = npcm_rng_cleanup;

@@ -163,6 +169,7 @@ static const struct dev_pm_ops npcm_rng_pm_ops = {
 
 static const struct of_device_id rng_dt_id[] __maybe_unused = {
 	{ .compatible = "nuvoton,npcm750-rng",  },
+	{ .compatible = "nuvoton,npcm845-rng",  },
 	{},
 };
 MODULE_DEVICE_TABLE(of, rng_dt_id);
Signature · 1 line
2.33.0
#6 lore raw

Re: [PATCH v1 2/2] hwrng: npcm: Add NPCM8XX support

drivers/char/hw_random/npcm-rng.c static int npcm_rng_probe(struct platform_device *pdev) · line 109

Quoted 9 lines · Tomer Maimon

static int npcm_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)

drivers/char/hw_random/npcm-rng.c +4 -0
@@ -102,6 +103,11 @@ static int npcm_rng_probe(struct platform_device *pdev)
 	pm_runtime_use_autosuspend(&pdev->dev);
 	pm_runtime_enable(&pdev->dev);
 
+	if (of_device_is_compatible(pdev->dev.of_node, "nuvoton,npcm750-rng"))
+		priv->clkp = NPCM_RNG_CLK_SET_25MHZ;
+	if (of_device_is_compatible(pdev->dev.of_node, "nuvoton,npcm845-rng"))
+		priv->clkp = NPCM_RNG_CLK_SET_62_5MHZ;

No, don't sprinkle compatibles here and there. Driver data is for this.

Best regards,
Krzysztof