Date: Fri, 19 Apr 2019 12:54:05 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r346380 - in stable/12: lib/libdevctl usr.sbin/devctl Message-ID: <201904191254.x3JCs54F083577@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Fri Apr 19 12:54:05 2019 New Revision: 346380 URL: https://svnweb.freebsd.org/changeset/base/346380 Log: MFC r345966, r345968: Implement devctl(8) command 'reset', using DEV_RESET /dev/devctl2 ioctl. Modified: stable/12/lib/libdevctl/devctl.3 stable/12/lib/libdevctl/devctl.c stable/12/lib/libdevctl/devctl.h stable/12/usr.sbin/devctl/devctl.8 stable/12/usr.sbin/devctl/devctl.c Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libdevctl/devctl.3 ============================================================================== --- stable/12/lib/libdevctl/devctl.3 Fri Apr 19 12:50:25 2019 (r346379) +++ stable/12/lib/libdevctl/devctl.3 Fri Apr 19 12:54:05 2019 (r346380) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 22, 2018 +.Dd April 4, 2019 .Dt DEVCTL 3 .Os .Sh NAME @@ -38,6 +38,7 @@ .Nm devctl_enable , .Nm devctl_freeze , .Nm devctl_rescan , +.Nm devctl_reset , .Nm devctl_resume , .Nm devctl_set_driver , .Nm devctl_suspend , @@ -64,6 +65,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" @@ -205,6 +208,15 @@ The .Fn devctl_thaw function resumes (thaws the freeze) probe and attach processing initiated in response to drivers being loaded. +.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 \ @@ -378,6 +390,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 , @@ -392,3 +419,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/12/lib/libdevctl/devctl.c ============================================================================== --- stable/12/lib/libdevctl/devctl.c Fri Apr 19 12:50:25 2019 (r346379) +++ stable/12/lib/libdevctl/devctl.c Fri Apr 19 12:54:05 2019 (r346380) @@ -159,3 +159,11 @@ devctl_thaw(void) return (devctl_simple_request(DEV_THAW, "", 0)); } + +int +devctl_reset(const char *device, bool detach) +{ + + return (devctl_simple_request(DEV_RESET, device, detach ? + DEVF_RESET_DETACH : 0)); +} Modified: stable/12/lib/libdevctl/devctl.h ============================================================================== --- stable/12/lib/libdevctl/devctl.h Fri Apr 19 12:50:25 2019 (r346379) +++ stable/12/lib/libdevctl/devctl.h Fri Apr 19 12:54:05 2019 (r346380) @@ -44,6 +44,7 @@ int devctl_rescan(const char *device); int devctl_delete(const char *device, bool force); int devctl_freeze(void); int devctl_thaw(void); +int devctl_reset(const char *device, bool detach); __END_DECLS #endif /* !__DEVCTL_H__ */ Modified: stable/12/usr.sbin/devctl/devctl.8 ============================================================================== --- stable/12/usr.sbin/devctl/devctl.8 Fri Apr 19 12:50:25 2019 (r346379) +++ stable/12/usr.sbin/devctl/devctl.8 Fri Apr 19 12:54:05 2019 (r346380) @@ -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/12/usr.sbin/devctl/devctl.c ============================================================================== --- stable/12/usr.sbin/devctl/devctl.c Fri Apr 19 12:50:25 2019 (r346379) +++ stable/12/usr.sbin/devctl/devctl.c Fri Apr 19 12:54:05 2019 (r346380) @@ -83,7 +83,9 @@ usage(void) " devctl rescan device\n" " devctl delete [-f] device\n" " devctl freeze\n" - " devctl thaw\n"); + " devctl thaw\n" + " devctl reset [-d] device\n" + ); exit(1); } @@ -384,6 +386,40 @@ thaw(int ac, char **av __unused) return (0); } DEVCTL_COMMAND(top, thaw, thaw); + +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[])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904191254.x3JCs54F083577>