Release version 2.4.0

Honor PKG_CONFIG variable if exists
Some build systems want to pass location for pkg-config. Closes #315.
2026-05-17 08:26:29 +03:00 · 2021-02-13 16:21:16 -08:00 · 2021-02-11 17:48:11 -08:00 · 2021-02-05 15:40:21 -08:00 · 2021-02-05 15:32:05 -08:00 · 2021-01-21 13:16:46 -08:00
7 changed files with 789 additions and 257 deletions
--- a/Formula/uhubctl.rb
+++ b/Formula/uhubctl.rb
@@ -1,9 +1,17 @@
 class Uhubctl < Formula
-  desc "control USB hubs powering per-port"
+  desc "USB hub per-port power control"
  homepage "https://github.com/mvp/uhubctl"
  head "https://github.com/mvp/uhubctl.git"
+  url "https://github.com/mvp/uhubctl/archive/v2.3.0.tar.gz"
+  sha256 "714f733592d3cb6ba8efc84fbc03b1beed2323918ff33aef01cdb956755be7b7"
+  license "GPL-2.0"

  depends_on "libusb"
+  depends_on "pkg-config" => :build
+
+  livecheck do
+    url :stable
+  end

  def install
    system "make"
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 uhubctl – USB hub per-port power control.

-Copyright (c) 2009-2018, Vadim Mikhailov
+Copyright (c) 2009-2020, Vadim Mikhailov

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/27
+++ b/27
@@ -10,34 +10,35 @@ INSTALL		:= install
 INSTALL_DIR	:= $(INSTALL) -m 755 -d
 INSTALL_PROGRAM	:= $(INSTALL) -m 755
 RM		:= rm -rf
+PKG_CONFIG	?= pkg-config

 CC ?= gcc
 CFLAGS ?= -g -O0
 CFLAGS += -Wall -Wextra -std=c99 -pedantic
-GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
+GIT_VERSION := $(shell git describe --match "v[0-9]*" --abbrev=8 --dirty --tags | cut -c2-)
+ifeq ($(GIT_VERSION),)
+	GIT_VERSION := $(shell cat VERSION)
+endif
 CFLAGS += -DPROGRAM_VERSION=\"$(GIT_VERSION)\"

+# Use hardening options on Linux
 ifeq ($(UNAME_S),Linux)
-	LDFLAGS += -Wl,-z,relro -lusb-1.0
+	LDFLAGS += -Wl,-zrelro,-znow
 endif

-ifeq ($(UNAME_S),Darwin)
-ifneq ($(wildcard /opt/local/include),)
-	# MacPorts
-	CFLAGS  += -I/opt/local/include
-	LDFLAGS += -L/opt/local/lib
-endif
+# Use pkg-config if available
+ifneq (,$(shell which $(PKG_CONFIG)))
+	CFLAGS  += $(shell $(PKG_CONFIG) --cflags libusb-1.0)
+	LDFLAGS += $(shell $(PKG_CONFIG) --libs libusb-1.0)
+else
+# But it should still build if pkg-config is not available (e.g. Linux or Mac homebrew)
 	LDFLAGS += -lusb-1.0
 endif

-ifeq ($(UNAME_S),FreeBSD)
-	LDFLAGS += -lusb
-endif
-
 PROGRAM = uhubctl

 $(PROGRAM): $(PROGRAM).c
