From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 686E2C432C3 for ; Mon, 2 Dec 2019 10:33:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34CC62070B for ; Mon, 2 Dec 2019 10:33:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fmU7E+ca" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726428AbfLBKdt (ORCPT ); Mon, 2 Dec 2019 05:33:49 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35078 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727378AbfLBKds (ORCPT ); Mon, 2 Dec 2019 05:33:48 -0500 Received: by mail-wr1-f66.google.com with SMTP id g17so11485961wro.2 for ; Mon, 02 Dec 2019 02:33:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=BZDOs+6KZ65EcElvSJt7ZXy2SOQLStp1UNKeuht/zHU=; b=fmU7E+caJrhN4O84Y+GBUPoblqRU8cvSE8dkjhn+RfoMdpe5f3Z87mOLEdTZ8YWx4z QALr7K7e4a46/SKwYPdiOlqulBxq3hYemJK/7mlsFmMVTgwOPK6o+rbJj6j1zxfk/sMn Z5acmBAZMLSe+i4b8LXayUXSgYuqmyd/nyC+c1GT/adj2GI1Gvc17WVhjxrhCkh7bezO fdUM11NMn2chRM2VxPgpXq1PpxzJy8+H4oomxiDg3AQOUk2nIuyGYJcEazASfiZO9wtg QdyEnRohoejvYqH0h7KK6q+xbNoopaFjf+WSx6dPRM2TI78/Cf2TU4gJQsghe2Ry2fZX 1HmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=BZDOs+6KZ65EcElvSJt7ZXy2SOQLStp1UNKeuht/zHU=; b=bZ6Cdk/oPPRc/12nHLJLHSrk4HZV6hwiJNt40N73zRorIvAiAyCYBcCZMuWkd3EkxE m+UKBZYY9OeHvJ8UM8DZWC8fkQMde6IOrvKHm+ccZO5CQfqhzg/FlRQ0TWEXI0+bvebS +fp9HdFnWXStgU3y8BSiQBnRpcyKVHenLwVR+cMJjqzTqWwTYGMwfZ/dMn2/THiF0KQj OKQBsuTjgctp6vQwU4ToDBSTNekAXxUZbPrs+PykY+p/HFCk7m/qo703EywppuEZNpF8 FYTtLZwWffxQP4je6l0WDrRxNbpfDpaPvUIwu8EX5N8uoH+Ne3N4CMaupF3dG9Kjfi6x VQAw== X-Gm-Message-State: APjAAAVkgsKl4EwK1bOT9alS3KSikap9t+s3puucxFh7G67GTaP27dcF YkDbJ0LnRD8KhfrsMeZXVUJ1dVHRPnA= X-Google-Smtp-Source: APXvYqysFOI6AOcGUQddrF8MtvJ5dTuF8wjH4s29z+XircZgUOI4BYk/do5s+5x7CSkxFY/Id3geig== X-Received: by 2002:adf:b602:: with SMTP id f2mr7387723wre.99.1575282824896; Mon, 02 Dec 2019 02:33:44 -0800 (PST) Received: from [192.168.0.38] ([176.61.57.127]) by smtp.gmail.com with ESMTPSA id z7sm22986240wma.46.2019.12.02.02.33.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Dec 2019 02:33:44 -0800 (PST) Subject: Re: [PATCH v6 1/8] usb: dwc3: Registering a role switch in the DRD code. To: John Stultz , lkml Cc: Yu Chen , Greg Kroah-Hartman , Rob Herring , Mark Rutland , ShuFan Lee , Heikki Krogerus , Suzuki K Poulose , Chunfeng Yun , Felipe Balbi , Hans de Goede , Andy Shevchenko , Jun Li , Valentin Schneider , Jack Pham , linux-usb@vger.kernel.org, devicetree@vger.kernel.org References: <20191128051001.18995-1-john.stultz@linaro.org> <20191128051001.18995-2-john.stultz@linaro.org> From: Bryan O'Donoghue Message-ID: Date: Mon, 2 Dec 2019 10:33:59 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191128051001.18995-2-john.stultz@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 28/11/2019 05:09, John Stultz wrote: > From: Yu Chen > > The Type-C drivers use USB role switch API to inform the > system about the negotiated data role, so registering a role > switch in the DRD code in order to support platforms with > USB Type-C connectors. > > Cc: Greg Kroah-Hartman > Cc: Rob Herring > Cc: Mark Rutland > CC: ShuFan Lee > Cc: Heikki Krogerus > Cc: Suzuki K Poulose > Cc: Chunfeng Yun > Cc: Yu Chen > Cc: Felipe Balbi > Cc: Hans de Goede > Cc: Andy Shevchenko > Cc: Jun Li > Cc: Valentin Schneider > Cc: Jack Pham > Cc: linux-usb@vger.kernel.org > Cc: devicetree@vger.kernel.org > Suggested-by: Heikki Krogerus > Signed-off-by: Yu Chen > Signed-off-by: John Stultz > Change-Id: Ibd89b7eb3e59688895a2d317f3515e6d2705c6f3 > --- > v2: Fix role_sw and role_switch_default_mode descriptions as > reported by kbuild test robot > > v3: Split out the role-switch-default-host logic into its own > patch > > v5: Drop selecting CONFIG_USB_ROLE_SWITCH & ifdef dependent code > > v6: Fix build issue Reported-by: kbuild test robot > --- > drivers/usb/dwc3/core.h | 3 ++ > drivers/usb/dwc3/drd.c | 77 ++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 79 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h > index 1c8b349379af..6f19e9891767 100644 > --- a/drivers/usb/dwc3/core.h > +++ b/drivers/usb/dwc3/core.h > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > #include > > #include > @@ -951,6 +952,7 @@ struct dwc3_scratchpad_array { > * @hsphy_mode: UTMI phy mode, one of following: > * - USBPHY_INTERFACE_MODE_UTMI > * - USBPHY_INTERFACE_MODE_UTMIW > + * @role_sw: usb_role_switch handle > * @usb2_phy: pointer to USB2 PHY > * @usb3_phy: pointer to USB3 PHY > * @usb2_generic_phy: pointer to USB2 PHY > @@ -1084,6 +1086,7 @@ struct dwc3 { > struct extcon_dev *edev; > struct notifier_block edev_nb; > enum usb_phy_interface hsphy_mode; > + struct usb_role_switch *role_sw; > > u32 fladj; > u32 irq_gadget; > diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c > index c946d64142ad..3b57d2ddda93 100644 > --- a/drivers/usb/dwc3/drd.c > +++ b/drivers/usb/dwc3/drd.c > @@ -476,6 +476,73 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) > return edev; > } > > +#ifdef CONFIG_USB_ROLE_SWITCH > +#define ROLE_SWITCH 1 > +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) > +{ > + struct dwc3 *dwc = dev_get_drvdata(dev); > + u32 mode; > + > + switch (role) { > + case USB_ROLE_HOST: > + mode = DWC3_GCTL_PRTCAP_HOST; > + break; > + case USB_ROLE_DEVICE: > + mode = DWC3_GCTL_PRTCAP_DEVICE; > + break; > + default: > + mode = DWC3_GCTL_PRTCAP_DEVICE; > + break; > + } > + > + dwc3_set_mode(dwc, mode); > + return 0; > +} > + > +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) > +{ > + struct dwc3 *dwc = dev_get_drvdata(dev); > + unsigned long flags; > + enum usb_role role; > + > + spin_lock_irqsave(&dwc->lock, flags); > + switch (dwc->current_dr_role) { > + case DWC3_GCTL_PRTCAP_HOST: > + role = USB_ROLE_HOST; > + break; > + case DWC3_GCTL_PRTCAP_DEVICE: > + role = USB_ROLE_DEVICE; > + break; > + case DWC3_GCTL_PRTCAP_OTG: > + role = dwc->current_otg_role; > + break; > + default: > + role = USB_ROLE_DEVICE; > + break; > + } > + spin_unlock_irqrestore(&dwc->lock, flags); > + return role; > +} > + > +static int dwc3_setup_role_switch(struct dwc3 *dwc) > +{ > + struct usb_role_switch_desc dwc3_role_switch = {NULL}; > + > + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); > + dwc3_role_switch.set = dwc3_usb_role_switch_set; > + dwc3_role_switch.get = dwc3_usb_role_switch_get; > + dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch); > + if (IS_ERR(dwc->role_sw)) > + return PTR_ERR(dwc->role_sw); > + > + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); > + return 0; > +} > +#else > +#define ROLE_SWITCH 0 > +#define dwc3_setup_role_switch(x) 0 > +#endif > + > int dwc3_drd_init(struct dwc3 *dwc) > { > int ret, irq; > @@ -484,7 +551,12 @@ int dwc3_drd_init(struct dwc3 *dwc) > if (IS_ERR(dwc->edev)) > return PTR_ERR(dwc->edev); > > - if (dwc->edev) { > + if (ROLE_SWITCH && > + device_property_read_bool(dwc->dev, "usb-role-switch")) { > + ret = dwc3_setup_role_switch(dwc); > + if (ret < 0) > + return ret; > + } else if (dwc->edev) { > dwc->edev_nb.notifier_call = dwc3_drd_notifier; > ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST, > &dwc->edev_nb); > @@ -531,6 +603,9 @@ void dwc3_drd_exit(struct dwc3 *dwc) > { > unsigned long flags; > > + if (dwc->role_sw) > + usb_role_switch_unregister(dwc->role_sw); > + > if (dwc->edev) > extcon_unregister_notifier(dwc->edev, EXTCON_USB_HOST, > &dwc->edev_nb); > Try again ;) Tested-by: Bryan O'Donoghue