target/linux/apm821xx/patches-5.4/112-crypto-crypto4xx-use-GFP_KERNEL-for-big-allocations.patch

   1 From 5bacaaea8a228bc46f402595b1694ef9128f3599 Mon Sep 17 00:00:00 2001
   2 Message-Id: <5bacaaea8a228bc46f402595b1694ef9128f3599.1577917078.git.chunkeey@gmail.com>
   3 In-Reply-To: <3913dbe4b3256ead342572f7aba726a60ab5fd43.1577917078.git.chunkeey@gmail.com>
   4 References: <3913dbe4b3256ead342572f7aba726a60ab5fd43.1577917078.git.chunkeey@gmail.com>
   5 From: Christian Lamparter <chunkeey@gmail.com>
   6 Date: Wed, 1 Jan 2020 22:54:54 +0100
   7 Subject: [PATCH 2/2] crypto: crypto4xx - use GFP_KERNEL for big allocations
   8 To: linux-crypto@vger.kernel.org
   9 Cc: Herbert Xu <herbert@gondor.apana.org.au>
  10
  11 The driver should use GFP_KERNEL for the bigger allocation
  12 during the driver's crypto4xx_probe() and not GFP_ATOMIC in
  13 my opinion.
  14
  15 Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  16 ---
  17  drivers/crypto/amcc/crypto4xx_core.c | 12 ++++++------
  18  1 file changed, 6 insertions(+), 6 deletions(-)
  19
  20 --- a/drivers/crypto/amcc/crypto4xx_core.c
  21 +++ b/drivers/crypto/amcc/crypto4xx_core.c
  22 @@ -169,7 +169,7 @@ static u32 crypto4xx_build_pdr(struct cr
  23         int i;
  24         dev->pdr = dma_alloc_coherent(dev->core_dev->device,
  25                                       sizeof(struct ce_pd) * PPC4XX_NUM_PD,
  26 -                                     &dev->pdr_pa, GFP_ATOMIC);
  27 +                                     &dev->pdr_pa, GFP_KERNEL);
  28         if (!dev->pdr)
  29                 return -ENOMEM;
  30
  31 @@ -185,13 +185,13 @@ static u32 crypto4xx_build_pdr(struct cr
  32         dev->shadow_sa_pool = dma_alloc_coherent(dev->core_dev->device,
  33                                    sizeof(union shadow_sa_buf) * PPC4XX_NUM_PD,
  34                                    &dev->shadow_sa_pool_pa,
  35 -                                  GFP_ATOMIC);
  36 +                                  GFP_KERNEL);
  37         if (!dev->shadow_sa_pool)
  38                 return -ENOMEM;
  39
  40         dev->shadow_sr_pool = dma_alloc_coherent(dev->core_dev->device,
  41                          sizeof(struct sa_state_record) * PPC4XX_NUM_PD,
  42 -                        &dev->shadow_sr_pool_pa, GFP_ATOMIC);
  43 +                        &dev->shadow_sr_pool_pa, GFP_KERNEL);
  44         if (!dev->shadow_sr_pool)
  45                 return -ENOMEM;
  46         for (i = 0; i < PPC4XX_NUM_PD; i++) {
  47 @@ -277,7 +277,7 @@ static u32 crypto4xx_build_gdr(struct cr
  48  {
  49         dev->gdr = dma_alloc_coherent(dev->core_dev->device,
  50                                       sizeof(struct ce_gd) * PPC4XX_NUM_GD,
  51 -                                     &dev->gdr_pa, GFP_ATOMIC);
  52 +                                     &dev->gdr_pa, GFP_KERNEL);
  53         if (!dev->gdr)
  54                 return -ENOMEM;
  55
  56 @@ -358,14 +358,14 @@ static u32 crypto4xx_build_sdr(struct cr
  57         dev->scatter_buffer_va =
  58                 dma_alloc_coherent(dev->core_dev->device,
  59                         PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,
  60 -                       &dev->scatter_buffer_pa, GFP_ATOMIC);
  61 +                       &dev->scatter_buffer_pa, GFP_KERNEL);
  62         if (!dev->scatter_buffer_va)
  63                 return -ENOMEM;
  64
  65         /* alloc memory for scatter descriptor ring */
  66         dev->sdr = dma_alloc_coherent(dev->core_dev->device,
  67                                       sizeof(struct ce_sd) * PPC4XX_NUM_SD,
  68 -                                     &dev->sdr_pa, GFP_ATOMIC);
  69 +                                     &dev->sdr_pa, GFP_KERNEL);
  70         if (!dev->sdr)
  71                 return -ENOMEM;
  72