From patchwork Wed Jun 5 09:05:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 10976495 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9186014E5 for ; Wed, 5 Jun 2019 09:06:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8152528885 for ; Wed, 5 Jun 2019 09:06:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74ED428889; Wed, 5 Jun 2019 09:06:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0090288DA for ; Wed, 5 Jun 2019 09:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfFEJGT (ORCPT ); Wed, 5 Jun 2019 05:06:19 -0400 Received: from smtp1.de.adit-jv.com ([93.241.18.167]:49387 "EHLO smtp1.de.adit-jv.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726502AbfFEJGT (ORCPT ); Wed, 5 Jun 2019 05:06:19 -0400 Received: from localhost (smtp1.de.adit-jv.com [127.0.0.1]) by smtp1.de.adit-jv.com (Postfix) with ESMTP id 44CD33C014D; Wed, 5 Jun 2019 11:06:16 +0200 (CEST) Received: from smtp1.de.adit-jv.com ([127.0.0.1]) by localhost (smtp1.de.adit-jv.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qlywOd2IU4e6; Wed, 5 Jun 2019 11:06:09 +0200 (CEST) Received: from HI2EXCH01.adit-jv.com (hi2exch01.adit-jv.com [10.72.92.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by smtp1.de.adit-jv.com (Postfix) with ESMTPS id B23853C00D1; Wed, 5 Jun 2019 11:06:09 +0200 (CEST) Received: from vmlxhi-102.adit-jv.com (10.72.93.184) by HI2EXCH01.adit-jv.com (10.72.92.24) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 5 Jun 2019 11:06:09 +0200 From: Eugeniu Rosca To: , , Greg Kroah-Hartman , Alan Stern , Mathias Nyman , Kai-Heng Feng , Felipe Balbi , Nicolas Boichat , Mathias Payer , Kento Kobayashi , Hui Peng , Raul E Rangel , Douglas Anderson , Jan-Marek Glogowski , Bin Liu , Colin Ian King , Nicolas Saenz Julienne , Jon Flatley , Mathieu Malaterre CC: Spyridon Papageorgiou , Eugeniu Rosca , Eugeniu Rosca , Joshua Frkuska , "George G . Davis" , , , , Subject: [PATCH] usb: hub: report failure to enumerate uevent to userspace Date: Wed, 5 Jun 2019 11:05:56 +0200 Message-ID: <20190605090556.17792-1-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Originating-IP: [10.72.93.184] Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Spyridon Papageorgiou When a USB device fails to enumerate, only a kernel message is printed. With this patch, a uevent is also generated to notify userspace. Services can monitor for the event through udev and handle failures accordingly. The "port_enumerate_fail_notify()" function name follows the syntax of "port_over_current_notify()" used in v4.20-rc1 commit 201af55da8a398 ("usb: core: added uevent for over-current"). Signed-off-by: Spyridon Papageorgiou Signed-off-by: Eugeniu Rosca --- Documentation/ABI/testing/usb-uevent | 36 ++++++++++++++++++++++++++++ drivers/usb/core/hub.c | 15 +++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/usb-uevent b/Documentation/ABI/testing/usb-uevent index d35c3cad892c..23e618227d31 100644 --- a/Documentation/ABI/testing/usb-uevent +++ b/Documentation/ABI/testing/usb-uevent @@ -25,3 +25,39 @@ Description: When the USB Host Controller has entered a state where it is no TYPE=9/0/1 Users: chromium-os-dev@chromium.org + +What: Raise a uevent when USB device enumeration has failed +Date: 2019-06-05 +KernelVersion: 5.2 +Contact: linux-usb@vger.kernel.org +Description: When a USB device has failed to enumerate, a uevent will be generated. + The uevent will contain ACTION=change, ENUMERATION_FAILURE=1 and + ENUMERATION_FAIL_PORT=. Services can monitor for the event + through udev and handle failures accordingly. + + Here is an example taken using udevadm monitor -p (R-Car H3ULCB): + + UDEV [47.298493] change /devices/platform/soc/ee0a0000.usb/usb4/4-0:1.0 (usb) + ACTION=change + DEVPATH=/devices/platform/soc/ee0a0000.usb/usb4/4-0:1.0 + DEVTYPE=usb_interface + DRIVER=hub + ENUMERATION_FAILURE=1 + ENUMERATION_FAIL_PORT=1 + ID_MODEL_FROM_DATABASE=1.1 root hub + ID_USB_CLASS_FROM_DATABASE=Hub + ID_USB_PROTOCOL_FROM_DATABASE=Full speed (or root) hub + ID_VENDOR_FROM_DATABASE=Linux Foundation + INTERFACE=9/0/0 + MODALIAS=usb:v1D6Bp0001d0502dc09dsc00dp00ic09isc00ip00in00 + OF_COMPATIBLE_0=generic-ohci + OF_COMPATIBLE_N=1 + OF_FULLNAME=/soc/usb@ee0a0000 + OF_NAME=usb + PRODUCT=1d6b/1/502 + SEQNUM=1762 + SUBSYSTEM=usb + TYPE=9/0/0 + USEC_INITIALIZED=24344435 + +Users: ADIT, DENSO TEN diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 2f94568ba385..da1a3d47a071 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -4921,6 +4921,17 @@ hub_power_remaining(struct usb_hub *hub) return remaining; } +static void port_enumerate_fail_notify(struct usb_port *port) +{ + char env_port[32]; + char *envp[3] = { "ENUMERATION_FAILURE=1", env_port, NULL }; + + snprintf(env_port, sizeof(env_port), "ENUMERATION_FAIL_PORT=%d", + port->portnum); + + kobject_uevent_env(&port->dev.parent->kobj, KOBJ_CHANGE, envp); +} + static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, u16 portchange) { @@ -5131,9 +5142,11 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, if (hub->hdev->parent || !hcd->driver->port_handed_over || !(hcd->driver->port_handed_over)(hcd, port1)) { - if (status != -ENOTCONN && status != -ENODEV) + if (status != -ENOTCONN && status != -ENODEV) { + port_enumerate_fail_notify(port_dev); dev_err(&port_dev->dev, "unable to enumerate USB device\n"); + } } done: