hwrng: meson: add clock handling
Subsystems (6)
cover hwrng: meson: add clock handling
The HW randon number generator requires a clock and we shouldn't rely on the boot loader to enable it.
Heiner Kallweit (2):
hwrng: meson: expose RNG0 clock via DT
hwrng: meson: add clock handling to driver
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +++++ drivers/char/hw_random/meson-rng.c | 27 ++++++++++++++++++++++++++- include/dt-bindings/clock/gxbb-clkc.h | 1 + 4 files changed, 33 insertions(+), 2 deletions(-)
Signature · 1 line
2.11.1
PATCH 1/2 hwrng: meson: expose RNG0 clock via DT
Expose the RNG0 clock via DT.
--- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +++++ include/dt-bindings/clock/gxbb-clkc.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +1 -1
@@ -380,7 +380,7 @@ #size-cells = <2>; ranges = <0x0 0x0 0x0 0xc8834000 0x0 0x2000>; - rng { + hwrng: rng { compatible = "amlogic,meson-rng"; reg = <0x0 0x0 0x0 0x4>; };
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +5 -0
@@ -524,3 +524,8 @@ &vpu { compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; }; + +&hwrng { + clocks = <&clkc CLKID_RNG0>; + clock-names = "core"; +};
include/dt-bindings/clock/gxbb-clkc.h +1 -0
@@ -15,6 +15,7 @@#define CLKID_SPI 34#define CLKID_I2C 22#define CLKID_SAR_ADC 23 +#define CLKID_RNG0 25#define CLKID_ETH 36#define CLKID_USB0 50#define CLKID_USB1 51
Signature · 1 line
2.11.1
Jerome Brunet
maintainerPATCH 1/2 hwrng: meson: expose RNG0 clock via DT
Quoted 45 lines · Heiner Kallweit
Expose the RNG0 clock via DT.
Signed-off-by Heiner Kallweit <[email protected]>---
?arch/arm64/boot/dts/amlogic/meson-gx.dtsi???| 2 +- ?arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +++++ ?include/dt-bindings/clock/gxbb-clkc.h???????| 1 +?3 files changed, 7 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +0
-0@@ -380,7 +380,7 @@ ? #size-cells = <2>;? ranges = <
0x00x00x00xc88340000x00x2000>;
?arch/arm64/boot/dts/amlogic/meson-gx.dtsi +1
-1- rng { + hwrng: rng {? compatible = "amlogic,meson-rng";
? reg = <0x00x00x00x4>;
? };arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +0
-0@@ -524,3 +524,8 @@ ?&vpu {? compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-
vpu";
?};arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +5
-0+ +&hwrng { + clocks = <&clkc CLKID_RNG0>; + clock-names = "core"; +};include/dt- renamed from include/dt-bindings/clock/gxbb-clkc.h +0
-0
bindings/clock/gxbb-clkc.h
index692846c7..473676b1100644include/dt-bindings/clock/gxbb-clkc.h +0
-0@@ -15,6 +15,7 @@
Quoted 4 lines
?#define
CLKID_SPI34
?#defineCLKID_I2C22
?#defineCLKID_SAR_ADC23
+#defineCLKID_RNG025
Shouldn't you comment out the corresponding "define" in drivers/clk/meson/gxbb.h ?
I don't know if it is rule, but we usually "expose" the clock (moving the define from drivers/clk/meson/gxbb.h to include/dt- bindings/clock/gxbb-clkc.h) in a dedicated patch, with the subject starting with "clk: gxbb: expose foobar clock". It helps the maintainers of the subsystem to give their ack.
For this to happen, please remember the patch should be sent to them as well. Here you are missing the clock and dt guys:
* Stephen Boyd <[email protected]>
* Michael Turquette <[email protected]>
* linux-clk at vger.kernel.org
* devicetree at vger.kernel.org
scripts/get_maintainer.pl can help you finding all people your patch should be sent to.
The remaining part of this patch involves DT, so the subject should start with "ARM64: dts: meson-gx:"
You also need to add devicetree at vger.kernel.org in CC.
Apart from these minor remarks, the patchset looks good to me. Thx !
Quoted 3 lines
?#define
CLKID_ETH36
?#defineCLKID_USB050
?#defineCLKID_USB151
PATCH 2/2 hwrng: meson: add clock handling to driver
In reply to Heiner KallweitAdd handling of RNG0 clock to the driver.
--- drivers/char/hw_random/meson-rng.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/char/hw_random/meson-rng.c +26 -1
@@ -62,6 +62,7 @@#include <linux/slab.h> #include <linux/types.h> #include <linux/of.h> +#include <linux/clk.h> #define RNG_DATA 0x00
@@ -69,6 +70,7 @@ struct meson_rng_data {void __iomem *base;struct platform_device *pdev;struct hwrng rng; +struct clk *core_clk; };static int meson_rng_read (struct hwrng *rng,void *buf,size_t max,bool wait)
@@ -86,6 +88,7 @@ static int meson_rng_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct meson_rng_data *data;struct resource *res; +int ret; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)
@@ -98,12 +101,33 @@ static int meson_rng_probe(struct platform_device *pdev)if (IS_ERR (data->base))return PTR_ERR (data->base); + data->core_clk =devm_clk_get (dev,"core" ); +if (IS_ERR (data->core_clk)) +return PTR_ERR (data->core_clk); + + ret =clk_prepare_enable (data->core_clk); +if (ret) +return ret; + data->rng.name = pdev->name; data->rng.read = meson_rng_read;platform_set_drvdata (pdev, data); -return devm_hwrng_register (dev, &data->rng); + ret =devm_hwrng_register (dev, &data->rng); +if (ret) +clk_disable_unprepare (data->core_clk); + +return ret; +} + +static int meson_rng_remove (struct platform_device *pdev) +{ +struct meson_rng_data *data =platform_get_drvdata (pdev); + +clk_disable_unprepare (data->core_clk); + +return 0 ; }static const struct of_device_id meson_rng_of_match[] = {
@@ -114,6 +138,7 @@ MODULE_DEVICE_TABLE(of, meson_rng_of_match);static struct platform_driver meson_rng_driver = { .probe = meson_rng_probe, + .remove = meson_rng_remove, .driver = { .name ="meson-rng" , .of_match_table = meson_rng_of_match,
Signature · 1 line
2.11.1
PATCH 2/2 hwrng: meson: add clock handling to driver
Quoted 28 lines · Heiner Kallweit
Add handling of RNG0 clock to the driver.
Signed-off-by Heiner Kallweit <[email protected]>--- drivers/char/hw_random/meson-rng.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)drivers/char/hw_random/meson-rng.c +2
-0@@ -62,6 +62,7 @@#include <linux/slab.h> #include <linux/types.h> #include <linux/of.h> +#include <linux/clk.h> #define RNG_DATA 0x00@@ -69,6 +70,7 @@ struct meson_rng_data {void __iomem *base;struct platform_device *pdev;struct hwrng rng; +struct clk *core_clk; };static int meson_rng_read (struct hwrng *rng,void *buf,size_t max,bool wait)
drivers/char/hw_random/meson-rng.c static int meson_rng_probe(struct platform_device *pdev) · line 91
Quoted 4 lines
drivers/char/hw_random/meson-rng.c +1
-0@@ -86,6 +88,7 @@ static int meson_rng_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct meson_rng_data *data;struct resource *res; +int ret;
Variable ret is not used. It can be removed.
Quoted 25 lines
drivers/char/hw_random/meson-rng.c +13
-1data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)@@ -98,12 +101,33 @@ static int meson_rng_probe(struct platform_device *pdev)if (IS_ERR (data->base))return PTR_ERR (data->base); + data->core_clk =devm_clk_get (dev,"core" ); +if (IS_ERR (data->core_clk)) +return PTR_ERR (data->core_clk); + + ret =clk_prepare_enable (data->core_clk); +if (ret) +return ret; + data->rng.name = pdev->name; data->rng.read = meson_rng_read;platform_set_drvdata (pdev, data); -return devm_hwrng_register (dev, &data->rng); + ret =devm_hwrng_register (dev, &data->rng); +if (ret) +clk_disable_unprepare (data->core_clk); + +return ret;
drivers/char/hw_random/meson-rng.c static int meson_rng_probe(struct platform_device *pdev) · line 131
Quoted 10 lines
drivers/char/hw_random/meson-rng.c +9
-0+} + +static int meson_rng_remove (struct platform_device *pdev) +{ +struct meson_rng_data *data =platform_get_drvdata (pdev); + +clk_disable_unprepare (data->core_clk); + +return 0 ; }
In .remove clock gets disabled before the hwrng_unregister is called. The device node '/dev/hwrng' could be accessed while meson_rng_remove is called which could lead to problems. Instead of devm_hwrng_register use hwrng_register in .probe and call hwrng_unregister in .remove.
Quoted 13 lines
drivers/char/hw_random/meson-rng.c +1
-1static const struct of_device_id meson_rng_of_match[] = {@@ -114,6 +138,7 @@ MODULE_DEVICE_TABLE(of, meson_rng_of_match);static struct platform_driver meson_rng_driver = { .probe = meson_rng_probe, + .remove = meson_rng_remove, .driver = { .name ="meson-rng" , .of_match_table = meson_rng_of_match, --2.11.1
cover hwrng: meson: add clock handling
In reply to Heiner KallweitQuoted 7 lines · Heiner Kallweit
The HW randon number generator requires a clock and we shouldn't rely on the boot loader to enable it.
Heiner Kallweit (2):
hwrng: meson: expose RNG0 clock via DT
hwrng: meson: add clock handling to driver
Quoted 6 lines
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +++++ drivers/char/hw_random/meson-rng.c | 27 ++++++++++++++++++++++++++- include/dt-bindings/clock/gxbb-clkc.h | 1 + 4 files changed, 33 insertions(+), 2 deletions(-)
Hi Heiner,
Thanks for the fix, but can you also update the dt-bindings document ? Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt
I also think this clock should be optional, to keep driver working using old bindings, set the core_clk to NULL if not available, clock_prepare_enable and clock_disable_unprepare won't fail with a NULL clock
Neil