-	$(CC) $(CFLAGS) $@.c -o $@ $(LDFLAGS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $@.c -o $@ $(LDFLAGS)

 install:
 	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 uhubctl
 =======

-uhubctl is utility to control USB power per-port on smart USB hubs.
+`uhubctl` is utility to control USB power per-port on smart USB hubs.
 Smart hub is defined as one that implements per-port power switching.

 Original idea for this code was inspired by hub-ctrl.c by Niibe Yutaka:
-http://www.gniibe.org/development/ac-power-control-by-USB-hub
+https://www.gniibe.org/development/ac-power-control-by-USB-hub


 Compatible USB hubs
@@ -16,113 +16,374 @@ Some of them are no longer manufactured and can be hard to find.

 This is list of known compatible USB hubs:

-| Manufacturer       | Product                                                | VID:PID   | Release | EOL  |
-|:-------------------|:-------------------------------------------------------|:----------|:--------|:-----|
-| AmazonBasics       | HU3641V1, 4 Port USB3 Hub (see USB3 note below)        |`2109:2811`| 2013    |      |
-| AmazonBasics       | HU3770V1, 7 Port USB3 Hub (see USB3 note below)        |`2109:2811`| 2013    |      |
-| Apple              | Thunderbolt Display 27" (internal USB hub)             |           | 2011    | 2016 |
-| Apple              | USB Keyboard With Numeric Pad (internal USB hub)       |           | 2011    |      |
-| Asus               | Z87-PLUS Motherboard (onboard USB hubs)                |           | 2013    | 2016 |
-| B&B Electronics    | UHR204                                                 |           | 2013    |      |
-| Belkin             | F5U701-BLK                                             |           | 2008    | 2012 |
-| Circuitco          | Beagleboard-xM (internal USB hub)                      |`0424:9514`| 2010    |      |
-| CyberPower         | CP-H420P                                               |`0409:0059`| 2004    |      |
-| Cypress            | CY4608 HX2VL development kit                           |`04b4:6570`| 2012    |      |
-| D-Link             | DUB-H4 rev D1 (black edition, old silver not working)  |`05E3:0608`| 2012    |      |
-| D-Link             | DUB-H7 (silver edition only, new black not working)    |`2001:F103`| 2005    | 2010 |
-| Elecom             | U2H-G4S                                                |           | 2006    | 2011 |
-| Hawking Technology | UH214                                                  |           | 2003    | 2008 |
-| Lenovo             | ThinkPad EU Ultra Dockingstation (40A20090EU)          |`17EF:100F`| 2015    |      |
-| Lenovo             | ThinkPad X200 Ultrabase 42X4963                        |`17EF:1005`| 2008    | 2011 |
-| Linksys            | USB2HUB4                                               |           | 2004    | 2010 |
-| Maplin             | A08CQ                                                  |`0409:0059`| 2008    | 2011 |
-| Microchip          | EVB-USB2517                                            |           | 2008    |      |
-| Plugable           | USB3-HUB7BC (see USB3 note below)                      |`2109:0813`| 2015    |      |
-| Plugable           | USB3-HUB7-81X (see USB3 note below)                    |`2109:0813`| 2012    |      |
-| Plugable           | USB2-HUB10S                                            |           | 2010    |      |
-| Raspberry Pi       | Model B+, Model 2 B, Model 3 B (port 2 only)           |           | 2011    |      |
-| Rosewill           | RHUB-210                                               |`0409:005A`| 2011    | 2014 |
-| Sanwa Supply       | USB-HUB14GPH                                           |           | 2001    | 2003 |
-| Sunix              | SHB4200MA                                              |`0409:0058`| 2006    | 2009 |
-| Targus             | PAUH212U                                               |           | 2004    | 2009 |
+| Manufacturer       | Product                                              | Ports | USB | VID:PID   | Release | EOL  |
+|:-------------------|:-----------------------------------------------------|:------|:----|:----------|:--------|:-----|
+| AmazonBasics       | HU3641V1 ([RPi issue](https://goo.gl/CLt46M))        | 4     | 3.0 |`2109:2811`| 2013    |      |
+| AmazonBasics       | HU3770V1 ([RPi issue](https://goo.gl/CLt46M))        | 7     | 3.0 |`2109:2811`| 2013    |      |
+| AmazonBasics       | HU9003V1EBL                                          | 7     | 3.1 |`2109:2817`| 2018    |      |
+| AmazonBasics       | HU9002V1SBL, HU9002V1ESL                             | 10    | 3.1 |`2109:2817`| 2018    |      |
+| AmazonBasics       | HUC9002V1SBL, HUC9002V1EBL, HUC9002V1ESL             | 10    | 3.1 |`2109:2817`| 2018    |      |
+| Anker              | AK-68ANHUB-BV7A-0004 ([note](https://git.io/JLnZb))  | 7     | 3.0 |`2109:0812`| 2014    |      |
+| Apple              | Thunderbolt Display 27" (internal USB hub)           | 6     | 2.0 |           | 2011    | 2016 |
+| Apple              | USB Keyboard With Numeric Pad (internal USB hub)     | 3     | 2.0 |           | 2011    |      |
+| Asus               | Z87-PLUS Motherboard (onboard USB hub)               | 4     | 3.0 |           | 2013    | 2016 |
+| Aukey              | CB-C59                                               | 4     | 3.1 |`2109:2813`| 2017    |      |
+| B+B SmartWorx      | UHR204                                               | 4     | 2.0 |`0856:DB00`| 2013    |      |
+| B+B SmartWorx      | USH304                                               | 4     | 3.0 |`04B4:6506`| 2017    |      |
+| Basler             | 2000036234                                           | 4     | 3.0 |`0451:8046`| 2016    |      |
+| Belkin             | F5U101                                               | 4     | 2.0 |`0451:2046`| 2005    | 2010 |
+| Buffalo            | BSH4A05U3BK                                          | 4     | 3.0 |`05E3:0610`| 2015    |      |
+| Bytecc             | BT-UH340                                             | 4     | 3.0 |`2109:8110`| 2010    |      |
+| Circuitco          | Beagleboard-xM (internal USB hub)                    | 4     | 2.0 |`0424:9514`| 2010    |      |
+| Club3D             | CSV-3242HD Dual Display Docking Station              | 4     | 3.0 |`2109:2811`| 2015    |      |
+| CyberPower         | CP-H420P                                             | 4     | 2.0 |`0409:0059`| 2004    |      |
+| Cypress            | CY4608 HX2VL development kit                         | 4     | 2.0 |`04B4:6570`| 2012    |      |
+| D-Link             | DUB-H4 rev B (silver). Note: rev B7+ not supported   | 4     | 2.0 |`05E3:0605`| 2005    | 2010 |
+| D-Link             | DUB-H4 rev D,E (black). Note: rev A,C,F not supported| 4     | 2.0 |`05E3:0608`| 2012    |      |
+| D-Link             | DUB-H7 rev A (silver)                                | 7     | 2.0 |`2001:F103`| 2005    | 2010 |
+| D-Link             | DUB-H7 rev D,E (black). Note: rev B,C,F not supported| 7     | 2.0 |`05E3:0608`| 2012    |      |
+| Dell               | P2416D 24" QHD Monitor ([note](https://git.io/JUAu8))| 4     | 2.0 |           | 2017    |      |
+| Dell               | S2719DGF 27" WQHD Gaming-Monitor                     | 5     | 3.1 |`0424:5734`| 2018    |      |
+| Dell               | UltraSharp 1704FPT 17" LCD Monitor                   | 4     | 2.0 |`0424:A700`| 2005    | 2015 |
+| Dell               | UltraSharp U2415 24" LCD Monitor                     | 5     | 3.0 |           | 2014    |      |
+| Elecom             | U2H-G4S                                              | 4     | 2.0 |           | 2006    | 2011 |
+| ExSys              | EX-1113HMS                                           | 16    | 3.1 |           | 2018    |      |
+| GlobalScale        | ESPRESSObin SBUD102 V5                               | 1     | 3.0 |`1D6B:0003`| 2017    |      |
+| Hawking Technology | UH214                                                | 4     | 2.0 |           | 2003    | 2008 |
+| IOI                | U3H415E1                                             | 4     | 3.0 |           | 2012    |      |
+| j5create           | JUH470 (works only in USB2 mode)                     | 3     | 3.0 |`05E3:0610`| 2014    |      |
+| Juiced Systems     | 6HUB-01                                              | 7     | 3.0 |`0BDA:0411`| 2014    | 2018 |
+| LG Electronics     | 38WK95C-W monitor                                    | 4     | 3.0 |`0451:8142`| 2018    |      |
+| Lenovo             | ThinkPad Ultra Docking Station (40A20090EU)          | 6     | 2.0 |`17EF:100F`| 2015    |      |
+| Lenovo             | ThinkPad Ultra Docking Station (40AJ0135EU)          | 7     | 3.1 |`17EF:3070`| 2018    |      |
+| Lenovo             | ThinkPad X200 Ultrabase 42X4963                      | 3     | 2.0 |`17EF:1005`| 2008    | 2011 |
+| Lenovo             | ThinkPad X6 Ultrabase 42W3107                        | 4     | 2.0 |`17EF:1000`| 2006    | 2009 |
+| Lindy              | USB serial converter 4 port                          | 4     | 1.1 |`058F:9254`| 2008    |      |
+| Linksys            | USB2HUB4                                             | 4     | 2.0 |           | 2004    | 2010 |
+| Maplin             | A08CQ                                                | 7     | 2.0 |`0409:0059`| 2008    | 2011 |
+| Microchip          | EVB-USB2517                                          | 7     | 2.0 |           | 2008    |      |
+| Microchip          | EVB-USB2534BC                                        | 4     | 2.0 |           | 2013    |      |
+| Moxa               | Uport-407                                            | 7     | 2.0 |`110A:0407`| 2009    |      |
+| NVidia             | Jetson Nano B01 ([details](https://git.io/JJaFR))    | 4     | 3.0 |           | 2019    |      |
+| Phidgets           | HUB0003_0                                            | 7     | 2.0 |`1A40:0201`| 2017    |      |
+| Plugable           | USB3-HUB7BC                                          | 7     | 3.0 |`2109:0813`| 2015    |      |
+| Plugable           | USB3-HUB7C                                           | 7     | 3.0 |`2109:0813`| 2015    |      |
+| Plugable           | USB3-HUB7-81X                                        | 7     | 3.0 |`2109:0813`| 2012    |      |
+| Port Inc           | NWUSB01                                              | 4     | 1.1 |`0451:1446`| 1999    | 2003 |
+| Raspberry Pi       | B+, 2B, 3B ([see below](#raspberry-pi-b2b3b))        | 4     | 2.0 |           | 2011    |      |
+| Raspberry Pi       | 3B+        ([see below](#raspberry-pi-3b))           | 4     | 2.0 |`0424:2514`| 2018    |      |
+| Raspberry Pi       | 4B         ([see below](#raspberry-pi-4b))           | 4     | 3.0 |`2109:3431`| 2019    |      |
+| Renesas            | uPD720202 PCIe USB 3.0 host controller               | 2     | 3.0 |           | 2013    |      |
+| Rosewill           | RHUB-210                                             | 4     | 2.0 |`0409:005A`| 2011    | 2014 |
+| Rosonway           | RSH-A16 ([note](https://git.io/JTawg))               | 16    | 3.2 |`0bda:0411`| 2020    |      |
+| Sanwa Supply       | USB-HUB14GPH                                         | 4     | 1.1 |           | 2001    | 2003 |
+| Seagate            | Backup Plus Hub STEL8000100                          | 2     | 3.0 |`0BC2:AB44`| 2016    |      |
+| Sunix              | SHB4200MA                                            | 4     | 2.0 |`0409:0058`| 2006    | 2009 |
+| Targus             | PAUH212/PAUH212U                                     | 7     | 2.0 |           | 2004    | 2009 |
+| Texas Instruments  | TUSB4041PAPEVM                                       | 4     | 2.1 |`0451:8142`| 2015    |      |

 This table is by no means complete.
-If your hub works with uhubctl, but is not listed above, please report it
+If your hub works with `uhubctl`, but is not listed above, please report it
 by opening new issue at https://github.com/mvp/uhubctl/issues,
 so we can add it to supported table. In your report, please provide
-exact product model and add output from uhubctl.
+exact product model and add output from `uhubctl`
+and please test VBUS off support as described below in FAQ.

 Note that quite a few modern motherboards have built-in root hubs that
 do support this feature - you may not even need to buy any external hub.
-WARNING: turning off built-in USB ports may cut off your keyboard or mouse,
-so be careful what ports you are turning off!


 USB 3.0 duality note
 ====================
-If you have compatible USB 3.0 hub connected to USB3 upstream port,
-it will be detected as 2 independent virtual hubs: USB2 and USB3, and your USB devices will be
-connected to USB2 or USB3 virtual hub depending on their capabilities and connection speed.
+If you have USB 3.0 hub connected to USB3 upstream port, it will be detected
+as 2 independent virtual hubs: USB2 and USB3, and your USB devices will be connected
+to USB2 or USB3 virtual hub depending on their capabilities and connection speed.
 To control power for such hubs, it is necessary to turn off/on power on **both** USB2 and USB3
 virtual hubs for power off/on changes to take effect. `uhubctl` will try to do this automatically
 (unless you disable this behavior with option `-e`).

 Unfortunately, while most hubs will cut off data USB connection, some may still not cut off VBUS to port,
-which means connected phone may still continue to charge from port that is powered off by uhubctl.
+which means connected phone may still continue to charge from port that is powered off by `uhubctl`.


 Compiling
 =========

 This utility was tested to compile and work on Linux
-(Ubuntu/Debian, Redhat/Fedora/CentOS, Arch Linux, Gentoo, OpenSUSE, Buildroot), FreeBSD and Mac OS X.
+(Ubuntu/Debian, Redhat/Fedora/CentOS, Arch Linux, Gentoo, openSUSE, Buildroot), FreeBSD, NetBSD, SunOS and MacOS.

 While `uhubctl` compiles on Windows, USB power switching does not work on Windows because `libusb`
 is using `winusb.sys` driver, which according to Microsoft does not support
 [necessary USB control requests](https://social.msdn.microsoft.com/Forums/sqlserver/en-US/f680b63f-ca4f-4e52-baa9-9e64f8eee101).
 This may be fixed if `libusb` starts supporting different driver on Windows.

-First, you need to install library libusb-1.0 (version 1.0.12 or later):
+Note that it is highly recommended to have `pkg-config` installed (many platforms provide it by default).
+
+First, you need to install library libusb-1.0 (version 1.0.12 or later, 1.0.16 or later is recommended):

 * Ubuntu: `sudo apt-get install libusb-1.0-0-dev`
 * Redhat: `sudo yum install libusb1-devel`
-* MacOSX: `brew install libusb`, or `sudo port install libusb-devel`
-  Note that Mac OS Sierra may be affected by issue https://github.com/libusb/libusb/issues/303.
-  Until libusb 1.0.22 is released, use `brew install --HEAD libusb` as a workaround.
+* MacOS: `brew install libusb`, or `sudo port install libusb-devel`
 * FreeBSD: libusb is included by default
+* NetBSD: `sudo pkgin install libusb1 gmake pkg-config`
 * Windows: TBD?

-To compile, simply run `make` - this will generate `uhubctl` binary.
+To fetch uhubctl source and compile it:

-Also, for Mac OS X you can install `uhubctl` with Homebrew custom tap:
+    git clone https://github.com/mvp/uhubctl
+    cd uhubctl
+    make
+
+This should generate `uhubctl` binary.
+You can install it in your system as `/usr/sbin/uhubctl` using:
+
+    sudo make install
+
+Note that on some OS (e.g. FreeBSD/NetBSD) you need to use `gmake` instead to build.
+
+Also, on MacOS you can install `uhubctl` with all necessary dependencies in one shot using Homebrew tap:

 ```
 brew tap mvp/uhubctl https://github.com/mvp/uhubctl
-brew install --HEAD uhubctl
+brew install uhubctl
+```
+To build/install from master branch, use `--HEAD`:
+```
+brew install uhubctl --HEAD
 ```

 Usage
 =====

+> :warning: On Linux, use `sudo` or configure USB permissions as described below!
+
+To list all supported hubs:
+
+    uhubctl
+
 You can control the power on a USB port(s) like this:

-    uhubctl -a off -p 235
+    uhubctl -a off -p 2

 This means operate on default smart hub and turn power off (`-a off`, or `-a 0`)
-on ports 2,3,5 (`-p 235`). Supported actions are `off`/`on`/`cycle` (or `0`/`1`/`2`).
+on port 2 (`-p 2`). Supported actions are `off`/`on`/`cycle`/`toggle` (or `0`/`1`/`2`/`3`).
 `cycle` means turn power off, wait some delay (configurable with `-d`) and turn it back on.
+Ports can be comma separated list, and may use `-` for ranges e.g. `2`, or `2,4`, or `2-5`, or `1-2,5-8`.

-On Linux, you may need to run it with `sudo`, or to configure `udev` USB permissions.
+> :warning: Turning off built-in USB ports may cut off your keyboard or mouse,
+so be careful which ports you are turning off!

 If you have more than one smart USB hub connected, you should choose
 specific hub to control using `-l` (location) parameter.
-To find hub locations, simply run uhubctl without any parameters.
+To find hub locations, simply run `uhubctl` without any parameters.
+Hub locations look like `b-x.y.z`, where `b` is USB bus number, and `x`, `y`, `z`...
+are port numbers for all hubs in chain, starting from root hub for a given USB bus.
+This address is semi-stable - it will not change if you unplug/replug (or turn off/on)
+USB device into the same physical USB port (this method is also used in Linux kernel).
+
+
+Linux USB permissions
+=====================
+
+On Linux, you should configure `udev` USB permissions (otherwise you will have to run it as root using `sudo uhubctl`).
+To fix USB permissions, first run `sudo uhubctl` and note all `vid:pid` for hubs you need to control.
+Then, add one or more udev rules like below to file `/etc/udev/rules.d/52-usb.rules` (replace 2001 with your vendor id):
+
+    SUBSYSTEM=="usb", ATTR{idVendor}=="2001", MODE="0666"
+
+Note that for USB3 hubs, some hubs use different vendor ID for USB2 vs USB3 components of the same chip,
+and both need permissions to make uhubctl work properly. E.g. for Raspberry Pi 4B, you need to add these 2 lines:
+
+    SUBSYSTEM=="usb", ATTR{idVendor}=="2109", MODE="0666"
+    SUBSYSTEM=="usb", ATTR{idVendor}=="1d6b", MODE="0666"
+
+If you don't like wide open mode `0666`, you can restrict access by group like this:
+
+    SUBSYSTEM=="usb", ATTR{idVendor}=="2001", MODE="0664", GROUP="dialout"
+
+and then add permitted users to `dialout` group:
+
+    sudo usermod -a -G dialout $USER
+
+For your `udev` rule changes to take effect, reboot or run:
+
+    sudo udevadm trigger --attr-match=subsystem=usb
+
+
+
+FAQ
+===
+
+#### _What is USB per-port power switching?_
+
+According to USB 2.0 specification, USB hubs can advertise no power switching,
+ganged (all ports at once) power switching or per-port (individual) power switching.
+Note that by default `uhubctl` will only detect USB hubs which support per-port power switching
+(but you can force it to try operating on unsupported hubs with option `-f`).
+You can find what kind of power switching your hardware supports by using `sudo lsusb -v`:
+
+No power switching:
+
+    wHubCharacteristic 0x000a
+      No power switching (usb 1.0)
+      Per-port overcurrent protection
+
+Ganged power switching:
+
+    wHubCharacteristic 0x0008
+      Ganged power switching
+      Per-port overcurrent protection
+
+Per-port power switching:
+
+    wHubCharacteristic 0x0009
+      Per-port power switching
+      Per-port overcurrent protection
+
+
+#### _How do I check if my USB hub is supported by `uhubctl`?_
+
+1. Run `sudo uhubctl`. If your hub is not listed, it is not supported.
+   Alternatively, you can run `sudo lsusb -v` and check for
+   `Per-port power switching` -  if you cannot see such line in lsusb output,
+   hub is not supported.
+2. Check for VBUS (voltage) off support: plug a phone, USB light
+    or USB fan into USB port of your hub.
+   Try using `uhubctl` to turn power off on that port, and check
+   that phone stops charging, USB light stops shining or USB fan stops spinning.
+   If VBUS doesn't turn off, your hub manufacturer did not include circuitry
+   to actually cut power off. Such hub would still work
+   to cut off USB data connection, but it cannot turn off power,
+   and we do not consider this supported device.
+3. If tests above were successful, please report your hub
+   by opening new issue at https://github.com/mvp/uhubctl/issues,
+   so we can add it to list of supported devices.
+   Please do not report unsupported hubs, unless it is different
+   hardware revision of some already listed supported model.
+
+
+#### _USB devices are not removed after port power down on Linux_
+
+After powering down USB port, udev does not get any event, so it keeps the device files around.
+However, trying to access the device files will lead to an IO error.
+
+This is Linux kernel issue. It may be eventually fixed in kernel, see more discussion [here](https://bit.ly/2JzczjZ).
+Basically what happens here is that kernel USB driver knows about power off,
+but doesn't send notification about it to udev.
+
+You can use this workaround for this issue:
+
+    sudo uhubctl -a off -l ${location} -p ${port}
+    sudo udevadm trigger --action=remove /sys/bus/usb/devices/${location}.${port}/
+
+Device file will be removed by udev, but USB device will be still visible in `lsusb`.
+Note that path `/sys/bus/usb/devices/${location}.${port}` will only exist if device was detected on that port.
+When you turn power back on, device should re-enumerate properly (no need to call `udevadm` again).
+
+#### _Power comes back on after few seconds on Linux_
+
+Some device drivers in kernel are surprised by USB device being turned off and automatically try to power it back on.
+
+You can use option `-r N` where N is some number from 10 to 1000 to fix this -
+`uhubctl` will try to turn power off many times in quick succession, and it should suppress that.
+This may be eventually fixed in kernel, see more discussion [here](https://bit.ly/2JzczjZ).
+
+Disabling USB authorization for device in question before turning power off with `uhubctl` should help:
+
+    echo 0 > sudo tee /sys/bus/usb/devices/${location}.${port}/authorized
+
+If your device is USB mass storage, invoking `udisksctl` before calling `uhubctl` should help too:
+
+    sudo udisksctl power-off --block-device /dev/disk/...`
+    sudo uhubctl -a off ...
+
+
+#### _Multiple 4-port hubs are detected, but I only have one 7-port hub connected_
+
+Many hub manufacturers build their USB hubs using basic 4 port USB chips.
+E.g. to make 7 port hub, they daisy-chain two 4 port hubs - 1 port is lost to daisy-chaining,
+so it makes it 4+4-1=7 port hub. Similarly, 10 port hub could be built as 3 4-port hubs
+daisy-chained together, which gives 4+4+4-2=10 usable ports.
+
+Note that you should never try to change power state for ports used to daisy-chain internal hubs together.
+Doing so will confuse internal hub circuitry and will cause unpredictable behavior.
+
+
+#### _Raspberry Pi turns power off on all ports, not just the one I specified_
+
+This is the limitation of Raspberry Pi hardware design.
+As a workaround, you can buy any external USB hub from supported list above,
+attach it to any USB port of Raspberry Pi, and control power on its ports independently.
+
+For reference, supported Raspberry Pi models have following internal USB topology:
+
+##### Raspberry Pi B+,2B,3B
+
+  * Single hub `1-1`, ports 2-5 ganged, all controlled by port `2`:
+
+        uhubctl -l 1-1 -p 2 -a 0
+
+    Trying to control ports `3`,`4`,`5` will not do anything.
+    Port `1` controls power for Ethernet+WiFi.
+
+##### Raspberry Pi 3B+
+
+  * Main hub `1-1`, all 4 ports ganged, all controlled by port `2` (turns off secondary hub ports as well).
+    Port `1` connects hub `1-1.1` below, ports `2` and `3` are wired outside, port `4` not wired.
+
+        uhubctl -l 1-1 -p 2 -a 0
+
+  * Secondary hub `1-1.1` (daisy-chained to main): 3 ports,
+    port `1` is used for Ethernet+WiFi, and ports `2` and `3` are wired outside.
+
+
+##### Raspberry Pi 4B
+
+ > :warning: If your VL805 firmware is older than `00137ad` (check with `sudo rpi-eeprom-update`),
+you have to [update firmware](https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md)
+to make power switching work on RPi 4B.
+
+  * USB2 hub `1`, 1 port, only connects hub `1-1` below.
+
+  * USB2 hub `1-1`, 4 ports ganged, dual to USB3 hub `2` below:
+
+        uhubctl -l 1-1 -a 0
+
+  * USB3 hub `2`, 4 ports ganged, dual to USB2 hub `1-1` above:
+
+        uhubctl -l 2 -a 0
+
+  * USB2 hub `3`, 1 port, OTG controller. Power switching is [not supported](https://git.io/JUc5Q).
+
+
+
+Notable projects using uhubctl
+==============================
+| Project                                                  | Description                                           |
+|:---------------------------------------------------------|:------------------------------------------------------|
+| [Morse code USB light](https://git.io/fj1F4)             | Flash a message in Morse code with USB light          |
+| [Webcam USB light](https://git.io/fj1FB)                 | Turn on/off LED when webcam is turned on/off          |
+| [Cinema Lightbox](https://goo.gl/fjCvkz)                 | Turn on/off Cinema Lightbox from iOS Home app         |
+| [Build Status Light](https://goo.gl/3GA82o)              | Create a build status light in under 10 minutes       |
+| [Buildenlights](https://git.io/fj1FC)                    | GitLab/GitHub project build status as green/red light |
+| [Weather Station](https://goo.gl/3b1FzC)                 | Reset Weather Station when it freezes                 |
+| [sysmoQMOD](https://bit.ly/2VtWrVt)                      | Reset cellular modems when necessary                  |
+| [Smog Sensor](https://bit.ly/2EMwgCk)                    | Raspberry Pi based smog sensor power reset            |
+| [Terrible Cluster](https://goo.gl/XjiXFu)                | Power on/off Raspberry Pi cluster nodes as needed     |
+| [Ideal Music Server](https://bit.ly/39MeVFQ)             | Turn off unused USB ports to improve audio quality    |
+| [USB drives with no phantom load](https://goo.gl/qfrmGK) | Power USB drives only when needed to save power       |
+| [USB drive data recovery](https://goo.gl/4MddLr)         | Recover data from failing USB hard drive              |
+| [Control power to 3D printer](https://git.io/fh5Tr)      | OctoPrint web plugin for USB power control            |
+| [USB fan for Raspberry Pi](https://bit.ly/2TRV6sM)       | Control USB fan to avoid Raspberry Pi overheating     |
+| [Raspberry Pi Reboot Router](https://bit.ly/3aNbQqs)     | Automatically reboot router if internet isn't working |
+| [Control USB Lamp With Voice](https://bit.ly/2VtW2SX)    | Voice Control of USB Lamp using Siri and Raspberry Pi |
+| [Control USB LED Strip](https://bit.ly/3oVWfeZ)          | Controlling USB powered LED Light Strip               |


 Copyright
 =========

-Copyright (C) 2009-2018 Vadim Mikhailov
+Copyright (C) 2009-2020 Vadim Mikhailov

 This file can be distributed under the terms and conditions of the
 GNU General Public License version 2.
--- a/1
+++ b/1
@@ -0,0 +1 @@
+2.4.0
--- a/uhubctl.c
+++ b/uhubctl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2018 Vadim Mikhailov
+ * Copyright (c) 2009-2020 Vadim Mikhailov
 *
 * Utility to turn USB port power on/off
 * for USB hubs that support per-port power switching.
@@ -29,16 +29,20 @@
 #include <unistd.h>
 #endif

-#if defined(__FreeBSD__) || defined(_WIN32)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(_WIN32)
 #include <libusb.h>
 #else
 #include <libusb-1.0/libusb.h>
 #endif

-#if defined(__APPLE__) /* snprintf is not available in pure C mode */
+#if defined(__APPLE__) || defined(__FreeBSD__) /* snprintf is not available in pure C mode */
 int snprintf(char * __restrict __str, size_t __size, const char * __restrict __format, ...) __printflike(3, 4);
 #endif

+#if !defined(LIBUSB_API_VERSION) || (LIBUSB_API_VERSION <= 0x01000103)
+#define LIBUSB_DT_SUPERSPEED_HUB 0x2a
+#endif
+
 #if _POSIX_C_SOURCE >= 199309L
 #include <time.h>   /* for nanosleep */
 #endif
@@ -59,14 +63,8 @@ void sleep_ms(int milliseconds)
 #endif
 }

-/* Max number of hub ports supported.
- * This is somewhat artifically limited by "-p" option parser.
- * If "-p" parser is improved, we can support up to 32 ports.
- * However, biggest number of ports on smart hub I've seen was 8.
- * I've also observed onboard USB hub with whopping 14 ports,
- * but that hub did not support per-port power switching.
- */
-#define MAX_HUB_PORTS            9
+/* Max number of hub ports supported */
+#define MAX_HUB_PORTS            14
 #define ALL_HUB_PORTS            ((1 << MAX_HUB_PORTS) - 1) /* bitmask */

 #define USB_CTRL_GET_TIMEOUT     5000
@@ -77,6 +75,7 @@ void sleep_ms(int milliseconds)
 #define POWER_OFF                0
 #define POWER_ON                 1
 #define POWER_CYCLE              2
+#define POWER_TOGGLE             3

 #define MAX_HUB_CHAIN            8  /* Per USB 3.0 spec max hub chain is 7 */

@@ -180,15 +179,27 @@ struct usb_port_status {
 /* List of all USB devices enumerated by libusb */
 static struct libusb_device **usb_devs = NULL;

+struct descriptor_strings {
+    char vendor[64];
+    char product[64];
+    char serial[64];
+    char description[512];
+};
+
 struct hub_info {
    struct libusb_device *dev;
    int bcd_usb;
+    int super_speed; /* 1 if super speed hub, and 0 otherwise */
    int nports;
-    int ppps;
+    int lpsm; /* logical power switching mode */
    int actionable; /* true if this hub is subject to action */
+    char container_id[33]; /* container ID as hex string */
    char vendor[16];
    char location[32];
-    char description[256];
+    uint8_t bus;
+    uint8_t port_numbers[MAX_HUB_CHAIN];
+    int pn_len; /* length of port numbers */
+    struct descriptor_strings ds;
 };

 /* Array of all enumerated USB hubs */
@@ -199,24 +210,30 @@ static int hub_phys_count = 0;

 /* default options */
 static char opt_vendor[16]   = "";
+static char opt_search[64]   = "";     /* Search by attached device description */
 static char opt_location[32] = "";     /* Hub location a-b.c.d */
+static int opt_level = 0;              /* Hub location level (e.g., a-b is level 2, a-b.c is level 3)*/
 static int opt_ports  = ALL_HUB_PORTS; /* Bitmask of ports to operate on */
 static int opt_action = POWER_KEEP;
-static int opt_delay  = 2;
+static double opt_delay = 2;
 static int opt_repeat = 1;
 static int opt_wait   = 20; /* wait before repeating in ms */
 static int opt_exact  = 0;  /* exact location match - disable USB3 duality handling */
 static int opt_reset  = 0;  /* reset hub after operation(s) */
+static int opt_force  = 0;  /* force operation even on unsupported hubs */

 static const struct option long_options[] = {
-    { "loc",      required_argument, NULL, 'l' },
+    { "location", required_argument, NULL, 'l' },
    { "vendor",   required_argument, NULL, 'n' },
+    { "search",   required_argument, NULL, 's' },
+    { "level",    required_argument, NULL, 'L' },
    { "ports",    required_argument, NULL, 'p' },
    { "action",   required_argument, NULL, 'a' },
    { "delay",    required_argument, NULL, 'd' },
    { "repeat",   required_argument, NULL, 'r' },
    { "wait",     required_argument, NULL, 'w' },
    { "exact",    no_argument,       NULL, 'e' },
+    { "force",    no_argument,       NULL, 'f' },
    { "reset",    no_argument,       NULL, 'R' },
    { "version",  no_argument,       NULL, 'v' },
    { "help",     no_argument,       NULL, 'h' },
@@ -224,32 +241,36 @@ static const struct option long_options[] = {
 };


-int print_usage()
+static int print_usage()
 {
    printf(
-        "uhubctl %s: utility to control USB port power for smart hubs.\n"
+        "uhubctl: utility to control USB port power for smart hubs.\n"
        "Usage: uhubctl [options]\n"
        "Without options, show status for all smart hubs.\n"
        "\n"
        "Options [defaults in brackets]:\n"
-        "--action,   -a - action to off/on/cycle (0/1/2) for affected ports.\n"
+        "--action,   -a - action to off/on/cycle/toggle (0/1/2/3) for affected ports.\n"
        "--ports,    -p - ports to operate on    [all hub ports].\n"
-        "--loc,      -l - limit hub by location  [all smart hubs].\n"
+        "--location, -l - limit hub by location  [all smart hubs].\n"
+        "--level     -L - limit hub by location level (e.g. a-b.c is level 3).\n"
        "--vendor,   -n - limit hub by vendor id [%s] (partial ok).\n"
-        "--delay,    -d - delay for cycle action [%d sec].\n"
+        "--search,   -s - limit hub by attached device description.\n"
+        "--delay,    -d - delay for cycle action [%g sec].\n"
        "--repeat,   -r - repeat power off count [%d] (some devices need it to turn off).\n"
        "--exact,    -e - exact location (no USB3 duality handling).\n"
+        "--force,    -f - force operation even on unsupported hubs.\n"
        "--reset,    -R - reset hub after each power-on action, causing all devices to reassociate.\n"
        "--wait,     -w - wait before repeat power off [%d ms].\n"
        "--version,  -v - print program version.\n"
        "--help,     -h - print this text.\n"
        "\n"
-        "Send bugs and requests to: https://github.com/mvp/uhubctl\n",
-        PROGRAM_VERSION,
+        "Send bugs and requests to: https://github.com/mvp/uhubctl\n"
+        "version: %s\n",
        strlen(opt_vendor) ? opt_vendor : "any",
        opt_delay,
        opt_repeat,
-        opt_wait
+        opt_wait,
+        PROGRAM_VERSION
    );
    return 0;
 }
@@ -261,11 +282,83 @@ static char* rtrim(char* str)
 {
    int i;
    for (i = strlen(str)-1; i>=0 && isspace(str[i]); i--) {
-       str[i] = 0;
+        str[i] = 0;
    }
    return str;
 }

+/*
+ * Convert port list into bitmap.
+ * Following port list specifications are equivalent:
+ *   1,3,4,5,11,12,13
+ *   1,3-5,11-13
+ * Returns: bitmap of specified ports, max port is MAX_HUB_PORTS.
+ */
+
+static int ports2bitmap(char* const portlist)
+{
+    int ports = 0;
+    char* position = portlist;
+    char* comma;
+    char* dash;
+    int len;
+    int i;
+    while (position) {
+        char buf[8] = {0};
+        comma = strchr(position, ',');
+        len = sizeof(buf) - 1;
+        if (comma) {
+            if (len > comma - position)
+                len = comma - position;
+            strncpy(buf, position, len);
+            position = comma + 1;
+        } else {
+            strncpy(buf, position, len);
+            position = NULL;
+        }
+        /* Check if we have port range, e.g.: a-b */
+        int a=0, b=0;
+        a = atoi(buf);
+        dash = strchr(buf, '-');
+        if (dash) {
+            b = atoi(dash+1);
+        } else {
+            b = a;
+        }
+        if (a > b) {
+            fprintf(stderr, "Bad port spec %d-%d, first port must be less than last\n", a, b);
+            exit(1);
+        }
+        if (a <= 0 || a > MAX_HUB_PORTS || b <= 0 || b > MAX_HUB_PORTS) {
+            fprintf(stderr, "Bad port spec %d-%d, port numbers must be from 1 to %d\n", a, b, MAX_HUB_PORTS);
+            exit(1);
+        }
+        for (i=a; i<=b; i++) {
+            ports |= (1 << (i-1));
+        }
+    }
+    return ports;
+}
+
+
+/*
+ * Compatibility wrapper around libusb_get_port_numbers()
+ */
+
+static int get_port_numbers(libusb_device *dev, uint8_t *buf, uint8_t bufsize)
+{
+    int pcount;
+#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000102)
+    /*
+     * libusb_get_port_path is deprecated since libusb v1.0.16,
+     * therefore use libusb_get_port_numbers when supported
+     */
+    pcount = libusb_get_port_numbers(dev, buf, bufsize);
+#else
+    pcount = libusb_get_port_path(NULL, dev, buf, bufsize);
+#endif
+    return pcount;
+}

 /*
 * get USB hub properties.
@@ -273,14 +366,13 @@ static char* rtrim(char* str)
 * returns 0 for success and error code for failure.
 */

-int get_hub_info(struct libusb_device *dev, struct hub_info *info)
+static int get_hub_info(struct libusb_device *dev, struct hub_info *info)
 {
    int rc = 0;
    int len = 0;
    struct libusb_device_handle *devh = NULL;
    unsigned char buf[LIBUSB_DT_HUB_NONVAR_SIZE + 2 + 3] = {0};
-    struct usb_hub_descriptor *uhd =
-                (struct usb_hub_descriptor *)buf;
+    struct usb_hub_descriptor *uhd = (struct usb_hub_descriptor *)buf;
    int minlen = LIBUSB_DT_HUB_NONVAR_SIZE + 2;
    struct libusb_device_descriptor desc;
    rc = libusb_get_device_descriptor(dev, &desc);
@@ -304,9 +396,9 @@ int get_hub_info(struct libusb_device *dev, struct hub_info *info)
        );

        if (len >= minlen) {
-            unsigned char port_numbers[MAX_HUB_CHAIN] = {0};
            info->dev     = dev;
            info->bcd_usb = bcd_usb;
+            info->super_speed = (bcd_usb >= USB_SS_BCD);
            info->nports  = uhd->bNbrPorts;
            snprintf(
                info->vendor, sizeof(info->vendor),
@@ -316,36 +408,65 @@ int get_hub_info(struct libusb_device *dev, struct hub_info *info)
            );

            /* Convert bus and ports array into USB location string */
-            int bus = libusb_get_bus_number(dev);
-            snprintf(info->location, sizeof(info->location), "%d", bus);
-#if defined(LIBUSB_API_VERSION) && (LIBUSB_API_VERSION >= 0x01000102)
-            /*
-             * libusb_get_port_path is deprecated since libusb v1.0.16,
-             * therefore use libusb_get_port_numbers when supported
-             */
-            int pcount = libusb_get_port_numbers(dev, port_numbers, MAX_HUB_CHAIN);
-#else
-            int pcount = libusb_get_port_path(NULL, dev, port_numbers, MAX_HUB_CHAIN);
-#endif
+            info->bus = libusb_get_bus_number(dev);
+            snprintf(info->location, sizeof(info->location), "%d", info->bus);
+            info->pn_len = get_port_numbers(dev, info->port_numbers, sizeof(info->port_numbers));
            int k;
-            for (k=0; k<pcount; k++) {
+            for (k=0; k < info->pn_len; k++) {
                char s[8];
-                snprintf(s, sizeof(s), "%s%d", k==0 ? "-" : ".", port_numbers[k]);
+                snprintf(s, sizeof(s), "%s%d", k==0 ? "-" : ".", info->port_numbers[k]);
                strcat(info->location, s);
            }

-            info->ppps = 0;
+            /* Get container_id: */
+            bzero(info->container_id, sizeof(info->container_id));
+            struct libusb_bos_descriptor *bos;
+            rc = libusb_get_bos_descriptor(devh, &bos);
+            if (rc == 0) {
+                int cap;
+#ifdef __FreeBSD__
+                for (cap=0; cap < bos->bNumDeviceCapabilities; cap++) {
+#else
+                for (cap=0; cap < bos->bNumDeviceCaps; cap++) {
+#endif
+                    if (bos->dev_capability[cap]->bDevCapabilityType == LIBUSB_BT_CONTAINER_ID) {
+                        struct libusb_container_id_descriptor *container_id;
+                        rc = libusb_get_container_id_descriptor(NULL, bos->dev_capability[cap], &container_id);
+                        if (rc == 0) {
+                            int i;
+                            for (i=0; i<16; i++) {
+                                sprintf(info->container_id+i*2, "%02x", container_id->ContainerID[i]);
+                            }
+                            info->container_id[i*2] = 0;
+                            libusb_free_container_id_descriptor(container_id);
+                        }
+                    }
+                }
+                libusb_free_bos_descriptor(bos);
+
+                /* Raspberry Pi 4B hack for USB3 root hub: */
+                if (strlen(info->container_id)==0 &&
+                    strcasecmp(info->vendor, "1d6b:0003")==0 &&
+                    info->pn_len==0 &&
+                    info->nports==4 &&
+                    bcd_usb==USB_SS_BCD)
+                {
+                    strcpy(info->container_id, "5cf3ee30d5074925b001802d79434c30");
+                }
+            }
+
            /* Logical Power Switching Mode */
            int lpsm = uhd->wHubCharacteristics[0] & HUB_CHAR_LPSM;
-            /* Over-Current Protection Mode */
-            int ocpm = uhd->wHubCharacteristics[0] & HUB_CHAR_OCPM;
-            /* LPSM must be supported per-port, and OCPM per port or ganged */
-            if ((lpsm == HUB_CHAR_INDV_PORT_LPSM) &&
-                (ocpm == HUB_CHAR_INDV_PORT_OCPM ||
-                 ocpm == HUB_CHAR_COMMON_OCPM))
-            {
-                info->ppps = 1;
+            if (lpsm == HUB_CHAR_COMMON_LPSM && info->nports == 1) {
+                /* For 1 port hubs, ganged power switching is the same as per-port: */
+                lpsm = HUB_CHAR_INDV_PORT_LPSM;
            }
+            /* Raspberry Pi 4B reports inconsistent descriptors, override: */
+            if (lpsm == HUB_CHAR_COMMON_LPSM && strcasecmp(info->vendor, "2109:3431")==0) {
+                lpsm = HUB_CHAR_INDV_PORT_LPSM;
+            }
+            info->lpsm = lpsm;
+            rc = 0;
        } else {
            rc = len;
        }
@@ -384,9 +505,9 @@ static int get_port_status(struct libusb_device_handle *devh, int port)


 /*
- * Get USB device description as a string.
+ * Get USB device descriptor strings and summary description.
 *
- * It will use following format:
+ * Summary will use following format:
 *
 *    "<vid:pid> <vendor> <product> <serial>, <USB x.yz, N ports>"
 *
@@ -394,60 +515,66 @@ static int get_port_status(struct libusb_device_handle *devh, int port)
 * may be skipped if they are empty or not enough permissions to read them.
 * <USB x.yz, N ports> will be present only for USB hubs.
 *
- * returns 0 for success and error code for failure.
- * in case of failure description buffer is not altered.
+ * Returns 0 for success and error code for failure.
+ * In case of failure return buffer is not altered.
 */

-static int get_device_description(struct libusb_device * dev, char* description, int desc_len)
+static int get_device_description(struct libusb_device * dev, struct descriptor_strings * ds)
 {
    int rc;
    int id_vendor  = 0;
    int id_product = 0;
-    char vendor[64]  = "";
-    char product[64] = "";
-    char serial[64]  = "";
-    char ports[64]   = "";
+    char hub_specific[64] = "";
    struct libusb_device_descriptor desc;
    struct libusb_device_handle *devh = NULL;
    rc = libusb_get_device_descriptor(dev, &desc);
    if (rc)
        return rc;
+    bzero(ds, sizeof(*ds));
    id_vendor  = libusb_le16_to_cpu(desc.idVendor);
    id_product = libusb_le16_to_cpu(desc.idProduct);
    rc = libusb_open(dev, &devh);
    if (rc == 0) {
        if (desc.iManufacturer) {
            libusb_get_string_descriptor_ascii(devh,
-                desc.iManufacturer, (unsigned char*)vendor, sizeof(vendor));
-            rtrim(vendor);
+                desc.iManufacturer, (unsigned char*)ds->vendor, sizeof(ds->vendor));
+            rtrim(ds->vendor);
        }
        if (desc.iProduct) {
            libusb_get_string_descriptor_ascii(devh,
-                desc.iProduct, (unsigned char*)product, sizeof(product));
-            rtrim(product);
+                desc.iProduct, (unsigned char*)ds->product, sizeof(ds->product));
+            rtrim(ds->product);
        }
        if (desc.iSerialNumber) {
            libusb_get_string_descriptor_ascii(devh,
-                desc.iSerialNumber, (unsigned char*)serial, sizeof(serial));
-            rtrim(serial);
+                desc.iSerialNumber, (unsigned char*)ds->serial, sizeof(ds->serial));
+            rtrim(ds->serial);
        }
        if (desc.bDeviceClass == LIBUSB_CLASS_HUB) {
            struct hub_info info;
            rc = get_hub_info(dev, &info);
            if (rc == 0) {
-                snprintf(ports, sizeof(ports), ", USB %x.%02x, %d ports",
-                   info.bcd_usb >> 8, info.bcd_usb & 0xFF, info.nports);
+                const char * lpsm_type;
+                if (info.lpsm == HUB_CHAR_INDV_PORT_LPSM) {
+                    lpsm_type = "ppps";
+                } else if (info.lpsm == HUB_CHAR_COMMON_LPSM) {
+                    lpsm_type = "ganged";
+                } else {
+                    lpsm_type = "nops";
+                }
+                snprintf(hub_specific, sizeof(hub_specific), ", USB %x.%02x, %d ports, %s",
+                   info.bcd_usb >> 8, info.bcd_usb & 0xFF, info.nports, lpsm_type);
            }
        }
        libusb_close(devh);
    }
-    snprintf(description, desc_len,
+    snprintf(ds->description, sizeof(ds->description),
        "%04x:%04x%s%s%s%s%s%s%s",
        id_vendor, id_product,
-        vendor[0]  ? " " : "", vendor,
-        product[0] ? " " : "", product,
-        serial[0]  ? " " : "", serial,
-        ports
+        ds->vendor[0]  ? " " : "", ds->vendor,
+        ds->product[0] ? " " : "", ds->product,
+        ds->serial[0]  ? " " : "", ds->serial,
+        hub_specific
    );
    return 0;
 }
@@ -481,20 +608,29 @@ static int print_port_status(struct hub_info * hub, int portmask)

            printf("  Port %d: %04x", port, port_status);

-            char description[256] = "";
+            struct descriptor_strings ds;
+            bzero(&ds, sizeof(ds));
            struct libusb_device * udev;
            int i = 0;
            while ((udev = usb_devs[i++]) != NULL) {
-                if (libusb_get_parent(udev)      == dev &&
+                uint8_t dev_bus;
+                uint8_t dev_pn[MAX_HUB_CHAIN];
+                int dev_plen;
+                dev_bus = libusb_get_bus_number(udev);
+                /* only match devices on the same bus: */
+                if (dev_bus != hub->bus) continue;
+                dev_plen = get_port_numbers(udev, dev_pn, sizeof(dev_pn));
+                if ((dev_plen == hub->pn_len + 1) &&
+                    (memcmp(hub->port_numbers, dev_pn, hub->pn_len) == 0) &&
                    libusb_get_port_number(udev) == port)
                {
-                    rc = get_device_description(udev, description, sizeof(description));
+                    rc = get_device_description(udev, &ds);
                    if (rc == 0)
                        break;
                }
            }

-            if (hub->bcd_usb < USB_SS_BCD) {
+            if (!hub->super_speed) {
                if (port_status == 0) {
                    printf(" off");
                } else {
@@ -506,7 +642,7 @@ static int print_port_status(struct hub_info * hub, int portmask)
                    if (port_status & USB_PORT_STAT_SUSPEND)      printf(" suspend");
                }
            } else {
-                if (port_status == USB_SS_PORT_LS_SS_DISABLED) {
+                if (!(port_status & USB_SS_PORT_STAT_POWER)) {
                    printf(" off");
                } else {
                    int link_state = port_status & USB_PORT_STAT_LINK_STATE;
@@ -535,7 +671,7 @@ static int print_port_status(struct hub_info * hub, int portmask)
            if (port_status & USB_PORT_STAT_ENABLE)      printf(" enable");
            if (port_status & USB_PORT_STAT_CONNECTION)  printf(" connect");

-            if (port_status & USB_PORT_STAT_CONNECTION)  printf(" [%s]", description);
+            if (port_status & USB_PORT_STAT_CONNECTION)  printf(" [%s]", ds.description);

            printf("\n");
        }
@@ -572,76 +708,184 @@ static int usb_find_hubs()
        rc = get_hub_info(dev, &info);
        if (rc) {
            perm_ok = 0; /* USB permission issue? */
+            continue;
        }
-        get_device_description(dev, info.description, sizeof(info.description));
-        if (info.ppps) { /* PPPS is supported */
-            if (hub_count < MAX_HUBS) {
-                info.actionable = 1;
-                if (strlen(opt_location)>0) {
-                    if (strcasecmp(opt_location, info.location)) {
-                       info.actionable = 0;
+        get_device_description(dev, &info.ds);
+        if (info.lpsm != HUB_CHAR_INDV_PORT_LPSM && !opt_force) {
+            continue;
+        }
+        info.actionable = 1;
+        if (strlen(opt_search) > 0) {
+            /* Search by attached device description */
+            info.actionable = 0;
+            struct libusb_device * udev;
+            int k = 0;
+            while ((udev = usb_devs[k++]) != NULL) {
+                uint8_t dev_pn[MAX_HUB_CHAIN];
+                uint8_t dev_bus = libusb_get_bus_number(udev);
+                /* only match devices on the same bus: */
+                if (dev_bus != info.bus) continue;
+                int dev_plen = get_port_numbers(udev, dev_pn, sizeof(dev_pn));
+                if ((dev_plen == info.pn_len + 1) &&
+                    (memcmp(info.port_numbers, dev_pn, info.pn_len) == 0))
+                {
+                    struct descriptor_strings ds;
+                    bzero(&ds, sizeof(ds));
+                    rc = get_device_description(udev, &ds);
+                    if (rc != 0)
+                        break;
+                    if (strstr(ds.description, opt_search)) {
+                        info.actionable = 1;
+                        opt_ports &= 1 << (dev_pn[dev_plen-1] - 1);
+                        break;
                    }
                }
-                if (strlen(opt_vendor)>0) {
-                    if (strncasecmp(opt_vendor, info.vendor, strlen(opt_vendor))) {
-                        info.actionable = 0;
+            }
+        }
+        if (strlen(opt_location) > 0) {
+            if (strcasecmp(opt_location, info.location)) {
+                info.actionable = 0;
+            }
+        }
+        if (opt_level > 0) {
+            if (opt_level != info.pn_len + 1) {
+                info.actionable = 0;
+            }
+        }
+        if (strlen(opt_vendor) > 0) {
+            if (strncasecmp(opt_vendor, info.vendor, strlen(opt_vendor))) {
+                info.actionable = 0;
+            }
+        }
+        memcpy(&hubs[hub_count], &info, sizeof(info));
+        if (hub_count < MAX_HUBS) {
+            hub_count++;
+        } else {
+            /* That should be impossible - but we don't want to crash! */
+            fprintf(stderr, "Too many hubs!");
+            break;
+        }
+    }
+    if (!opt_exact) {
+        /* Handle USB2/3 duality: */
+        for (i=0; i<hub_count; i++) {
+            /* Check only actionable hubs: */
+            if (hubs[i].actionable != 1)
+                continue;
+            /* Must have non empty container ID: */
+            if (strlen(hubs[i].container_id) == 0)
+                continue;
+            int best_match = -1;
+            int best_score = -1;
+            for (j=0; j<hub_count; j++) {
+                if (i==j)
+                    continue;
+
+                /* Find hub which is USB2/3 dual to the hub above */
+
+                /* Hub and its dual must be different types: one USB2, another USB3: */
+                if (hubs[i].super_speed == hubs[j].super_speed)
+                    continue;
+
+                /* Must have non empty container ID: */
+                if (strlen(hubs[j].container_id) == 0)
+                    continue;
+
+                /* Per USB 3.0 spec chapter 11.2, container IDs must match: */
+                if (strcmp(hubs[i].container_id, hubs[j].container_id) != 0)
+                    continue;
+
+                /* At this point, it should be enough to claim a match.
+                 * However, some devices use hardcoded non-unique container ID.
+                 * We should do few more checks below if multiple such devices are present.
+                 */
+
+                /* Hubs should have the same number of ports */
+                if (hubs[i].nports != hubs[j].nports) {
+                    /* Except for some weird hubs like Apple mini-dock (has 2 usb2 + 1 usb3 ports) */
+                    if (hubs[i].nports + hubs[j].nports > 3) {
+                        continue;
                    }
                }
-                memcpy(&hubs[hub_count], &info, sizeof(info));
-                hub_count++;
+
+                /* If serial numbers are both present, they must match: */
+                if ((strlen(hubs[i].ds.serial) > 0 && strlen(hubs[j].ds.serial) > 0) &&
+                    strcmp(hubs[i].ds.serial, hubs[j].ds.serial) != 0)
+                {
+                    continue;
+                }
+
+                /* We have first possible candidate, but need to keep looking for better one */
+
+                if (best_score < 1) {
+                    best_score = 1;
+                    best_match = j;
+                }
+
+                /* Checks for various levels of USB2 vs USB3 path similarity... */
+
+                uint8_t* p1 = hubs[i].port_numbers;
+                uint8_t* p2 = hubs[j].port_numbers;
+                int l1 = hubs[i].pn_len;
+                int l2 = hubs[j].pn_len;
+                int s1 = hubs[i].super_speed;
+                int s2 = hubs[j].super_speed;
+
+                /* Check if port path is the same after removing top level (needed for M1 Macs): */
+                if (l1 >= 1 && l1 == l2 && memcmp(p1 + 1, p2 + 1, l1 - 1)==0) {
+                    if (best_score < 2) {
+                        best_score = 2;
+                        best_match = j;
+                    }
+                }
+
+                /* Raspberry Pi 4B hack (USB2 hub is one level deeper than USB3): */
+                if (l1 + s1 == l2 + s2 && l1 >= s2 && memcmp(p1 + s2, p2 + s1, l1 - s2)==0) {
+                    if (best_score < 3) {
+                        best_score = 3;
+                        best_match = j;
+                    }
+                }
+                /* Check if port path is exactly the same: */
+                if (l1 == l2 && memcmp(p1, p2, l1)==0) {
+                    if (best_score < 4) {
+                        best_score = 4;
+                        best_match = j;
+                    }
+                    /* Give even higher priority if `usb2bus + 1 == usb3bus` (Linux specific): */
+                    if (hubs[i].bus - s1 == hubs[j].bus - s2) {
+                        if (best_score < 5) {
+                            best_score = 5;
+                            best_match = j;
+                        }
+                    }
+                }
+            }
+            if (best_match >= 0) {
+                if (!hubs[best_match].actionable) {
+                    /* Use 2 to signify that this is derived dual device */
+                    hubs[best_match].actionable = 2;
+                }
            }
        }
    }
    hub_phys_count = 0;
    for (i=0; i<hub_count; i++) {
-        /* Check only actionable USB3 hubs: */
        if (!hubs[i].actionable)
            continue;
-        if (hubs[i].bcd_usb < USB_SS_BCD || opt_exact) {
+        if (!hubs[i].super_speed || opt_exact) {
            hub_phys_count++;
        }
-        if (opt_exact)
-            continue;
-        int match = -1;
-        for (j=0; j<hub_count; j++) {
-            if (i==j)
-                continue;
-
-            /* Find hub which is USB2/3 dual to the hub above.
-             * This is quite reliable and predictable on Linux
-             * but not on Mac, where we may match wrong hub :(
-             * It will work reliably on Mac if there is
-             * only one compatible USB3 hub is connected.
-             * TODO: discover better way to find dual hub.
-             */
-
-            /* Hub and its dual must be different types: one USB2, another USB3: */
-            if ((hubs[i].bcd_usb < USB_SS_BCD) ==
-                (hubs[j].bcd_usb < USB_SS_BCD))
-                continue;
-
-            /* But they must have the same vendor: */
-            if (strncasecmp(hubs[i].vendor, hubs[j].vendor, 4))
-                continue;
-
-            /* Provisionally we choose this one as dual: */
-            if (match < 0 && !hubs[j].actionable)
-                match = j;
-
-            /* But if there is exact port path match,
-             * we prefer it (true for Linux but not Mac):
-             */
-            char *p1 = strchr(hubs[i].location, '-');
-            char *p2 = strchr(hubs[j].location, '-');
-            if (p1 && p2 && strcasecmp(p1, p2)==0) {
-                match = j;
-                break;
-            }
-        }
-        if (match >= 0)
-            hubs[match].actionable = 1;
    }
    if (perm_ok == 0 && hub_phys_count == 0) {
+#ifdef __gnu_linux__
+        if (geteuid() != 0) {
+            fprintf(stderr,
+                "There were permission problems while accessing USB.\n"
+                "Follow https://git.io/JIB2Z for a fix!\n"
+            );
+        }
+#endif
        return LIBUSB_ERROR_ACCESS;
    }
    return hub_phys_count;
@@ -655,7 +899,7 @@ int main(int argc, char *argv[])
    int option_index = 0;

    for (;;) {
-        c = getopt_long(argc, argv, "l:n:a:p:d:r:w:hveR",
+        c = getopt_long(argc, argv, "l:L:n:a:p:d:r:w:s:hvefR",
            long_options, &option_index);
        if (c == -1)
            break;  /* no more options left */
@@ -672,24 +916,21 @@ int main(int argc, char *argv[])
        case 'l':
            strncpy(opt_location, optarg, sizeof(opt_location));
            break;
+        case 'L':
+            opt_level = atoi(optarg);
+            break;
        case 'n':
            strncpy(opt_vendor, optarg, sizeof(opt_vendor));
            break;
+        case 's':
+            strncpy(opt_search, optarg, sizeof(opt_search));
+            break;
        case 'p':
            if (!strcasecmp(optarg, "all")) { /* all ports is the default */
                break;
            }
            if (strlen(optarg)) {
-                /* parse port list */
-                opt_ports = 0;
-                size_t i;
-                for (i=0; i<strlen(optarg); i++) {
-                    if (!isdigit(optarg[i]) || optarg[i] == '0') {
-                        printf("%s must be list of ports 1 to %d\n", optarg, MAX_HUB_PORTS);
-                    }
-                    int d = optarg[i]-'1';
-                    opt_ports |= (1 << d);
-                }
+                opt_ports = ports2bitmap(optarg);
            }
            break;
        case 'a':
@@ -702,13 +943,19 @@ int main(int argc, char *argv[])
            if (!strcasecmp(optarg, "cycle") || !strcasecmp(optarg, "2")) {
                opt_action = POWER_CYCLE;
            }
+            if (!strcasecmp(optarg, "toggle") || !strcasecmp(optarg, "3")) {
+                opt_action = POWER_TOGGLE;
+            }
            break;
        case 'd':
-            opt_delay = atoi(optarg);
+            opt_delay = atof(optarg);
            break;
        case 'r':
            opt_repeat = atoi(optarg);
            break;
+        case 'f':
+            opt_force = 1;
+            break;
        case 'e':
            opt_exact = 1;
            break;
@@ -762,23 +1009,11 @@ int main(int argc, char *argv[])
    rc = usb_find_hubs();
    if (rc <= 0) {
        fprintf(stderr,
-            "No compatible smart hubs detected%s%s!\n"
+            "No compatible devices detected%s%s!\n"
            "Run with -h to get usage info.\n",
            strlen(opt_location) ? " at location " : "",
            opt_location
        );
-#ifdef __gnu_linux__
-        if (rc < 0) {
-            fprintf(stderr,
-                "There were permission problems while accessing USB.\n"
-                "To fix this, run this tool as root using 'sudo uhubctl',\n"
-                "or add one or more udev rules like below\n"
-                "to file '/etc/udev/rules.d/52-usb.rules':\n"
-                "SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2001\", MODE=\"0666\"\n"
-                "then run 'sudo udevadm trigger --attr-match=subsystem=usb'\n"
-            );
-        }
-#endif
        rc = 1;
        goto cleanup;
    }
@@ -790,45 +1025,51 @@ int main(int argc, char *argv[])
        );
        exit(1);
    }
-    int i;
-    for (i=0; i<hub_count; i++) {
-        if (hubs[i].actionable == 0)
+    int k; /* k=0 for power OFF, k=1 for power ON */
+    for (k=0; k<2; k++) { /* up to 2 power actions - off/on */
+        if (k == 0 && opt_action == POWER_ON )
            continue;
-        printf("Current status for hub %s [%s]\n",
-            hubs[i].location, hubs[i].description
-        );
-        print_port_status(&hubs[i], opt_ports);
-        if (opt_action == POWER_KEEP) { /* no action, show status */
+        if (k == 1 && opt_action == POWER_OFF)
            continue;
-        }
-        struct libusb_device_handle * devh = NULL;
-        rc = libusb_open(hubs[i].dev, &devh);
-        if (rc == 0) {
-            /* will operate on these ports */
-            int ports = ((1 << hubs[i].nports) - 1) & opt_ports;
-            int k; /* k=0 for power OFF, k=1 for power ON */
-            for (k=0; k<2; k++) { /* up to 2 power actions - off/on */
-                if (k == 0 && opt_action == POWER_ON )
-                    continue;
-                if (k == 1 && opt_action == POWER_OFF)
-                    continue;
+        if (k == 1 && opt_action == POWER_KEEP)
+            continue;
+        // if toggle requested, do it only once when `k == 0`
+        if (k == 1 && opt_action == POWER_TOGGLE)
+            continue;
+        int i;
+        for (i=0; i<hub_count; i++) {
+            if (hubs[i].actionable == 0)
+                continue;
+            printf("Current status for hub %s [%s]\n",
+                hubs[i].location, hubs[i].ds.description
+            );
+            print_port_status(&hubs[i], opt_ports);
+            if (opt_action == POWER_KEEP) { /* no action, show status */
+                continue;
+            }
+            struct libusb_device_handle * devh = NULL;
+            rc = libusb_open(hubs[i].dev, &devh);
+            if (rc == 0) {
+                /* will operate on these ports */
+                int ports = ((1 << hubs[i].nports) - 1) & opt_ports;
                int request = (k == 0) ? LIBUSB_REQUEST_CLEAR_FEATURE
                                       : LIBUSB_REQUEST_SET_FEATURE;
                int port;
                for (port=1; port <= hubs[i].nports; port++) {
                    if ((1 << (port-1)) & ports) {
                        int port_status = get_port_status(devh, port);
-                        int power_mask = hubs[i].bcd_usb < USB_SS_BCD ? USB_PORT_STAT_POWER
-                                                                          : USB_SS_PORT_STAT_POWER;
-                        if (k == 0 && !(port_status & power_mask))
+                        int power_mask = hubs[i].super_speed ? USB_SS_PORT_STAT_POWER
+                                                             : USB_PORT_STAT_POWER;
+                        int powered_on = port_status & power_mask;
+                        if (opt_action == POWER_TOGGLE) {
+                            request = powered_on ? LIBUSB_REQUEST_CLEAR_FEATURE
+                                                 : LIBUSB_REQUEST_SET_FEATURE;
+                        }
+                        if (k == 0 && !powered_on && opt_action != POWER_TOGGLE)
                            continue;
-                        if (k == 1 && (port_status & power_mask))
+                        if (k == 1 && powered_on)
                            continue;
-                        int repeat = 1;
-                        if (k == 0)
-                            repeat = opt_repeat;
-                        if (!(port_status & ~power_mask))
-                            repeat = 1;
+                        int repeat = powered_on ? opt_repeat : 1;
                        while (repeat-- > 0) {
                            rc = libusb_control_transfer(devh,
                                LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_OTHER,
@@ -844,16 +1085,14 @@ int main(int argc, char *argv[])
                        }
                    }
                }
-                if (k==0 && opt_action == POWER_CYCLE)
-                    sleep_ms(opt_delay * 1000);
                /* USB3 hubs need extra delay to actually turn off: */
-                if (k==0 && hubs[i].bcd_usb >= USB_SS_BCD)
+                if (k==0 && hubs[i].super_speed)
                    sleep_ms(150);
                printf("Sent power %s request\n",
                    request == LIBUSB_REQUEST_CLEAR_FEATURE ? "off" : "on"
                );
                printf("New status for hub %s [%s]\n",
-                    hubs[i].location, hubs[i].description
+                    hubs[i].location, hubs[i].ds.description
                );
                print_port_status(&hubs[i], opt_ports);

@@ -869,6 +1108,8 @@ int main(int argc, char *argv[])
            }
            libusb_close(devh);
        }
+        if (k == 0 && opt_action == POWER_CYCLE)
+            sleep_ms((int)(opt_delay * 1000));
    }
    rc = 0;
 cleanup:
--- a/uhubctl_git.bb
+++ b/uhubctl_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "uhubctl - USB hub per-port power control"
+HOMEPAGE = "https://github.com/mvp/uhubctl"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://LICENSE;md5=a79e6a142b69522fe7757fe7313895eb"
+
+DEPENDS = "libusb1"
+RDEPENDS_${PN} = "libusb1"
+
+SRC_URI = "git://github.com/mvp/uhubctl.git"
+SRCREV = "${AUTOREV}"
+PV = "git"
+S = "${WORKDIR}/git"
+
+do_install_append () {
+	install -d ${D}${bindir}
+	install -Dm 0755 ${S}/uhubctl ${D}${bindir}/
+}
+
+FILES_${PN}  += "${bindir}/*"