Hi Heikki,
On Wed, Jun 24, 2020 at 12:20:40PM +0300, Heikki Krogerus wrote:
> On Wed, Jun 24, 2020 at 12:15:20PM +0300, Heikki Krogerus wrote:
> > On Wed, Jun 24, 2020 at 01:09:24AM -0700, Prashant Malani wrote:
> > > Add mux control support for Thunderbolt compatibility mode.
> > >
> > > Suggested-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
> > > Co-developed-by: Azhar Shaikh <azhar.sha...@intel.com>
> > > Co-developed-by: Casey Bowman <casey.g.bow...@intel.com>
> > > Signed-off-by: Prashant Malani <pmal...@chromium.org>
> > > ---
> > > drivers/platform/chrome/cros_ec_typec.c | 70 ++++++++++++++++++++++++-
> > > 1 file changed, 69 insertions(+), 1 deletion(-)
> >
> > Cool! Can you guys test also USB4 with the attached patch (still work
> > in progress)? It should apply on top of these.
> >
> > The mux driver is still missing USB4 support, but I'll send the
> > patches needed for that right now...
>
> Actually, I'll just attach that one here as well. Let me know if you
> guys can test these.
Thanks for the patches. Will try them out today and compare the PMC IPC
buffers against what extcon is doing.
Best regards,
-Prashant
>
> thanks,
>
> --
> heikki
> From 396bd399ac815165ec4992739d45d52ecf234acc Mon Sep 17 00:00:00 2001
> From: Heikki Krogerus <heikki.kroge...@linux.intel.com>
> Date: Wed, 3 Jun 2020 17:00:14 +0300
> Subject: [PATCH] usb: typec: intel_pmc_mux: Add support for USB4
>
> The PMC mux-agent can be used also when Enter_USB is used in
> order to enter USB4 mode. The mux-agent does not have USB4
> specific message, but instead needs to be put into TBT
> alternate mode also with USB4. That is OK as the controller
> is in any case the same with TBT3 and USB4.
>
> Signed-off-by: Heikki Krogerus <heikki.kroge...@linux.intel.com>
> ---
> drivers/usb/typec/mux/intel_pmc_mux.c | 65 +++++++++++++++++++++++----
> 1 file changed, 56 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c
> b/drivers/usb/typec/mux/intel_pmc_mux.c
> index 70ddc9d6d49e4..6d223bd360b8e 100644
> --- a/drivers/usb/typec/mux/intel_pmc_mux.c
> +++ b/drivers/usb/typec/mux/intel_pmc_mux.c
> @@ -10,6 +10,7 @@
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/property.h>
> +#include <linux/usb/pd.h>
> #include <linux/usb/role.h>
> #include <linux/usb/typec_mux.h>
> #include <linux/usb/typec_dp.h>
> @@ -227,6 +228,41 @@ pmc_usb_mux_tbt(struct pmc_usb_port *port, struct
> typec_mux_state *state)
> return pmc_usb_command(port, (void *)&req, sizeof(req));
> }
>
> +static int
> +pmc_usb_mux_usb4(struct pmc_usb_port *port, struct typec_mux_state *state)
> +{
> + u32 eudo = *(u32 *)state->data;
> + struct altmode_req req = { };
> + u8 cable_speed;
> +
> + req.usage = PMC_USB_ALT_MODE;
> + req.usage |= port->usb3_port << PMC_USB_MSG_USB3_PORT_SHIFT;
> + req.mode_type = PMC_USB_MODE_TYPE_TBT << PMC_USB_MODE_TYPE_SHIFT;
> +
> + /* USB4 Mode */
> + req.mode_data = PMC_USB_ALTMODE_FORCE_LSR;
> + req.mode_data |= PMC_USB_ALTMODE_ACTIVE_LINK;
> +
> + req.mode_data |= (port->orientation - 1) << PMC_USB_ALTMODE_ORI_SHIFT;
> + req.mode_data |= (port->role - 1) << PMC_USB_ALTMODE_UFP_SHIFT;
> +
> + switch ((eudo & EUDO_CABLE_TYPE_MASK) >> EUDO_CABLE_TYPE_SHIFT) {
> + case EUDO_CABLE_TYPE_PASSIVE:
> + break;
> + case EUDO_CABLE_TYPE_OPTICAL:
> + req.mode_data |= PMC_USB_ALTMODE_CABLE_TYPE;
> + /* fall through */
> + default:
> + req.mode_data |= PMC_USB_ALTMODE_ACTIVE_CABLE;
> + break;
> + }
> +
> + cable_speed = (eudo & EUDO_CABLE_SPEED_MASK) >> EUDO_CABLE_SPEED_SHIFT;
> + req.mode_data |= PMC_USB_ALTMODE_CABLE_SPD(cable_speed);
> +
> + return pmc_usb_command(port, (void *)&req, sizeof(req));
> +}
> +
> static int pmc_usb_mux_safe_state(struct pmc_usb_port *port)
> {
> u8 msg;
> @@ -268,17 +304,28 @@ pmc_usb_mux_set(struct typec_mux *mux, struct
> typec_mux_state *state)
> {
> struct pmc_usb_port *port = typec_mux_get_drvdata(mux);
>
> - if (!state->alt)
> - return 0;
> -
> if (state->mode == TYPEC_STATE_SAFE)
> return pmc_usb_mux_safe_state(port);
> -
> - switch (state->alt->svid) {
> - case USB_TYPEC_TBT_SID:
> - return pmc_usb_mux_tbt(port, state);
> - case USB_TYPEC_DP_SID:
> - return pmc_usb_mux_dp(port, state);
> + if (state->mode == TYPEC_STATE_USB)
> + return pmc_usb_connect(port);
> +
> + if (state->alt) {
> + switch (state->alt->svid) {
> + case USB_TYPEC_TBT_SID:
> + return pmc_usb_mux_tbt(port, state);
> + case USB_TYPEC_DP_SID:
> + return pmc_usb_mux_dp(port, state);
> + }
> + } else {
> + switch (state->mode) {
> + case TYPEC_MODE_USB2:
> + /* REVISIT: Try with usb3_port set to 0? */
> + break;
> + case TYPEC_MODE_USB3:
> + return pmc_usb_connect(port);
> + case TYPEC_MODE_USB4:
> + return pmc_usb_mux_usb4(port, state);
> + }
> }
>
> return -EOPNOTSUPP;
> --
> 2.27.0
>
