From patchwork Mon May 3 19:44:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 12236889 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DE90C433ED for ; Mon, 3 May 2021 19:45:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03BA8610A1 for ; Mon, 3 May 2021 19:45:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229764AbhECTpu (ORCPT ); Mon, 3 May 2021 15:45:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229603AbhECTpr (ORCPT ); Mon, 3 May 2021 15:45:47 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D998CC061763 for ; Mon, 3 May 2021 12:44:52 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id c21so252429pgg.3 for ; Mon, 03 May 2021 12:44:52 -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=s9SQ7k96X0LZxd9chKqf25mgiUdmMwQrmDeOSJipN9g=; b=Cd4RGTeYMPERymb9cg+7xjK6COf7qBmXEpyKC+NWyFLDDrZOQxtJ95gh2b+3kdYjU6 rCcawbLcPI+Qhxlg87lEiC1NXcMgZeXx+hCzf9Cu7vzPQk+JqFaivArGUIhJodz9P01u hAWTb957ZhlMKlCFMV+KymkbnXcJ4gxyK6FJc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s9SQ7k96X0LZxd9chKqf25mgiUdmMwQrmDeOSJipN9g=; b=Nj5z2e6As0rke4Fg/kfTqm2m1Kg0P+U1TlWViXWYpI9K3Db4BrVF8Xum0/OoYAerak HnK5iXBtVTT27AVyH5WzA5FyYM7GxDcKoNuGpSsaZeFpx8rt4zaA2zimnQ7z2Ct/U48u f0iTHC4FD1n9eqOUAtWoNIxemVw2pTs8J6AlcdZBqBLlNt4RG1aoMo9KpTsBzlb1rI13 +7oyFojYFZTZBwI9T2qJka7e7Lvxb5iJB/WeLy5tQj2tb9TzznwMb6Rg2JXYJ2l9DMRN BZta4k0h3LM1ywusThrrYBgbor2HDiW3hZHe6yXbKzm69eyOfVVlMV5+La0r4ErvtGSc vaUQ== X-Gm-Message-State: AOAM530Q9PW37OEYPnbBLgO8iZ1tuph/QfZ9T0d4KcjIvvAxCPDExmrc wpZ7Gf0pu1hbts3fdLHBrWEOUg== X-Google-Smtp-Source: ABdhPJzszT/PlNKe1jrnCfrkvz6XxI6c8I2RBRLM1bccNOzwoZP1+kX3eldQCxj1EABXz9jyPKyG6A== X-Received: by 2002:a17:90b:505:: with SMTP id r5mr23060904pjz.121.1620071092395; Mon, 03 May 2021 12:44:52 -0700 (PDT) Received: from localhost ([2620:15c:202:201:8584:3fd:2adf:a655]) by smtp.gmail.com with UTF8SMTPSA id a13sm438705pgm.43.2021.05.03.12.44.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 May 2021 12:44:52 -0700 (PDT) From: Matthias Kaehlcke To: Greg Kroah-Hartman , Alan Stern , Rob Herring , Frank Rowand Cc: Peter Chen , Bastien Nocera , linux-usb@vger.kernel.org, Stephen Boyd , Ravi Chandra Sadineni , Douglas Anderson , devicetree@vger.kernel.org, Krzysztof Kozlowski , linux-kernel@vger.kernel.org, Michal Simek , Matthias Kaehlcke , Al Cooper , Christian Lamparter , Dmitry Osipenko , Fabio Estevam , Masahiro Yamada , Mathias Nyman , Vinod Koul Subject: [PATCH v9 4/5] usb: host: xhci-plat: Create platform device for onboard hubs in probe() Date: Mon, 3 May 2021 12:44:38 -0700 Message-Id: <20210503124408.v9.4.I7a3a7d9d2126c34079b1cab87aa0b2ec3030f9b7@changeid> X-Mailer: git-send-email 2.31.1.527.g47e6f16901-goog In-Reply-To: <20210503194439.3289065-1-mka@chromium.org> References: <20210503194439.3289065-1-mka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Check during probe() if a hub supported by the onboard_usb_hub driver is connected to the controller. If such a hub is found create the corresponding platform device. This requires the device tree to have a node for the hub with its vendor and product id (which is not common for USB devices). Further the platform device is only created when CONFIG_USB_ONBOARD_HUB=y/m. Signed-off-by: Matthias Kaehlcke Reported-by: kernel test robot --- Changes in v9: - added dependency on USB_ONBOARD_HUB (or !!USB_ONBOARD_HUB) to USB_XHCI_PLATFORM Changes in v8: - none Changes in v7: - none Changes in v6: - none Changes in v5: - patch added to the series drivers/usb/host/Kconfig | 1 + drivers/usb/host/xhci-plat.c | 16 ++++++++++++++++ include/linux/usb/hcd.h | 2 ++ 3 files changed, 19 insertions(+) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index b94f2a070c05..da50496787fe 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -54,6 +54,7 @@ config USB_XHCI_PCI_RENESAS config USB_XHCI_PLATFORM tristate "Generic xHCI driver for a platform device" select USB_XHCI_RCAR if ARCH_RENESAS + depends on USB_ONBOARD_HUB || !USB_ONBOARD_HUB help Adds an xHCI host driver for a generic platform device, which provides a memory space and an irq. diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index c1edcc9b13ce..9c0fb7e8df1f 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -195,6 +196,7 @@ static int xhci_plat_probe(struct platform_device *pdev) int ret; int irq; struct xhci_plat_priv *priv = NULL; + struct device_node *np; if (usb_disabled()) @@ -374,6 +376,17 @@ static int xhci_plat_probe(struct platform_device *pdev) */ pm_runtime_forbid(&pdev->dev); + np = usb_of_get_device_node(hcd->self.root_hub, hcd->self.busnum); + if (np && of_is_onboard_usb_hub(np)) { + struct platform_device *pdev; + + pdev = of_platform_device_create(np, NULL, NULL); + if (pdev) + hcd->onboard_hub_dev = &pdev->dev; + else + xhci_warn(xhci, "failed to create onboard hub platform device\n"); + } + return 0; @@ -420,6 +433,9 @@ static int xhci_plat_remove(struct platform_device *dev) usb_remove_hcd(hcd); usb_put_hcd(shared_hcd); + if (hcd->onboard_hub_dev) + of_platform_device_destroy(hcd->onboard_hub_dev, NULL); + clk_disable_unprepare(clk); clk_disable_unprepare(reg_clk); usb_put_hcd(hcd); diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 96281cd50ff6..d02a508e19b0 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -225,6 +225,8 @@ struct usb_hcd { * (ohci 32, uhci 1024, ehci 256/512/1024). */ + struct device *onboard_hub_dev; + /* The HC driver's private data is stored at the end of * this structure. */