From patchwork Fri Mar 31 09:11:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 669630 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 B56CCC77B62 for ; Fri, 31 Mar 2023 09:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229529AbjCaJMR (ORCPT ); Fri, 31 Mar 2023 05:12:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231951AbjCaJMO (ORCPT ); Fri, 31 Mar 2023 05:12:14 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C959F1D905 for ; Fri, 31 Mar 2023 02:12:07 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id j13so19845560pjd.1 for ; Fri, 31 Mar 2023 02:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1680253927; 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=KuyGEC/BCL1exOJo9w5cckpDi+j1ToSvkBZ5wHJd1EI=; b=asCmRmQnDO169ph3UWKR1Z453FBunIfmYwRDQIA8D06CqqHt26CWm64PBNzQPfLq7i 9VhRVbihJvA417MwBMmcik33jSerfc/m9zokq3LI30/lC1AN3uxYjN74qdAsdwHwFfEo LD6TuuAm1zjPYtesKo5nMx7iPf9AOv/0ZprM0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680253927; 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=KuyGEC/BCL1exOJo9w5cckpDi+j1ToSvkBZ5wHJd1EI=; b=aHwDosxp5Mm49YtA0KEOY2GQbjrNmUUem9dTocvw9v/WvkpwWaYgSVxCrF2MIe4C/J AOpyzVsyCBESuDLjeRUPNM7THqlkQyVMvAE5LOKQxMmvWDN34B7eFKycR6+H3UYvOR6q 5BnDwWylnavhqhxHVo/6Vb73WEhGVhv2QQ8Axje+dzgMGIpXmtkaK3YNovXs15HlJeAg 7Wxef3SaaFNG+HNR1qDOfo9U66Q0j6hxNv84ckXouu2bBkyuGF8vZ7GvSmvCNM8MA98S QUFmrpZSAjjFQVmsnbU7nehIJqWQGxRlHxTklPqgMxneMekKHSkw8tE2Fjq1GY14LnE6 N34g== X-Gm-Message-State: AO0yUKWrRdF2hXA5kkoscSIuFHBMXXlCGnBrrc61xy35VkL3JpbpaoBZ Vdn+iUO19FAsrUFR/ywbpI2JAQ== X-Google-Smtp-Source: AK7set+ubiZHdR0EYwAEQ+6mxM9jDOMo4i5HJvDrMdaVpzntUKo5Gz+rySNDQSajJbJNpYlHL+hJnA== X-Received: by 2002:a05:6a20:4f1f:b0:be:da1c:df65 with SMTP id gi31-20020a056a204f1f00b000beda1cdf65mr21256623pzb.28.1680253927134; Fri, 31 Mar 2023 02:12:07 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:ae9d:db7a:8a71:d458]) by smtp.gmail.com with ESMTPSA id n6-20020a62e506000000b006227c3d5e29sm1360905pff.16.2023.03.31.02.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 02:12:06 -0700 (PDT) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Xin Ji , Marek Vasut , Hsin-Yi Wang , Thomas Zimmermann , AngeloGioacchino Del Regno , Lyude Paul , devicetree@vger.kernel.org, Stephen Boyd , dri-devel@lists.freedesktop.org, linux-acpi@vger.kernel.org, chrome-platform@lists.linux.dev, =?utf-8?q?N?= =?utf-8?q?=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , Javier Martinez Canillas , Pin-yen Lin , linux-kernel@vger.kernel.org, Chen-Yu Tsai Subject: [PATCH v15 02/10] platform/chrome: cros_ec_typec: Purge blocking switch devlinks Date: Fri, 31 Mar 2023 17:11:37 +0800 Message-Id: <20230331091145.737305-3-treapking@chromium.org> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog In-Reply-To: <20230331091145.737305-1-treapking@chromium.org> References: <20230331091145.737305-1-treapking@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Prashant Malani 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 Signed-off-by: Pin-yen Lin Reviewed-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno Tested-by: Chen-Yu Tsai Acked-by: Heikki Krogerus --- Changes in v15: - Collected Reviewed-by tags Changes in v11: - Collected Acked-by tag 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 a673c3342470..5911cd9640cb 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -325,6 +325,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) {