All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alan Tull <atull@kernel.org>
To: Moritz Fischer <mdf@kernel.org>
Cc: Alan Tull <atull@kernel.org>,
	linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org
Subject: [PATCH v4 09/18] fpga: region: use image info as parameter for programming region
Date: Wed, 13 Sep 2017 15:48:32 -0500	[thread overview]
Message-ID: <20170913204841.2730-10-atull@kernel.org> (raw)
In-Reply-To: <20170913204841.2730-1-atull@kernel.org>

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: Alan Tull <atull@kernel.org>
---
v2: split out from another patch
v3: change API to use the region->info, remove info param
    remove check for region->info, not needed
v4: no change to this patch in this version of patchset
---
 drivers/fpga/fpga-region.c    | 16 +++++++++-------
 include/linux/fpga/fpga-mgr.h |  4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index 35af952..eaacf50 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -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;
diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
index 5e2b36e..6977a6b02 100644
--- a/include/linux/fpga/fpga-mgr.h
+++ b/include/linux/fpga/fpga-mgr.h
@@ -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
 };
 
 /**
-- 
2.7.4

  parent reply	other threads:[~2017-09-13 20:51 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-13 20:48 [PATCH v4 00/18] Enable upper layers using FPGA region w/o device tree Alan Tull
2017-09-13 20:48 ` [PATCH v4 01/18] fpga: bridge: support getting bridge from device Alan Tull
2017-09-13 23:38   ` matthew.gerlach
2017-09-14 19:26     ` Alan Tull
2017-09-14 22:29       ` matthew.gerlach
2017-09-14 22:54         ` Moritz Fischer
2017-09-19 16:06           ` Alan Tull
2017-09-18 17:59   ` Moritz Fischer
2017-09-18 20:53     ` Alan Tull
2017-09-18 22:53   ` Moritz Fischer
2017-09-19 15:35     ` Alan Tull
2017-09-13 20:48 ` [PATCH v4 02/18] fpga: mgr: API change to replace fpga load functions with single function Alan Tull
2017-09-13 20:48 ` [PATCH v4 03/18] fpga: mgr: separate getting/locking FPGA manager Alan Tull
2017-09-13 20:48 ` [PATCH v4 04/18] fpga: region: use dev_err instead of pr_err Alan Tull
2017-09-18 18:17   ` Moritz Fischer
2017-09-18 20:54     ` Alan Tull
2017-09-13 20:48 ` [PATCH v4 05/18] fpga: region: remove unneeded of_node_get and put Alan Tull
2017-09-13 20:48 ` [PATCH v4 06/18] fpga: region: get mgr early on Alan Tull
2017-09-13 20:48 ` [PATCH v4 07/18] fpga: region: check for child regions before allocing image info Alan Tull
2017-09-13 20:48 ` [PATCH v4 08/18] fpga: region: fix slow warning with more than one overlay Alan Tull
2017-09-13 20:48 ` Alan Tull [this message]
2017-09-13 20:48 ` [PATCH v4 10/18] fpga: region: separate out code that parses the overlay Alan Tull
2017-09-13 20:48 ` [PATCH v4 11/18] fpga: region: add fpga-region.h header Alan Tull
2017-09-14  9:50   ` Wu Hao
2017-09-14 19:36     ` Alan Tull
2017-09-13 20:48 ` [PATCH v4 12/18] fpga: region: rename some functions prior to moving Alan Tull
2017-09-13 20:48 ` [PATCH v4 13/18] fpga: region: add register/unregister functions Alan Tull
2017-09-14  9:56   ` Wu Hao
2017-09-14 20:03     ` Alan Tull
2017-09-13 20:48 ` [PATCH v4 14/18] fpga: region: add fpga_region_class_find Alan Tull
2017-09-13 20:48 ` [PATCH v4 15/18] fpga: region: move device tree support to of-fpga-region.c Alan Tull
2017-09-14 15:50   ` matthew.gerlach
2017-09-14 20:54     ` Alan Tull
2017-09-13 20:48 ` [PATCH v4 16/18] fpga: of-fpga-region: accept overlays that don't program FPGA Alan Tull
2017-09-13 20:48 ` [PATCH v4 17/18] fpga: clean up fpga Kconfig Alan Tull
2017-09-14 15:56   ` matthew.gerlach
2017-09-14 20:41     ` Alan Tull
2017-09-13 20:48 ` [PATCH v4 18/18] fpga: add attribute groups Alan Tull

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170913204841.2730-10-atull@kernel.org \
    --to=atull@kernel.org \
    --cc=linux-fpga@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mdf@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.