[RFC PATCH v2 1/8] FWU: Calculate CRC32 in fwu_update_mdata()

[Masami Hiramatsu]

To avoid calculating crc32 in several places, do it in
fwu_update_mdata(). This also ensures the mdata crc32
is always sane.

Signed-off-by: Masami Hiramatsu <masami.hirama...@linaro.org>
---
 drivers/fwu-mdata/fwu-mdata-uclass.c |   33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/drivers/fwu-mdata/fwu-mdata-uclass.c 
b/drivers/fwu-mdata/fwu-mdata-uclass.c
index 64b3051ecf..b98eda3789 100644
--- a/drivers/fwu-mdata/fwu-mdata-uclass.c
+++ b/drivers/fwu-mdata/fwu-mdata-uclass.c
@@ -115,7 +115,6 @@ out:
 int fwu_update_active_index(u32 active_idx)
 {
        int ret;
-       void *buf;
        struct fwu_mdata *mdata = NULL;
 
        if (active_idx > CONFIG_FWU_NUM_BANKS - 1) {
@@ -136,14 +135,6 @@ int fwu_update_active_index(u32 active_idx)
        mdata->previous_active_index = mdata->active_index;
        mdata->active_index = active_idx;
 
-       /*
-        * Calculate the crc32 for the updated FWU metadata
-        * and put the updated value in the FWU metadata crc32
-        * field
-        */
-       buf = &mdata->version;
-       mdata->crc32 = crc32(0, buf, sizeof(*mdata) - sizeof(u32));
-
        /*
         * Now write this updated FWU metadata to both the
         * FWU metadata partitions
@@ -233,7 +224,6 @@ int fwu_mdata_check(void)
 int fwu_revert_boot_index(void)
 {
        int ret;
-       void *buf;
        u32 cur_active_index;
        struct fwu_mdata *mdata = NULL;
 
@@ -251,14 +241,6 @@ int fwu_revert_boot_index(void)
        mdata->active_index = mdata->previous_active_index;
        mdata->previous_active_index = cur_active_index;
 
-       /*
-        * Calculate the crc32 for the updated FWU metadata
-        * and put the updated value in the FWU metadata crc32
-        * field
-        */
-       buf = &mdata->version;
-       mdata->crc32 = crc32(0, buf, sizeof(*mdata) - sizeof(u32));
-
        /*
         * Now write this updated FWU metadata to both the
         * FWU metadata partitions
@@ -293,7 +275,6 @@ out:
 static int fwu_set_clear_image_accept(efi_guid_t *img_type_id,
                                      u32 bank, u8 action)
 {
-       void *buf;
        int ret, i;
        u32 nimages;
        struct fwu_mdata *mdata = NULL;
@@ -316,10 +297,6 @@ static int fwu_set_clear_image_accept(efi_guid_t 
*img_type_id,
                        else
                                img_bank_info->accepted = 0;
 
-                       buf = &mdata->version;
-                       mdata->crc32 = crc32(0, buf, sizeof(*mdata) -
-                                            sizeof(u32));
-
                        ret = fwu_update_mdata(mdata);
                        goto out;
                }
@@ -425,6 +402,16 @@ int fwu_update_mdata(struct fwu_mdata *mdata)
                return -ENOSYS;
        }
 
+       if (!mdata)
+               return -EINVAL;
+       /*
+        * Calculate the crc32 for the updated FWU metadata
+        * and put the updated value in the FWU metadata crc32
+        * field
+        */
+       mdata->crc32 = crc32(0, (const unsigned char *)&mdata->version,
+                            sizeof(*mdata) - sizeof(u32));
+
        return ops->update_mdata(dev, mdata);
 }