Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61c32102 authored by Alan Tull's avatar Alan Tull Committed by Greg Kroah-Hartman
Browse files

fpga: region: use image info as parameter for programming region 



Use FPGA image info (region->info) when region code is
programming the FPGA to pass in multiple parameters.

This is a baby step in refactoring the FPGA region code to
separate out common FPGA region code from FPGA region
Device Tree overlay support.

Signed-off-by: default avatarAlan Tull <atull@kernel.org>
Acked-by: default avatarMoritz Fischer <mdf@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed81f5fc

drivers/fpga/fpga-region.c

+9 −7
Original line number Diff line number Diff line
@@ -223,14 +223,13 @@ static int fpga_region_get_bridges(struct fpga_region *region, 
/**

 * fpga_region_program_fpga - program FPGA

 * @region: FPGA region

 * @overlay: device node of the overlay

 * Program an FPGA using information in the region's fpga image info.

 * Program an FPGA using fpga image info (region->info).

 * Return 0 for success or negative error code.

 */

static int fpga_region_program_fpga(struct fpga_region *region,

				    struct device_node *overlay)

static int fpga_region_program_fpga(struct fpga_region *region)

{

	struct device *dev = &region->dev;

	struct fpga_image_info *info = region->info;

	int ret;



	region = fpga_region_get(region);
@@ -245,7 +244,7 @@ static int fpga_region_program_fpga(struct fpga_region *region, 
		goto err_put_region;

	}



	ret = fpga_region_get_bridges(region, overlay);

	ret = fpga_region_get_bridges(region, info->overlay);

	if (ret) {

		dev_err(dev, "failed to get FPGA bridges\n");

		goto err_unlock_mgr;
@@ -257,7 +256,7 @@ static int fpga_region_program_fpga(struct fpga_region *region, 
		goto err_put_br;

	}



	ret = fpga_mgr_load(region->mgr, region->info);

	ret = fpga_mgr_load(region->mgr, info);

	if (ret) {

		dev_err(dev, "failed to load FPGA image\n");

		goto err_put_br;
@@ -373,6 +372,8 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region, 
	if (!info)

		return -ENOMEM;



	info->overlay = nd->overlay;



	/* Read FPGA region properties from the overlay */

	if (of_property_read_bool(nd->overlay, "partial-fpga-config"))

		info->flags |= FPGA_MGR_PARTIAL_RECONFIG;
@@ -421,7 +422,8 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region, 
	}



	region->info = info;

	ret = fpga_region_program_fpga(region, nd->overlay);



	ret = fpga_region_program_fpga(region);

	if (ret) {

		fpga_image_info_free(info);

		region->info = NULL;

include/linux/fpga/fpga-mgr.h

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ enum fpga_mgr_states { 
 * @buf: contiguous buffer containing FPGA image

 * @count: size of buf

 * @dev: device that owns this

 * @overlay: Device Tree overlay

 */

struct fpga_image_info {

	u32 flags;
@@ -100,6 +101,9 @@ struct fpga_image_info { 
	const char *buf;

	size_t count;

	struct device *dev;

#ifdef CONFIG_OF

	struct device_node *overlay;

#endif

};



/**