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 16/18] fpga: of-fpga-region: accept overlays that don't program FPGA
Date: Wed, 13 Sep 2017 15:48:39 -0500 [thread overview]
Message-ID: <20170913204841.2730-17-atull@kernel.org> (raw)
In-Reply-To: <20170913204841.2730-1-atull@kernel.org>
The FPGA may already have a static image programmed when
Linux boots. In that case a DT overlay may be used to add
the devices that already exist. This commit allows that
by shuffling the order of some checks.
Signed-off-by: Alan Tull <atull@kernel.org>
---
v4: Patch added to patchset in v4
---
drivers/fpga/of-fpga-region.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index 1797057..d942ae1 100644
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -298,18 +298,19 @@ static int of_fpga_region_notify_pre_apply(struct fpga_region *region,
struct fpga_image_info *info;
int ret;
- if (region->info) {
- dev_err(dev, "Region already has overlay applied.\n");
- return -EINVAL;
- }
-
info = of_fpga_region_parse_ov(region, nd->overlay);
if (IS_ERR(info))
return PTR_ERR(info);
+ /* If overlay doesn't program the FPGA, accept it anyway. */
if (!info)
return 0;
+ if (region->info) {
+ dev_err(dev, "Region already has overlay applied.\n");
+ return -EINVAL;
+ }
+
region->info = info;
ret = fpga_region_program_fpga(region);
if (ret) {
--
2.7.4
next prev parent reply other threads:[~2017-09-13 20:49 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 ` [PATCH v4 09/18] fpga: region: use image info as parameter for programming region Alan Tull
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 ` Alan Tull [this message]
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-17-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome