public inbox for linux-rdma@vger.kernel.org
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Subject: [rdma-next v2 27/33] RDMA/netlink: Export FW version
Date: Thu, 10 Aug 2017 14:08:21 +0300	[thread overview]
Message-ID: <20170810110827.9952-28-leon@kernel.org> (raw)
In-Reply-To: <20170810110827.9952-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

From: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

Add FW version to the device properties exported
by RDMA netlink, to be used by RDMAtool.

Signed-off-by: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
 drivers/infiniband/core/nldev.c  | 9 +++++++++
 include/uapi/rdma/rdma_netlink.h | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 94c1e49074f5..cdc970ca5a1b 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -40,10 +40,14 @@ static const struct nla_policy nldev_policy[RDMA_NLDEV_ATTR_MAX] = {
 	[RDMA_NLDEV_ATTR_DEV_NAME]	= { .type = NLA_NUL_STRING,
 					    .len = IB_DEVICE_NAME_MAX - 1},
 	[RDMA_NLDEV_ATTR_PORT_INDEX]	= { .type = NLA_U32 },
+	[RDMA_NLDEV_ATTR_FW_VERSION]	= { .type = NLA_NUL_STRING,
+					    .len = IB_FW_VERSION_NAME_MAX - 1},
 };
 
 static int fill_dev_info(struct sk_buff *msg, struct ib_device *device)
 {
+	char fw[IB_FW_VERSION_NAME_MAX];
+
 	if (nla_put_u32(msg, RDMA_NLDEV_ATTR_DEV_INDEX, device->index))
 		return -EMSGSIZE;
 	if (nla_put_string(msg, RDMA_NLDEV_ATTR_DEV_NAME, device->name))
@@ -56,6 +60,11 @@ static int fill_dev_info(struct sk_buff *msg, struct ib_device *device)
 			      device->attrs.device_cap_flags, 0))
 		return -EMSGSIZE;
 
+	ib_get_device_fw_str(device, fw);
+	/* Device without FW has strlen(fw) */
+	if (strlen(fw) && nla_put_string(msg, RDMA_NLDEV_ATTR_FW_VERSION, fw))
+		return -EMSGSIZE;
+
 	return 0;
 }
 
diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 90de11db6580..5159858730b0 100644
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -262,6 +262,10 @@ enum rdma_nldev_attr {
 	 */
 	RDMA_NLDEV_ATTR_CAP_FLAGS,		/* u64 */
 
+	/*
+	 * FW version
+	 */
+	RDMA_NLDEV_ATTR_FW_VERSION,		/* string */
 	RDMA_NLDEV_ATTR_MAX
 };
 #endif /* _UAPI_RDMA_NETLINK_H */
-- 
2.14.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-08-10 11:08 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-10 11:07 [pull request][rdma-next v2 00/33] RDMA netlink refactoring and RDMAtool code Leon Romanovsky
     [not found] ` <20170810110827.9952-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-08-10 11:07   ` [rdma-next v2 01/33] RDMA/core: Add wait/retry version of ibnl_unicast Leon Romanovsky
2017-08-10 11:07   ` [rdma-next v2 02/33] RDMA/netlink: Remove netlink clients infrastructure Leon Romanovsky
2017-08-10 11:07   ` [rdma-next v2 03/33] RDMA/netlink: Remove redundant owner option for netlink callbacks Leon Romanovsky
2017-08-10 11:07   ` [rdma-next v2 04/33] RDMA/netlink: Avoid double pass for RDMA netlink messages Leon Romanovsky
2017-08-10 11:07   ` [rdma-next v2 05/33] RDMA/iwcm: Remove useless check of netlink client validity Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 06/33] RDMA/iwcm: Remove extra EXPORT_SYMBOLS Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 07/33] RDMA/netlink: Add flag to consolidate common handling Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 08/33] RDMA/netlink: Simplify the put_msg and put_attr Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 09/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_unicast* Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 10/33] RDMA/netlink: Rename and remove redundant parameter from ibnl_multicast Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 11/33] RDMA/netlink: Simplify and rename ibnl_chk_listeners Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 12/33] RDMA/netlink: Rename netlink callback struct Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 13/33] RDMA/core: Add iterator over ib_devices Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 14/33] RDMA/core: Add and expose static device index Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 15/33] RDMA/netlink: Add and implement doit netlink callback Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 16/33] RDMA/netlink: Reduce indirection access to cb_table Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 17/33] RDMA/netlink: Convert LS to doit callback Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 18/33] RDMA/netlink: Update copyright Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 19/33] RDMA/netlink: Add netlink device definitions to UAPI Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 20/33] RDMA/netlink: Add nldev initialization flows Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 21/33] RDMA/netlink: Implement nldev device dumpit calback Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 22/33] RDMA/netlink: Add nldev device doit implementation Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 23/33] RDMA/netlink: Add nldev port dumpit implementation Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 24/33] RDMA/netlink: Implement nldev port doit callback Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 25/33] RDMA/netlink: Expose device and port capability masks Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 26/33] RDMA: Simplify get firmware interface Leon Romanovsky
2017-08-10 11:08   ` Leon Romanovsky [this message]
2017-08-10 11:08   ` [rdma-next v2 28/33] RDMA/netlink: Export node_guid and sys_image_guid Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 29/33] RDMA/netlink: Advertise IB subnet prefix Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 30/33] RDMA/netink: Export lids and sm_lids Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 31/33] RDMA/netlink: Export LID mask control (LMC) Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 32/33] RDMA/netlink: Provide port state and physical link state Leon Romanovsky
2017-08-10 11:08   ` [rdma-next v2 33/33] RDMA/netlink: Export node_type Leon Romanovsky
2017-08-11 15:37   ` [pull request][rdma-next v2 00/33] RDMA netlink refactoring and RDMAtool code Doug Ledford

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=20170810110827.9952-28-leon@kernel.org \
    --to=leon-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
    --cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.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