From patchwork Sun Sep 1 04:06:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 13786249 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02D8CC54FC6 for ; Sun, 1 Sep 2024 04:07:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 03BE310E00C; Sun, 1 Sep 2024 04:07:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PRNvAj5+"; dkim-atps=neutral Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9933C10E00C for ; Sun, 1 Sep 2024 04:07:02 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2053a0bd0a6so12966315ad.3 for ; Sat, 31 Aug 2024 21:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1725163622; x=1725768422; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nuBr4jHV5S80VE6wt73LlMepnLPoYFInOo7nmnbq2q0=; b=PRNvAj5+wQ+1CTLY7xSzDVhnNnfd/0OQPqJIFizoszKBxrJg1PkT0uUwnJYgpuVPXe M8UjLVx9ExiASZ4P2lgl3exIU6j3wejMmz0x1/8OTApJiFTAk1VlssTp1BvJapEyCo8a ta4bhBL+LWwkhNM3QmJbwHUKsOEd8hYTAvxoM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725163622; x=1725768422; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nuBr4jHV5S80VE6wt73LlMepnLPoYFInOo7nmnbq2q0=; b=IBD7MVgBuX+uCegtzXYZgGg4HjVSUmCTx38BeRFIeO11Pd96cgggSmjqWC+cXbTZQ8 UBsYPkCsMNAuUbBSjznEt6OsgE5tfD6hsbyUaeKZDK7k6udfekMBQ3osKZUiCiUzzMQ5 Se+sjlTiGN6NgD99SD1keSMvaRt5/3Rdg+DnZLD2CtBfQvYAjgZCxzgWh87s1nb6RTS1 taIZVHnNTwowqNQiWCFkWLBMYJsW2yKNP/Fvm67qLvih+vcpNNr7jzBpRbWCbCjdcOm8 La5SAfTkzY3fkJ+BJFNqg6nYGbor7ZmlCytZ7+AIEnktRo+92MqwIGEwq3nZOThyuHlg 0mgQ== X-Forwarded-Encrypted: i=1; AJvYcCVGm3NIDFr4DAHyYa9KE4hekMBfm5hxlE5zFaIHrTkHnH4UmX4DGA+NxTe/cWf67LmdbNVeEY5mchA=@lists.freedesktop.org X-Gm-Message-State: AOJu0YybJn9N3q2wrlq/iTfmJ3POfX89kpQ/skjkFhNId9xs/L7b/rfm z5wNVhy8ltVXWrV0jzZeqDDcVXmk/z/OKA6s9F6s/wntkUs/CWn0BVhP+NcM/w== X-Google-Smtp-Source: AGHT+IFdVKVrHGgclkl0cGkMwkBlcXVzyf0ZspkV2XMx+5RcpUZYEjzMjlqXOut5r9vzgEcJ72vHDg== X-Received: by 2002:a17:902:ecc7:b0:1fc:2b3b:1482 with SMTP id d9443c01a7336-2050c2159fcmr112626595ad.12.1725163621781; Sat, 31 Aug 2024 21:07:01 -0700 (PDT) Received: from localhost (210.73.125.34.bc.googleusercontent.com. [34.125.73.210]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-20543b7c7e2sm19180565ad.3.2024.08.31.21.06.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 31 Aug 2024 21:07:01 -0700 (PDT) From: Stephen Boyd To: chrome-platform@lists.linux.dev Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, devicetree@vger.kernel.org, Douglas Anderson , Pin-yen Lin , Andrzej Hajda , Benson Leung , Conor Dooley , Daniel Vetter , David Airlie , Dmitry Baryshkov , dri-devel@lists.freedesktop.org, Guenter Roeck , Jernej Skrabec , Jonas Karlman , Krzysztof Kozlowski , Laurent Pinchart , Lee Jones , Maarten Lankhorst , Maxime Ripard , Neil Armstrong , Prashant Malani , Robert Foss , Rob Herring , Thomas Zimmermann , Tzung-Bi Shih , Alexandre Belloni , Andy Shevchenko , Daniel Scally , Greg Kroah-Hartman , Heikki Krogerus , Ivan Orlov , linux-acpi@vger.kernel.org, linux-usb@vger.kernel.org, Mika Westerberg , "Rafael J . Wysocki" , Sakari Ailus , Vinod Koul Subject: [PATCH v4 00/18] platform/chrome: Add DT USB/DP muxing/topology support Date: Sat, 31 Aug 2024 21:06:38 -0700 Message-ID: <20240901040658.157425-1-swboyd@chromium.org> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This series adds support for fully describing the USB/DP topology on ChromeOS Trogdor devices in DT. Trogdor devices have a single DP phy in the AP that is muxed to one of two usb type-c connectors depending on which port asserts HPD first to the EC. We'd like to know which port is connected to an external monitor to provide a better experience to the user about things like which type-c port is displaying DP or which type-c hub is acting up, etc. Describing the connection all the way from the source to the connector will allow us to do this. DRM core patches: These are used to implement lane assignment for DP altmode configurations through the drm_bridge code. The typec code will use this to tell the DP phy how many lanes of DP to drive and which lanes to drive out to the USB type-c connector. Adding support for lane assignment allows us to implement DP muxing as well, physically splitting the DP lanes on the DP phy so that hardware doesn't have to use an analog mux to steer two DP lanes to one or the other type-c port. Type-c core patches: These add some devm helpers so that the next patches in the series can skip open-coding devres helpers for unregistering typec switches and muxes. DRM aux hpd patches: These implement an auxiliary device for USB type-c DP alternate mode. I took Dmitry's suggestion and moved the code that does the remapping into this driver. The existing hpd bridge is wrapped so as to avoid changing the current users. It also registers a typec mux and switch (if applicable) so that the DP altmode pin assignment and port orientation can be passed to the switch callbacks. We'll still need to implement logic in the phy layer to handle configuration. Cros EC typec patches: This ties together everything that comes before it in this series. The EC typec driver registers the drm_dp_typec_bridge that can signal HPD from the type-c connector through the bridge chain, mux the DP phy in software so that we don't have to use an analog mux, and implement orientation control for boards like Kukui that directly connect the DP phy to the type-c port, necessitating lane assignment to flip the lanes to match the cable orientation. Changes from v3: https://lore.kernel.org/r/20240819223834.2049862-1-swboyd@chromium.org * Use devm_add_action_or_reset() for typec patches * Fix kernel-doc * Document devcon_match_fn_t before extending it * Include err.h in typec header * Document devm_typec_switch_register() * Remove struct cros_typec_dp_bridge and fold it into parent * Drop unevaluatedProperties in some places * Change name of registered typec switches to include dev_name of parent to avoid collisions Changes from v2: https://lore.kernel.org/r/20240815003417.1175506-1-swboyd@chromium.org * Move most of the binding bits to usb-switch.yaml * Move google,cros-ec-typec binding to usb/ * Implement mode-switch and orientation-switch typec controls in drm_dp_typec_bridge driver * Get rid of public APIs that would be used to assign pins or orientation of the port * Add devm helpers for typec mux and switch registration * Add a way to match fwnodes while walking the graph based on the endpoint Changes from v1: https://lore.kernel.org/r/20240210070934.2549994-1-swboyd@chromium.org * Too many to count! * Split out the DRM bits into this series * Moved the logic into dp-aux-hpd bridge driver * Drive the bridge from cros_ec_typec driver instead of globbing onto the ACPI centric cros-typec-switch driver * During that process drop a lot of patches that aren't needed anymore * Move the DT graph and other properties to the cros-ec-typec binding * Skip mode-switch/orientation-switch properties because we're not registering typec structs anymore Stephen Boyd (18): drm/atomic-helper: Introduce lane remapping support to bridges drm/bridge: Verify lane assignment is going to work during atomic_check usb: typec: Stub out typec_switch APIs when CONFIG_TYPEC=n usb: typec: Add device managed typec_mux_register() usb: typec: Add device managed typec_switch_register() drm/bridge: aux-hpd: Support USB Type-C DP altmodes via DRM lane assignment drm/bridge: dp_typec: Support USB Type-C orientation drm/bridge: dp_typec: Add "no-hpd" support drm/bridge: dp_typec: Allow users to hook hpd notify path devcon property: Document devcon_match_fn_t device property: Add remote endpoint to devcon matcher dt-bindings: usb-switch: Extract endpoints to defs dt-bindings: usb-switch: Extend for DisplayPort altmode dt-bindings: Move google,cros-ec-typec binding to usb dt-bindings: usb: Add ports to google,cros-ec-typec for DP altmode platform/chrome: cros_ec_typec: Add support for signaling DP HPD via drm_bridge platform/chrome: cros_ec_typec: Support DP muxing platform/chrome: cros_ec_typec: Handle lack of HPD information .../bindings/chrome/google,cros-ec-typec.yaml | 66 -- .../bindings/mfd/google,cros-ec.yaml | 7 +- .../bindings/usb/google,cros-ec-typec.yaml | 295 +++++++++ .../devicetree/bindings/usb/usb-switch.yaml | 163 ++++- drivers/base/property.c | 7 +- drivers/gpu/drm/bridge/aux-hpd-bridge.c | 575 +++++++++++++++++- drivers/gpu/drm/drm_atomic_state_helper.c | 2 + drivers/gpu/drm/drm_bridge.c | 51 ++ drivers/platform/chrome/Kconfig | 1 + drivers/platform/chrome/cros_ec_typec.c | 136 ++++- drivers/platform/chrome/cros_ec_typec.h | 4 + drivers/usb/roles/class.c | 4 +- drivers/usb/typec/mux.c | 79 +++ drivers/usb/typec/retimer.c | 7 +- include/drm/bridge/aux-bridge.h | 26 + include/drm/drm_atomic.h | 31 + include/drm/drm_bridge.h | 4 + include/linux/property.h | 24 +- include/linux/usb/typec_mux.h | 59 +- 19 files changed, 1433 insertions(+), 108 deletions(-) delete mode 100644 Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml create mode 100644 Documentation/devicetree/bindings/usb/google,cros-ec-typec.yaml base-commit: 8400291e289ee6b2bf9779ff1c83a291501f017b