From patchwork Fri Jul 7 06:53:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Patel, Utkarsh H" X-Patchwork-Id: 13304481 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 5FC64EB64D9 for ; Fri, 7 Jul 2023 06:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbjGGGwB (ORCPT ); Fri, 7 Jul 2023 02:52:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231280AbjGGGv6 (ORCPT ); Fri, 7 Jul 2023 02:51:58 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB1161FE4; Thu, 6 Jul 2023 23:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688712715; x=1720248715; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ayO+jeRCG7JzuDV4hkaToHHdQ4NayqOy1kTKwggV0GQ=; b=aBWW5dYdJ7L3iYnr8/4RvuK9IYCQgYaWwnu+dlsGkYOtmlnHqJHh4FuJ aAtVWGIsZMOb2xR9e2JGa9EhrJr3oCBrbKI/o7kAGgLt0F8srl0woCD7C B5T37jfq/Nt22c1B5YQZ4MgZ3fFhaCrVWIeof8OnNTekeCldihaQaOEAY FKHlLXtoXXCweuEIJUqlJlbZFMT+bZQ931Po6VSH58gbQTuSGQ78fWcku PvFU/D/SjRsr/+huz1rlk6Yio280PJx98sRy/7Y9GwXEKZiH0sbL2nJwx 2EhKNypAzeTpF5aKzgUHcxWKSx4qIF4jFxrjSqBzgaGaqksVjz7lt0xRA Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="394586943" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="394586943" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 23:51:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="749436228" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="749436228" Received: from uhpatel-desk4.jf.intel.com ([10.23.15.157]) by orsmga008.jf.intel.com with ESMTP; 06 Jul 2023 23:51:42 -0700 From: Utkarsh Patel To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, heikki.krogerus@linux.intel.com, pmalani@chromium.org, bleung@chromium.org Cc: Utkarsh Patel Subject: [PATCH v3 1/2] platform/chrome: cros_ec_typec: Configure Retimer cable type Date: Thu, 6 Jul 2023 23:53:17 -0700 Message-Id: <20230707065318.18681-2-utkarsh.h.patel@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230707065318.18681-1-utkarsh.h.patel@intel.com> References: <20230707065318.18681-1-utkarsh.h.patel@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Connector class driver only configure cable type active or passive. Configure if the cable type is retimer or redriver with this change. This detail will be provided as a part of cable discover mode VDO. Signed-off-by: Utkarsh Patel --- Changes in v2: - Implemented use of cable discover mode vdo. - Removed adittional changes to host command. Changes in v3: - Changed the return method in cros_typec_get_cable_vdo. - Changed passed parameters in cros_typec_get_cable_vdo. - Corrected definition for unsigned integers as kerenl standard. - Assigning cable_vdo values directly in to cable_mode. - Removed unncessary checks for Retimer cable type. --- --- drivers/platform/chrome/cros_ec_typec.c | 26 ++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c index 25f9767c28e8..0ea085fec55a 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -406,6 +406,20 @@ static int cros_typec_usb_safe_state(struct cros_typec_port *port) return ret; } +static int cros_typec_get_cable_vdo(struct cros_typec_port *port, u16 svid) +{ + struct list_head *head = &port->plug_mode_list; + struct cros_typec_altmode_node *node; + int ret = 0; + + list_for_each_entry(node, head, list) { + if (node->amode->svid == svid) + return node->amode->vdo; + } + + return ret; +} + /* * Spoof the VDOs that were likely communicated by the partner for TBT alt * mode. @@ -416,6 +430,7 @@ static int cros_typec_enable_tbt(struct cros_typec_data *typec, { struct cros_typec_port *port = typec->ports[port_num]; struct typec_thunderbolt_data data; + u32 cable_vdo; int ret; if (typec->pd_ctrl_ver < 2) { @@ -432,6 +447,10 @@ static int cros_typec_enable_tbt(struct cros_typec_data *typec, /* Cable Discover Mode VDO */ data.cable_mode = TBT_MODE; + + cable_vdo = cros_typec_get_cable_vdo(port, USB_TYPEC_TBT_SID); + data.cable_mode |= cable_vdo; + data.cable_mode |= TBT_SET_CABLE_SPEED(pd_ctrl->cable_speed); if (pd_ctrl->control_flags & USB_PD_CTRL_OPTICAL_CABLE) @@ -513,17 +532,22 @@ static int cros_typec_enable_usb4(struct cros_typec_data *typec, { struct cros_typec_port *port = typec->ports[port_num]; struct enter_usb_data data; + u32 cable_vdo; data.eudo = EUDO_USB_MODE_USB4 << EUDO_USB_MODE_SHIFT; + cable_vdo = cros_typec_get_cable_vdo(port, USB_TYPEC_TBT_SID); + /* Cable Speed */ data.eudo |= pd_ctrl->cable_speed << EUDO_CABLE_SPEED_SHIFT; /* Cable Type */ if (pd_ctrl->control_flags & USB_PD_CTRL_OPTICAL_CABLE) data.eudo |= EUDO_CABLE_TYPE_OPTICAL << EUDO_CABLE_TYPE_SHIFT; - else if (pd_ctrl->control_flags & USB_PD_CTRL_ACTIVE_CABLE) + else if (cable_vdo & TBT_CABLE_RETIMER) data.eudo |= EUDO_CABLE_TYPE_RE_TIMER << EUDO_CABLE_TYPE_SHIFT; + else if (pd_ctrl->control_flags & USB_PD_CTRL_ACTIVE_CABLE) + data.eudo |= EUDO_CABLE_TYPE_RE_DRIVER << EUDO_CABLE_TYPE_SHIFT; data.active_link_training = !!(pd_ctrl->control_flags & USB_PD_CTRL_ACTIVE_LINK_UNIDIR); From patchwork Fri Jul 7 06:53:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Patel, Utkarsh H" X-Patchwork-Id: 13304482 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 E5340EB64DA for ; Fri, 7 Jul 2023 06:52:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231570AbjGGGwD (ORCPT ); Fri, 7 Jul 2023 02:52:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231334AbjGGGv6 (ORCPT ); Fri, 7 Jul 2023 02:51:58 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E243A1FE5; Thu, 6 Jul 2023 23:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688712715; x=1720248715; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0s3VvmQ7Mpf//Dpu0NAISFRua0FC701ilpRQVR252lU=; b=Gg4nMDhRfmAp9x+fVXabKgXgWuAcAJBQ4R7hqYXkIY0gGsbgFp95fbfh 3iJ29CV8Ztda2WRvguOcCs0r/OVKgK5jyxLfUcdFiIdPeK+i2piJUPb8d FQoIgK/ZwO4eELCZZLzIRUIRmVi6ebkcfDsPgfel8WcH5fVgxMb9sOeKO 3XJdeu7sysKR+ouIIE/O0wBeDurgMlsHh/d+FpthUR1anRe95QJ3xyCHP TOsW0D+up+5bU7MifJRQ+ViLRfJN2tVQwNhf27UR6/KXAHpsbjykb8PGl VIuH+hR1mQnies5mFFeDel+d+zp1LnEBWYr5IEnqXwR9vtbBWNxQ10bMl A==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="394586944" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="394586944" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 23:51:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="749436231" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="749436231" Received: from uhpatel-desk4.jf.intel.com ([10.23.15.157]) by orsmga008.jf.intel.com with ESMTP; 06 Jul 2023 23:51:42 -0700 From: Utkarsh Patel To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, heikki.krogerus@linux.intel.com, pmalani@chromium.org, bleung@chromium.org Cc: Utkarsh Patel Subject: [PATCH v3 2/2] usb: typec: intel_pmc_mux: Configure Active and Retimer Cable type Date: Thu, 6 Jul 2023 23:53:18 -0700 Message-Id: <20230707065318.18681-3-utkarsh.h.patel@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230707065318.18681-1-utkarsh.h.patel@intel.com> References: <20230707065318.18681-1-utkarsh.h.patel@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Cable type such as active and retimer received as a part of Thunderbolt3 or Thunderbolt4 cable discover mode VDO needs to be configured in the thunderbolt alternate mode. Configuring the register bits for this cable type is changed with Intel Meteor Lake platform. BIT2 for Retimer/Redriver cable and BIT22 for Active/Passive cable. Reviewed-by: Heikki Krogerus Signed-off-by: Utkarsh Patel --- Changes in v2: - No changes. Changes in v3: - No changes. --- --- drivers/usb/typec/mux/intel_pmc_mux.c | 28 +++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c index 5e8edf3881c0..888632847a74 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -59,7 +59,7 @@ enum { }; /* Common Mode Data bits */ -#define PMC_USB_ALTMODE_ACTIVE_CABLE BIT(2) +#define PMC_USB_ALTMODE_RETIMER_CABLE BIT(2) #define PMC_USB_ALTMODE_ORI_SHIFT 1 #define PMC_USB_ALTMODE_UFP_SHIFT 3 @@ -71,6 +71,7 @@ enum { #define PMC_USB_ALTMODE_TBT_TYPE BIT(17) #define PMC_USB_ALTMODE_CABLE_TYPE BIT(18) #define PMC_USB_ALTMODE_ACTIVE_LINK BIT(20) +#define PMC_USB_ALTMODE_ACTIVE_CABLE BIT(22) #define PMC_USB_ALTMODE_FORCE_LSR BIT(23) #define PMC_USB_ALTMODE_CABLE_SPD(_s_) (((_s_) & GENMASK(2, 0)) << 25) #define PMC_USB_ALTMODE_CABLE_USB31 1 @@ -319,8 +320,18 @@ pmc_usb_mux_tbt(struct pmc_usb_port *port, struct typec_mux_state *state) if (data->cable_mode & TBT_CABLE_LINK_TRAINING) req.mode_data |= PMC_USB_ALTMODE_ACTIVE_LINK; - if (data->enter_vdo & TBT_ENTER_MODE_ACTIVE_CABLE) - req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; + if (acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1072", NULL) || + acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1079", NULL)) { + if ((data->enter_vdo & TBT_ENTER_MODE_ACTIVE_CABLE) || + (data->cable_mode & TBT_CABLE_RETIMER)) + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; + } else { + if (data->enter_vdo & TBT_ENTER_MODE_ACTIVE_CABLE) + req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; + + if (data->cable_mode & TBT_CABLE_RETIMER) + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; + } req.mode_data |= PMC_USB_ALTMODE_CABLE_SPD(cable_speed); @@ -359,8 +370,17 @@ pmc_usb_mux_usb4(struct pmc_usb_port *port, struct typec_mux_state *state) case EUDO_CABLE_TYPE_OPTICAL: req.mode_data |= PMC_USB_ALTMODE_CABLE_TYPE; fallthrough; + case EUDO_CABLE_TYPE_RE_TIMER: + if (!acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1072", NULL) || + !acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1079", NULL)) + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; + fallthrough; default: - req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; + if (acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1072", NULL) || + acpi_dev_hid_uid_match(port->pmc->iom_adev, "INTC1079", NULL)) + req.mode_data |= PMC_USB_ALTMODE_RETIMER_CABLE; + else + req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE; /* Configure data rate to rounded in the case of Active TBT3 * and USB4 cables.