crypto/fsl: Update blob cmd to accept 64bit addresses

Update blob cmd to accept 64bit source, key modifier and destination
addresses. Also correct output result print format for fsl specific
implementation of blob cmd.

Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/cmd/blob.c b/cmd/blob.c
index ac8b268e0b83735f7c487a425a8195b0d73f3d4f..bdd4cfda0b3071fdfa1d2af362c539c6e5018fbd 100644 (file)
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -54,7 +54,7 @@ __weak int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
  */
 static int do_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
-       uint32_t key_addr, src_addr, dst_addr, len;
+       ulong key_addr, src_addr, dst_addr, len;
        uint8_t *km_ptr, *src_ptr, *dst_ptr;
        int enc, ret = 0;
 

diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index 8b259212723cd13027549c884780da186fe89c43..d24b8fc045dc8284e05bd1e9fd96101e6c9b61a2 100644 (file)
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -18,7 +18,7 @@ int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
        int ret, i = 0;
        u32 *desc;
 
-       printf("\nDecapsulating data to form blob\n");
+       printf("\nDecapsulating blob to get data\n");
        desc = malloc(sizeof(int) * MAX_CAAM_DESCSIZE);
        if (!desc) {
                debug("Not enough memory for descriptor allocation\n");
@@ -27,12 +27,15 @@ int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
 
        inline_cnstr_jobdesc_blob_decap(desc, key_mod, src, dst, len);
 
+       debug("Descriptor dump:\n");
        for (i = 0; i < 14; i++)
-               printf("%x\n", *(desc + i));
+               debug("Word[%d]: %08x\n", i, *(desc + i));
        ret = run_descriptor_jr(desc);
 
        if (ret)
                printf("Error in Decapsulation %d\n", ret);
+       else
+               printf("Decapsulation Success\n");
 
        free(desc);
        return ret;
@@ -51,12 +54,16 @@ int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
        }
 
        inline_cnstr_jobdesc_blob_encap(desc, key_mod, src, dst, len);
+
+       debug("Descriptor dump:\n");
        for (i = 0; i < 14; i++)
-               printf("%x\n", *(desc + i));
+               debug("Word[%d]: %08x\n", i, *(desc + i));
        ret = run_descriptor_jr(desc);
 
        if (ret)
                printf("Error in Encapsulation %d\n", ret);
+       else
+               printf("Encapsulation Success\n");
 
        free(desc);
        return ret;