diff mbox

crypto: inside-secure - do not parse the dma mask from dt

Message ID 20170623140525.360-1-antoine.tenart@free-electrons.com (mailing list archive)
State Accepted
Delegated to: Herbert Xu
Headers show

Commit Message

Antoine Tenart June 23, 2017, 2:05 p.m. UTC
Remove the dma mask parsing from dt as this should not be encoded into
the engine device tree node. Keep the fallback value for now, which
should work for the boards already supported upstream.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---

Hi Herbert,

As pointed our by Arnd (ic Cc) parsing the dma mask from the dt node of
the engine is broken. This property will be removed from the device
trees having an inside-secure safexcel engine node. While the
inside-secure won't fail because of this (as it will fallback to a
64 bits mask), the code handling the dma-mask property is dead. This
patch removes it.

Thanks!
Antoine

 drivers/crypto/inside-secure/safexcel.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Arnd Bergmann June 23, 2017, 2:29 p.m. UTC | #1
On Fri, Jun 23, 2017 at 4:05 PM, Antoine Tenart
<antoine.tenart@free-electrons.com> wrote:
> Remove the dma mask parsing from dt as this should not be encoded into
> the engine device tree node. Keep the fallback value for now, which
> should work for the boards already supported upstream.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Acked-by: Arnd Bergmann <arnd@arndb.de>

> ---
>
> Hi Herbert,
>
> As pointed our by Arnd (ic Cc) parsing the dma mask from the dt node of
> the engine is broken. This property will be removed from the device
> trees having an inside-secure safexcel engine node. While the
> inside-secure won't fail because of this (as it will fallback to a
> 64 bits mask), the code handling the dma-mask property is dead. This
> patch removes it.

Do we also need a patch to update the DT binding?

       Arnd
Antoine Tenart June 23, 2017, 2:35 p.m. UTC | #2
Hi Arnd,

On Fri, Jun 23, 2017 at 04:29:58PM +0200, Arnd Bergmann wrote:
> On Fri, Jun 23, 2017 at 4:05 PM, Antoine Tenart
> <antoine.tenart@free-electrons.com> wrote:
> >
> > As pointed our by Arnd (ic Cc) parsing the dma mask from the dt node of
> > the engine is broken. This property will be removed from the device
> > trees having an inside-secure safexcel engine node. While the
> > inside-secure won't fail because of this (as it will fallback to a
> > 64 bits mask), the code handling the dma-mask property is dead. This
> > patch removes it.
> 
> Do we also need a patch to update the DT binding?

You're right, we need to update the bindings documentation. I'll send a
patch for this as well.

Thanks!
Antoine
Herbert Xu July 18, 2017, 10:35 a.m. UTC | #3
On Fri, Jun 23, 2017 at 04:05:25PM +0200, Antoine Tenart wrote:
> Remove the dma mask parsing from dt as this should not be encoded into
> the engine device tree node. Keep the fallback value for now, which
> should work for the boards already supported upstream.
> 
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Patch applied.  Thanks.
diff mbox

Patch

diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index e7f87ac12685..1fabd4aee81b 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -773,7 +773,6 @@  static int safexcel_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct resource *res;
 	struct safexcel_crypto_priv *priv;
-	u64 dma_mask;
 	int i, ret;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -802,9 +801,7 @@  static int safexcel_probe(struct platform_device *pdev)
 			return -EPROBE_DEFER;
 	}
 
-	if (of_property_read_u64(dev->of_node, "dma-mask", &dma_mask))
-		dma_mask = DMA_BIT_MASK(64);
-	ret = dma_set_mask_and_coherent(dev, dma_mask);
+	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
 	if (ret)
 		goto err_clk;