From: trix@redhat.com
To: mdf@kernel.org
Cc: linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org,
Tom Rix <trix@redhat.com>
Subject: [PATCH v2 4/5] fpga: defer checking for update ops until they are used
Date: Thu, 20 May 2021 11:30:48 -0700 [thread overview]
Message-ID: <20210520183048.2022642-1-trix@redhat.com> (raw)
From: Tom Rix <trix@redhat.com>
Which update ops need to be used will depend on the
FPGA_MGR_REIMAGE bit in the fpga_image_info flags.
reimaging is optional, no drv that does not need
to remimage should be forced to provide stub functions.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/fpga-mgr.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index 4263c9e94949d..5247703a3743d 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -369,6 +369,14 @@ int fpga_mgr_load(struct fpga_manager *mgr, struct fpga_image_info *info)
{
const struct fpga_manager_update_ops *uops = &mgr->mops->reconfig;
+ if (!uops->write_complete ||
+ !uops->write_init ||
+ (!uops->write && !uops->write_sg) ||
+ (uops->write && uops->write_sg)) {
+ dev_err(&mgr->dev, "Attempt to load an image without fpga_manager_update_ops\n");
+ return -EOPNOTSUPP;
+ }
+
if (info->sgt)
return fpga_mgr_buf_load_sg(mgr, info, uops, info->sgt);
if (info->buf && info->count)
@@ -579,10 +587,7 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name,
struct fpga_manager *mgr;
int id, ret;
- if (!mops || !mops->reconfig.write_complete || !mops->state ||
- !mops->reconfig.write_init || (!mops->reconfig.write &&
- !mops->reconfig.write_sg) ||
- (mops->reconfig.write && mops->reconfig.write_sg)) {
+ if (!mops || !mops->state) {
dev_err(dev, "Attempt to register without fpga_manager_ops\n");
return NULL;
}
--
2.26.3
reply other threads:[~2021-05-20 18:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210520183048.2022642-1-trix@redhat.com \
--to=trix@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).