Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RFC] rimage: Add support for multiple toml file #176

Closed
wants to merge 1 commit into from
Closed

[RFC] rimage: Add support for multiple toml file #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 56 additions & 4 deletions src/adsp_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
#include <sys/stat.h>

/* map memory zone string name to enum value */
static enum snd_sof_fw_blk_type zone_name_to_idx(const char *name)
Expand Down Expand Up @@ -2337,18 +2338,69 @@ static int adsp_parse_config_fd(FILE *fd, struct image *image)
return ret;
}

static FILE* adsp_conf_files_open(struct adsp_conf_files *files, const char *mode)
{
struct stat statbuf;
char *buf;
int ret;
int i;
size_t file_size[MAX_SUPPORTED_CONF_FILES];
size_t buf_size = 0;

for (i = 0; i < files->file_count; i++) {
ret = stat(files->file[i], &statbuf);
if (ret) {
fprintf(stderr, "error: failed to stat file %s\n", files->file[i]);
return NULL;
}

file_size[i] = statbuf.st_size;
buf_size += statbuf.st_size;
}
/* Reserve space for adding '\n' at the end of each file */
buf_size += files->file_count;
files->buffer = malloc(buf_size);

buf = files->buffer;
for (i = 0; i < files->file_count; i++) {
FILE *file;
size_t read;

file = fopen(files->file[i], mode);
if (!file) {
fprintf(stderr, "error: failed to open file %s\n", files->file[i]);
return NULL;
}
read = fread(buf, 1, file_size[i], file);
if (read != file_size[i]) {
fprintf(stderr, "error: failed to read file %s\n", files->file[i]);
return NULL;
}
fclose(file);

buf[file_size[i]] = '\n';
buf += file_size[i] + 1;
}
return fmemopen(files->buffer, buf_size, mode);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok this is quite clever approach. "fmemopen()" will potentially hit some compatibility issues, so needs a smoketest on Windows at minimum.

I was actually thinking of something much more low-tech. I.e. "cat a.toml b.toml >$BUILD/rimage.toml" in make rules, and pass generated "rimage.toml" to rimage. But making this in a portable way is not zero effort either, so I guess depends in the end what is the lowest effort way to make this so that it works across platforms.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A new proposal, see #179, this probably won't work on windows, let's close

}

static void adsp_conf_files_close(struct adsp_conf_files *files)
{
free(files->buffer);
}

/* public function, fully handle parsing process */
int adsp_parse_config(const char *file, struct image *image)
int adsp_parse_config(struct adsp_conf_files *files, struct image *image)
{
FILE *fd;
int ret;

fd = fopen(file, "r");
fd = adsp_conf_files_open(files, "r");
if (!fd)
return file_error("unable to open file for reading", file);
return -EINVAL;

ret = adsp_parse_config_fd(fd, image);
fclose(fd);
adsp_conf_files_close(files);
return ret;
}

Expand Down
2 changes: 1 addition & 1 deletion src/include/rimage/adsp_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
#include <rimage/rimage.h>
#include <stdbool.h>

int adsp_parse_config(const char *file, struct image *image);
int adsp_parse_config(struct adsp_conf_files *file, struct image *image);
void adsp_free(struct adsp *adsp);
7 changes: 7 additions & 0 deletions src/include/rimage/rimage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define MAX_MODULES 32
#define MAX_SUPPORTED_CONF_FILES 8

struct adsp;

Expand Down Expand Up @@ -128,6 +129,12 @@ struct adsp {
int exec_boot_ldr;
};

struct adsp_conf_files {
uint32 file_count;
char *file[MAX_SUPPORTED_CONF_FILES];
char *buffer;
};

int ri_manifest_sign_v1_5(struct image *image);
int ri_manifest_sign_v1_8(struct image *image);
int ri_manifest_sign_v2_5(struct image *image);
Expand Down
15 changes: 9 additions & 6 deletions src/rimage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ int main(int argc, char *argv[])
{
struct image image;
struct adsp *heap_adsp;
const char *adsp_config = NULL;
int opt, ret, i, first_non_opt;
struct adsp_conf_files files;
int opt, ret, first_non_opt;
int use_ext_man = 0;
unsigned int pv_bit = 0;
bool imr_type_override = false;
int i = 0;

memset(&image, 0, sizeof(image));

Expand Down Expand Up @@ -84,7 +85,8 @@ int main(int argc, char *argv[])
use_ext_man = 1;
break;
case 'c':
adsp_config = optarg;
files.file[i] = optarg;
i++;
break;
case 'y':
image.verify_file = optarg;
Expand All @@ -110,11 +112,12 @@ int main(int argc, char *argv[])
first_non_opt = optind;

/* we must have config */
if (!adsp_config) {
if (i == 0 || i >= MAX_SUPPORTED_CONF_FILES) {
usage(argv[0]);
fprintf(stderr, "error: must have adsp desc\n");
fprintf(stderr, "error: invalid number of adsp_desc provided\n");
return -EINVAL;
}
files.file_count = i;

/* requires private key */
if (!image.key_name) {
Expand Down Expand Up @@ -161,7 +164,7 @@ int main(int argc, char *argv[])
}
image.adsp = heap_adsp;
memset(heap_adsp, 0, sizeof(*heap_adsp));
ret = adsp_parse_config(adsp_config, &image);
ret = adsp_parse_config(&files, &image);
if (ret < 0)
goto out;

Expand Down
Loading