* @dev: FPGA Region device
* @mutex: enforces exclusive reference to region
* @bridge_list: list of FPGA bridges specified in region
+ * @mgr: FPGA manager
* @info: fpga image specific information
*/
struct fpga_region {
struct device dev;
struct mutex mutex; /* for exclusive reference to region */
struct list_head bridge_list;
+ struct fpga_manager *mgr;
struct fpga_image_info *info;
};
}
get_device(dev);
- of_node_get(dev->of_node);
if (!try_module_get(dev->parent->driver->owner)) {
- of_node_put(dev->of_node);
put_device(dev);
mutex_unlock(®ion->mutex);
return ERR_PTR(-ENODEV);
}
- dev_dbg(®ion->dev, "get\n");
+ dev_dbg(dev, "get\n");
return region;
}
{
struct device *dev = ®ion->dev;
- dev_dbg(®ion->dev, "put\n");
+ dev_dbg(dev, "put\n");
module_put(dev->parent->driver->owner);
- of_node_put(dev->of_node);
put_device(dev);
mutex_unlock(®ion->mutex);
}
/**
- * fpga_region_get_manager - get exclusive reference for FPGA manager
- * @region: FPGA region
+ * fpga_region_get_manager - get reference for FPGA manager
+ * @np: device node of FPGA region
*
* Get FPGA Manager from "fpga-mgr" property or from ancestor region.
*
*
* Return: fpga manager struct or IS_ERR() condition containing error code.
*/
-static struct fpga_manager *fpga_region_get_manager(struct fpga_region *region)
+static struct fpga_manager *fpga_region_get_manager(struct device_node *np)
{
- struct device *dev = ®ion->dev;
- struct device_node *np = dev->of_node;
struct device_node *mgr_node;
struct fpga_manager *mgr;
int i, ret;
/* If parent is a bridge, add to list */
- ret = fpga_bridge_get_to_list(region_np->parent, region->info,
- ®ion->bridge_list);
+ ret = of_fpga_bridge_get_to_list(region_np->parent, region->info,
+ ®ion->bridge_list);
+
+ /* -EBUSY means parent is a bridge that is under use. Give up. */
if (ret == -EBUSY)
return ret;
+ /* Zero return code means parent was a bridge and was added to list. */
if (!ret)
parent_br = region_np->parent;
continue;
/* If node is a bridge, get it and add to list */
- ret = fpga_bridge_get_to_list(br, region->info,
- ®ion->bridge_list);
+ ret = of_fpga_bridge_get_to_list(br, region->info,
+ ®ion->bridge_list);
/* If any of the bridges are in use, give up */
if (ret == -EBUSY) {
/**
* fpga_region_program_fpga - program FPGA
* @region: FPGA region
- * @firmware_name: name of FPGA image firmware file
* @overlay: device node of the overlay
- * Program an FPGA using information in the device tree.
- * Function assumes that there is a firmware-name property.
+ * Program an FPGA using information in the region's fpga image info.
* Return 0 for success or negative error code.
*/
static int fpga_region_program_fpga(struct fpga_region *region,
- const char *firmware_name,
struct device_node *overlay)
{
- struct fpga_manager *mgr;
+ struct device *dev = ®ion->dev;
int ret;
region = fpga_region_get(region);
if (IS_ERR(region)) {
- pr_err("failed to get fpga region\n");
+ dev_err(dev, "failed to get FPGA region\n");
return PTR_ERR(region);
}
- mgr = fpga_region_get_manager(region);
- if (IS_ERR(mgr)) {
- pr_err("failed to get fpga region manager\n");
- ret = PTR_ERR(mgr);
+ ret = fpga_mgr_lock(region->mgr);
+ if (ret) {
+ dev_err(dev, "FPGA manager is busy\n");
goto err_put_region;
}
ret = fpga_region_get_bridges(region, overlay);
if (ret) {
- pr_err("failed to get fpga region bridges\n");
- goto err_put_mgr;
+ dev_err(dev, "failed to get FPGA bridges\n");
+ goto err_unlock_mgr;
}
ret = fpga_bridges_disable(®ion->bridge_list);
if (ret) {
- pr_err("failed to disable region bridges\n");
+ dev_err(dev, "failed to disable bridges\n");
goto err_put_br;
}
- ret = fpga_mgr_firmware_load(mgr, region->info, firmware_name);
+ ret = fpga_mgr_load(region->mgr, region->info);
if (ret) {
- pr_err("failed to load fpga image\n");
+ dev_err(dev, "failed to load FPGA image\n");
goto err_put_br;
}
ret = fpga_bridges_enable(®ion->bridge_list);
if (ret) {
- pr_err("failed to enable region bridges\n");
+ dev_err(dev, "failed to enable region bridges\n");
goto err_put_br;
}
- fpga_mgr_put(mgr);
+ fpga_mgr_unlock(region->mgr);
fpga_region_put(region);
return 0;
err_put_br:
fpga_bridges_put(®ion->bridge_list);
-err_put_mgr:
- fpga_mgr_put(mgr);
+err_unlock_mgr:
+ fpga_mgr_unlock(region->mgr);
err_put_region:
fpga_region_put(region);
static int fpga_region_notify_pre_apply(struct fpga_region *region,
struct of_overlay_notify_data *nd)
{
- const char *firmware_name = NULL;
+ struct device *dev = ®ion->dev;
struct fpga_image_info *info;
+ const char *firmware_name;
int ret;
- info = devm_kzalloc(®ion->dev, sizeof(*info), GFP_KERNEL);
- if (!info)
- return -ENOMEM;
-
- region->info = info;
-
- /* Reject overlay if child FPGA Regions have firmware-name property */
+ /*
+ * Reject overlay if child FPGA Regions added in the overlay have
+ * firmware-name property (would mean that an FPGA region that has
+ * not been added to the live tree yet is doing FPGA programming).
+ */
ret = child_regions_with_firmware(nd->overlay);
if (ret)
return ret;
+ info = fpga_image_info_alloc(dev);
+ if (!info)
+ return -ENOMEM;
+
/* Read FPGA region properties from the overlay */
if (of_property_read_bool(nd->overlay, "partial-fpga-config"))
info->flags |= FPGA_MGR_PARTIAL_RECONFIG;
if (of_property_read_bool(nd->overlay, "encrypted-fpga-config"))
info->flags |= FPGA_MGR_ENCRYPTED_BITSTREAM;
- of_property_read_string(nd->overlay, "firmware-name", &firmware_name);
+ if (!of_property_read_string(nd->overlay, "firmware-name",
+ &firmware_name)) {
+ info->firmware_name = devm_kstrdup(dev, firmware_name,
+ GFP_KERNEL);
+ if (!info->firmware_name)
+ return -ENOMEM;
+ }
of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us",
&info->enable_timeout_us);
&info->config_complete_timeout_us);
/* If FPGA was externally programmed, don't specify firmware */
- if ((info->flags & FPGA_MGR_EXTERNAL_CONFIG) && firmware_name) {
- pr_err("error: specified firmware and external-fpga-config");
+ if ((info->flags & FPGA_MGR_EXTERNAL_CONFIG) && info->firmware_name) {
+ dev_err(dev, "error: specified firmware and external-fpga-config");
+ fpga_image_info_free(info);
return -EINVAL;
}
/* FPGA is already configured externally. We're done. */
- if (info->flags & FPGA_MGR_EXTERNAL_CONFIG)
+ if (info->flags & FPGA_MGR_EXTERNAL_CONFIG) {
+ fpga_image_info_free(info);
return 0;
+ }
/* If we got this far, we should be programming the FPGA */
- if (!firmware_name) {
- pr_err("should specify firmware-name or external-fpga-config\n");
+ if (!info->firmware_name) {
+ dev_err(dev, "should specify firmware-name or external-fpga-config\n");
+ fpga_image_info_free(info);
return -EINVAL;
}
- return fpga_region_program_fpga(region, firmware_name, nd->overlay);
+ region->info = info;
+ ret = fpga_region_program_fpga(region, nd->overlay);
+ if (ret) {
+ fpga_image_info_free(info);
+ region->info = NULL;
+ }
+
+ return ret;
}
/**
{
fpga_bridges_disable(®ion->bridge_list);
fpga_bridges_put(®ion->bridge_list);
- devm_kfree(®ion->dev, region->info);
+ fpga_image_info_free(region->info);
region->info = NULL;
}
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct fpga_region *region;
+ struct fpga_manager *mgr;
int id, ret = 0;
+ mgr = fpga_region_get_manager(np);
+ if (IS_ERR(mgr))
+ return -EPROBE_DEFER;
+
region = kzalloc(sizeof(*region), GFP_KERNEL);
- if (!region)
- return -ENOMEM;
+ if (!region) {
+ ret = -ENOMEM;
+ goto err_put_mgr;
+ }
+
+ region->mgr = mgr;
id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL);
if (id < 0) {
ida_simple_remove(&fpga_region_ida, id);
err_kfree:
kfree(region);
+err_put_mgr:
+ fpga_mgr_put(mgr);
return ret;
}
struct fpga_region *region = platform_get_drvdata(pdev);
device_unregister(®ion->dev);
+ fpga_mgr_put(region->mgr);
return 0;
}
projects / J-linux.git / blobdiff