diff options
Diffstat (limited to 'drivers/firmware/zynqmp-fpga.c')
| -rw-r--r-- | drivers/firmware/zynqmp-fpga.c | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/drivers/firmware/zynqmp-fpga.c b/drivers/firmware/zynqmp-fpga.c index ab70d99933..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,13 +197,14 @@ 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); - char *buf_aligned; - u32 *buf_size = NULL; + struct device *hw_dev = mgr->dev.parent; + u32 *buf_aligned; + u32 buf_size; u32 *body; size_t body_length; int header_length = 0; enum xilinx_byte_order byte_order; - u64 addr; + dma_addr_t addr; int status = 0; u8 flags = 0; @@ -234,17 +235,13 @@ static int fpgamgr_program_finish(struct firmware_handler *fh) goto err_free; } - if (!(mgr->features & ZYNQMP_PM_FEATURE_SIZE_NOT_NEEDED)) { - buf_size = dma_alloc_coherent(sizeof(*buf_size), - DMA_ADDRESS_BROKEN); - if (!buf_size) { - status = -ENOBUFS; - goto err_free; - } - *buf_size = body_length; - } - - buf_aligned = dma_alloc_coherent(body_length, DMA_ADDRESS_BROKEN); + /* + * The PMU FW variants without the ZYNQMP_PM_FEATURE_SIZE_NOT_NEEDED + * feature expect a pointer to the bitstream size, which is stored in + * memory. Allocate extra space at the end of the buffer for the + * bitstream size. + */ + buf_aligned = dma_alloc(body_length + sizeof(buf_size)); if (!buf_aligned) { status = -ENOBUFS; goto err_free; @@ -256,26 +253,28 @@ 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; - addr = (u64)buf_aligned; - - /* we do not provide a header */ - flags |= ZYNQMP_FPGA_BIT_ONLY_BIN; - - if (!(mgr->features & ZYNQMP_PM_FEATURE_SIZE_NOT_NEEDED) && buf_size) { - status = mgr->eemi_ops->fpga_load(addr, - (u32)(uintptr_t)buf_size, - flags); - dma_free_coherent(buf_size, 0, sizeof(*buf_size)); - } else { - status = mgr->eemi_ops->fpga_load(addr, (u32)(body_length), - flags); + addr = dma_map_single(hw_dev, buf_aligned, + body_length + sizeof(buf_size), DMA_TO_DEVICE); + 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(hw_dev, addr, body_length + sizeof(buf_size), + DMA_TO_DEVICE); if (status < 0) dev_err(&mgr->dev, "unable to load fpga\n"); - dma_free_coherent(buf_aligned, 0, body_length); +err_free_dma: + dma_free(buf_aligned); err_free: free(mgr->buf); @@ -328,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; @@ -349,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; @@ -383,6 +382,8 @@ static int zynqmp_fpga_probe(struct device_d *dev) } fh->dev = &mgr->dev; + fh->device_node = dev->of_node; + ret = firmwaremgr_register(fh); if (ret != 0) { free(mgr); @@ -405,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, |