fpga: dfl: stub in reimaging
Subsystems (2)
[email protected]
reviewerPATCH v3 6/6 fpga: dfl: stub in reimaging
From: Tom Rix <[email protected]>
Generalize the pr writer to handle reimaging. Rename the input structure and add the DFL_FPGA_FME_REIMAGE ioctl.
Stub in reimage.write* ops
Signed-off-by Tom Rix <[email protected]>
--- drivers/fpga/dfl-fme-mgr.c | 28 ++++++++++++++++++++++++ drivers/fpga/dfl-fme-pr.c | 40 +++++++++++++++++++++-------------- include/uapi/linux/fpga-dfl.h | 18 +++++++++++++--- 3 files changed, 67 insertions(+), 19 deletions(-)
drivers/fpga/dfl-fme-mgr.c +28 -0
@@ -252,6 +252,31 @@ static int fme_mgr_write_complete(struct fpga_manager *mgr,return 0 ; } +static int fme_mgr_reimage_write_init (struct fpga_manager *mgr, +struct fpga_image_info *info, +const char *buf,size_t count) +{ +struct device *dev = &mgr->dev; + +if (!(info->flags &FPGA_MGR_REIMAGE )) { +dev_err (dev,"only supports reimaging.\n" ); +return -EINVAL ; + } +return -EOPNOTSUPP ; +} + +static int fme_mgr_reimage_write (struct fpga_manager *mgr, +const char *buf,size_t count) +{ +return -EOPNOTSUPP ; +} + +static int fme_mgr_reimage_write_complete (struct fpga_manager *mgr, +struct fpga_image_info *info) +{ +return -EOPNOTSUPP ; +} +static enum fpga_mgr_states fme_mgr_state (struct fpga_manager *mgr) {return FPGA_MGR_STATE_UNKNOWN ;
@@ -270,6 +295,9 @@ static const struct fpga_manager_ops fme_mgr_ops = { .reconfig.write_init = fme_mgr_write_init, .reconfig.write = fme_mgr_write, .reconfig.write_complete = fme_mgr_write_complete, + .reimage.write_init = fme_mgr_reimage_write_init, + .reimage.write = fme_mgr_reimage_write, + .reimage.write_complete = fme_mgr_reimage_write_complete, }; static void fme_mgr_get_compat_id(void __iomem *fme_pr,
drivers/fpga/dfl-fme-pr.c +24 -16
@@ -63,11 +63,11 @@ static struct fpga_region *dfl_fme_region_find(struct dfl_fme *fme, int port_id)return region; } -static int fme_pr (struct platform_device *pdev,unsigned long arg) +static int fme_image (struct platform_device *pdev,unsigned long arg,bool pr) {struct dfl_feature_platform_data *pdata =dev_get_platdata (&pdev->dev);void __user *argp = (void __user *)arg; -struct dfl_fpga_fme_port_pr port_pr; +struct dfl_fpga_fme_image image;struct fpga_image_info *info;struct fpga_region *region;void __iomem *fme_hdr;
@@ -78,12 +78,12 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg)int ret =0 ;u64 v; - minsz = offsetofend(struct dfl_fpga_fme_port_pr, buffer_address); + minsz = offsetofend(struct dfl_fpga_fme_image, buffer_address); -if (copy_from_user (&port_pr, argp, minsz)) +if (copy_from_user (&image, argp, minsz))return -EFAULT ; -if (port_pr.argsz < minsz || port_pr.flags) +if (image.argsz < minsz || image.flags)return -EINVAL ;/* get fme header region */
@@ -91,25 +91,27 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg) FME_FEATURE_ID_HEADER);/* check port id */ - v =readq (fme_hdr +FME_HDR_CAP ); -if (port_pr.port_id >=FIELD_GET (FME_CAP_NUM_PORTS , v)) { -dev_dbg (&pdev->dev,"port number more than maximum\n" ); -return -EINVAL ; +if (pr) { + v =readq (fme_hdr +FME_HDR_CAP ); +if (image.port_id >=FIELD_GET (FME_CAP_NUM_PORTS , v)) { +dev_dbg (&pdev->dev,"port number more than maximum\n" ); +return -EINVAL ; + } }/* * align PR buffer per PR bandwidth, as HW ignores the extra padding * data automatically. */ - length =ALIGN (port_pr.buffer_size,4 ); + length =ALIGN (image.buffer_size,4 ); buf =vmalloc (length);if (!buf)return -ENOMEM ;if (copy_from_user (buf, - (void __user *)(unsigned long )port_pr.buffer_address, - port_pr.buffer_size)) { + (void __user *)(unsigned long )image.buffer_address, + image.buffer_size)) { ret = -EFAULT ; goto free_exit; }
@@ -121,7 +123,10 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg) goto free_exit; } - info->flags |=FPGA_MGR_PARTIAL_RECONFIG ; +if (pr) + info->flags |=FPGA_MGR_PARTIAL_RECONFIG ; +else + info->flags |=FPGA_MGR_REIMAGE ;mutex_lock (&pdata->lock); fme =dfl_fpga_pdata_get_private (pdata);
@@ -131,7 +136,7 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg) goto unlock_exit; } - region =dfl_fme_region_find (fme, port_pr.port_id); + region =dfl_fme_region_find (fme, pr ? image.port_id :0 );if (!region) { ret = -EINVAL ; goto unlock_exit;
@@ -141,7 +146,7 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg) info->buf = buf; info->count = length; - info->region_id = port_pr.port_id; + info->region_id = image.port_id; region->info = info; ret =fpga_region_program_fpga (region);
@@ -457,7 +462,10 @@ static long fme_pr_ioctl(struct platform_device *pdev,switch (cmd) {case DFL_FPGA_FME_PORT_PR : - ret =fme_pr (pdev, arg); + ret =fme_image (pdev, arg, true); +break ; +case DFL_FPGA_FME_REIMAGE : + ret =fme_image (pdev, arg, false);break ;default : ret = -ENODEV ;
include/uapi/linux/fpga-dfl.h +15 -3
@@ -214,7 +214,7 @@ struct dfl_fpga_irq_set {/** * DFL_FPGA_FME_PORT_PR - _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 0, -* struct dfl_fpga_fme_port_pr) +* struct dfl_fpga_fme_image) * * Driver does Partial Reconfiguration based on Port ID and Buffer (Image) * provided by caller.
@@ -224,13 +224,13 @@ struct dfl_fpga_irq_set {* from the status of FME's fpga manager. */ -struct dfl_fpga_fme_port_pr { +struct dfl_fpga_fme_image {/* Input */ __u32 argsz;/* Structure length */ __u32 flags;/* Zero for now */ __u32 port_id;__u32 buffer_size; -__u64 buffer_address;/* Userspace address to the buffer for PR */ +__u64 buffer_address;/* Userspace address to the buffer for image */ };#define DFL_FPGA_FME_PORT_PR _IO(DFL_FPGA_MAGIC, DFL_FME_BASE + 0)
@@ -276,4 +276,16 @@ struct dfl_fpga_fme_port_pr { DFL_FME_BASE + 4, \ struct dfl_fpga_irq_set) +/** +* DFL_FPGA_FME_REIMAGE - _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 5, +* struct dfl_fpga_fme_image) +* +* Driver reimages the whole board with the Buffer (Image) provided by caller. +* Return: 0 on success, -errno on failure. +* If DFL_FPGA_FME_REIMAGE returns -EIO, that indicates the HW has detected +* some errors during PR, under this case, the user can fetch HW error info +* from the status of FME's fpga manager. +*/ +#define DFL_FPGA_FME_REIMAGE _IO(DFL_FPGA_MAGIC, DFL_FME_BASE + 5) +#endif /* _UAPI_LINUX_FPGA_DFL_H */
Signature · 1 line
2.26.3