Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp542529iog; Fri, 17 Jun 2022 08:21:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sDUwsOKajAzRngyC4EbSwVAmNzx0huCJ5C5K7fOubzfv62SolDrZykV+a067aj97Rv+gMr X-Received: by 2002:a17:902:8b85:b0:168:d854:be84 with SMTP id ay5-20020a1709028b8500b00168d854be84mr10360252plb.94.1655479289829; Fri, 17 Jun 2022 08:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655479289; cv=none; d=google.com; s=arc-20160816; b=N9clWa29+e4oRgyLtb5mE0v1QTHWqb7b+7GJJFq8YG8z4RWM51w494ywvjUbP0Vykr 2hxlCGUgynd+ee9Yj2YfNdO4ITjbKDjPsdtLI+ffhK0S3w4BqHti8z3k+um2gH8O794s 8aoe5aJgIOpybODjfFOoQjEbxfgi3hv1rpYEO5L3uJIIOZLKaPoFDnyoIYhRKWHJ3e7G hNUzP0q8coxK1IqtETRtnRGBnZjsgQIN+yjBk4nbK3UbxhOgf9kfUeIHU9xVt4T0ERkI K5xoslgW/9pjRKhAHjctqhp8abKzohxbTNTRgNcpR2ZmNdWiUtY9S7JqRyIrJJz1Ao7F 4Q0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=wVlgAsZcjgEndPSaTBGgG2UpQMPJXQeZ+RRRV+uGzds=; b=Uk5jLsSBO8QNdUJcPbGfCd3jEwBEFN3lwhlCKC9NO8WAQ4XRUGkijWRXCK3DmvINSk rHCvQPU1wOaJ+0R9JkX1Tmqn4ieO687obf5QjVj5wDAuZJGTVuKcWZSsESMLRGuTRDXw yFEHzI/PrLW30J4f3edFM6xU/9i++dIZz1nU6Fyzj3co/coJFR7+OdPHSyukmL2l64Mv FO9cvY0Txe1ppUOenZtpJhAjKHXMC/y9FcSlRLTCnJI3dvMP6Vv2Mu5ZdQY31yqJLEaC R3cAOMtntI+f/dDQXiJfwbH1Bn7EKtDoqIMN2PrTFxxYUx6PVuCF2Sd3p6IfGNV4anar rcEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=eujYXJWT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x16-20020a17090a8a9000b001df6f1c3c04si3310539pjn.44.2022.06.17.08.21.16; Fri, 17 Jun 2022 08:21:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=eujYXJWT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236634AbiFQPJZ (ORCPT + 99 others); Fri, 17 Jun 2022 11:09:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382977AbiFQPJY (ORCPT ); Fri, 17 Jun 2022 11:09:24 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2BB336E24 for ; Fri, 17 Jun 2022 08:09:22 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 25so6564080edw.8 for ; Fri, 17 Jun 2022 08:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wVlgAsZcjgEndPSaTBGgG2UpQMPJXQeZ+RRRV+uGzds=; b=eujYXJWTngTW+P7GEEq8gLwxqE0e+vnigGGrMjJZJvpCqIao7qMv7+EO86HXeV7QfB 5Jhv/itc+gbfzvX3R9/FfkpCGX7bVunQwaNy2BdD6ExtuAmUtk3+6xvvV96i4cBHVXam frXbIwEU+qslRqkCOQo8jGqLDfGK8MaWDO23U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wVlgAsZcjgEndPSaTBGgG2UpQMPJXQeZ+RRRV+uGzds=; b=EY/ImnbCXy0YHty7bQC0c9XhymsW2UWxRmPmzZQTm/Cw/dVr9eHbVw62fa2IJIYuY8 mID77ZbmZLDt28TB2xBo4kJYXggDnoh0S+4qtWiEImmAxbxFWAdICNKqHJbrZ2tVHLeI eACX1+ijuXnk7iUq5kBovXkrDbz7oYpuTLt0FPAqNmMVdFv0sRegDWqq9nL08XWWysEi gTy7BiYcPQT4uoVwhFmmFv0ddJSOg7bkLIqeOhqcjaOLiDpmnRDKgAHW/ikTT3Obw3OL JTSBKvXj0+MwmomsAtTQFyU192d1GO0SrwubRTMQ7iIX9vcFNxRYKo8TI/to2JZWiPOE sgyw== X-Gm-Message-State: AJIora9UFwA8MCHqvCVqGT0ZYTXFWErBqKSPQzbkTNfdBdxXmmUlGG14 3awkkof2QLkLQwYUaULoY3SzdMPGpqxFrpT2cIo= X-Received: by 2002:a05:6402:190d:b0:431:4e5d:d780 with SMTP id e13-20020a056402190d00b004314e5dd780mr13132387edz.279.1655478560994; Fri, 17 Jun 2022 08:09:20 -0700 (PDT) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com. [209.85.221.43]) by smtp.gmail.com with ESMTPSA id w1-20020a170906480100b006fe9f9d0938sm2305235ejq.175.2022.06.17.08.09.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Jun 2022 08:09:19 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id w17so6133633wrg.7 for ; Fri, 17 Jun 2022 08:09:19 -0700 (PDT) X-Received: by 2002:a5d:68d2:0:b0:210:31cc:64a6 with SMTP id p18-20020a5d68d2000000b0021031cc64a6mr9739954wrw.679.1655478558608; Fri, 17 Jun 2022 08:09:18 -0700 (PDT) MIME-Version: 1.0 References: <20220609192000.990763-1-mka@chromium.org> <20220609121838.v22.2.I7c9a1f1d6ced41dd8310e8a03da666a32364e790@changeid> In-Reply-To: From: Doug Anderson Date: Fri, 17 Jun 2022 08:09:06 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v22 2/3] usb: misc: Add onboard_usb_hub driver To: Matthias Kaehlcke Cc: Greg Kroah-Hartman , Alan Stern , Rob Herring , Frank Rowand , Mathias Nyman , Felipe Balbi , Michal Simek , LKML , Krzysztof Kozlowski , Stephen Boyd , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Bastien Nocera , Peter Chen , Ravi Chandra Sadineni , Roger Quadros , Linux USB List , Geert Uytterhoeven , Souradeep Chowdhury Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Thu, Jun 16, 2022 at 5:36 PM Matthias Kaehlcke wrote: > > On Thu, Jun 16, 2022 at 03:46:15PM -0700, Doug Anderson wrote: > > Hi, > > > > On Thu, Jun 16, 2022 at 3:01 PM Matthias Kaehlcke wrote: > > > > > > On Thu, Jun 16, 2022 at 02:28:38PM -0700, Doug Anderson wrote: > > > > Hi, > > > > > > > > On Thu, Jun 16, 2022 at 2:08 PM Matthias Kaehlcke wrote: > > > > > > > > > > On Thu, Jun 16, 2022 at 01:12:32PM -0700, Doug Anderson wrote: > > > > > > Hi, > > > > > > > > > > > > On Wed, Jun 15, 2022 at 4:22 PM Matthias Kaehlcke wrote: > > > > > > > > > > > > > > > > +void onboard_hub_create_pdevs(struct usb_device *parent_hub, struct list_head *pdev_list) > > > > > > > > > +{ > > > > > > > > > + int i; > > > > > > > > > + struct usb_hcd *hcd = bus_to_hcd(parent_hub->bus); > > > > > > > > > + struct device_node *np, *npc; > > > > > > > > > + struct platform_device *pdev = NULL; > > > > > > > > > + struct pdev_list_entry *pdle; > > > > > > > > > + > > > > > > > > > + if (!parent_hub->dev.of_node) > > > > > > > > > + return; > > > > > > > > > + > > > > > > > > > + for (i = 1; i <= parent_hub->maxchild; i++) { > > > > > > > > > + np = usb_of_get_device_node(parent_hub, i); > > > > > > > > > + if (!np) > > > > > > > > > + continue; > > > > > > > > > + > > > > > > > > > + if (!of_is_onboard_usb_hub(np)) > > > > > > > > > + goto node_put; > > > > > > > > > + > > > > > > > > > + npc = of_parse_phandle(np, "companion-hub", 0); > > > > > > > > > + if (npc) { > > > > > > > > > + /* > > > > > > > > > + * Hubs with companions share the same platform device. > > > > > > > > > + * Create the plaform device only for the hub that is > > > > > > > > > + * connected to the primary HCD (directly or through > > > > > > > > > + * other hubs). > > > > > > > > > + */ > > > > > > > > > + if (!usb_hcd_is_primary_hcd(hcd)) { > > > > > > > > > + of_node_put(npc); > > > > > > > > > + goto node_put; > > > > > > > > > + } > > > > > > > > > + > > > > > > > > > + pdev = of_find_device_by_node(npc); > > > > > > > > > + of_node_put(npc); > > > > > > > > > + } else { > > > > > > > > > + /* > > > > > > > > > + * For root hubs this function can be called multiple times > > > > > > > > > + * for the same root hub node (the HCD node). Make sure only > > > > > > > > > + * one platform device is created for this hub. > > > > > > > > > + */ > > > > > > > > > + if (!parent_hub->parent && !usb_hcd_is_primary_hcd(hcd)) > > > > > > > > > + goto node_put; > > > > > > > > > > > > > > > > I don't understand the "else" case above. What case exactly are we > > > > > > > > handling again? This is when: > > > > > > > > * the hub is presumably just a 2.0 hub since there is no companion. > > > > > > > > * our parent is the root hub and the USB 2.0 hub we're looking at is > > > > > > > > not the primary > > > > > > > > > > > > > > The 'else' case can be entered for hubs connected to a root hub or to another > > > > > > > hub further down in the tree, but we bail out only for first level hubs. > > > > > > > > > > > > > > > ...but that doesn't make a lot of sense to me? I must have missed something... > > > > > > > > > > > > > > It's not super-obvious, this bit is important: "this function can be called > > > > > > > multiple times for the same root hub node". For any first level hub we only > > > > > > > create a pdev if this function is called on behalf of the primary HCD. That > > > > > > > is also true of a hub connected to the secondary HCD. We only want to create > > > > > > > one pdev and there is supposedly always a primary HCD. > > > > > > > > > > > > > > Maybe it would be slightly clearer if the function returned before the loop > > > > > > > if this condition is met. > > > > > > > > > > > > I guess I'm still pretty confused. You say "For root hubs this > > > > > > function can be called multiple times for the same root hub node". > > > > > > Does that mean that the function will be called multiple times with > > > > > > the same "parent_hub", or something else. > > > > > > > > > > It is called with a different "parent_hub", however for root hubs the > > > > > DT node is the same for both root hubs (it's the DT node of the > > > > > controller since there are no dedicated nodes for the root hubs). > > > > > > > > > > Just to make sure this isn't the source of the confusion: the root hubs > > > > > are part of the USB controller, not 'external' hubs which are directly > > > > > connected to the controller. I call the latter 'first level hubs'. > > > > > > > > > > > Unless it's called with the same "parent_hub" then it seems like if > > > > > > the USB device has a device tree node and that device tree node is for > > > > > > a onboard_usb_hub and there's no companion node then we _always_ want > > > > > > to create the platform device, don't we? If it is called with the same > > > > > > "parent_hub" then I'm confused how your test does something different > > > > > > the first time the function is called vs. the 2nd. > > > > > > > > > > Let's use an adapted trogdor DT with only a USB 2.x hub as an example: > > > > > > > > > > usb_1_dwc3 { > > > > > dr_mode = "host"; > > > > > #address-cells = <1>; > > > > > #size-cells = <0>; > > > > > > > > > > /* 2.x hub on port 1 */ > > > > > usb_hub_2_x: hub@1 { > > > > > compatible = "usbbda,5411"; > > > > > reg = <1>; > > > > > vdd-supply = <&pp3300_hub>; > > > > > }; > > > > > }; > > > > > > > > > > 1st call: the 'parent_hub' corresponds to the USB 3.x root hub of > > > > > usb_1_dwc3, the DT node of the hub is 'usb_1_dwc3'. The function > > > > > iterates over the ports, finds usb_hub_2_x, enters the else branch > > > > > (no companion hub), checks that the function was called on behalf > > > > > of the primary controller and creates the pdev. > > > > > > > > > > 2nd call: the 'parent_hub' corresponds to the USB 2.x root hub of > > > > > usb_1_dwc3, the DT node of the hub is also 'usb_1_dwc3'. The function > > > > > iterates over the ports, finds usb_hub_2_x, enters the else branch > > > > > (no companion hub), sees that it is not called on behalf of the > > > > > primary controller and does not create a second (unnecessary) pdev. > > > > > > > > > > Is it clearer now? > > > > > > > > Ah, I get it now! Sorry for being so dense... > > > > > > No worries, it's certainly not obvious and probably my commentary could > > > have been clearer. > > > > > > > So like this: > > > > > > > > Root hubs (those hubs with no parent) are all created with the same > > > > device_node, the one for the controller itself. We don't want to > > > > iterate through the same children multiple times, so we bail right > > > > away if we're detect that `parent_hub` is a root hub and we're not on > > > > the primary HCD. > > > > > > yep > > > > > > > For all other cases the primary and secondary controllers have distinct > > > > device_nodes. > > > > > > You probably mean that all non-root hubs have distinct nodes, so for these > > > the function is only called once. > > > > > > > I guess in theory that test could go before the "companion-hub" test, > > > > though I don't see any case where it truly matters... > > > > > > Yeah, I'm still wondering whether it would be slightly less confusing to > > > bail before the loop (besides saving a few cycles), it would eliminate > > > the conflation with the 'companion-hub' check. > > > > I'm not sure how that would work, though? You'd essentially need two loops then? > > Maybe I got myself confused, but I think the behavior would be the same as > now, without a second loop: > > We never create a pdev if the parent is a root hub and the controller is the > secondary. Even for a hub with companion the pdev is only created when the call > comes from the primary controller. > > Does that make sense? Yes, looking at it with fresh eyes I think you're right. Looking at the "companion-hub" case with fresh eyes, too, I wonder if that can be simpler. If we find a companion hub, do we need both the check for usb_hcd_is_primary_hcd() and the check to see whether the pdev was already created? -Doug