| Message ID | 20220422173032.2259019-4-sean.anderson@seco.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | net: fm: Add support for loading firmware from filesystem | expand |
On Fri, Apr 22, 2022 at 8:30 PM Sean Anderson <sean.anderson@seco.com> wrote: > > This adds a new method to load Fman firmware from a filesystem. This > allows users to use regular files instead of hard-coded offsets for the > firmware. > > Signed-off-by: Sean Anderson <sean.anderson@seco.com> > --- > > (no changes since v1) > > drivers/net/fm/fm.c | 25 ++++++++++++++++++++++++- > drivers/qe/Kconfig | 4 ++++ > 2 files changed, 28 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c > index aa0cc69232..39b939cb97 100644 > --- a/drivers/net/fm/fm.c > +++ b/drivers/net/fm/fm.c > @@ -5,6 +5,7 @@ > */ > #include <common.h> > #include <env.h> > +#include <fs_loader.h> > #include <malloc.h> > #include <asm/io.h> > #include <dm/device_compat.h> > @@ -453,7 +454,29 @@ int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name) > int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name) > { > int rc; > -#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR) > +#if defined(CONFIG_SYS_QE_FMAN_FW_IN_FS) > + struct udevice *fs_loader; > + void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); > + > + if (!addr) > + return -ENOMEM; > + > + rc = get_fs_loader(&fs_loader); > + if (rc) { > + debug("could not get fs loader: %d\n", rc); > + return rc; > + } > + > + if (!firmware_name) > + firmware_name = "fman.itb"; > + > + rc = request_firmware_into_buf(fs_loader, firmware_name, addr, > + CONFIG_SYS_QE_FMAN_FW_LENGTH, 0); > + if (rc < 0) { > + debug("could not request %s: %d\n", firmware_name, rc); > + return rc; > + } > +#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR) > void *addr = (void *)CONFIG_SYS_FMAN_FW_ADDR; > #elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NAND) > size_t fw_length = CONFIG_SYS_QE_FMAN_FW_LENGTH; > diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig > index c44a81f69a..89a75c175b 100644 > --- a/drivers/qe/Kconfig > +++ b/drivers/qe/Kconfig > @@ -27,6 +27,10 @@ choice > depends on FMAN_ENET || QE > default SYS_QE_FMAN_FW_IN_ROM > > +config SYS_QE_FMAN_FW_IN_FS > + depends on FS_LOADER && FMAN_ENET > + bool "Filesystem" > + > config SYS_QE_FMAN_FW_IN_NOR > bool "NOR flash" > > -- > 2.35.1.1320.gc452695387.dirty > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index aa0cc69232..39b939cb97 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <env.h> +#include <fs_loader.h> #include <malloc.h> #include <asm/io.h> #include <dm/device_compat.h> @@ -453,7 +454,29 @@ int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name) int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name) { int rc; -#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR) +#if defined(CONFIG_SYS_QE_FMAN_FW_IN_FS) + struct udevice *fs_loader; + void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); + + if (!addr) + return -ENOMEM; + + rc = get_fs_loader(&fs_loader); + if (rc) { + debug("could not get fs loader: %d\n", rc); + return rc; + } + + if (!firmware_name) + firmware_name = "fman.itb"; + + rc = request_firmware_into_buf(fs_loader, firmware_name, addr, + CONFIG_SYS_QE_FMAN_FW_LENGTH, 0); + if (rc < 0) { + debug("could not request %s: %d\n", firmware_name, rc); + return rc; + } +#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR) void *addr = (void *)CONFIG_SYS_FMAN_FW_ADDR; #elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NAND) size_t fw_length = CONFIG_SYS_QE_FMAN_FW_LENGTH; diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig index c44a81f69a..89a75c175b 100644 --- a/drivers/qe/Kconfig +++ b/drivers/qe/Kconfig @@ -27,6 +27,10 @@ choice depends on FMAN_ENET || QE default SYS_QE_FMAN_FW_IN_ROM +config SYS_QE_FMAN_FW_IN_FS + depends on FS_LOADER && FMAN_ENET + bool "Filesystem" + config SYS_QE_FMAN_FW_IN_NOR bool "NOR flash"
This adds a new method to load Fman firmware from a filesystem. This allows users to use regular files instead of hard-coded offsets for the firmware. Signed-off-by: Sean Anderson <sean.anderson@seco.com> --- (no changes since v1) drivers/net/fm/fm.c | 25 ++++++++++++++++++++++++- drivers/qe/Kconfig | 4 ++++ 2 files changed, 28 insertions(+), 1 deletion(-)