Some EC firmwares on Trogdor/Strongbad boards don't properly indicate
the state of DP HPD on a type-c port. Instead, the EC only indicates
that a type-c port has entered or exited DP mode. To make matters worse,
on these boards the DP signal is muxed between two USB type-c
connectors, so we can't use the DP entry of a port to figure out which
type-c port is actually displaying DP.
Stash the HPD state in this case whenever the drm_bridge is notified of
a connector status change and kick off the port worker so that the
type-c port state can be re-evaluated. If an analog mux is in use, read
the mux to figure out which type-c port signaled HPD. Once we know which
port is actually signaling HPD, inject that state into the message
received from the EC. This simplifies the rest of the logic as it can
all stay the same with respect to picking the first port to assert HPD,
etc.
Cc: Prashant Malani <pmalani@xxxxxxxxxxxx>
Cc: Benson Leung <bleung@xxxxxxxxxxxx>
Cc: Tzung-Bi Shih <tzungbi@xxxxxxxxxx>
Cc: <chrome-platform@xxxxxxxxxxxxxxx>
Cc: Pin-yen Lin <treapking@xxxxxxxxxxxx>
Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
---
drivers/platform/chrome/cros_ec_typec.c | 79 +++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index b32abd14825c..991361abbc31 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -7,6 +7,7 @@
*/
#include <linux/acpi.h>
+#include <linux/gpio/consumer.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_graph.h>
@@ -28,6 +29,8 @@ struct cros_typec_dp_bridge {
struct cros_typec_data *typec_data;
struct drm_dp_typec_bridge_dev *dev;
struct cros_typec_port *active_port;
+ struct gpio_desc *mux_gpio;
+ bool hpd_asserted;
};
#define DP_PORT_VDO (DP_CONF_SET_PIN_ASSIGN(BIT(DP_PIN_ASSIGN_C) | BIT(DP_PIN_ASSIGN_D)) | \
@@ -429,6 +432,18 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
return ret;
}
+static void cros_typec_dp_bridge_hpd_notify(void *data, enum drm_connector_status status)
+{
+ struct cros_typec_dp_bridge *dp_bridge = data;
+ struct cros_typec_data *typec = dp_bridge->typec_data;
+
+ /* Proxy the connector status as the HPD state to replay later. */
+ dp_bridge->hpd_asserted = status == connector_status_connected;
+
+ /* Refresh port state. */
+ schedule_work(&typec->port_work);
+}
+
static int cros_typec_init_dp_bridge(struct cros_typec_data *typec)
{
struct device *dev = typec->dev;
@@ -445,9 +460,19 @@ static int cros_typec_init_dp_bridge(struct cros_typec_data *typec)
typec->dp_bridge = dp_bridge;
dp_bridge->typec_data = typec;
+ dp_bridge->mux_gpio = devm_gpiod_get_optional(dev, "mux", GPIOD_ASIS);
+ if (IS_ERR(dp_bridge->mux_gpio))
+ return dev_err_probe(dev, PTR_ERR(dp_bridge->mux_gpio), "failed to get mux gpio\n");
+
dp_dev = devm_drm_dp_typec_bridge_alloc(dev, dev->of_node);
if (IS_ERR(dp_dev))
return PTR_ERR(dp_dev);
+
+ if (fwnode_property_read_bool(dev_fwnode(dev), "no-hpd")) {
+ drm_dp_typec_bridge_add_hpd_notify(dp_dev, cros_typec_dp_bridge_hpd_notify,
+ dp_bridge);
+ }
+
dp_bridge->dev = dp_dev;
return devm_drm_dp_typec_bridge_add(dev, dp_dev);
@@ -648,6 +673,59 @@ static int cros_typec_enable_usb4(struct cros_typec_data *typec,
return typec_mux_set(port->mux, &port->state);
}
+/* Inject HPD state into the EC's response if EC firmware is broken. */
+static void cros_typec_inject_hpd(struct ec_response_usb_pd_mux_info *resp,
+ struct cros_typec_port *port,
+ struct cros_typec_dp_bridge *dp_bridge)
+{
+ struct cros_typec_data *typec = port->typec_data;
+ struct gpio_desc *mux_gpio;
+ int val;
+
+ if (!dp_bridge)
+ return;
+
+ /* Don't need to inject HPD level when DP isn't enabled */
+ if (!(resp->flags & USB_PD_MUX_DP_ENABLED))
+ return;
+
+ /*
+ * The default setting is HPD deasserted. Ignore if nothing to inject.
+ */
+ if (!dp_bridge->hpd_asserted)
+ return;
+
+ /*
+ * Some ECs don't notify AP when HPD goes high or low so we have to
+ * read the EC GPIO that controls the mux to figure out which type-c
+ * port is connected to DP by the EC.
+ */
+ mux_gpio = dp_bridge->mux_gpio;
+ if (!mux_gpio)
+ return;
+
+ /*
+ * Only read the mux GPIO setting if we need to change the active_port.
+ * Otherwise, an active_port is already set and HPD going high or low
+ * doesn't change the muxed port until DP mode is exited.
+ */
+ if (!dp_bridge->active_port) {
+ val = gpiod_get_value_cansleep(mux_gpio);
+ if (val < 0) {
+ dev_err(typec->dev, "Failed to read mux gpio\n");
+ return;
+ }
+ if (typec->ports[val] != port)
+ return;
+ } else if (port != dp_bridge->active_port) {
+ return;
+ }
+
+ /* Inject HPD from the GPIO state if EC firmware is broken. */
+ if (dp_bridge->hpd_asserted)
+ resp->flags |= USB_PD_MUX_HPD_LVL;
+}
+
static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
struct ec_response_usb_pd_control_v2 *pd_ctrl)
{
@@ -669,6 +747,7 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
port_num, ret);
return ret;
}
+ cros_typec_inject_hpd(&resp, port, dp_bridge);
/* No change needs to be made, let's exit early. */
if (port->mux_flags == resp.flags && port->role == pd_ctrl->role)
--
https://chromeos.dev
