From: "Neil Armstrong" <neil.armstrong@linaro.org>
To: Alexey Romanov <avromanov@salutedevices.com>,
narmstrong@baylibre.com, sughosh.ganu@linaro.org,
xypron.glpk@gmx.de
Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, kernel@sberdevices.ru
Subject: Re: [PATCH v2 1/1] drivers: rng: add support for Meson S4
Date: Thu, 12 Oct 2023 09:24:20 +0200 [thread overview]
Message-ID: <a4ee2c60-2176-43be-87d4-dcd32a1173a2@linaro.org> (raw)
In-Reply-To: <20231010111344.77563-2-avromanov@salutedevices.com>
Hi,
On 10/10/2023 13:13, Alexey Romanov wrote:
> For some Amlogic SOC's, mechanism to obtain random number
> has been changed. For example, S4 now uses status bit waiting algo.
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> ---
> drivers/rng/meson-rng.c | 72 ++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 71 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
> index e0a1e8c7e0..ba60325b94 100644
> --- a/drivers/rng/meson-rng.c
> +++ b/drivers/rng/meson-rng.c
> @@ -10,10 +10,23 @@
> #include <dm.h>
> #include <rng.h>
> #include <asm/io.h>
> +#include <linux/iopoll.h>
> +
> +#define RNG_DATA 0x00
> +#define RNG_S4_DATA 0x08
> +#define RNG_S4_CFG 0x00
> +
> +#define RUN_BIT BIT(0)
> +#define SEED_READY_STS_BIT BIT(31)
> +
> +struct meson_rng_priv {
> + u32 (*read)(fdt_addr_t base);
> +};
>
> struct meson_rng_plat {
> fdt_addr_t base;
> struct clk clk;
> + struct meson_rng_priv *priv;
> };
>
> /**
> @@ -27,10 +40,11 @@ struct meson_rng_plat {
> static int meson_rng_read(struct udevice *dev, void *data, size_t len)
> {
> struct meson_rng_plat *pdata = dev_get_plat(dev);
> + struct meson_rng_priv *priv = pdata->priv;
> char *buffer = (char *)data;
>
> while (len) {
> - u32 rand = readl(pdata->base);
> + u32 rand = priv->read(pdata->base);
> size_t step;
>
> if (len >= 4)
> @@ -44,6 +58,47 @@ static int meson_rng_read(struct udevice *dev, void *data, size_t len)
> return 0;
> }
>
> +static int meson_rng_wait_status(void __iomem *cfg_addr, int bit)
> +{
> + u32 status = 0;
> + int ret;
> +
> + ret = readl_relaxed_poll_timeout(cfg_addr,
> + status, !(status & bit),
> + 10000);
> + if (ret)
> + return -EBUSY;
> +
> + return 0;
> +}
> +
> +static u32 meson_common_rng_read(fdt_addr_t base)
> +{
> + return readl(base);
> +}
> +
> +static u32 meson_s4_rng_read(fdt_addr_t base)
> +{
> + void __iomem *cfg_addr = (void *)base + RNG_S4_CFG;
> + int err;
> +
> + writel_relaxed(readl_relaxed(cfg_addr) | SEED_READY_STS_BIT, cfg_addr);
> +
> + err = meson_rng_wait_status(cfg_addr, SEED_READY_STS_BIT);
> + if (err) {
> + pr_err("Seed isn't ready, try again\n");
> + return err;
> + }
> +
> + err = meson_rng_wait_status(cfg_addr, RUN_BIT);
> + if (err) {
> + pr_err("Can't get random number, try again\n");
> + return err;
> + }
> +
> + return readl_relaxed(base + RNG_S4_DATA);
> +}
> +
> /**
> * meson_rng_probe() - probe rng device
> *
> @@ -59,6 +114,8 @@ static int meson_rng_probe(struct udevice *dev)
> if (err)
> return err;
>
> + pdata->priv = dev_get_driver_data(dev);
> +
> return 0;
> }
>
> @@ -102,9 +159,22 @@ static const struct dm_rng_ops meson_rng_ops = {
> .read = meson_rng_read,
> };
>
> +static const struct meson_rng_priv meson_rng_priv = {
> + .read = meson_common_rng_read,
> +};
> +
> +static const struct meson_rng_priv meson_rng_priv_s4 = {
> + .read = meson_s4_rng_read,
> +};
> +
> static const struct udevice_id meson_rng_match[] = {
> {
> .compatible = "amlogic,meson-rng",
> + .data = (ulong)&meson_rng_priv,
> + },
> + {
> + .compatible = "amlogic,meson-s4-rng",
> + .data = (ulong)&meson_rng_priv_s4,
> },
> {},
> };
I get:
+drivers/rng/meson-rng.c: In function 'meson_rng_probe':
+drivers/rng/meson-rng.c:117:21: error: assignment to 'struct meson_rng_priv *' from 'ulong' {aka 'long unsigned int'} makes pointer from integer without a cast [-Werror=int-conversion]
+ 117 | pdata->priv = dev_get_driver_data(dev);
while building in CI.
Thanks,
Neil
WARNING: multiple messages have this Message-ID (diff)
From: neil.armstrong@linaro.org
To: Alexey Romanov <avromanov@salutedevices.com>,
narmstrong@baylibre.com, sughosh.ganu@linaro.org,
xypron.glpk@gmx.de
Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, kernel@sberdevices.ru
Subject: Re: [PATCH v2 1/1] drivers: rng: add support for Meson S4
Date: Thu, 12 Oct 2023 09:24:20 +0200 [thread overview]
Message-ID: <a4ee2c60-2176-43be-87d4-dcd32a1173a2@linaro.org> (raw)
Message-ID: <20231012072420._MLSvXlQ9yIiuwaLaJ0kUaJCPuZW5wcT6q9gWXM_5qQ@z> (raw)
In-Reply-To: <20231010111344.77563-2-avromanov@salutedevices.com>
Hi,
On 10/10/2023 13:13, Alexey Romanov wrote:
> For some Amlogic SOC's, mechanism to obtain random number
> has been changed. For example, S4 now uses status bit waiting algo.
>
> Signed-off-by: Alexey Romanov <avromanov@salutedevices.com>
> ---
> drivers/rng/meson-rng.c | 72 ++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 71 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c
> index e0a1e8c7e0..ba60325b94 100644
> --- a/drivers/rng/meson-rng.c
> +++ b/drivers/rng/meson-rng.c
> @@ -10,10 +10,23 @@
> #include <dm.h>
> #include <rng.h>
> #include <asm/io.h>
> +#include <linux/iopoll.h>
> +
> +#define RNG_DATA 0x00
> +#define RNG_S4_DATA 0x08
> +#define RNG_S4_CFG 0x00
> +
> +#define RUN_BIT BIT(0)
> +#define SEED_READY_STS_BIT BIT(31)
> +
> +struct meson_rng_priv {
> + u32 (*read)(fdt_addr_t base);
> +};
>
> struct meson_rng_plat {
> fdt_addr_t base;
> struct clk clk;
> + struct meson_rng_priv *priv;
> };
>
> /**
> @@ -27,10 +40,11 @@ struct meson_rng_plat {
> static int meson_rng_read(struct udevice *dev, void *data, size_t len)
> {
> struct meson_rng_plat *pdata = dev_get_plat(dev);
> + struct meson_rng_priv *priv = pdata->priv;
> char *buffer = (char *)data;
>
> while (len) {
> - u32 rand = readl(pdata->base);
> + u32 rand = priv->read(pdata->base);
> size_t step;
>
> if (len >= 4)
> @@ -44,6 +58,47 @@ static int meson_rng_read(struct udevice *dev, void *data, size_t len)
> return 0;
> }
>
> +static int meson_rng_wait_status(void __iomem *cfg_addr, int bit)
> +{
> + u32 status = 0;
> + int ret;
> +
> + ret = readl_relaxed_poll_timeout(cfg_addr,
> + status, !(status & bit),
> + 10000);
> + if (ret)
> + return -EBUSY;
> +
> + return 0;
> +}
> +
> +static u32 meson_common_rng_read(fdt_addr_t base)
> +{
> + return readl(base);
> +}
> +
> +static u32 meson_s4_rng_read(fdt_addr_t base)
> +{
> + void __iomem *cfg_addr = (void *)base + RNG_S4_CFG;
> + int err;
> +
> + writel_relaxed(readl_relaxed(cfg_addr) | SEED_READY_STS_BIT, cfg_addr);
> +
> + err = meson_rng_wait_status(cfg_addr, SEED_READY_STS_BIT);
> + if (err) {
> + pr_err("Seed isn't ready, try again\n");
> + return err;
> + }
> +
> + err = meson_rng_wait_status(cfg_addr, RUN_BIT);
> + if (err) {
> + pr_err("Can't get random number, try again\n");
> + return err;
> + }
> +
> + return readl_relaxed(base + RNG_S4_DATA);
> +}
> +
> /**
> * meson_rng_probe() - probe rng device
> *
> @@ -59,6 +114,8 @@ static int meson_rng_probe(struct udevice *dev)
> if (err)
> return err;
>
> + pdata->priv = dev_get_driver_data(dev);
> +
> return 0;
> }
>
> @@ -102,9 +159,22 @@ static const struct dm_rng_ops meson_rng_ops = {
> .read = meson_rng_read,
> };
>
> +static const struct meson_rng_priv meson_rng_priv = {
> + .read = meson_common_rng_read,
> +};
> +
> +static const struct meson_rng_priv meson_rng_priv_s4 = {
> + .read = meson_s4_rng_read,
> +};
> +
> static const struct udevice_id meson_rng_match[] = {
> {
> .compatible = "amlogic,meson-rng",
> + .data = (ulong)&meson_rng_priv,
> + },
> + {
> + .compatible = "amlogic,meson-s4-rng",
> + .data = (ulong)&meson_rng_priv_s4,
> },
> {},
> };
I get:
+drivers/rng/meson-rng.c: In function 'meson_rng_probe':
+drivers/rng/meson-rng.c:117:21: error: assignment to 'struct meson_rng_priv *' from 'ulong' {aka 'long unsigned int'} makes pointer from integer without a cast [-Werror=int-conversion]
+ 117 | pdata->priv = dev_get_driver_data(dev);
while building in CI.
Thanks,
Neil
next prev parent reply other threads:[~2023-10-12 7:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 11:13 [PATCH v2 0/1] hwrng: meson - add support for S4 Alexey Romanov
2023-10-10 11:13 ` Alexey Romanov
2023-10-10 11:13 ` [PATCH v2 1/1] drivers: rng: add support for Meson S4 Alexey Romanov
2023-10-10 11:13 ` Alexey Romanov
2023-10-12 7:24 ` Neil Armstrong [this message]
2023-10-12 7:24 ` neil.armstrong
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=a4ee2c60-2176-43be-87d4-dcd32a1173a2@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=avromanov@salutedevices.com \
--cc=kernel@sberdevices.ru \
--cc=narmstrong@baylibre.com \
--cc=sughosh.ganu@linaro.org \
--cc=u-boot-amlogic@groups.io \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).