| Message ID | 20220302211113.4003816-12-clabbe@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | crypto: rockchip: permit to pass self-tests | expand |
Hi Corentin,
Make your clock driver parsing portable.
===
oneOf:
- const: rockchip,rk3288-crypto
- items:
- enum:
- rockchip,rk3328-crypto
- const: rockchip,rk3288-crypto
Compatible string must be SoC related!
rk3288 was the first in line that had support, so we use that as fall
back string.
===
Make binding fit for more SoC types.
Allow more clocks by using devm_clk_bulk_get_all.
Drop reset-names requirement for devm_reset_control_array_get_exclusive.
===
Use a patch order to prevent the scripts generate notifications.
- dt-bindings conversion
- add rk3328 compatible string in a separate patch
- your driver changes
- dts patches
A proposed maintainer must be able to submit patch series without errors. ;)
===
When you remove a clock in a YAML conversion you must add a note to the
DT maintainer.
===
Johan
On 3/2/22 22:11, Corentin Labbe wrote:
> The DMA clock is handled by the DMA controller, so the crypto does not
> have to touch it.
>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
> drivers/crypto/rockchip/rk3288_crypto.c | 16 +---------------
> drivers/crypto/rockchip/rk3288_crypto.h | 1 -
> 2 files changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c
> index 94ef1283789f..645855d2651b 100644
> --- a/drivers/crypto/rockchip/rk3288_crypto.c
> +++ b/drivers/crypto/rockchip/rk3288_crypto.c
> @@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
> __func__, __LINE__);
> goto err_hclk;
> }
> - err = clk_prepare_enable(dev->dmaclk);
> - if (err) {
> - dev_err(dev->dev, "[%s:%d], Couldn't enable clock dmaclk\n",
> - __func__, __LINE__);
> - goto err_dmaclk;
> - }
> +
> return err;
> -err_dmaclk:
> - clk_disable_unprepare(dev->hclk);
> err_hclk:
> clk_disable_unprepare(dev->aclk);
> err_aclk:
> @@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev)
>
> static void rk_crypto_disable_clk(struct rk_crypto_info *dev)
> {
> - clk_disable_unprepare(dev->dmaclk);
> clk_disable_unprepare(dev->hclk);
> clk_disable_unprepare(dev->aclk);
> clk_disable_unprepare(dev->sclk);
> @@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev)
> goto err_crypto;
> }
>
> - crypto_info->dmaclk = devm_clk_get(&pdev->dev, "apb_pclk");
> - if (IS_ERR(crypto_info->dmaclk)) {
> - err = PTR_ERR(crypto_info->dmaclk);
> - goto err_crypto;
> - }
> -
rk3288:
clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
- <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
- clock-names = "aclk", "hclk", "sclk", "apb_pclk";
+ <&cru SCLK_CRYPTO>;
+ clock-names = "aclk", "hclk", "sclk";
rk3328:
+ clocks = <&cru HCLK_CRYPTO_MST>, <&cru HCLK_CRYPTO_SLV>,
+ <&cru SCLK_CRYPTO>;
+ clock-names = "aclk", "hclk", "sclk";
The HCLK_CRYPTO_MST not is related to ACLK_CRYPTO.
You are reusing rk3288 names to not to change the driver.
Give it an other name.
===
The sclk goes through a crypto_div_con.
Does that need a frequency set?
Or does that come from nowhere?
From crypto_v1.c
priv->frequency = dev_read_u32_default(dev, "clock-frequency",
CRYPTO_V1_DEFAULT_RATE);
ret = clk_set_rate(&priv->sclk, priv->frequency);
===
Could you make this portable?
Example:
int i;
priv->num_clks = devm_clk_bulk_get_all(dev, &priv->clks);
if (priv->num_clks < 1)
return -EINVAL;
priv->sclk = NULL;
for (i = 0; i < priv->num_clks; i++) {
if (!strncmp(priv->clks[i].id, "sclk", 3)) {
priv->sclk = priv->clks[i].clk;
break;
}
}
if (!priv->sclk) {
dev_err(dev, "no sclk found\n");
return -EINVAL;
}
Also add optional "sclk1" clock for rk3399.
Use "sclk" and not "sclk0" to be backwards compatible.
===
Also make the resets portable for rk3399.
Remove the requirement for "reset-names".
Example:
priv->phy_rst = devm_reset_control_array_get_exclusive(dev);
if (IS_ERR(priv->phy_rst))
return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy
reset\n");
> crypto_info->irq = platform_get_irq(pdev, 0);
> if (crypto_info->irq < 0) {
> dev_err(&pdev->dev, "control Interrupt is not available.\n");
> diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h
> index c741e97057dc..963fbfc4d14e 100644
> --- a/drivers/crypto/rockchip/rk3288_crypto.h
> +++ b/drivers/crypto/rockchip/rk3288_crypto.h
> @@ -191,7 +191,6 @@ struct rk_crypto_info {
> struct clk *aclk;
> struct clk *hclk;
> struct clk *sclk;
> - struct clk *dmaclk;
int num_clks;
struct clk_bulk_data *clks;
struct clk *sclk;
struct clk *sclk1;
> struct reset_control *rst;
> void __iomem *reg;
> int irq;
Le Fri, Mar 04, 2022 at 04:01:58PM +0100, Johan Jonker a écrit : > Hi Corentin, > > Make your clock driver parsing portable. > > === > oneOf: > - const: rockchip,rk3288-crypto > - items: > - enum: > - rockchip,rk3328-crypto > - const: rockchip,rk3288-crypto > > Compatible string must be SoC related! > > rk3288 was the first in line that had support, so we use that as fall > back string. > > === > > Make binding fit for more SoC types. > Allow more clocks by using devm_clk_bulk_get_all. Hello Thanks for the hint of devm_clk_bulk_get_all, I will switch to it as it simplify clock handling. > Drop reset-names requirement for devm_reset_control_array_get_exclusive. > > === > > Use a patch order to prevent the scripts generate notifications. which scripts ? > > - dt-bindings conversion > > - add rk3328 compatible string in a separate patch > > - your driver changes > > - dts patches > > A proposed maintainer must be able to submit patch series without errors. ;) > > === > > When you remove a clock in a YAML conversion you must add a note to the > DT maintainer. > > === > > Johan > > On 3/2/22 22:11, Corentin Labbe wrote: > > The DMA clock is handled by the DMA controller, so the crypto does not > > have to touch it. > > > > Signed-off-by: Corentin Labbe <clabbe@baylibre.com> > > --- > > drivers/crypto/rockchip/rk3288_crypto.c | 16 +--------------- > > drivers/crypto/rockchip/rk3288_crypto.h | 1 - > > 2 files changed, 1 insertion(+), 16 deletions(-) > > > > diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c > > index 94ef1283789f..645855d2651b 100644 > > --- a/drivers/crypto/rockchip/rk3288_crypto.c > > +++ b/drivers/crypto/rockchip/rk3288_crypto.c > > @@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) > > __func__, __LINE__); > > goto err_hclk; > > } > > - err = clk_prepare_enable(dev->dmaclk); > > - if (err) { > > - dev_err(dev->dev, "[%s:%d], Couldn't enable clock dmaclk\n", > > - __func__, __LINE__); > > - goto err_dmaclk; > > - } > > + > > return err; > > -err_dmaclk: > > - clk_disable_unprepare(dev->hclk); > > err_hclk: > > clk_disable_unprepare(dev->aclk); > > err_aclk: > > @@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) > > > > static void rk_crypto_disable_clk(struct rk_crypto_info *dev) > > { > > - clk_disable_unprepare(dev->dmaclk); > > clk_disable_unprepare(dev->hclk); > > clk_disable_unprepare(dev->aclk); > > clk_disable_unprepare(dev->sclk); > > @@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev) > > goto err_crypto; > > } > > > > > - crypto_info->dmaclk = devm_clk_get(&pdev->dev, "apb_pclk"); > > - if (IS_ERR(crypto_info->dmaclk)) { > > - err = PTR_ERR(crypto_info->dmaclk); > > - goto err_crypto; > > - } > > - > > rk3288: > clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>, > - <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>; > - clock-names = "aclk", "hclk", "sclk", "apb_pclk"; > + <&cru SCLK_CRYPTO>; > + clock-names = "aclk", "hclk", "sclk"; > > > rk3328: > + clocks = <&cru HCLK_CRYPTO_MST>, <&cru HCLK_CRYPTO_SLV>, > + <&cru SCLK_CRYPTO>; > + clock-names = "aclk", "hclk", "sclk"; > > The HCLK_CRYPTO_MST not is related to ACLK_CRYPTO. > You are reusing rk3288 names to not to change the driver. > Give it an other name. You are right, I will change them. > > === > > The sclk goes through a crypto_div_con. > Does that need a frequency set? > Or does that come from nowhere? > > From crypto_v1.c > priv->frequency = dev_read_u32_default(dev, "clock-frequency", > CRYPTO_V1_DEFAULT_RATE); > > ret = clk_set_rate(&priv->sclk, priv->frequency); > The problem is that I dont see any hints for this in TRM, and their rockchips source are inconsistent, they do this in uboot not in linux.... > === > > Could you make this portable? > Example: > > int i; > > priv->num_clks = devm_clk_bulk_get_all(dev, &priv->clks); > if (priv->num_clks < 1) > return -EINVAL; > > priv->sclk = NULL; > for (i = 0; i < priv->num_clks; i++) { > if (!strncmp(priv->clks[i].id, "sclk", 3)) { > priv->sclk = priv->clks[i].clk; > break; > } > } > > if (!priv->sclk) { > dev_err(dev, "no sclk found\n"); > return -EINVAL; > } > > Also add optional "sclk1" clock for rk3399. > Use "sclk" and not "sclk0" to be backwards compatible. > > === > > Also make the resets portable for rk3399. > Remove the requirement for "reset-names". > > Example: > priv->phy_rst = devm_reset_control_array_get_exclusive(dev); > if (IS_ERR(priv->phy_rst)) > return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy > reset\n"); > > > > > crypto_info->irq = platform_get_irq(pdev, 0); > > if (crypto_info->irq < 0) { > > dev_err(&pdev->dev, "control Interrupt is not available.\n"); > > diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h > > index c741e97057dc..963fbfc4d14e 100644 > > --- a/drivers/crypto/rockchip/rk3288_crypto.h > > +++ b/drivers/crypto/rockchip/rk3288_crypto.h > > @@ -191,7 +191,6 @@ struct rk_crypto_info { > > > struct clk *aclk; > > struct clk *hclk; > > struct clk *sclk; > > - struct clk *dmaclk; > > > int num_clks; > struct clk_bulk_data *clks; > struct clk *sclk; > struct clk *sclk1; > > > > struct reset_control *rst; > > void __iomem *reg; > > int irq; For handling rk3399, I have no hardware so I cannot do anything for it easily. I have asked on IRC for some tests, so let's see if it works. Anyway we can always add support for it later, the priority is to fix the driver breakage. Regards
On 3/10/22 15:45, LABBE Corentin wrote: > Le Fri, Mar 04, 2022 at 04:01:58PM +0100, Johan Jonker a écrit : >> Hi Corentin, >> >> Make your clock driver parsing portable. >> >> === >> oneOf: >> - const: rockchip,rk3288-crypto >> - items: >> - enum: >> - rockchip,rk3328-crypto >> - const: rockchip,rk3288-crypto >> >> Compatible string must be SoC related! >> >> rk3288 was the first in line that had support, so we use that as fall >> back string. >> >> === >> >> Make binding fit for more SoC types. >> Allow more clocks by using devm_clk_bulk_get_all. > > Hello > > Thanks for the hint of devm_clk_bulk_get_all, I will switch to it as it simplify clock handling. > >> Drop reset-names requirement for devm_reset_control_array_get_exclusive. >> >> === >> >> Use a patch order to prevent the scripts generate notifications. > > which scripts ? For Linux users: ./scripts/checkpatch.pl --strict <patch1> <patch2> Device tree maintainer rob+dt: A bot with unknown scripts. > >> - dts rk3288 clock removal >> - dt-bindings conversion >> >> - add rk3328 compatible string in a separate patch + new clock names >> >> - your driver changes >> >> - dts patches >> >> A proposed maintainer must be able to submit patch series without errors. ;) >> >> === >> >> When you remove a clock in a YAML conversion you must add a note to the >> DT maintainer. >> >> === >> >> Johan >> >> On 3/2/22 22:11, Corentin Labbe wrote: >>> The DMA clock is handled by the DMA controller, so the crypto does not >>> have to touch it. >>> >>> Signed-off-by: Corentin Labbe <clabbe@baylibre.com> >>> --- >>> drivers/crypto/rockchip/rk3288_crypto.c | 16 +--------------- >>> drivers/crypto/rockchip/rk3288_crypto.h | 1 - >>> 2 files changed, 1 insertion(+), 16 deletions(-) >>> >>> diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c >>> index 94ef1283789f..645855d2651b 100644 >>> --- a/drivers/crypto/rockchip/rk3288_crypto.c >>> +++ b/drivers/crypto/rockchip/rk3288_crypto.c >>> @@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) >>> __func__, __LINE__); >>> goto err_hclk; >>> } >>> - err = clk_prepare_enable(dev->dmaclk); >>> - if (err) { >>> - dev_err(dev->dev, "[%s:%d], Couldn't enable clock dmaclk\n", >>> - __func__, __LINE__); >>> - goto err_dmaclk; >>> - } >>> + >>> return err; >>> -err_dmaclk: >>> - clk_disable_unprepare(dev->hclk); >>> err_hclk: >>> clk_disable_unprepare(dev->aclk); >>> err_aclk: >>> @@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) >>> >>> static void rk_crypto_disable_clk(struct rk_crypto_info *dev) >>> { >>> - clk_disable_unprepare(dev->dmaclk); >>> clk_disable_unprepare(dev->hclk); >>> clk_disable_unprepare(dev->aclk); >>> clk_disable_unprepare(dev->sclk); >>> @@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev) >>> goto err_crypto; >>> } >>> >> >>> - crypto_info->dmaclk = devm_clk_get(&pdev->dev, "apb_pclk"); >>> - if (IS_ERR(crypto_info->dmaclk)) { >>> - err = PTR_ERR(crypto_info->dmaclk); >>> - goto err_crypto; >>> - } >>> - >> >> rk3288: >> clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>, >> - <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>; >> - clock-names = "aclk", "hclk", "sclk", "apb_pclk"; >> + <&cru SCLK_CRYPTO>; >> + clock-names = "aclk", "hclk", "sclk"; >> >> >> rk3328: >> + clocks = <&cru HCLK_CRYPTO_MST>, <&cru HCLK_CRYPTO_SLV>, >> + <&cru SCLK_CRYPTO>; >> + clock-names = "aclk", "hclk", "sclk"; >> >> The HCLK_CRYPTO_MST not is related to ACLK_CRYPTO. >> You are reusing rk3288 names to not to change the driver. >> Give it an other name. > > You are right, I will change them. > > >> >> === >> >> The sclk goes through a crypto_div_con. >> Does that need a frequency set? >> Or does that come from nowhere? >> >> From crypto_v1.c >> priv->frequency = dev_read_u32_default(dev, "clock-frequency", >> CRYPTO_V1_DEFAULT_RATE); >> >> ret = clk_set_rate(&priv->sclk, priv->frequency); >> > > The problem is that I dont see any hints for this in TRM, and their rockchips source are inconsistent, they do this in uboot not in linux.... Rockchip RK3288TRM V1.2 Part2-20170321.pdf page 1419 Make sure F crypto do not exceed 150M. === For rk3228/rk3328: Rockchip RK3228TRM V0.1 20151016-Part3 Graphic and Multi-media.pdf page 476 Make sure F crypto do not exceed 150M. === Rockchip RK3399TRM V1.1 Part3 20160728.pdf page 781 Make sure F crypto do not exceed 200M. === They all have a limit. Rockchip uses a default in there drivers and in there TRM tables. Then stay consistant and use that too what is already set by the bootloader. (till someone comes up with a better (yet unknown) approuch) #define CRYPTO_V1_DEFAULT_RATE 100000000 === Could you disclose your sclk frequency table from: /sys/kernel/debug/clk/clk_summary Does that fit within the limits? > >> === >> >> Could you make this portable? >> Example: >> >> int i; >> >> priv->num_clks = devm_clk_bulk_get_all(dev, &priv->clks); >> if (priv->num_clks < 1) >> return -EINVAL; >> >> priv->sclk = NULL; >> for (i = 0; i < priv->num_clks; i++) { >> if (!strncmp(priv->clks[i].id, "sclk", 3)) { >> priv->sclk = priv->clks[i].clk; >> break; >> } >> } >> >> if (!priv->sclk) { >> dev_err(dev, "no sclk found\n"); >> return -EINVAL; >> } >> >> Also add optional "sclk1" clock for rk3399. >> Use "sclk" and not "sclk0" to be backwards compatible. >> >> === >> >> Also make the resets portable for rk3399. >> Remove the requirement for "reset-names". >> >> Example: >> priv->phy_rst = devm_reset_control_array_get_exclusive(dev); >> if (IS_ERR(priv->phy_rst)) >> return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy >> reset\n"); >> >> >> >>> crypto_info->irq = platform_get_irq(pdev, 0); >>> if (crypto_info->irq < 0) { >>> dev_err(&pdev->dev, "control Interrupt is not available.\n"); >>> diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h >>> index c741e97057dc..963fbfc4d14e 100644 >>> --- a/drivers/crypto/rockchip/rk3288_crypto.h >>> +++ b/drivers/crypto/rockchip/rk3288_crypto.h >>> @@ -191,7 +191,6 @@ struct rk_crypto_info { >> >>> struct clk *aclk; >>> struct clk *hclk; >>> struct clk *sclk; >>> - struct clk *dmaclk; >> >> >> int num_clks; >> struct clk_bulk_data *clks; >> struct clk *sclk; >> struct clk *sclk1; >> >> >>> struct reset_control *rst; >>> void __iomem *reg; >>> int irq; > > > For handling rk3399, I have no hardware so I cannot do anything for it easily. > I have asked on IRC for some tests, so let's see if it works. > Anyway we can always add support for it later, the priority is to fix the driver breakage. The problem with "later" is always that people "forget". Now you have all people there attention, so get it right for rk3228/rk3328 (and probably for rk3399). Success! Johan > > Regards
Le Thu, Mar 10, 2022 at 06:52:15PM +0100, Johan Jonker a écrit : > > > On 3/10/22 15:45, LABBE Corentin wrote: > > Le Fri, Mar 04, 2022 at 04:01:58PM +0100, Johan Jonker a écrit : > >> Hi Corentin, > >> > >> Make your clock driver parsing portable. > >> > >> === > >> oneOf: > >> - const: rockchip,rk3288-crypto > >> - items: > >> - enum: > >> - rockchip,rk3328-crypto > >> - const: rockchip,rk3288-crypto > >> > >> Compatible string must be SoC related! > >> > >> rk3288 was the first in line that had support, so we use that as fall > >> back string. > >> > >> === > >> > >> Make binding fit for more SoC types. > >> Allow more clocks by using devm_clk_bulk_get_all. > > > > Hello > > > > Thanks for the hint of devm_clk_bulk_get_all, I will switch to it as it simplify clock handling. > > > >> Drop reset-names requirement for devm_reset_control_array_get_exclusive. > >> > >> === > >> > >> Use a patch order to prevent the scripts generate notifications. > > > > > which scripts ? > > For Linux users: > ./scripts/checkpatch.pl --strict <patch1> <patch2> > > Device tree maintainer rob+dt: > A bot with unknown scripts. > > > > >> > > > - dts rk3288 clock removal > > >> - dt-bindings conversion > >> > >> - add rk3328 compatible string in a separate patch > + new clock names > > > >> > >> - your driver changes > >> > >> - dts patches > >> > >> A proposed maintainer must be able to submit patch series without errors. ;) > >> > >> === > >> > >> When you remove a clock in a YAML conversion you must add a note to the > >> DT maintainer. > >> > >> === > >> > >> Johan > >> > >> On 3/2/22 22:11, Corentin Labbe wrote: > >>> The DMA clock is handled by the DMA controller, so the crypto does not > >>> have to touch it. > >>> > >>> Signed-off-by: Corentin Labbe <clabbe@baylibre.com> > >>> --- > >>> drivers/crypto/rockchip/rk3288_crypto.c | 16 +--------------- > >>> drivers/crypto/rockchip/rk3288_crypto.h | 1 - > >>> 2 files changed, 1 insertion(+), 16 deletions(-) > >>> > >>> diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c > >>> index 94ef1283789f..645855d2651b 100644 > >>> --- a/drivers/crypto/rockchip/rk3288_crypto.c > >>> +++ b/drivers/crypto/rockchip/rk3288_crypto.c > >>> @@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) > >>> __func__, __LINE__); > >>> goto err_hclk; > >>> } > >>> - err = clk_prepare_enable(dev->dmaclk); > >>> - if (err) { > >>> - dev_err(dev->dev, "[%s:%d], Couldn't enable clock dmaclk\n", > >>> - __func__, __LINE__); > >>> - goto err_dmaclk; > >>> - } > >>> + > >>> return err; > >>> -err_dmaclk: > >>> - clk_disable_unprepare(dev->hclk); > >>> err_hclk: > >>> clk_disable_unprepare(dev->aclk); > >>> err_aclk: > >>> @@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) > >>> > >>> static void rk_crypto_disable_clk(struct rk_crypto_info *dev) > >>> { > >>> - clk_disable_unprepare(dev->dmaclk); > >>> clk_disable_unprepare(dev->hclk); > >>> clk_disable_unprepare(dev->aclk); > >>> clk_disable_unprepare(dev->sclk); > >>> @@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev) > >>> goto err_crypto; > >>> } > >>> > >> > >>> - crypto_info->dmaclk = devm_clk_get(&pdev->dev, "apb_pclk"); > >>> - if (IS_ERR(crypto_info->dmaclk)) { > >>> - err = PTR_ERR(crypto_info->dmaclk); > >>> - goto err_crypto; > >>> - } > >>> - > >> > >> rk3288: > >> clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>, > >> - <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>; > >> - clock-names = "aclk", "hclk", "sclk", "apb_pclk"; > >> + <&cru SCLK_CRYPTO>; > >> + clock-names = "aclk", "hclk", "sclk"; > >> > >> > >> rk3328: > >> + clocks = <&cru HCLK_CRYPTO_MST>, <&cru HCLK_CRYPTO_SLV>, > >> + <&cru SCLK_CRYPTO>; > >> + clock-names = "aclk", "hclk", "sclk"; > >> > >> The HCLK_CRYPTO_MST not is related to ACLK_CRYPTO. > >> You are reusing rk3288 names to not to change the driver. > >> Give it an other name. > > > > You are right, I will change them. > > > > > >> > >> === > >> > > >> The sclk goes through a crypto_div_con. > >> Does that need a frequency set? > >> Or does that come from nowhere? > >> > >> From crypto_v1.c > >> priv->frequency = dev_read_u32_default(dev, "clock-frequency", > >> CRYPTO_V1_DEFAULT_RATE); > >> > >> ret = clk_set_rate(&priv->sclk, priv->frequency); > >> > > > > > The problem is that I dont see any hints for this in TRM, and their rockchips source are inconsistent, they do this in uboot not in linux.... > > Rockchip RK3288TRM V1.2 Part2-20170321.pdf > page 1419 > > Make sure F crypto do not exceed 150M. > > === > > For rk3228/rk3328: > Rockchip RK3228TRM V0.1 20151016-Part3 Graphic and Multi-media.pdf > page 476 > > Make sure F crypto do not exceed 150M. > > === > > Rockchip RK3399TRM V1.1 Part3 20160728.pdf > page 781 > > Make sure F crypto do not exceed 200M. > > === > > They all have a limit. > Rockchip uses a default in there drivers and in there TRM tables. > Then stay consistant and use that too what is already set by the bootloader. > (till someone comes up with a better (yet unknown) approuch) > > #define CRYPTO_V1_DEFAULT_RATE 100000000 > > === > > Could you disclose your sclk frequency table from: > > /sys/kernel/debug/clk/clk_summary > > Does that fit within the limits? > Hello On my rk3328-rock64, sclk is 240Mhz, so far beyond the limit. [ 32.416633] rk3288-crypto ff060000.crypto: CLK 0 hclk_master 75000000 75Mhz [ 32.417292] rk3288-crypto ff060000.crypto: CLK 1 hclk_slave 75000000 75Mhz [ 32.417926] rk3288-crypto ff060000.crypto: CLK 2 sclk 240000000 240Mhz But everything is stable even with this value. I remember trying overcloacking allwinner crypto, things broke really fast. I will try to collect values from other SoCs. enable prepare protect duty hardware clock count count count rate accuracy phase cycle enable ------------------------------------------------------------------------------------------------------- rk805-clkout2 0 0 0 32768 0 0 50000 Y xin32k 0 0 0 32768 0 0 50000 Y gmac_clkin 1 1 0 125000000 0 0 50000 Y clk_mac2io 2 2 0 125000000 0 0 50000 Y clk_mac2io_ref 0 0 0 125000000 0 0 50000 N clk_mac2io_rx 0 0 0 125000000 0 0 50000 N clk_mac2io_tx 1 1 0 125000000 0 0 50000 Y clk_mac2io_refout 0 0 0 125000000 0 0 50000 N clk_mac2io_ext 0 0 0 125000000 0 0 50000 Y xin24m 8 8 0 24000000 0 0 50000 Y hdmi_phy 0 0 0 148500000 0 0 50000 Y usb480m_phy 4 4 0 480000000 0 0 50000 Y usb480m 0 0 0 480000000 0 0 50000 Y sclk_uart1 0 0 0 24000000 0 0 50000 Y sclk_uart0 0 0 0 24000000 0 0 50000 Y xin12m 0 0 0 12000000 0 0 50000 Y clk_usb3otg_suspend 0 0 0 30770 0 0 50000 N clk_usb3otg_ref 0 0 0 24000000 0 0 50000 N clk_ref_usb3otg 0 0 0 24000000 0 0 50000 Y clk_emmc 0 0 0 200000 0 0 50000 N emmc_sample 0 0 0 100000 0 0 50000 Y emmc_drv 0 0 0 100000 0 90 50000 Y sclk_hdmi_sfc 0 0 0 24000000 0 0 50000 N sclk_timer5 0 0 0 24000000 0 0 50000 N sclk_timer4 0 0 0 24000000 0 0 50000 N sclk_timer3 0 0 0 24000000 0 0 50000 N sclk_timer2 0 0 0 24000000 0 0 50000 N sclk_timer1 0 0 0 24000000 0 0 50000 N sclk_timer0 0 0 0 24000000 0 0 50000 N clk_efuse 0 0 0 12000000 0 0 50000 N clk_otp 0 0 0 24000000 0 0 50000 N sclk_uart2 1 1 0 24000000 0 0 50000 Y clk_ddrmon 0 0 0 24000000 0 0 50000 Y hdmiphy 0 0 0 24000000 0 0 50000 Y dclk_lcdc 0 0 0 24000000 0 0 50000 Y hdmiphy_peri 0 0 0 24000000 0 0 50000 Y clk_24m 1 1 0 24000000 0 0 50000 Y clk_saradc 0 0 0 49897 0 0 50000 N clk_tsadc 1 1 0 50000 0 0 50000 Y pll_npll 1 1 0 1200000000 0 0 50000 Y npll 1 1 0 1200000000 0 0 50000 Y npll_core 1 1 0 1200000000 0 0 50000 Y armclk 2 2 0 1200000000 0 0 50000 Y pclk_dbg 1 1 0 200000000 0 0 50000 Y aclk_core 2 2 0 600000000 0 0 50000 Y aclk_gic400 1 1 0 600000000 0 0 50000 Y aclk_core_niu 1 1 0 600000000 0 0 50000 Y pll_gpll 1 1 0 491520000 0 0 50000 Y gpll 3 3 0 491520000 0 0 50000 Y clk_rtc32k 0 0 0 32768 0 0 50000 N aclk_gmac 3 3 0 163840000 0 0 50000 Y aclk_gmac_niu 1 1 0 163840000 0 0 50000 Y aclk_mac2io 1 1 0 163840000 0 0 50000 Y aclk_mac2phy 0 0 0 163840000 0 0 50000 N pclk_gmac 2 2 0 54613334 0 0 50000 Y pclk_gmac_niu 1 1 0 54613334 0 0 50000 Y pclk_mac2io 1 1 0 54613334 0 0 50000 Y pclk_mac2phy 0 0 0 54613334 0 0 50000 N gpll_peri 0 0 0 491520000 0 0 50000 N clk_rga 0 0 0 163840000 0 0 50000 N clk_spi 0 0 0 15360000 0 0 50000 N aclk_gpu_pre 1 1 0 163840000 0 0 50000 Y aclk_gpu_niu 1 1 0 163840000 0 0 50000 Y aclk_gpu 0 0 0 163840000 0 0 50000 N gpll_core 1 1 0 491520000 0 0 50000 Y pll_cpll 1 1 0 1200000000 0 0 50000 Y cpll 10 11 0 1200000000 0 0 50000 Y clk_sdmmc 0 0 0 100000000 0 0 50000 N sdmmc_sample 0 0 0 50000000 0 0 50000 Y sdmmc_drv 0 0 0 50000000 0 90 50000 Y aclk_bus_pre 4 5 0 150000000 0 0 50000 Y aclk_dmac_bus 0 1 0 150000000 0 0 50000 N aclk_intmem 1 1 0 150000000 0 0 50000 Y aclk_tsp 0 0 0 150000000 0 0 50000 N aclk_dcf 0 0 0 150000000 0 0 50000 N aclk_bus_niu 1 1 0 150000000 0 0 50000 Y pclk_bus_pre 2 2 0 75000000 0 0 50000 Y pclk_phy_pre 3 3 0 75000000 0 0 50000 Y pclk_phy_niu 1 1 0 75000000 0 0 50000 Y pclk_vdacphy 0 0 0 75000000 0 0 50000 Y pclk_hdmiphy 1 1 0 75000000 0 0 50000 Y pclk_acodecphy 0 0 0 75000000 0 0 50000 N pclk_ddrphy 1 1 0 75000000 0 0 50000 N pclk_usb2_grf 0 0 0 75000000 0 0 50000 Y pclk_usb3_grf 0 0 0 75000000 0 0 50000 Y pclk_usb3phy_pipe 0 0 0 75000000 0 0 50000 N pclk_usb3phy_otg 0 0 0 75000000 0 0 50000 N pclk_bus 14 15 0 75000000 0 0 50000 Y pclk_wdt 1 1 0 75000000 0 0 50000 Y pclk_pmu 1 1 0 75000000 0 0 50000 Y pclk_saradc 0 0 0 75000000 0 0 50000 N pclk_sim 0 0 0 75000000 0 0 50000 Y pclk_sgrf 1 1 0 75000000 0 0 50000 Y pclk_cru 1 1 0 75000000 0 0 50000 Y pclk_grf 1 1 0 75000000 0 0 50000 Y pclk_dcf 0 0 0 75000000 0 0 50000 N pclk_tsadc 1 1 0 75000000 0 0 50000 Y pclk_uart2 1 1 0 75000000 0 0 50000 Y pclk_uart1 0 0 0 75000000 0 0 50000 N pclk_uart0 0 0 0 75000000 0 0 50000 N pclk_gpio3 1 1 0 75000000 0 0 50000 Y pclk_gpio2 1 1 0 75000000 0 0 50000 Y pclk_gpio1 1 1 0 75000000 0 0 50000 Y pclk_gpio0 1 1 0 75000000 0 0 50000 Y pclk_rk_pwm 0 0 0 75000000 0 0 50000 N pclk_spi 0 0 0 75000000 0 0 50000 N pclk_stimer 0 0 0 75000000 0 0 50000 N pclk_timer0 1 1 0 75000000 0 0 50000 Y pclk_i2c3 0 0 0 75000000 0 0 50000 N pclk_i2c2 0 0 0 75000000 0 0 50000 N pclk_i2c1 0 1 0 75000000 0 0 50000 N pclk_i2c0 0 0 0 75000000 0 0 50000 N pclk_otp 0 0 0 75000000 0 0 50000 Y pclk_efuse 0 0 0 75000000 0 0 50000 Y pclk_bus_niu 1 1 0 75000000 0 0 50000 Y hclk_bus_pre 2 2 0 75000000 0 0 50000 Y hclk_pdm 0 0 0 75000000 0 0 50000 N hclk_bus_niu 1 1 0 75000000 0 0 50000 Y hclk_crypto_slv 0 0 0 75000000 0 0 50000 N hclk_crypto_mst 0 0 0 75000000 0 0 50000 N hclk_tsp 0 0 0 75000000 0 0 50000 N hclk_spdif_8ch 0 0 0 75000000 0 0 50000 N hclk_i2s2_2ch 0 0 0 75000000 0 0 50000 N hclk_i2s1_8ch 0 0 0 75000000 0 0 50000 N hclk_i2s0_8ch 0 0 0 75000000 0 0 50000 N hclk_rom 1 1 0 75000000 0 0 50000 Y clk_wifi 0 0 0 24000000 0 0 50000 N sclk_vdec_core 0 0 0 100000000 0 0 50000 N sclk_vdec_cabac 0 0 0 100000000 0 0 50000 N aclk_vpu_pre 2 3 0 400000000 0 0 50000 Y aclk_vpu_niu 1 1 0 400000000 0 0 50000 Y aclk_vpu 0 5 0 400000000 0 0 50000 N hclk_vpu_pre 1 2 0 100000000 0 0 50000 Y hclk_vpu_niu 1 1 0 100000000 0 0 50000 Y hclk_vpu 0 5 0 100000000 0 0 50000 N aclk_rga_pre 1 1 0 100000000 0 0 50000 Y aclk_rga_niu 1 1 0 100000000 0 0 50000 Y aclk_rga 0 0 0 100000000 0 0 50000 N aclk_vio_pre 2 2 0 100000000 0 0 50000 Y aclk_vio_niu 1 1 0 100000000 0 0 50000 Y aclk_hdcp 0 0 0 100000000 0 0 50000 N aclk_cif 0 0 0 100000000 0 0 50000 N aclk_iep 0 0 0 100000000 0 0 50000 N hclk_vio_pre 5 6 0 33333334 0 0 50000 Y pclk_hdcp 0 0 0 33333334 0 0 50000 N pclk_hdmi 0 0 0 33333334 0 0 50000 N hclk_vio_niu 1 1 0 33333334 0 0 50000 Y hclk_hdcp 0 0 0 33333334 0 0 50000 N hclk_vio_h2p 1 1 0 33333334 0 0 50000 Y pclk_vio_h2p 1 1 0 33333334 0 0 50000 Y hclk_ahb1tom 1 1 0 33333334 0 0 50000 Y hclk_rga 0 0 0 33333334 0 0 50000 N hclk_cif 0 0 0 33333334 0 0 50000 N hclk_iep 0 0 0 33333334 0 0 50000 N hclk_vop_niu 1 1 0 33333334 0 0 50000 Y hclk_vop 0 1 0 33333334 0 0 50000 N clk_mac2phy_src 0 0 0 75000000 0 0 50000 N clk_mac2phy 0 0 0 75000000 0 0 50000 Y clk_mac2phy_ref 0 0 0 75000000 0 0 50000 N clk_mac2phy_rxtx 0 0 0 75000000 0 0 50000 N clk_mac2phy_out 0 0 0 75000000 0 0 50000 N clk_mac2io_out 0 0 0 150000000 0 0 50000 N clk_mac2io_src 0 0 0 200000000 0 0 50000 N clk_ref_usb3otg_src 0 0 0 37500000 0 0 50000 N clk_sdmmc_ext 0 0 0 300000000 0 0 50000 N sdmmc_ext_sample 0 0 0 150000000 0 0 50000 Y sdmmc_ext_drv 0 0 0 150000000 0 180 50000 Y clk_sdio 0 0 0 50000000 0 0 50000 N sdio_sample 0 0 0 25000000 0 0 50000 Y sdio_drv 0 0 0 25000000 0 180 50000 Y cpll_peri 1 1 0 1200000000 0 0 50000 Y aclk_peri_pre 3 3 0 150000000 0 0 50000 Y aclk_peri 1 1 0 150000000 0 0 50000 Y aclk_usb3otg 0 0 0 150000000 0 0 50000 N aclk_peri_noc 0 0 0 150000000 0 0 50000 Y hclk_peri 7 7 0 75000000 0 0 50000 Y pclk_peri_niu 1 1 0 75000000 0 0 50000 Y hclk_peri_niu 1 1 0 75000000 0 0 50000 Y hclk_otg_pmu 1 1 0 75000000 0 0 50000 Y hclk_otg 1 1 0 75000000 0 0 50000 Y hclk_host0_arb 0 0 0 75000000 0 0 50000 Y hclk_host0 2 2 0 75000000 0 0 50000 Y hclk_sdmmc_ext 0 0 0 75000000 0 0 50000 N hclk_emmc 0 0 0 75000000 0 0 50000 N hclk_sdio 0 0 0 75000000 0 0 50000 N hclk_sdmmc 1 1 0 75000000 0 0 50000 Y pclk_peri 1 1 0 75000000 0 0 50000 Y dclk_lcdc_src 1 1 0 24000000 0 0 50000 Y dclk_hdmiphy 1 1 0 8000000 0 0 50000 Y clk_cif_src 0 0 0 1200000000 0 0 50000 N clk_cif_out 0 0 0 60000000 0 0 50000 Y aclk_vop_pre 1 2 0 100000000 0 0 50000 Y aclk_vop_niu 1 1 0 100000000 0 0 50000 Y aclk_vop 0 1 0 100000000 0 0 50000 N sclk_venc_dsp 0 0 0 50000000 0 0 50000 N sclk_venc_core 0 0 0 50000000 0 0 50000 N aclk_rkvenc 2 2 0 50000000 0 0 50000 Y aclk_axisram 0 0 0 50000000 0 0 50000 Y aclk_h264 0 0 0 50000000 0 0 50000 N aclk_h265 0 0 0 50000000 0 0 50000 N aclk_rkvenc_niu 1 1 0 50000000 0 0 50000 Y hclk_rkvenc 1 1 0 12500000 0 0 50000 Y hclk_h264 0 0 0 12500000 0 0 50000 N pclk_h265 0 0 0 12500000 0 0 50000 N hclk_rkvenc_niu 1 1 0 12500000 0 0 50000 Y aclk_rkvdec_pre 2 2 0 100000000 0 0 50000 Y aclk_rkvdec_niu 1 1 0 100000000 0 0 50000 Y aclk_rkvdec 0 0 0 100000000 0 0 50000 N hclk_rkvdec_pre 1 1 0 25000000 0 0 50000 Y hclk_rkvdec_niu 1 1 0 25000000 0 0 50000 Y hclk_rkvdec 0 0 0 25000000 0 0 50000 N clk_pwm 0 0 0 150000000 0 0 50000 N clk_crypto 0 0 0 240000000 0 0 50000 N clk_i2c3 0 0 0 150000000 0 0 50000 N clk_i2c2 0 0 0 150000000 0 0 50000 N clk_i2c1 0 1 0 150000000 0 0 50000 N clk_i2c0 0 0 0 150000000 0 0 50000 N clk_uart2_div 0 0 0 150000000 0 0 50000 N clk_uart2_frac 0 0 0 7500000 0 0 50000 N clk_uart1_div 0 0 0 150000000 0 0 50000 N clk_uart1_frac 0 0 0 7500000 0 0 50000 N clk_uart0_div 0 0 0 150000000 0 0 50000 N clk_uart0_frac 0 0 0 7500000 0 0 50000 N clk_spdif_div 0 0 0 75000000 0 0 50000 N sclk_spdif 0 0 0 75000000 0 0 50000 Y clk_spdif_frac 0 0 0 3750000 0 0 50000 N clk_i2s2_div 0 0 0 75000000 0 0 50000 N i2s2_pre 0 0 0 75000000 0 0 50000 Y clk_i2s2 0 0 0 75000000 0 0 50000 N i2s2_out 0 0 0 75000000 0 0 50000 N clk_i2s2_frac 0 0 0 3750000 0 0 50000 N clk_i2s1_div 0 0 0 75000000 0 0 50000 N i2s1_pre 0 0 0 75000000 0 0 50000 Y clk_i2s1 0 0 0 75000000 0 0 50000 N i2s1_out 0 0 0 75000000 0 0 50000 N clk_i2s1_frac 0 0 0 3750000 0 0 50000 N clk_i2s0_div 0 0 0 75000000 0 0 50000 N i2s0_pre 0 0 0 75000000 0 0 50000 Y clk_i2s0 0 0 0 75000000 0 0 50000 N clk_i2s0_frac 0 0 0 3750000 0 0 50000 N clk_tsp 0 0 0 50000000 0 0 50000 N pclk_ddr 3 3 0 150000000 0 0 50000 Y pclk_ddr_grf 1 1 0 150000000 0 0 50000 Y pclk_ddrstdby 0 0 0 150000000 0 0 50000 Y pclk_ddr_mon 1 1 0 150000000 0 0 50000 Y pclk_ddr_msch 1 1 0 150000000 0 0 50000 Y pclk_ddrupctl 0 0 0 150000000 0 0 50000 Y pll_dpll 1 1 0 1596000000 0 0 50000 Y dpll 1 1 0 1596000000 0 0 50000 Y clk_ddr 2 2 0 1596000000 0 0 50000 Y aclk_ddrupctl 0 0 0 1596000000 0 0 50000 Y clk_ddrupctl 1 1 0 1596000000 0 0 50000 Y clk_ddrmsch 1 1 0 1596000000 0 0 50000 Y dpll_core 0 0 0 1596000000 0 0 50000 Y pll_apll 0 0 0 61440000 0 0 50000 Y apll 0 0 0 61440000 0 0 50000 Y clk_pdm 0 0 0 61440000 0 0 50000 N apll_core 0 0 0 61440000 0 0 50000 Y clk_hsadc_tsp 0 0 0 0 0 0 50000 N clk_jtag 1 1 0 0 0 0 50000 Y
diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c index 94ef1283789f..645855d2651b 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.c +++ b/drivers/crypto/rockchip/rk3288_crypto.c @@ -40,15 +40,8 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) __func__, __LINE__); goto err_hclk; } - err = clk_prepare_enable(dev->dmaclk); - if (err) { - dev_err(dev->dev, "[%s:%d], Couldn't enable clock dmaclk\n", - __func__, __LINE__); - goto err_dmaclk; - } + return err; -err_dmaclk: - clk_disable_unprepare(dev->hclk); err_hclk: clk_disable_unprepare(dev->aclk); err_aclk: @@ -59,7 +52,6 @@ static int rk_crypto_enable_clk(struct rk_crypto_info *dev) static void rk_crypto_disable_clk(struct rk_crypto_info *dev) { - clk_disable_unprepare(dev->dmaclk); clk_disable_unprepare(dev->hclk); clk_disable_unprepare(dev->aclk); clk_disable_unprepare(dev->sclk); @@ -199,12 +191,6 @@ static int rk_crypto_probe(struct platform_device *pdev) goto err_crypto; } - crypto_info->dmaclk = devm_clk_get(&pdev->dev, "apb_pclk"); - if (IS_ERR(crypto_info->dmaclk)) { - err = PTR_ERR(crypto_info->dmaclk); - goto err_crypto; - } - crypto_info->irq = platform_get_irq(pdev, 0); if (crypto_info->irq < 0) { dev_err(&pdev->dev, "control Interrupt is not available.\n"); diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h index c741e97057dc..963fbfc4d14e 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -191,7 +191,6 @@ struct rk_crypto_info { struct clk *aclk; struct clk *hclk; struct clk *sclk; - struct clk *dmaclk; struct reset_control *rst; void __iomem *reg; int irq;
The DMA clock is handled by the DMA controller, so the crypto does not have to touch it. Signed-off-by: Corentin Labbe <clabbe@baylibre.com> --- drivers/crypto/rockchip/rk3288_crypto.c | 16 +--------------- drivers/crypto/rockchip/rk3288_crypto.h | 1 - 2 files changed, 1 insertion(+), 16 deletions(-)