Message ID | 20230112042104.4107253-3-treapking@chromium.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3686821wrt; Wed, 11 Jan 2023 20:23:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXv2y6ROsKhL99DET756W4UFQCLCPz3w+aeHpoeEgM8krThmumVyQqtnmDpvBKaRHm7MEFNW X-Received: by 2002:a05:6402:2d9:b0:499:d0e3:7745 with SMTP id b25-20020a05640202d900b00499d0e37745mr5852277edx.14.1673497433553; Wed, 11 Jan 2023 20:23:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673497433; cv=none; d=google.com; s=arc-20160816; b=HOmhEXaeNq+cEPJbGjP+OLwclso2rewGQr3gto+S25RoeZVgdSlWmUmHt0iu70KiQL hqtKpSYAnxPqiGYAtZ/YrZavRasmOPvu5VOm+WVrBsa/0rKk7umYqU7UCGCl/W7FDHvn 7crUrU+6KWBbxs8Jezup2lggpqHK+RyW0+skpIMOu6RK15btxhNCtNVD/Pa1y9LY9VIy qqx2B05HprCup/NClI3ShUqDrIYyvHC7yqE2S7Hs8EclTjj7cSeEsGVsL04pD0MmEtga iVUx6ztDZncbWAbe//FFk6WdCLxs6pKS+Ze7PseRD8wGF/r3fJu8AU8ZoQRjPc7jByhg 7oDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=H1TkdCYd6ACDb822V5ymCJqJsoUWZt84bjeNRJjxiCU=; b=jrXuvBgQeVbViMog2S5FV9xIx9bZQBQrX9jpUNRIYC3xDxJd4/6DbCFRADbU/GXe4K H2aaDGxOCpyq8m7gY1IZsSiR7MAXadrvxSos+LwfVtwKA0UIK2S7FXG3T1rAovPoYdaL KOC1bv8yAMROsaKJuVFb7sO86KjOjVvHkm8Y1XGe0RXUaXo1PuYnjxSDTTc8i+VJAoVF qnPqesc5f7cfCDGInw/oD3UVrJxWHOh9neUqIOl/qN3fc6ZKZKOfIGYG1VwasOU1qt5g ZJyAxostZkpuTpsT+2lxw0sf9THr5dQz0tQ7KVKMGh1BQTIgPWaBZwRULKQcM8EK2qBn 1eHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jdJO71CD; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds7-20020a0564021cc700b00484f68b784csi16449780edb.329.2023.01.11.20.23.29; Wed, 11 Jan 2023 20:23:53 -0800 (PST) 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=jdJO71CD; 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 S239134AbjALEWh (ORCPT <rfc822;zhuangel570@gmail.com> + 99 others); Wed, 11 Jan 2023 23:22:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236697AbjALEVw (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 11 Jan 2023 23:21:52 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98A6CA1B1 for <linux-kernel@vger.kernel.org>; Wed, 11 Jan 2023 20:21:26 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id a30so12940836pfr.6 for <linux-kernel@vger.kernel.org>; Wed, 11 Jan 2023 20:21:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H1TkdCYd6ACDb822V5ymCJqJsoUWZt84bjeNRJjxiCU=; b=jdJO71CDHt8Fc8jxM5omcbFXpLk35O/tD3XpCg8d1m2smMqB62v74cke8eZw48ZwPG 22NL7DuFBjv0SkgEL2IMFOkU+iJ4QR+phjPOZKqJDGP8XkkfHFuZhL7jJgm8yFsgXAW5 animO4QOKlwWfmaPFXh/tkYURQg5TaxD8tqas= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H1TkdCYd6ACDb822V5ymCJqJsoUWZt84bjeNRJjxiCU=; b=yh/EiiGKX4A13gNkQ6sgLffmbEbP+dcdE83aZQ8S34liiKgXzrqCcG2cNHTURBfHRk S02GFISnhGe14vYFtlp4U9ahDHcCJIIVNtVWsg2TATT3KdBYXqAI3DAW6AbIIbJa3kyh 28G3HlgoBpN82qa0KB9QG62BFXFRnWBiN9haG03jUwmb02wvNREmtJ+1KWAGxdiwXHms cKrwWR+jWLxDZHrgccyTmSk7ohs5w5POF1CmIXzqEtBUXNsQKQ9EwrvvwZabecKtJitF 27rQQV40NNQQQGzsyLWfxroyiG3/f5r8IVqgaK7sQR6TL2uhz3O/KOIlzAx3KSocMeG7 Br7w== X-Gm-Message-State: AFqh2kq/GYOcierZzrf2c2cs+1enS1XoeDcdnpX/uRt4Ple0Kh6fQWZ4 QB1DtFevPmTPYTYZrYB3zscB8w== X-Received: by 2002:a05:6a00:2997:b0:582:1f25:5b8 with SMTP id cj23-20020a056a00299700b005821f2505b8mr44070232pfb.19.1673497286002; Wed, 11 Jan 2023 20:21:26 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:594f:5484:7591:d074]) by smtp.gmail.com with ESMTPSA id s8-20020aa78bc8000000b00582579cb0e0sm5519478pfd.129.2023.01.11.20.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 20:21:25 -0800 (PST) From: Pin-yen Lin <treapking@chromium.org> To: Andrzej Hajda <andrzej.hajda@intel.com>, Neil Armstrong <neil.armstrong@linaro.org>, Robert Foss <robert.foss@linaro.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Jonas Karlman <jonas@kwiboo.se>, Jernej Skrabec <jernej.skrabec@gmail.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Daniel Scally <djrscally@gmail.com>, Heikki Krogerus <heikki.krogerus@linux.intel.com>, Sakari Ailus <sakari.ailus@linux.intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J . Wysocki" <rafael@kernel.org>, Prashant Malani <pmalani@chromium.org>, Benson Leung <bleung@chromium.org>, Guenter Roeck <groeck@chromium.org> Cc: Stephen Boyd <swboyd@chromium.org>, Pin-yen Lin <treapking@chromium.org>, =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= <nfraprado@collabora.com>, Marek Vasut <marex@denx.de>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Javier Martinez Canillas <javierm@redhat.com>, Lyude Paul <lyude@redhat.com>, chrome-platform@lists.linux.dev, Xin Ji <xji@analogixsemi.com>, Thomas Zimmermann <tzimmermann@suse.de>, linux-kernel@vger.kernel.org, Allen Chen <allen.chen@ite.com.tw>, linux-acpi@vger.kernel.org, Hsin-Yi Wang <hsinyi@chromium.org>, Chen-Yu Tsai <wenst@chromium.org> Subject: [PATCH v10 2/9] platform/chrome: cros_ec_typec: Purge blocking switch devlinks Date: Thu, 12 Jan 2023 12:20:57 +0800 Message-Id: <20230112042104.4107253-3-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230112042104.4107253-1-treapking@chromium.org> References: <20230112042104.4107253-1-treapking@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 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 autolearn=ham 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754789244521072748?= X-GMAIL-MSGID: =?utf-8?q?1754789244521072748?= |
Series |
Register Type-C mode-switch in DP bridge endpoints
|
|
Commit Message
Pin-yen Lin
Jan. 12, 2023, 4:20 a.m. UTC
From: Prashant Malani <pmalani@chromium.org> When using OF graph, the fw_devlink code will create links between the individual port driver (cros-ec-typec here) and the parent device for a Type-C switch (like mode-switch). Since the mode-switch will in turn have the usb-c-connector (i.e the child of the port driver) as a supplier, fw_devlink will not be able to resolve the cyclic dependency correctly. As a result, the mode-switch driver probe() never runs, so mode-switches are never registered. Because of that, the port driver probe constantly fails with -EPROBE_DEFER, because the Type-C connector class requires all switch devices to be registered prior to port registration. To break this deadlock and allow the mode-switch registration to occur, purge all the usb-c-connector nodes' absent suppliers. This eliminates the connector as a supplier for a switch and allows it to be probed. Signed-off-by: Prashant Malani <pmalani@chromium.org> Signed-off-by: Pin-yen Lin <treapking@chromium.org> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Tested-by: Chen-Yu Tsai <wenst@chromium.org> --- Changes in v10: - Collected Reviewed-by and Tested-by tags Changes in v7: - Fix the long comment lines Changes in v6: - New in v6 drivers/platform/chrome/cros_ec_typec.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
Comments
On Thu, Jan 12, 2023 at 12:20:57PM +0800, Pin-yen Lin wrote: > From: Prashant Malani <pmalani@chromium.org> > > When using OF graph, the fw_devlink code will create links between the > individual port driver (cros-ec-typec here) and the parent device for > a Type-C switch (like mode-switch). Since the mode-switch will in turn > have the usb-c-connector (i.e the child of the port driver) as a > supplier, fw_devlink will not be able to resolve the cyclic dependency > correctly. > > As a result, the mode-switch driver probe() never runs, so mode-switches > are never registered. Because of that, the port driver probe constantly > fails with -EPROBE_DEFER, because the Type-C connector class requires all > switch devices to be registered prior to port registration. > > To break this deadlock and allow the mode-switch registration to occur, > purge all the usb-c-connector nodes' absent suppliers. This eliminates > the connector as a supplier for a switch and allows it to be probed. > > Signed-off-by: Prashant Malani <pmalani@chromium.org> > Signed-off-by: Pin-yen Lin <treapking@chromium.org> > Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> > Tested-by: Chen-Yu Tsai <wenst@chromium.org> FWIW: Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > > Changes in v10: > - Collected Reviewed-by and Tested-by tags > > Changes in v7: > - Fix the long comment lines > > Changes in v6: > - New in v6 > > drivers/platform/chrome/cros_ec_typec.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c > index 2a7ff14dc37e..302474a647cc 100644 > --- a/drivers/platform/chrome/cros_ec_typec.c > +++ b/drivers/platform/chrome/cros_ec_typec.c > @@ -382,6 +382,16 @@ static int cros_typec_init_ports(struct cros_typec_data *typec) > return -EINVAL; > } > > + /* > + * OF graph may have set up some device links with switches, > + * since connectors have their own compatible. Purge these > + * to avoid a deadlock in switch probe (the switch mistakenly > + * assumes the connector is a supplier). > + */ > + if (dev_of_node(dev)) > + device_for_each_child_node(dev, fwnode) > + fw_devlink_purge_absent_suppliers(fwnode); > + > /* DT uses "reg" to specify port number. */ > port_prop = dev->of_node ? "reg" : "port-number"; > device_for_each_child_node(dev, fwnode) { > -- > 2.39.0.314.g84b9a713c41-goog
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c index 2a7ff14dc37e..302474a647cc 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -382,6 +382,16 @@ static int cros_typec_init_ports(struct cros_typec_data *typec) return -EINVAL; } + /* + * OF graph may have set up some device links with switches, + * since connectors have their own compatible. Purge these + * to avoid a deadlock in switch probe (the switch mistakenly + * assumes the connector is a supplier). + */ + if (dev_of_node(dev)) + device_for_each_child_node(dev, fwnode) + fw_devlink_purge_absent_suppliers(fwnode); + /* DT uses "reg" to specify port number. */ port_prop = dev->of_node ? "reg" : "port-number"; device_for_each_child_node(dev, fwnode) {