Skip to content

Commit

Permalink
rimage: manifest v2.5 for MEU
Browse files Browse the repository at this point in the history 
Add function writing manifest v2.5 for MEU.

Signed-off-by: Janusz Jankowski <janusz.jankowski@linux.intel.com>
  • Loading branch information
@jajanusz @lgirdwood
jajanusz authored and lgirdwood committed Oct 1, 2019
1 parent 92fa185 commit 86a4e62
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 15 deletions.
103 changes: 92 additions & 11 deletions rimage/manifest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,13 +572,13 @@ static int man_module_create_reloc(struct image *image, struct module *module,
}

static int man_write_unsigned_mod(struct image *image, int meta_start_offset,
int meta_end_offset)
int meta_end_offset, size_t ext_file_size)
{
int count;

/* write metadata file for unsigned FW */
count = fwrite(image->fw_image + meta_start_offset,
sizeof(struct sof_man_adsp_meta_file_ext_v1_8), 1,
ext_file_size, 1,
image->out_man_fd);

/* did the metadata/manifest write succeed ? */
Expand Down Expand Up @@ -756,7 +756,8 @@ static int man_write_fw_v1_5(struct image *image)

/* write the unsigned files*/
ret = man_write_unsigned_mod(image, MAN_META_EXT_OFFSET_V1_5,
MAN_FW_DESC_OFFSET_V1_5);
MAN_FW_DESC_OFFSET_V1_5,
sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
if (ret < 0)
goto err;

Expand Down Expand Up @@ -861,8 +862,8 @@ static int man_write_fw_v1_8(struct image *image)
fprintf(stdout, "Firmware completing manifest v1.8\n");

/* create structures from end of file to start of file */
ri_adsp_meta_data_create(image, MAN_META_EXT_OFFSET_V1_8,
MAN_FW_DESC_OFFSET_V1_8);
ri_adsp_meta_data_create_v1_8(image, MAN_META_EXT_OFFSET_V1_8,
MAN_FW_DESC_OFFSET_V1_8);
ri_plat_ext_data_create(image);
ri_css_v1_8_hdr_create(image);
ri_cse_create(image);
Expand Down Expand Up @@ -902,7 +903,8 @@ static int man_write_fw_v1_8(struct image *image)

/* write the unsigned files*/
ret = man_write_unsigned_mod(image, MAN_META_EXT_OFFSET_V1_8,
MAN_FW_DESC_OFFSET_V1_8);
MAN_FW_DESC_OFFSET_V1_8,
sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
if (ret < 0)
goto err;

Expand Down Expand Up @@ -959,7 +961,8 @@ static int man_write_fw_meu_v1_5(struct image *image)
fprintf(stdout, "Firmware completing manifest v1.5\n");

/* create structures from end of file to start of file */
ri_adsp_meta_data_create(image, meta_start_offset, image->meu_offset);
ri_adsp_meta_data_create_v1_8(image, meta_start_offset,
image->meu_offset);

/* write preload page count */
preload_size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_5;
Expand All @@ -975,7 +978,8 @@ static int man_write_fw_meu_v1_5(struct image *image)

/* write the unsigned files */
ret = man_write_unsigned_mod(image, meta_start_offset,
image->meu_offset);
image->meu_offset,
sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
if (ret < 0)
goto err;

Expand Down Expand Up @@ -1032,7 +1036,8 @@ static int man_write_fw_meu_v1_8(struct image *image)
fprintf(stdout, "Firmware completing manifest v1.8\n");

/* create structures from end of file to start of file */
ri_adsp_meta_data_create(image, meta_start_offset, image->meu_offset);
ri_adsp_meta_data_create_v1_8(image, meta_start_offset,
image->meu_offset);

/* write preload page count */
preload_size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_8;
Expand All @@ -1048,7 +1053,83 @@ static int man_write_fw_meu_v1_8(struct image *image)

/* write the unsigned files */
ret = man_write_unsigned_mod(image, meta_start_offset,
image->meu_offset);
image->meu_offset,
sizeof(struct sof_man_adsp_meta_file_ext_v1_8));
if (ret < 0)
goto err;

fprintf(stdout, "Firmware manifest completed!\n");
return 0;

err:
free(image->fw_image);
unlink(image->out_file);
return ret;
}

