From: Steffen Trumtrar <s.trumtrar@pengutronix.de> To: Barebox List <barebox@lists.infradead.org> Subject: [PATCH v3 10/10] firmware: add support for compressed images Date: Tue, 15 Jun 2021 13:25:08 +0200 [thread overview] Message-ID: <20210615112508.5489-10-s.trumtrar@pengutronix.de> (raw) In-Reply-To: <20210615112508.5489-1-s.trumtrar@pengutronix.de> At least bitstreams for FPGAs can consist of a lot of zeros depending on device utilization. These bitstreams can be compressed very effectively. Let the firmware code accept these images and decompress them before handing it to the firmware-manager in question. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> --- v2->v3 - better error handling - fix free'ing and close'ing - remove O_CREAT for devicefd. Destination is always a device that shall be written with a firmware (FPGA etc). If it doesn't exist, creating it is useless. --- common/firmware.c | 52 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/common/firmware.c b/common/firmware.c index 58509d5da615..47defbd739ca 100644 --- a/common/firmware.c +++ b/common/firmware.c @@ -14,6 +14,8 @@ #include <linux/list.h> #include <linux/stat.h> #include <linux/err.h> +#include <uncompress.h> +#include <filetype.h> #define BUFSIZ 4096 @@ -211,12 +213,54 @@ int firmwaremgr_register(struct firmware_handler *fh) */ int firmwaremgr_load_file(struct firmware_mgr *mgr, const char *firmware) { - int ret; - char *name = basprintf("/dev/%s", mgr->handler->id); + char *dst; + enum filetype type; + int ret = 0; + int firmwarefd = 0; + int devicefd = 0; + + if (!firmware) + return -EINVAL; + + if (!mgr->handler->id) { + pr_err("id not defined for handler\n"); + return -ENODEV; + } + + dst = basprintf("/dev/%s", mgr->handler->id); + + type = file_name_detect_type(firmware); + + if (type == filetype_unknown) { + ret = copy_file(firmware, dst, 0); + } else { + firmwarefd = open(firmware, O_RDONLY); + if (firmwarefd < 0) { + printf("could not open %s: %s\n", firmwarefd, + errno_str()); + ret = firmwarefd; + goto out; + } - ret = copy_file(firmware, name, 0); + devicefd = open(dst, O_WRONLY); + + if (devicefd < 0) { + printf("could not open %s: %s\n", dst, errno_str()); + ret = devicefd; + goto out; + } + + ret = uncompress_fd_to_fd(firmwarefd, devicefd, + uncompress_err_stdout); + } + +out: + free(dst); - free(name); + if (firmwarefd > 0) + close(firmwarefd); + if (devicefd > 0) + close(devicefd); return ret; } -- 2.29.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2021-06-15 13:57 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-15 11:24 [PATCH v3 01/10] reset: add of_reset_control_get to header Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 02/10] drivers: add fpga bridge framework Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 03/10] drivers: fpga: add socfpga bridges Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 04/10] firmware: socfpga: change function prefixes Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 05/10] firmware: import fpga-mgr.h from linux Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 06/10] of: kconfig: of_overlay uses firmwaremgr_load_file Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 07/10] of: of_firmware: add support for fpga bridges Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 08/10] commands: firmwareload: allow loading firmware from dt Steffen Trumtrar 2021-06-15 11:25 ` [PATCH v3 09/10] drivers: firmware: socfpga: remove bridges shutdown Steffen Trumtrar 2021-06-15 11:25 ` Steffen Trumtrar [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210615112508.5489-10-s.trumtrar@pengutronix.de \ --to=s.trumtrar@pengutronix.de \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH v3 10/10] firmware: add support for compressed images' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox