svn commit: r347751 - in stable/12: share/man/man4 sys/dev/mlx5 sys/dev/mlx5/mlx5_core usr.sbin/mlx5tool

[Hans Petter Selasky]

Author: hselasky
Date: Thu May 16 16:11:03 2019
New Revision: 347751
URL: https://svnweb.freebsd.org/changeset/base/347751

Log:
  MFC r347287:
  Rename mlx5_fwdump_addr to more neutral mlx5_tool_addr in mlx5core.
  
  Submitted by:	kib@
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/share/man/man4/mlx5io.4
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
  stable/12/sys/dev/mlx5/mlx5io.h
  stable/12/usr.sbin/mlx5tool/mlx5tool.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/man/man4/mlx5io.4
==============================================================================
--- stable/12/share/man/man4/mlx5io.4	Thu May 16 16:10:24 2019	(r347750)
+++ stable/12/share/man/man4/mlx5io.4	Thu May 16 16:11:03 2019	(r347751)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 20, 2018
+.Dd May 7, 2019
 .Dt mlx5io 4
 .Os
 .Sh NAME
@@ -55,10 +55,10 @@ far, or existing dump cleared with the
 .Dv MLX5_FWDUMP_RESET
 command for the specified device.
 The argument for the command should point to the
-.Vt struct mlx5_fwdump_addr
+.Vt struct mlx5_tool_addr
 structure, containing the PCIe bus address of the device.
 .Bd -literal
-struct mlx5_fwdump_addr {
+struct mlx5_tool_addr {
 	uint32_t domain;
 	uint8_t bus;
 	uint8_t slot;
@@ -69,7 +69,7 @@ struct mlx5_fwdump_addr {
 Clear the stored firmware dump, preparing the kernel buffer for
 the next dump.
 The argument for the command should point to the
-.Vt struct mlx5_fwdump_addr
+.Vt struct mlx5_tool_addr
 structure, containing the PCIe bus address of the device.
 .It Dv MLX5_FWDUMP_GET
 Fetch the stored firmware dump into the user memory.
@@ -88,7 +88,7 @@ in the
 field.
 .Bd -literal
 struct mlx5_fwdump_get {
-	struct mlx5_fwdump_addr devaddr;
+	struct mlx5_tool_addr devaddr;
 	struct mlx5_fwdump_reg *buf;
 	size_t reg_cnt;
 	size_t reg_filled; /* out */

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c	Thu May 16 16:10:24 2019	(r347750)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c	Thu May 16 16:11:03 2019	(r347751)
@@ -170,7 +170,7 @@ mlx5_fwdump_clean(struct mlx5_core_dev *mdev)
 }
 
 static int
-mlx5_dbsf_to_core(const struct mlx5_fwdump_addr *devaddr,
+mlx5_dbsf_to_core(const struct mlx5_tool_addr *devaddr,
     struct mlx5_core_dev **mdev)
 {
 	device_t dev;
@@ -231,7 +231,7 @@ mlx5_fwdump_ioctl(struct cdev *dev, u_long cmd, caddr_
 {
 	struct mlx5_core_dev *mdev;
 	struct mlx5_fwdump_get *fwg;
-	struct mlx5_fwdump_addr *devaddr;
+	struct mlx5_tool_addr *devaddr;
 	struct mlx5_dump_data *dd;
 	int error;
 
@@ -254,7 +254,7 @@ mlx5_fwdump_ioctl(struct cdev *dev, u_long cmd, caddr_
 			error = EBADF;
 			break;
 		}
-		devaddr = (struct mlx5_fwdump_addr *)data;
+		devaddr = (struct mlx5_tool_addr *)data;
 		error = mlx5_dbsf_to_core(devaddr, &mdev);
 		if (error != 0)
 			break;
@@ -269,7 +269,7 @@ mlx5_fwdump_ioctl(struct cdev *dev, u_long cmd, caddr_
 			error = EBADF;
 			break;
 		}
-		devaddr = (struct mlx5_fwdump_addr *)data;
+		devaddr = (struct mlx5_tool_addr *)data;
 		error = mlx5_dbsf_to_core(devaddr, &mdev);
 		if (error != 0)
 			break;

Modified: stable/12/sys/dev/mlx5/mlx5io.h
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5io.h	Thu May 16 16:10:24 2019	(r347750)
+++ stable/12/sys/dev/mlx5/mlx5io.h	Thu May 16 16:11:03 2019	(r347751)
@@ -35,7 +35,7 @@ struct mlx5_fwdump_reg {
 	uint32_t val;
 };
 
-struct mlx5_fwdump_addr {
+struct mlx5_tool_addr {
 	uint32_t domain;
 	uint8_t bus;
 	uint8_t slot;
@@ -43,15 +43,15 @@ struct mlx5_fwdump_addr {
 };
 
 struct mlx5_fwdump_get {
-	struct mlx5_fwdump_addr devaddr;
+	struct mlx5_tool_addr devaddr;
 	struct mlx5_fwdump_reg *buf;
 	size_t reg_cnt;
 	size_t reg_filled; /* out */
 };
 
 #define	MLX5_FWDUMP_GET		_IOWR('m', 1, struct mlx5_fwdump_get)
-#define	MLX5_FWDUMP_RESET	_IOW('m', 2, struct mlx5_fwdump_addr)
-#define	MLX5_FWDUMP_FORCE	_IOW('m', 3, struct mlx5_fwdump_addr)
+#define	MLX5_FWDUMP_RESET	_IOW('m', 2, struct mlx5_tool_addr)
+#define	MLX5_FWDUMP_FORCE	_IOW('m', 3, struct mlx5_tool_addr)
 
 #ifndef _KERNEL
 #define	MLX5_DEV_PATH	_PATH_DEV"mlx5ctl"

Modified: stable/12/usr.sbin/mlx5tool/mlx5tool.c
==============================================================================
--- stable/12/usr.sbin/mlx5tool/mlx5tool.c	Thu May 16 16:10:24 2019	(r347750)
+++ stable/12/usr.sbin/mlx5tool/mlx5tool.c	Thu May 16 16:11:03 2019	(r347751)
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 
 /* stolen from pciconf.c: parsesel() */
 static int
-parse_pci_addr(const char *addrstr, struct mlx5_fwdump_addr *addr)
+parse_pci_addr(const char *addrstr, struct mlx5_tool_addr *addr)
 {
 	char *eppos;
 	unsigned long selarr[4];
@@ -73,7 +73,7 @@ parse_pci_addr(const char *addrstr, struct mlx5_fwdump
 }
 
 static int
-mlx5tool_save_dump(int ctldev, const struct mlx5_fwdump_addr *addr,
+mlx5tool_save_dump(int ctldev, const struct mlx5_tool_addr *addr,
     const char *dumpname)
 {
 	struct mlx5_fwdump_get fdg;
@@ -123,7 +123,7 @@ out:
 }
 
 static int
-mlx5tool_dump_reset(int ctldev, const struct mlx5_fwdump_addr *addr)
+mlx5tool_dump_reset(int ctldev, const struct mlx5_tool_addr *addr)
 {
 
 	if (ioctl(ctldev, MLX5_FWDUMP_RESET, addr) == -1) {
@@ -134,7 +134,7 @@ mlx5tool_dump_reset(int ctldev, const struct mlx5_fwdu
 }
 
 static int
-mlx5tool_dump_force(int ctldev, const struct mlx5_fwdump_addr *addr)
+mlx5tool_dump_force(int ctldev, const struct mlx5_tool_addr *addr)
 {
 
 	if (ioctl(ctldev, MLX5_FWDUMP_FORCE, addr) == -1) {
@@ -166,7 +166,7 @@ enum mlx5_action {
 int
 main(int argc, char *argv[])
 {
-	struct mlx5_fwdump_addr addr;
+	struct mlx5_tool_addr addr;
 	char *dumpname;
 	char *addrstr;
 	int c, ctldev, res;