020-0010-crypto-crypto4xx-replace-crypto4xx_dev-s-scatter_buf.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. From 40e3b847bff70edc28c5290d209e531da6f9e534 Mon Sep 17 00:00:00 2001
  2. From: Christian Lamparter <[email protected]>
  3. Date: Fri, 25 Aug 2017 15:47:23 +0200
  4. Subject: [PATCH 10/25] crypto: crypto4xx - replace crypto4xx_dev's
  5. scatter_buffer_size with constant
  6. scatter_buffer_size is always set to PPC4XX_SD_BUFFER_SIZE.
  7. I don't think there's any point in keeping the variable
  8. around.
  9. Signed-off-by: Christian Lamparter <[email protected]>
  10. Signed-off-by: Herbert Xu <[email protected]>
  11. ---
  12. drivers/crypto/amcc/crypto4xx_core.c | 7 +++----
  13. drivers/crypto/amcc/crypto4xx_core.h | 1 -
  14. 2 files changed, 3 insertions(+), 5 deletions(-)
  15. --- a/drivers/crypto/amcc/crypto4xx_core.c
  16. +++ b/drivers/crypto/amcc/crypto4xx_core.c
  17. @@ -396,10 +396,9 @@ static u32 crypto4xx_build_sdr(struct cr
  18. if (!dev->sdr)
  19. return -ENOMEM;
  20. - dev->scatter_buffer_size = PPC4XX_SD_BUFFER_SIZE;
  21. dev->scatter_buffer_va =
  22. dma_alloc_coherent(dev->core_dev->device,
  23. - dev->scatter_buffer_size * PPC4XX_NUM_SD,
  24. + PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,
  25. &dev->scatter_buffer_pa, GFP_ATOMIC);
  26. if (!dev->scatter_buffer_va)
  27. return -ENOMEM;
  28. @@ -408,7 +407,7 @@ static u32 crypto4xx_build_sdr(struct cr
  29. for (i = 0; i < PPC4XX_NUM_SD; i++) {
  30. sd_array[i].ptr = dev->scatter_buffer_pa +
  31. - dev->scatter_buffer_size * i;
  32. + PPC4XX_SD_BUFFER_SIZE * i;
  33. }
  34. return 0;
  35. @@ -423,7 +422,7 @@ static void crypto4xx_destroy_sdr(struct
  36. if (dev->scatter_buffer_va)
  37. dma_free_coherent(dev->core_dev->device,
  38. - dev->scatter_buffer_size * PPC4XX_NUM_SD,
  39. + PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,
  40. dev->scatter_buffer_va,
  41. dev->scatter_buffer_pa);
  42. }
  43. --- a/drivers/crypto/amcc/crypto4xx_core.h
  44. +++ b/drivers/crypto/amcc/crypto4xx_core.h
  45. @@ -87,7 +87,6 @@ struct crypto4xx_device {
  46. program ce sdr_base_register */
  47. void *scatter_buffer_va;
  48. dma_addr_t scatter_buffer_pa;
  49. - u32 scatter_buffer_size;
  50. void *shadow_sa_pool; /* pool of memory for sa in pd_uinfo */
  51. dma_addr_t shadow_sa_pool_pa;