From patchwork Wed Jun 22 21:49:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 584398 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E0E7C43334 for ; Wed, 22 Jun 2022 21:49:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239711AbiFVVtr (ORCPT ); Wed, 22 Jun 2022 17:49:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235277AbiFVVto (ORCPT ); Wed, 22 Jun 2022 17:49:44 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2D403F30C for ; Wed, 22 Jun 2022 14:49:43 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id g186so17308381pgc.1 for ; Wed, 22 Jun 2022 14:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=olYSuR+MOT/ZUshrAp0iattV7CM2ZVM+skfjPn8b2+M=; b=UnJpR89QPDuNyRWadElkPWzCatOXAwynUc93UHxb9Fi0VzMdM3en9b4XTodA5dGyeT 4tktG4+GjSXcpwD9Vo43kMST8RfosfyTZVjpGrxxYDUQ/WIowNwejdM5jgrYQIwvPenb UVeST971UNxKkc/KeKIvcKQABx25nQngF5qNU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=olYSuR+MOT/ZUshrAp0iattV7CM2ZVM+skfjPn8b2+M=; b=ELzp2H5pA4NEfwlAK9YHJm52HHi4oM4oSYqKtC38j/m87yM/D4HZw9ZeapjONJSV2A 6LVKkCFIi8XCSY7gWVUAjEdrtsgcVEpnQC27mgUtGqpiv1ttpGzgPOo+wl3R/cFSxM7f GN+1ec7CL7tddvORbYG6aKO5m83BmcmTmR7OX7x07oLN9amN6jTZ7yiLakbBNKDY0Mom GVAyp2SyxeUwy/13hveKFpH6UCsb04TJwrnnK+s/Mueytx0ylqi3o3kI6q2h8I6NICwC x7zEr/FyBnZsc3+pnYe/lX4v+GkBUNM8YnyrYNCAt1gxiUBXhd5wq2/mam8gomCm160E Zrzw== X-Gm-Message-State: AJIora9UJBV15wu4NjASHCDvhqg1w6HNLxEnzqtGaEEdTnKk5FHbg+rS JSegWcg0buyuGxICmXZMEJoc3A== X-Google-Smtp-Source: AGRyM1u+5AjOJN51vnRt1dWDCPqyeU1pNqV6ZCu8LdPzElt9SvXUD3brWs5Kvslmp01edq8gY97Ftw== X-Received: by 2002:a05:6a00:2995:b0:525:398b:8585 with SMTP id cj21-20020a056a00299500b00525398b8585mr9469348pfb.7.1655934583325; Wed, 22 Jun 2022 14:49:43 -0700 (PDT) Received: from localhost ([2620:15c:11a:202:83c:92dc:a659:2900]) by smtp.gmail.com with UTF8SMTPSA id bd15-20020a056a00278f00b0050dc7628182sm14068297pfb.92.2022.06.22.14.49.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Jun 2022 14:49:43 -0700 (PDT) From: Matthias Kaehlcke To: Greg Kroah-Hartman , Alan Stern , Rob Herring , Frank Rowand , Mathias Nyman , Felipe Balbi Cc: linux-kernel@vger.kernel.org, Ravi Chandra Sadineni , Douglas Anderson , Bastien Nocera , linux-usb@vger.kernel.org, Roger Quadros , Krzysztof Kozlowski , devicetree@vger.kernel.org, Michal Simek , Stephen Boyd , Peter Chen , Matthias Kaehlcke , Bhuvanesh Surachari , Dan Carpenter , Kai-Heng Feng , Mathias Nyman , Vincent Mailhol Subject: [PATCH v23 3/3] usb: core: hub: Create platform devices for onboard hubs in hub_probe() Date: Wed, 22 Jun 2022 14:49:31 -0700 Message-Id: <20220622144857.v23.3.Ic9dd36078f9d803de82ca01a6700c58b8e4de27e@changeid> X-Mailer: git-send-email 2.37.0.rc0.104.g0611611a94-goog In-Reply-To: <20220622214931.1914770-1-mka@chromium.org> References: <20220622214931.1914770-1-mka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Call onboard_hub_create/destroy_pdevs() from hub_probe/disconnect() to create/destroy platform devices for onboard USB hubs that may be connected to the hub. The onboard hubs must have nodes in the device tree. onboard_hub_create/destroy_pdevs() are NOPs unless CONFIG_USB_ONBOARD_HUB=y/m. Also add a field to struct usb_hub to keep track of the onboard hub platform devices that are owned by the hub. Signed-off-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- Changes in v23: - added Doug's 'Reviewed-by' tag Changes in v22: - patch added to the series (moved creation/deletion from HCD) drivers/usb/core/hub.c | 9 ++++++++- drivers/usb/core/hub.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 68e9121c1878..8055130ee602 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -1752,6 +1753,8 @@ static void hub_disconnect(struct usb_interface *intf) if (hub->quirk_disable_autosuspend) usb_autopm_put_interface(intf); + onboard_hub_destroy_pdevs(&hub->onboard_hub_devs); + kref_put(&hub->kref, hub_release); } @@ -1869,6 +1872,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) INIT_DELAYED_WORK(&hub->leds, led_work); INIT_DELAYED_WORK(&hub->init_work, NULL); INIT_WORK(&hub->events, hub_event); + INIT_LIST_HEAD(&hub->onboard_hub_devs); spin_lock_init(&hub->irq_urb_lock); timer_setup(&hub->irq_urb_retry, hub_retry_irq_urb, 0); usb_get_intf(intf); @@ -1889,8 +1893,11 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) usb_autopm_get_interface_no_resume(intf); } - if (hub_configure(hub, &desc->endpoint[0].desc) >= 0) + if (hub_configure(hub, &desc->endpoint[0].desc) >= 0) { + onboard_hub_create_pdevs(hdev, &hub->onboard_hub_devs); + return 0; + } hub_disconnect(intf); return -ENODEV; diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index 22ea1f4f2d66..ccf90052d12a 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -73,6 +73,7 @@ struct usb_hub { spinlock_t irq_urb_lock; struct timer_list irq_urb_retry; struct usb_port **ports; + struct list_head onboard_hub_devs; }; /**