Author: kib
Date: Fri Apr 19 13:18:54 2019
New Revision: 346384
URL: https://svnweb.freebsd.org/changeset/base/346384
Log:
MFC r345966, r345968:
Implement devctl(8) command 'reset', using DEV_RESET /dev/devctl2 ioctl.
Modified:
stable/11/lib/libdevctl/devctl.3
stable/11/lib/libdevctl/devctl.c
stable/11/lib/libdevctl/devctl.h
stable/11/usr.sbin/devctl/devctl.8
stable/11/usr.sbin/devctl/devctl.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libdevctl/devctl.3
==============================================================================
--- stable/11/lib/libdevctl/devctl.3 Fri Apr 19 13:09:16 2019
(r346383)
+++ stable/11/lib/libdevctl/devctl.3 Fri Apr 19 13:18:54 2019
(r346384)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 29, 2016
+.Dd April 4, 2019
.Dt DEVCTL 3
.Os
.Sh NAME
@@ -37,6 +37,7 @@
.Nm devctl_disable ,
.Nm devctl_enable ,
.Nm devctl_rescan ,
+.Nm devctl_reset ,
.Nm devctl_resume ,
.Nm devctl_set_driver ,
.Nm devctl_suspend
@@ -60,6 +61,8 @@
.Ft int
.Fn devctl_rescan "const char *device"
.Ft int
+.Fn devctl_reset "const char *device" "bool detach"
+.Ft int
.Fn devctl_resume "const char *device"
.Ft int
.Fn devctl_set_driver "const char *device" "const char *driver" "bool force"
@@ -189,6 +192,15 @@ The
.Fn devctl_rescan
function rescans a bus device checking for devices that have been added or
removed.
+.Pp
+The
+.Fn devctl_reset
+function resets the specified device using bus-specific reset method.
+The
+.Fa detach
+argument, if true, specifies that the device driver is detached before
+the reset, and re-attached afterwards.
+If false, the device is suspended before the reset, and resumed after.
.Sh RETURN VALUES
.Rv -std devctl_attach devctl_clear_driver devctl_delete devctl_detach \
devctl_disable devctl_enable devctl_suspend devctl_rescan devctl_resume \
@@ -362,6 +374,21 @@ is false.
.Fa dev
is the root device of the device tree.
.El
+.Pp
+The
+.Fn devctl_reset
+function may fail if:
+.Bl -tag -width Er
+.It Bq Er ENXIO
+The bus does not implement the reset method.
+.It Bq Er ETIMEDOUT
+The device failed to respond after the reset in the time limits
+specific to the bus.
+.El
+The
+.Fn devctl_reset
+function may also return errors caused by the attach, detach, suspend,
+and resume methods of the device driver.
.Sh SEE ALSO
.Xr devinfo 3 ,
.Xr devstat 3 ,
@@ -376,3 +403,20 @@ If a device is suspended individually via
.Fn devctl_suspend
and the entire machine is subsequently suspended,
the device will be resumed when the machine resumes.
+.Pp
+Similarly, if the device is suspended, and
+.Fn devctl_reset
+is called on the device with
+.Fa detach
+set to
+.Va false ,
+the device is resumed by the
+.Fn devctl_reset
+call.
+Or, if the driver for the device is detached manually, and
+.Fn devctl_reset
+is called on the device with
+.Fa detach
+set to
+.Va true ,
+device reset re-attaches the driver.
Modified: stable/11/lib/libdevctl/devctl.c
==============================================================================
--- stable/11/lib/libdevctl/devctl.c Fri Apr 19 13:09:16 2019
(r346383)
+++ stable/11/lib/libdevctl/devctl.c Fri Apr 19 13:18:54 2019
(r346384)
@@ -145,3 +145,11 @@ devctl_delete(const char *device, bool force)
return (devctl_simple_request(DEV_DELETE, device, force ?
DEVF_FORCE_DELETE : 0));
}
+
+int
+devctl_reset(const char *device, bool detach)
+{
+
+ return (devctl_simple_request(DEV_RESET, device, detach ?
+ DEVF_RESET_DETACH : 0));
+}
Modified: stable/11/lib/libdevctl/devctl.h
==============================================================================
--- stable/11/lib/libdevctl/devctl.h Fri Apr 19 13:09:16 2019
(r346383)
+++ stable/11/lib/libdevctl/devctl.h Fri Apr 19 13:18:54 2019
(r346384)
@@ -42,6 +42,7 @@ int devctl_set_driver(const char *device, const char *
int devctl_clear_driver(const char *device, bool force);
int devctl_rescan(const char *device);
int devctl_delete(const char *device, bool force);
+int devctl_reset(const char *device, bool detach);
__END_DECLS
#endif /* !__DEVCTL_H__ */
Modified: stable/11/usr.sbin/devctl/devctl.8
==============================================================================
--- stable/11/usr.sbin/devctl/devctl.8 Fri Apr 19 13:09:16 2019
(r346383)
+++ stable/11/usr.sbin/devctl/devctl.8 Fri Apr 19 13:18:54 2019
(r346384)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 29, 2016
+.Dd April 4, 2019
.Dt DEVCTL 8
.Os
.Sh NAME
@@ -67,6 +67,10 @@
.Cm delete
.Op Fl f
.Ar device
+.Nm
+.Cm reset
+.Op Fl d
+.Ar device
.Sh DESCRIPTION
The
.Nm
@@ -167,7 +171,35 @@ the device will be deleted even if it is physically pr
This command should be used with care as a device that is deleted but present
can no longer be used unless the parent bus device rediscovers the device via
a rescan request.
+.It Xo Cm reset
+.Op Fl d
+.Ar device
+.Xc
+Reset the device, using bus-specific reset method.
+Drivers for the devices being reset are suspended around the reset.
+If the
+.Fl d
+option is specified, drivers are detached instead.
+.Pp
+Currently, resets are implemented for PCIe buses and PCI devices.
+For PCIe bus, the link is disabled and then re-trained, causing all
+children of the bus to reset.
+Use
+.Fl p
+option of
+.Xr devinfo 8
+tool to report parent bus for the device.
+For PCI device, if Function-Level Reset is implemented by it, FLR is
+tried first; if failed or not implemented, power reset is tried.
+.Pp
+If you have detached or suspended a child device explicitly and then
+do a reset, the child device will end up attached.
.El
+.Sh BUGS
+Currently there is no administrative flag to prevent re-attach or resume
+of the manually detached or suspended devices after reset.
+Similarly, there is no flag to prevent un-suspending of the the manually
+suspended devices after system resume.
.Sh SEE ALSO
.Xr devctl 3 ,
.Xr devinfo 8
Modified: stable/11/usr.sbin/devctl/devctl.c
==============================================================================
--- stable/11/usr.sbin/devctl/devctl.c Fri Apr 19 13:09:16 2019
(r346383)
+++ stable/11/usr.sbin/devctl/devctl.c Fri Apr 19 13:18:54 2019
(r346384)
@@ -71,7 +71,7 @@ DEVCTL_TABLE(top, set);
static void
usage(void)
{
- fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+ fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
"usage: devctl attach device",
" devctl detach [-f] device",
" devctl disable [-f] device",
@@ -81,7 +81,9 @@ usage(void)
" devctl set driver [-f] device driver",
" devctl clear driver [-f] device",
" devctl rescan device",
- " devctl delete [-f] device");
+ " devctl delete [-f] device",
+ " devctl reset [-d] device"
+ );
exit(1);
}
@@ -342,6 +344,40 @@ delete(int ac, char **av)
return (0);
}
DEVCTL_COMMAND(top, delete, delete);
+
+static void
+reset_usage(void)
+{
+
+ fprintf(stderr, "usage: devctl reset [-d] device\n");
+ exit(1);
+}
+
+static int
+reset(int ac, char **av)
+{
+ bool detach_drv;
+ int ch;
+
+ detach_drv = false;
+ while ((ch = getopt(ac, av, "d")) != -1)
+ switch (ch) {
+ case 'd':
+ detach_drv = true;
+ break;
+ default:
+ reset_usage();
+ }
+ ac -= optind;
+ av += optind;
+
+ if (ac != 1)
+ reset_usage();
+ if (devctl_reset(av[0], detach_drv) < 0)
+ err(1, "Failed to reset %s", av[0]);
+ return (0);
+}
+DEVCTL_COMMAND(top, reset, reset);
int
main(int ac, char *av[])
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
