@@ -27,6 +27,7 @@
struct cros_typec_dp_bridge {
struct cros_typec_data *typec_data;
struct drm_dp_typec_bridge_dev *dev;
+ struct cros_typec_port *active_port;
};
#define DP_PORT_VDO (DP_CONF_SET_PIN_ASSIGN(BIT(DP_PIN_ASSIGN_C) | BIT(DP_PIN_ASSIGN_D)) | \
@@ -330,6 +331,20 @@ static int cros_typec_register_port_altmodes(struct cros_typec_data *typec,
return 0;
}
+static void cros_typec_init_dp_usbc_lanes(struct cros_typec_port *typec_port)
+{
+ struct cros_typec_data *typec = typec_port->typec_data;
+ unsigned int port_num = typec_port->port_num;
+ struct device *dev = typec->dev;
+ struct fwnode_handle *ep __free(fwnode_handle);
+ const u32 default_lane_mapping[] = { 0, 1, 2, 3 };
+
+ ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), 2, port_num, 0);
+ if (fwnode_property_read_u32_array(ep, "data-lanes", typec_port->lane_mapping,
+ ARRAY_SIZE(typec_port->lane_mapping)))
+ memcpy(typec_port->lane_mapping, default_lane_mapping, sizeof(default_lane_mapping));
+}
+
static int cros_typec_init_ports(struct cros_typec_data *typec)
{
struct device *dev = typec->dev;
@@ -387,6 +402,7 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
typec->ports[port_num] = cros_port;
cap = &cros_port->caps;
+ cros_typec_init_dp_usbc_lanes(cros_port);
ret = cros_typec_parse_port_props(cap, fwnode, dev);
if (ret < 0)
goto unregister_ports;
@@ -434,6 +450,7 @@ static int cros_typec_init_dp_bridge(struct cros_typec_data *typec)
struct cros_typec_dp_bridge *dp_bridge;
struct fwnode_handle *ep __free(fwnode_handle);
struct drm_dp_typec_bridge_dev *dp_dev;
+ int num_lanes;
struct drm_dp_typec_bridge_desc desc = {
.of_node = dev->of_node,
};
@@ -450,6 +467,11 @@ static int cros_typec_init_dp_bridge(struct cros_typec_data *typec)
typec->dp_bridge = dp_bridge;
dp_bridge->typec_data = typec;
+ num_lanes = fwnode_property_count_u32(ep, "data-lanes");
+ if (num_lanes < 0)
+ num_lanes = 4;
+ desc.num_dp_lanes = num_lanes;
+
dp_dev = devm_drm_dp_typec_bridge_alloc(dev, &desc);
if (IS_ERR(dp_dev))
return PTR_ERR(dp_dev);
@@ -555,10 +577,12 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
struct ec_response_usb_pd_control_v2 *pd_ctrl)
{
struct cros_typec_port *port = typec->ports[port_num];
+ struct cros_typec_dp_bridge *dp_bridge = typec->dp_bridge;
struct typec_displayport_data dp_data;
u32 cable_tbt_vdo;
u32 cable_dp_vdo;
int ret;
+ bool hpd_asserted = port->mux_flags & USB_PD_MUX_HPD_LVL;
if (typec->pd_ctrl_ver < 2) {
dev_err(typec->dev,
@@ -566,6 +590,16 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
return -ENOTSUPP;
}
+ /*
+ * Assume the first port to have HPD asserted is the one muxed to DP
+ * (i.e. active_port). When there's only one port this delays setting
+ * the active_port until HPD is asserted, but before that the
+ * drm_connector looks disconnected so active_port doesn't need to be
+ * set.
+ */
+ if (dp_bridge && hpd_asserted && !dp_bridge->active_port)
+ dp_bridge->active_port = port;
+
if (!pd_ctrl->dp_mode) {
dev_err(typec->dev, "No valid DP mode provided.\n");
return -EINVAL;
@@ -575,7 +609,7 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
dp_data.status = DP_STATUS_ENABLED;
if (port->mux_flags & USB_PD_MUX_HPD_IRQ)
dp_data.status |= DP_STATUS_IRQ_HPD;
- if (port->mux_flags & USB_PD_MUX_HPD_LVL)
+ if (hpd_asserted)
dp_data.status |= DP_STATUS_HPD_STATE;
/* Configuration VDO. */
@@ -587,6 +621,13 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
return ret;
}
+ if (dp_bridge && dp_bridge->active_port == port) {
+ ret = drm_dp_typec_bridge_assign_pins(dp_bridge->dev, dp_data.conf, 0,
+ port->lane_mapping);
+ if (ret)
+ return ret;
+ }
+
port->state.data = &dp_data;
port->state.mode = TYPEC_MODAL_STATE(ffs(pd_ctrl->dp_mode));
@@ -710,7 +751,7 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
ret = cros_typec_enable_tbt(typec, port_num, pd_ctrl);
} else if (dp_enabled) {
ret = cros_typec_enable_dp(typec, port_num, pd_ctrl);
- if (dp_bridge) {
+ if (dp_bridge && dp_bridge->active_port == port) {
drm_dp_typec_bridge_notify(dp_bridge->dev,
port->mux_flags & USB_PD_MUX_HPD_LVL ?
connector_status_connected :
@@ -732,8 +773,10 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
}
mux_ack:
- if (dp_bridge && !dp_enabled)
+ if (dp_bridge && !dp_enabled && dp_bridge->active_port == port) {
drm_dp_typec_bridge_notify(dp_bridge->dev, connector_status_disconnected);
+ dp_bridge->active_port = NULL;
+ }
if (!typec->needs_mux_ack)
return ret;
@@ -14,6 +14,8 @@
#include <linux/usb/typec_retimer.h>
#include <linux/workqueue.h>
+#include <drm/bridge/aux-bridge.h>
+
/* Supported alt modes. */
enum {
CROS_EC_ALTMODE_DP = 0,
@@ -67,6 +69,7 @@ struct cros_typec_port {
uint8_t mux_flags;
uint8_t role;
+ u32 lane_mapping[NUM_USB_SS];
struct typec_altmode *port_altmode[CROS_EC_ALTMODE_MAX];
/* Flag indicating that PD partner discovery data parsing is completed. */
Most ARM based chromebooks with two usb-c-connector nodes and one DP controller are muxing the DP lanes between the two USB ports. This is done so that the type-c ports are at least equal in capability if not functionality. Either an analog mux is used to steer the DP signal to one or the other port, or a DP bridge chip has two lanes (DP ML0/ML1) wired to one type-c port while the other two (DP ML2/ML3) are wired to another type-c port. Use drm_dp_typec_bridge_assign_pins() to implement support for DP altmode configurations like pinconf D and DP muxing to different type-c ports. In the DP altmode spec, pinconf C assigns all 4 SuperSpeed lanes in the usb-c-connector node to DP, while pinconf D assigns 2 SuperSpeed lanes to DP and 2 SuperSpeed lanes to USB. Use the 'data-lanes' property from the input DP graph endpoint to calculate the maximum number of lanes coming from the DP source (either 2 or 4) and limit the lanes requested to the smaller of this or the pin configuration. Use the 'data-lanes' property from the active type-c output port to determine which logical DP lanes should be assigned to the output of the drm_bridge by passing the lane mapping to drm_dp_typec_bridge_assign_pins(). For now assume the type-c pins are in the normal orientation. The EC can mux the DP signal to any number of USB type-c ports. We only need to make sure that the drm_bridge is mapping the DP lanes to the appropriate type-c pins for the pin configuration. This means that having the same type-c port data-lanes property is valid and expected in cases where an analog mux is used to steer the DP signal to one of many TCPCs and eventually usb-c-connector nodes. Cc: Prashant Malani <pmalani@chromium.org> Cc: Benson Leung <bleung@chromium.org> Cc: Tzung-Bi Shih <tzungbi@kernel.org> Cc: <chrome-platform@lists.linux.dev> Cc: Pin-yen Lin <treapking@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- drivers/platform/chrome/cros_ec_typec.c | 49 +++++++++++++++++++++++-- drivers/platform/chrome/cros_ec_typec.h | 3 ++ 2 files changed, 49 insertions(+), 3 deletions(-)