Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: crypto4xx - use GFP_KERNEL for big allocations

The driver should use GFP_KERNEL for the bigger allocation
during the driver's crypto4xx_probe() and not GFP_ATOMIC in
my opinion.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Christian Lamparter and committed by
Herbert Xu
30a50e44 b87b2c4d

+6 -6
+6 -6
drivers/crypto/amcc/crypto4xx_core.c
··· 169 169 int i; 170 170 dev->pdr = dma_alloc_coherent(dev->core_dev->device, 171 171 sizeof(struct ce_pd) * PPC4XX_NUM_PD, 172 - &dev->pdr_pa, GFP_ATOMIC); 172 + &dev->pdr_pa, GFP_KERNEL); 173 173 if (!dev->pdr) 174 174 return -ENOMEM; 175 175 ··· 185 185 dev->shadow_sa_pool = dma_alloc_coherent(dev->core_dev->device, 186 186 sizeof(union shadow_sa_buf) * PPC4XX_NUM_PD, 187 187 &dev->shadow_sa_pool_pa, 188 - GFP_ATOMIC); 188 + GFP_KERNEL); 189 189 if (!dev->shadow_sa_pool) 190 190 return -ENOMEM; 191 191 192 192 dev->shadow_sr_pool = dma_alloc_coherent(dev->core_dev->device, 193 193 sizeof(struct sa_state_record) * PPC4XX_NUM_PD, 194 - &dev->shadow_sr_pool_pa, GFP_ATOMIC); 194 + &dev->shadow_sr_pool_pa, GFP_KERNEL); 195 195 if (!dev->shadow_sr_pool) 196 196 return -ENOMEM; 197 197 for (i = 0; i < PPC4XX_NUM_PD; i++) { ··· 277 277 { 278 278 dev->gdr = dma_alloc_coherent(dev->core_dev->device, 279 279 sizeof(struct ce_gd) * PPC4XX_NUM_GD, 280 - &dev->gdr_pa, GFP_ATOMIC); 280 + &dev->gdr_pa, GFP_KERNEL); 281 281 if (!dev->gdr) 282 282 return -ENOMEM; 283 283 ··· 358 358 dev->scatter_buffer_va = 359 359 dma_alloc_coherent(dev->core_dev->device, 360 360 PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD, 361 - &dev->scatter_buffer_pa, GFP_ATOMIC); 361 + &dev->scatter_buffer_pa, GFP_KERNEL); 362 362 if (!dev->scatter_buffer_va) 363 363 return -ENOMEM; 364 364 365 365 /* alloc memory for scatter descriptor ring */ 366 366 dev->sdr = dma_alloc_coherent(dev->core_dev->device, 367 367 sizeof(struct ce_sd) * PPC4XX_NUM_SD, 368 - &dev->sdr_pa, GFP_ATOMIC); 368 + &dev->sdr_pa, GFP_KERNEL); 369 369 if (!dev->sdr) 370 370 return -ENOMEM; 371 371