diff options
Diffstat (limited to 'drivers/firmware/zynqmp-fpga.c')
| -rw-r--r-- | drivers/firmware/zynqmp-fpga.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/drivers/firmware/zynqmp-fpga.c b/drivers/firmware/zynqmp-fpga.c index b76607f7ee..1a9a5c1b2c 100644 --- a/drivers/firmware/zynqmp-fpga.c +++ b/drivers/firmware/zynqmp-fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Xilinx Zynq MPSoC PL loading * @@ -15,7 +15,7 @@ #include <common.h> #include <init.h> #include <dma.h> -#include <mach/firmware-zynqmp.h> +#include <mach/zynqmp/firmware-zynqmp.h> #define ZYNQMP_PM_FEATURE_BYTE_ORDER_IRREL BIT(0) #define ZYNQMP_PM_FEATURE_SIZE_NOT_NEEDED BIT(1) @@ -58,7 +58,7 @@ enum xilinx_byte_order { struct fpgamgr { struct firmware_handler fh; - struct device_d dev; + struct device dev; const struct zynqmp_eemi_ops *eemi_ops; int programmed; char *buf; @@ -158,8 +158,8 @@ static int get_header_length(const char *header, size_t size) return -EINVAL; } -static void zynqmp_fpga_show_header(const struct device_d *dev, - struct bs_header *header, size_t size) +static void zynqmp_fpga_show_header(const struct device *dev, + struct bs_header *header, size_t size) { struct bs_header_entry *entry; unsigned int i; @@ -197,6 +197,7 @@ static void zynqmp_fpga_show_header(const struct device_d *dev, static int fpgamgr_program_finish(struct firmware_handler *fh) { struct fpgamgr *mgr = container_of(fh, struct fpgamgr, fh); + struct device *hw_dev = mgr->dev.parent; u32 *buf_aligned; u32 buf_size; u32 *body; @@ -205,7 +206,7 @@ static int fpgamgr_program_finish(struct firmware_handler *fh) enum xilinx_byte_order byte_order; dma_addr_t addr; int status = 0; - u8 flags = ZYNQMP_FPGA_BIT_ONLY_BIN; + u8 flags = 0; if (!mgr->buf) { status = -ENOBUFS; @@ -252,23 +253,22 @@ static int fpgamgr_program_finish(struct firmware_handler *fh) body_length / sizeof(u32)); else memcpy((u32 *)buf_aligned, body, body_length); + buf_aligned[body_length / sizeof(*buf_aligned)] = body_length; - if (mgr->features & ZYNQMP_PM_FEATURE_SIZE_NOT_NEEDED) { - buf_size = body_length; - } else { - buf_aligned[body_length / sizeof(*buf_aligned)] = body_length; - buf_size = addr + body_length; - } - - addr = dma_map_single(&mgr->dev, buf_aligned, + addr = dma_map_single(hw_dev, buf_aligned, body_length + sizeof(buf_size), DMA_TO_DEVICE); - if (dma_mapping_error(&mgr->dev, addr)) { + if (dma_mapping_error(hw_dev, addr)) { status = -EFAULT; goto err_free_dma; } + if (mgr->features & ZYNQMP_PM_FEATURE_SIZE_NOT_NEEDED) + buf_size = body_length; + else + buf_size = addr + body_length; + status = mgr->eemi_ops->fpga_load((u64)addr, buf_size, flags); - dma_unmap_single(&mgr->dev, addr, body_length + sizeof(buf_size), + dma_unmap_single(hw_dev, addr, body_length + sizeof(buf_size), DMA_TO_DEVICE); if (status < 0) dev_err(&mgr->dev, "unable to load fpga\n"); @@ -327,11 +327,11 @@ static int programmed_get(struct param_d *p, void *priv) return 0; } -static int zynqmp_fpga_probe(struct device_d *dev) +static int zynqmp_fpga_probe(struct device *dev) { struct fpgamgr *mgr; struct firmware_handler *fh; - const char *alias = of_alias_get(dev->device_node); + const char *alias = of_alias_get(dev->of_node); const char *model = NULL; struct param_d *p; u32 api_version; @@ -348,7 +348,7 @@ static int zynqmp_fpga_probe(struct device_d *dev) fh->open = fpgamgr_program_start; fh->write = fpgamgr_program_write_buf; fh->close = fpgamgr_program_finish; - of_property_read_string(dev->device_node, "compatible", &model); + of_property_read_string(dev->of_node, "compatible", &model); if (model) fh->model = xstrdup(model); fh->dev = dev; @@ -382,7 +382,7 @@ static int zynqmp_fpga_probe(struct device_d *dev) } fh->dev = &mgr->dev; - fh->device_node = dev->device_node; + fh->device_node = dev->of_node; ret = firmwaremgr_register(fh); if (ret != 0) { @@ -406,8 +406,9 @@ static struct of_device_id zynqmpp_fpga_id_table[] = { }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, zynqmpp_fpga_id_table); -static struct driver_d zynqmp_fpga_driver = { +static struct driver zynqmp_fpga_driver = { .name = "zynqmp_fpga_manager", .of_compatible = DRV_OF_COMPAT(zynqmpp_fpga_id_table), .probe = zynqmp_fpga_probe, |