1 files changed, 16 insertions, 28 deletions

diff --git a/drivers/misc/genwqe/card_dev.c b/drivers/misc/genwqe/card_dev.c
index 2c2c9cc75231..1d2f163a1906 100644
--- a/drivers/misc/genwqe/card_dev.c
+++ b/drivers/misc/genwqe/card_dev.c
@@ -531,7 +531,9 @@ static int do_flash_update(struct genwqe_file *cfile,
         case '1':
                 cmdopts = 0x1C;
                 break;          /* download/erase_first/part_1 */
-        case 'v':               /* cmdopts = 0x0c (VPD) */
+        case 'v':
+                cmdopts = 0x0C;
+                break;          /* download/erase_first/vpd */
         default:
                 return -EINVAL;
         }
@@ -665,6 +667,8 @@ static int do_flash_read(struct genwqe_file *cfile,
                 cmdopts = 0x1A;
                 break;          /* upload/part_1 */
         case 'v':
+                cmdopts = 0x0A;
+                break;          /* upload/vpd */
         default:
                 return -EINVAL;
         }
@@ -836,15 +840,8 @@ static int ddcb_cmd_cleanup(struct genwqe_file *cfile, struct ddcb_requ *req)
                         __genwqe_del_mapping(cfile, dma_map);
                         genwqe_user_vunmap(cd, dma_map, req);
                 }
-                if (req->sgl[i] != NULL) {
-                        genwqe_free_sgl(cd, req->sgl[i],
-                                       req->sgl_dma_addr[i],
-                                       req->sgl_size[i]);
-                        req->sgl[i] = NULL;
-                        req->sgl_dma_addr[i] = 0x0;
-                        req->sgl_size[i] = 0;
-                }
-
+                if (req->sgls[i].sgl != NULL)
+                        genwqe_free_sync_sgl(cd, &req->sgls[i]);
         }
         return 0;
 }
@@ -913,7 +910,7 @@ static int ddcb_cmd_fixups(struct genwqe_file *cfile, struct ddcb_requ *req)
 
                 case ATS_TYPE_SGL_RDWR:
                 case ATS_TYPE_SGL_RD: {
-                        int page_offs, nr_pages, offs;
+                        int page_offs;
 
                         u_addr = be64_to_cpu(*((__be64 *)
                                                &cmd->asiv[asiv_offs]));
@@ -951,27 +948,18 @@ static int ddcb_cmd_fixups(struct genwqe_file *cfile, struct ddcb_requ *req)
                                 page_offs = 0;
                         }
 
-                        offs = offset_in_page(u_addr);
-                        nr_pages = DIV_ROUND_UP(offs + u_size, PAGE_SIZE);
-
                         /* create genwqe style scatter gather list */
-                        req->sgl[i] = genwqe_alloc_sgl(cd, m->nr_pages,
-                                                      &req->sgl_dma_addr[i],
-                                                      &req->sgl_size[i]);
-                        if (req->sgl[i] == NULL) {
-                                rc = -ENOMEM;
+                        rc = genwqe_alloc_sync_sgl(cd, &req->sgls[i],
+                                                   (void __user *)u_addr,
+                                                   u_size);
+                        if (rc != 0)
                                 goto err_out;
-                        }
-                        genwqe_setup_sgl(cd, offs, u_size,
-                                        req->sgl[i],
-                                        req->sgl_dma_addr[i],
-                                        req->sgl_size[i],
-                                        m->dma_list,
-                                        page_offs,
-                                        nr_pages);
+
+                        genwqe_setup_sgl(cd, &req->sgls[i],
+                                         &m->dma_list[page_offs]);
 
                         *((__be64 *)&cmd->asiv[asiv_offs]) =
-                                cpu_to_be64(req->sgl_dma_addr[i]);
+                                cpu_to_be64(req->sgls[i].sgl_dma_addr);
 
                         break;
                 }