diff --git a/drivers/crypto/tegra-se-nvhost.c b/drivers/crypto/tegra-se-nvhost.c
index a53966f1..f0cfa052 100644
--- a/drivers/crypto/tegra-se-nvhost.c
+++ b/drivers/crypto/tegra-se-nvhost.c
@@ -5261,8 +5261,9 @@ static int tegra_se_ccm_compute_auth(struct aead_request *req, bool encrypt)
 		total += ilen;
 
 		/* 2.2 - Copy adata and map it */
-		adata = dma_alloc_coherent(se_dev->dev, assoclen,
-						&adata_addr, GFP_KERNEL);
+		adata = dma_alloc_coherent(se_dev->dev, assoclen, &adata_addr,
+					(req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
+					GFP_KERNEL : GFP_ATOMIC);
 		num_sgs = tegra_se_count_sgs(sg, assoclen);
 		sg_copy_to_buffer(sg, num_sgs, adata, assoclen);
 
@@ -5461,7 +5462,7 @@ static int tegra_se_ccm_ctr(struct aead_request *req, bool encrypt)
 	 * cryptlen case.
 	 */
 	dst_buf = dma_alloc_coherent(se_dev->dev, cryptlen+1, &dst_buf_dma_addr,
-		GFP_KERNEL);
+		(req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ? GFP_KERNEL : GFP_ATOMIC);
 	if (!dst_buf)
 		return -ENOMEM;
 
@@ -5994,7 +5995,8 @@ static int tegra_se_gcm_op(struct aead_request *req, bool encrypt)
 	 * cryptlen case.
 	 */
 	dst_buf = dma_alloc_coherent(se_dev->dev, cryptlen+1, &dst_buf_dma_addr,
-					GFP_KERNEL);
+				    (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
+				    GFP_KERNEL : GFP_ATOMIC);
 	if (!dst_buf)
 		return -ENOMEM;