crypto: cpt - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified

[linux-2.6-microblaze.git] / drivers / crypto / cavium / cpt / cptvf_reqmanager.c

diff --git a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c
index 7a24019..e343249 100644 (file)
--- a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c
+++ b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c
@@ -133,7 +133,7 @@ static inline int setup_sgio_list(struct cpt_vf *cptvf,
 
        /* Setup gather (input) components */
        g_sz_bytes = ((req->incnt + 3) / 4) * sizeof(struct sglist_component);
-       info->gather_components = kzalloc(g_sz_bytes, GFP_KERNEL);
+       info->gather_components = kzalloc(g_sz_bytes, req->may_sleep ? GFP_KERNEL : GFP_ATOMIC);
        if (!info->gather_components) {
                ret = -ENOMEM;
                goto  scatter_gather_clean;
@@ -150,7 +150,7 @@ static inline int setup_sgio_list(struct cpt_vf *cptvf,
 
        /* Setup scatter (output) components */
        s_sz_bytes = ((req->outcnt + 3) / 4) * sizeof(struct sglist_component);
-       info->scatter_components = kzalloc(s_sz_bytes, GFP_KERNEL);
+       info->scatter_components = kzalloc(s_sz_bytes, req->may_sleep ? GFP_KERNEL : GFP_ATOMIC);
        if (!info->scatter_components) {
                ret = -ENOMEM;
                goto  scatter_gather_clean;
@@ -167,7 +167,7 @@ static inline int setup_sgio_list(struct cpt_vf *cptvf,
 
        /* Create and initialize DPTR */
        info->dlen = g_sz_bytes + s_sz_bytes + SG_LIST_HDR_SIZE;
-       info->in_buffer = kzalloc(info->dlen, GFP_KERNEL);
+       info->in_buffer = kzalloc(info->dlen, req->may_sleep ? GFP_KERNEL : GFP_ATOMIC);
        if (!info->in_buffer) {
                ret = -ENOMEM;
                goto  scatter_gather_clean;
@@ -195,7 +195,7 @@ static inline int setup_sgio_list(struct cpt_vf *cptvf,
        }
 
        /* Create and initialize RPTR */
-       info->out_buffer = kzalloc(COMPLETION_CODE_SIZE, GFP_KERNEL);
+       info->out_buffer = kzalloc(COMPLETION_CODE_SIZE, req->may_sleep ? GFP_KERNEL : GFP_ATOMIC);
        if (!info->out_buffer) {
                ret = -ENOMEM;
                goto scatter_gather_clean;
@@ -421,7 +421,7 @@ int process_request(struct cpt_vf *cptvf, struct cpt_request_info *req)
        struct cpt_vq_command vq_cmd;
        union cpt_inst_s cptinst;
 
-       info = kzalloc(sizeof(*info), GFP_KERNEL);
+       info = kzalloc(sizeof(*info), req->may_sleep ? GFP_KERNEL : GFP_ATOMIC);
        if (unlikely(!info)) {
                dev_err(&pdev->dev, "Unable to allocate memory for info_buffer\n");
                return -ENOMEM;
@@ -443,7 +443,7 @@ int process_request(struct cpt_vf *cptvf, struct cpt_request_info *req)
         * Get buffer for union cpt_res_s response
         * structure and its physical address
         */
-       info->completion_addr = kzalloc(sizeof(union cpt_res_s), GFP_KERNEL);
+       info->completion_addr = kzalloc(sizeof(union cpt_res_s), req->may_sleep ? GFP_KERNEL : GFP_ATOMIC);
        if (unlikely(!info->completion_addr)) {
                dev_err(&pdev->dev, "Unable to allocate memory for completion_addr\n");
                ret = -ENOMEM;