leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: fm: Add firmware name parameter

Browse Source 
In order to read the firmware from the filesystem, we need a file name.
Read the firmware name from the device tree, using the firmware-name
property. This property is commonly used in Linux to determine the
correct name to use (and can be seen in several device trees in U-Boot).

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
Sean Anderson 2022-12-29 11:53:00 -05:00 committed by Tom Rini
parent 0998a20cfc
commit e4f0cc5ddf
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/fm/fm.c
View File

@ -8,6 +8,7 @@
#include <image.h> #include <image.h>
#include <malloc.h> #include <malloc.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/device_compat.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <u-boot/crc.h> #include <u-boot/crc.h>
#include <dm.h> #include <dm.h>
@ -353,7 +354,7 @@ static void fm_init_qmi(struct fm_qmi_common *qmi)
/* Init common part of FM, index is fm num# like fm as above */ /* Init common part of FM, index is fm num# like fm as above */
#ifdef CONFIG_TFABOOT #ifdef CONFIG_TFABOOT
int fm_init_common(int index, struct ccsr_fman *reg) int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name)
{ {
int rc; int rc;
void *addr = NULL; void *addr = NULL;
@ -448,7 +449,7 @@ int fm_init_common(int index, struct ccsr_fman *reg)
return fm_init_bmi(index, &reg->fm_bmi_common); return fm_init_bmi(index, &reg->fm_bmi_common);
} }
#else #else
int fm_init_common(int index, struct ccsr_fman *reg) int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name)
{ {
int rc; int rc;
#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR) #if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR)
@ -561,6 +562,8 @@ static const struct udevice_id fman_ids[] = {
static int fman_probe(struct udevice *dev) static int fman_probe(struct udevice *dev)
{ {
const char *firmware_name = NULL;
int ret;
struct fman_priv *priv = dev_get_priv(dev); struct fman_priv *priv = dev_get_priv(dev);
priv->reg = (struct ccsr_fman *)(uintptr_t)dev_read_addr(dev); priv->reg = (struct ccsr_fman *)(uintptr_t)dev_read_addr(dev);
@ -570,7 +573,13 @@ static int fman_probe(struct udevice *dev)
return -EINVAL; return -EINVAL;
} }
return fm_init_common(priv->fman_id, priv->reg); ret = dev_read_string_index(dev, "firmware-name", 0, &firmware_name);
if (ret && ret != -EINVAL) {
dev_dbg(dev, "Could not read firmware-name\n");
return ret;
}
return fm_init_common(priv->fman_id, priv->reg, firmware_name);
} }
static int fman_remove(struct udevice *dev) static int fman_remove(struct udevice *dev)

2
drivers/net/fm/fm.h
View File

@ -106,7 +106,7 @@ struct fm_port_global_pram {
void *fm_muram_alloc(int fm_idx, size_t size, ulong align); void *fm_muram_alloc(int fm_idx, size_t size, ulong align);
void *fm_muram_base(int fm_idx); void *fm_muram_base(int fm_idx);
int fm_init_common(int index, struct ccsr_fman *reg); int fm_init_common(int index, struct ccsr_fman *reg, const char *firmware_name);
int fm_eth_initialize(struct ccsr_fman *reg, struct fm_eth_info *info); int fm_eth_initialize(struct ccsr_fman *reg, struct fm_eth_info *info);
phy_interface_t fman_port_enet_if(enum fm_port port); phy_interface_t fman_port_enet_if(enum fm_port port);
void fman_disable_port(enum fm_port port); void fman_disable_port(enum fm_port port);