/* used to sign with MEU */
static int man_write_fw_meu_v2_5(struct image *image)
{
const int meta_start_offset = image->meu_offset -
sizeof(struct sof_man_adsp_meta_file_ext_v2_5) - MAN_EXT_PADDING;
struct sof_man_adsp_meta_file_ext_v2_5 *meta;
struct sof_man_fw_desc *desc;
uint32_t preload_size;
int ret;

/* allocate image */
image->fw_image = calloc(image->adsp->image_size, 1);
if (!image->fw_image) {
ret = -ENOMEM;
goto err;
}

/* open unsigned firmware */
ret = man_open_unsigned_file(image);
if (ret < 0)
goto err;

/* create the manifest */
ret = man_open_manifest_file(image);
if (ret < 0)
goto err;

/* create the module */
meta = image->fw_image + meta_start_offset;
desc = image->fw_image + MAN_DESC_OFFSET_V1_8;

/* copy data */
memcpy(meta, &image->adsp->man_v2_5->adsp_file_ext,
sizeof(struct sof_man_adsp_meta_file_ext_v2_5));
memcpy(desc, &image->adsp->man_v2_5->desc,
sizeof(struct sof_man_fw_desc));

/* create each module */
desc->header.num_module_entries = image->num_modules;
man_create_modules(image, desc, FILE_TEXT_OFFSET_V1_8);

fprintf(stdout, "Firmware completing manifest v2.5\n");

/* create structures from end of file to start of file */
ri_adsp_meta_data_create_v2_5(image, meta_start_offset,
image->meu_offset);

/* write preload page count */
preload_size = meta->comp_desc[0].limit_offset - MAN_DESC_OFFSET_V1_8;
preload_size += MAN_PAGE_SIZE - (preload_size % MAN_PAGE_SIZE);
desc->header.preload_page_count = preload_size / MAN_PAGE_SIZE;

/* calculate hash for each module */
man_hash_modules(image, desc);

/* calculate hash for ADSP meta data extension */
ri_sha384(image, image->meu_offset, image->image_end -
image->meu_offset, meta->comp_desc[0].hash);

/* write the unsigned files */
ret = man_write_unsigned_mod(image, meta_start_offset,
image->meu_offset,
sizeof(struct sof_man_adsp_meta_file_ext_v2_5));
if (ret < 0)
goto err;

Expand Down Expand Up @@ -1222,7 +1303,7 @@ const struct adsp machine_tgl = {
.dram_offset = 0,
.machine_id = MACHINE_TIGERLAKE,
.write_firmware = man_write_fw_v1_8,
.write_firmware_meu = man_write_fw_meu_v1_8,
.write_firmware_meu = man_write_fw_meu_v2_5,
.man_v1_8 = &cnl_manifest, // use the same as CNL
};

Expand Down
20 changes: 18 additions & 2 deletions rimage/plat_auth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "manifest.h"
#include "plat_auth.h"

void ri_adsp_meta_data_create(struct image *image, int meta_start_offset,
int meta_end_offset)
void ri_adsp_meta_data_create_v1_8(struct image *image, int meta_start_offset,
int meta_end_offset)
{
struct sof_man_adsp_meta_file_ext_v1_8 *meta =
image->fw_image + meta_start_offset;
Expand All @@ -25,6 +25,22 @@ void ri_adsp_meta_data_create(struct image *image, int meta_start_offset,
/* now hash the AdspFwBinaryDesc -> EOF */
}

void ri_adsp_meta_data_create_v2_5(struct image *image, int meta_start_offset,
int meta_end_offset)
{
struct sof_man_adsp_meta_file_ext_v2_5 *meta =
image->fw_image + meta_start_offset;

fprintf(stdout, " meta: completing ADSP manifest\n");

meta->comp_desc[0].limit_offset = MAN_DESC_OFFSET_V1_8 +
image->image_end - meta_end_offset;

fprintf(stdout, " meta: limit is 0x%x\n",
meta->comp_desc[0].limit_offset);
/* now hash the AdspFwBinaryDesc -> EOF */
}

void ri_plat_ext_data_create(struct image *image)
{
struct partition_info_ext *part = image->fw_image
Expand Down
6 changes: 4 additions & 2 deletions rimage/plat_auth.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ struct partition_info_ext {
(sizeof(struct partition_info_ext) + \
sizeof(struct signed_pkg_info_ext))

void ri_adsp_meta_data_create(struct image *image, int meta_start_offset,
int meta_end_offset);
void ri_adsp_meta_data_create_v1_8(struct image *image, int meta_start_offset,
int meta_end_offset);
void ri_adsp_meta_data_create_v2_5(struct image *image, int meta_start_offset,
int meta_end_offset);
void ri_plat_ext_data_create(struct image *image);

#endif
3 changes: 3 additions & 0 deletions rimage/rimage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ int main(int argc, char *argv[])
if (image.adsp->man_v1_8)
image.adsp->man_v1_8->adsp_file_ext.imr_type = imr_type;

if (image.adsp->man_v2_5)
image.adsp->man_v2_5->adsp_file_ext.imr_type = imr_type;

/* parse input ELF files */
image.num_modules = argc - elf_argc;
for (i = elf_argc; i < argc; i++) {
Expand Down

0 comments on commit 86a4e62

Please sign in to comment.