From: Logan Gunthorpe <logang@deltatee.com>
To: linux-ntb@googlegroups.com, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Jon Mason <jdmason@kudzu.us>, Dave Jiang <dave.jiang@intel.com>,
Allen Hubbe <Allen.Hubbe@emc.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kurt Schwemmer <kurt.schwemmer@microsemi.com>,
Stephen Bates <sbates@raithlin.com>,
Serge Semin <fancer.lancer@gmail.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v2 06/16] ntb: add check and comment for link up to mw_count() and mw_get_align()
Date: Tue, 18 Jul 2017 10:03:59 -0600 [thread overview]
Message-ID: <20170718160409.6493-7-logang@deltatee.com> (raw)
In-Reply-To: <20170718160409.6493-1-logang@deltatee.com>
Adds a comment and a check to ntb_mw_get_align() so that it always fails
if the function is called before the link is up.
Also adds a comment to ntb_mw_count() to note that it may return 0 if
it is called before the link is up.
This is to prevent accidental mis-use in clients that are testing
on hardware that this doesn't matter for.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
include/linux/ntb.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index 609e232c00da..47f2966cfd7f 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -730,7 +730,8 @@ static inline int ntb_link_disable(struct ntb_dev *ntb)
* Hardware and topology may support a different number of memory windows.
* Moreover different peer devices can support different number of memory
* windows. Simply speaking this method returns the number of possible inbound
- * memory windows to share with specified peer device.
+ * memory windows to share with specified peer device. Note: this may return
+ * zero if the link is not up yet.
*
* Return: the number of memory windows.
*/
@@ -751,7 +752,7 @@ static inline int ntb_mw_count(struct ntb_dev *ntb, int pidx)
* Get the alignments of an inbound memory window with specified index.
* NULL may be given for any output parameter if the value is not needed.
* The alignment and size parameters may be used for allocation of proper
- * shared memory.
+ * shared memory. Note: this must only be called when the link is up.
*
* Return: Zero on success, otherwise a negative error number.
*/
@@ -760,6 +761,9 @@ static inline int ntb_mw_get_align(struct ntb_dev *ntb, int pidx, int widx,
resource_size_t *size_align,
resource_size_t *size_max)
{
+ if (!(ntb_link_is_up(ntb, NULL, NULL) & (1 << pidx)))
+ return -ENOTCONN;
+
return ntb->ops->mw_get_align(ntb, pidx, widx, addr_align, size_align,
size_max);
}
--
2.11.0
next prev parent reply other threads:[~2017-07-18 16:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-18 16:03 [PATCH v2 00/16] Switchtec NTB Support Logan Gunthorpe
2017-07-18 16:03 ` [PATCH v2 01/16] switchtec: move structure definitions into a common header Logan Gunthorpe
2017-07-18 16:03 ` [PATCH v2 02/16] switchtec: export class symbol for use in upper layer driver Logan Gunthorpe
2017-07-18 16:03 ` [PATCH v2 03/16] switchtec: add NTB hardware register definitions Logan Gunthorpe
2017-07-18 16:03 ` [PATCH v2 04/16] switchtec: add link event notifier callback Logan Gunthorpe
2017-07-18 16:03 ` [PATCH v2 05/16] ntb: ensure ntb_mw_get_align() is only called when the link is up Logan Gunthorpe
2017-07-18 16:03 ` Logan Gunthorpe [this message]
2017-07-18 16:04 ` [PATCH v2 07/16] ntb: ntb_test: ensure the link is up before trying to configure the mws Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 08/16] switchtec_ntb: introduce initial NTB driver Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 09/16] switchtec_ntb: initialize hardware for memory windows Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 10/16] switchtec_ntb: initialize hardware for doorbells and messages Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 11/16] switchtec_ntb: add skeleton NTB driver Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 12/16] switchtec_ntb: add link management Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 13/16] switchtec_ntb: implement doorbell registers Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 14/16] switchtec_ntb: implement scratchpad registers Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 15/16] switchtec_ntb: add memory window support Logan Gunthorpe
2017-07-18 16:04 ` [PATCH v2 16/16] switchtec_ntb: update switchtec documentation with notes for NTB Logan Gunthorpe
2017-07-18 17:51 ` [PATCH v2 00/16] Switchtec NTB Support Allen Hubbe
2017-07-18 18:08 ` Logan Gunthorpe
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=20170718160409.6493-7-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=Allen.Hubbe@emc.com \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=fancer.lancer@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jdmason@kudzu.us \
--cc=kurt.schwemmer@microsemi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-ntb@googlegroups.com \
--cc=linux-pci@vger.kernel.org \
--cc=sbates@raithlin.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