From: Tom Rix <trix@redhat.com>
To: Moritz Fischer <mdf@kernel.org>, "Xu, Yilun" <yilun.xu@intel.com>
Cc: hao.wu@intel.com, michal.simek@xilinx.com,
linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 1/7] fpga-mgr: wrap the write_init() op
Date: Mon, 28 Jun 2021 14:03:04 -0700 [thread overview]
Message-ID: <088cbfc6-e627-c929-0d87-830bc6271c58@redhat.com> (raw)
In-Reply-To: <YNoauN/c0E65n8JU@epycbox.lan>
On 6/28/21 11:53 AM, Moritz Fischer wrote:
> On Fri, Jun 25, 2021 at 12:51:42PM -0700, trix@redhat.com wrote:
>> From: Tom Rix <trix@redhat.com>
>>
>> An FPGA manager should not be required to provide a
>> write_init() op if there is nothing for it do.
>> So add a wrapper and move the op checking.
>> Default to success.
>>
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
>> drivers/fpga/fpga-mgr.c | 15 ++++++++++++---
>> 1 file changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
>> index ecb4c3c795fa5..c047de8a059b7 100644
>> --- a/drivers/fpga/fpga-mgr.c
>> +++ b/drivers/fpga/fpga-mgr.c
>> @@ -25,6 +25,15 @@ struct fpga_mgr_devres {
>> struct fpga_manager *mgr;
>> };
>>
>> +static inline int fpga_mgr_write_init(struct fpga_manager *mgr,
>> + struct fpga_image_info *info,
>> + const char *buf, size_t count)
>> +{
>> + if (mgr->mops->write_init)
> Will you need a if (mgr->mops && mgr->mops->write_init) here later?
This was changed from v3 based on Yilun's comment
https://lore.kernel.org/linux-fpga/20210624075414.GA44700@yilunxu-OptiPlex-7050/
This is checked on creation
>> + return mgr->mops->write_init(mgr, info, buf, count);
>> + return 0;
>> +}
>> +
>> /**
>> * fpga_image_info_alloc - Allocate an FPGA image info struct
>> * @dev: owning device
>> @@ -83,9 +92,9 @@ static int fpga_mgr_write_init_buf(struct fpga_manager *mgr,
>>
>> mgr->state = FPGA_MGR_STATE_WRITE_INIT;
>> if (!mgr->mops->initial_header_size)
>> - ret = mgr->mops->write_init(mgr, info, NULL, 0);
>> + ret = fpga_mgr_write_init(mgr, info, NULL, 0);
>> else
>> - ret = mgr->mops->write_init(
>> + ret = fpga_mgr_write_init(
>> mgr, info, buf, min(mgr->mops->initial_header_size, count));
>>
>> if (ret) {
>> @@ -569,7 +578,7 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name,
>> int id, ret;
>>
>> if (!mops || !mops->write_complete || !mops->state ||
>> - !mops->write_init || (!mops->write && !mops->write_sg) ||
>> + (!mops->write && !mops->write_sg) ||
>> (mops->write && mops->write_sg)) {
>> dev_err(parent, "Attempt to register without fpga_manager_ops\n");
>> return NULL;
>> --
>> 2.26.3
>>
> Looks good to me, I might reword the commit message some when applying.
That is fine.
Thanks
Tom
> - Moritz
>
next prev parent reply other threads:[~2021-06-28 21:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 19:51 [PATCH v4 0/7] wrappers for fpga_manager_ops trix
2021-06-25 19:51 ` [PATCH v4 1/7] fpga-mgr: wrap the write_init() op trix
2021-06-28 18:53 ` Moritz Fischer
2021-06-28 21:03 ` Tom Rix [this message]
2021-06-25 19:51 ` [PATCH v4 2/7] fpga-mgr: make write_complete() op optional trix
2021-06-25 19:51 ` [PATCH v4 3/7] fpga-mgr: wrap the write() op trix
2021-06-25 19:51 ` [PATCH v4 4/7] fpga-mgr: wrap the status() op trix
2021-06-25 19:51 ` [PATCH v4 5/7] fpga-mgr: wrap the state() op trix
2021-06-25 19:51 ` [PATCH v4 6/7] fpga-mgr: wrap the fpga_remove() op trix
2021-06-25 19:51 ` [PATCH v4 7/7] fpga-mgr: wrap the write_sg() op trix
2021-07-18 15:08 ` [PATCH v4 0/7] wrappers for fpga_manager_ops Moritz Fischer
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=088cbfc6-e627-c929-0d87-830bc6271c58@redhat.com \
--to=trix@redhat.com \
--cc=hao.wu@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=michal.simek@xilinx.com \
--cc=yilun.xu@intel.com \
/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).