From patchwork Wed Aug 15 09:59:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enric Balletbo i Serra X-Patchwork-Id: 10566453 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EEA5D1515 for ; Wed, 15 Aug 2018 10:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE31D29E07 for ; Wed, 15 Aug 2018 10:09:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1BD529E0C; Wed, 15 Aug 2018 10:09:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6C5E829E07 for ; Wed, 15 Aug 2018 10:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=w9MlBU9ijO/rDzMf/N4tDv++uI4LkS8zH78ajXOCjQA=; b=GTRj8BBPOe/nK3qWnKLBt9aPfJ h10B4S7t9V94XkwgU3mbQl1svsR4i3vnQhqtVNeWFIUPIcFOpuc6Nvr0++m99OoYFb5HMIoGhmx5Z DQhv4nI4UBt/3427QyxIYgCgWH+k2r7VqbsnLk0w23Ey63KGavhlxeMtuH4XXhDxzhtIc3QmoQgSk QB7wwIgisA4a6+JxoBvLCae5WFdYoSVxr9AjXPktiuTBb9rhYlUqlatvndTPWaI3eiM712xXa2jrM 0uhXl7XtVQxKSgCq81dpO1vMh1a6jh7B/YhXSzWuvuX76lZgLrhYJB4VXGG5R4GRqSgXO097vqedl FahCvLYg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fpskG-0008De-97; Wed, 15 Aug 2018 10:09:40 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fpsat-0003pu-EB; Wed, 15 Aug 2018 10:00:02 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 8746327C585 From: Enric Balletbo i Serra To: linux-kernel@vger.kernel.org Subject: [PATCH 3/4] phy: rockchip-inno-usb2: allow to force the B-Device Session Valid bit. Date: Wed, 15 Aug 2018 11:59:33 +0200 Message-Id: <20180815095934.11205-4-enric.balletbo@collabora.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180815095934.11205-1-enric.balletbo@collabora.com> References: <20180815095934.11205-1-enric.balletbo@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180815_025959_746432_6D45F7ED X-CRM114-Status: GOOD ( 13.37 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: heiko@sntech.de, groeck@google.com, kieran.bingham@ideasonboard.com, Kishon Vijay Abraham I , linux-rockchip@lists.infradead.org, kernel@collabora.com, bleung@chromium.org, linux-arm-kernel@lists.infradead.org, amstan@chromium.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The OTG disconnection event is generated after the presence/abscense of an ID connection, but some platforms doesn't have the ID pin connected, so the event is not generated. In such case, for detecting the disconnection event, we can get the cable state from an extcon driver. We need, though, to force to set the B-Device Session Valid bit on the PHY to have the device respond to setup address. Otherwise, the following error is shown: usb 2-2: Device not responding to setup address. usb 2-2: device not accepting address 14, error -71 usb usb2-port2: unable to enumerate USB device The patch allows to tell the PHY to force the B-Device Session Valid bit when the OTG role is device and clear that bit if the OTG role is host. Signed-off-by: Enric Balletbo i Serra --- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index e1ef3e34163c..e7337c60ff9d 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -125,6 +125,7 @@ struct rockchip_chg_det_reg { * @bvalid_det_en: vbus valid rise detection enable register. * @bvalid_det_st: vbus valid rise detection status register. * @bvalid_det_clr: vbus valid rise detection clear register. + * @bvalid_session: force B-device session valid register. * @ls_det_en: linestate detection enable register. * @ls_det_st: linestate detection state register. * @ls_det_clr: linestate detection clear register. @@ -138,6 +139,7 @@ struct rockchip_usb2phy_port_cfg { struct usb2phy_reg bvalid_det_en; struct usb2phy_reg bvalid_det_st; struct usb2phy_reg bvalid_det_clr; + struct usb2phy_reg bvalid_session; struct usb2phy_reg ls_det_en; struct usb2phy_reg ls_det_st; struct usb2phy_reg ls_det_clr; @@ -172,6 +174,7 @@ struct rockchip_usb2phy_cfg { * true - use avalid to get vbus status * false - use bvalid to get vbus status * @vbus_attached: otg device vbus status. + * @force_bvalid: force the control of the B-device session valid bit. * @bvalid_irq: IRQ number assigned for vbus valid rise detection. * @ls_irq: IRQ number assigned for linestate detection. * @otg_mux_irq: IRQ number which multiplex otg-id/otg-bvalid/linestate @@ -191,6 +194,7 @@ struct rockchip_usb2phy_port { bool suspended; bool utmi_avalid; bool vbus_attached; + bool force_bvalid; int bvalid_irq; int ls_irq; int otg_mux_irq; @@ -561,6 +565,13 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work) switch (rport->state) { case OTG_STATE_UNDEFINED: rport->state = OTG_STATE_B_IDLE; + if (rport->force_bvalid) { + property_enable(rphy->grf, + &rport->port_cfg->bvalid_session, + true); + dev_dbg(&rport->phy->dev, + "set the B-Device Session Valid\n"); + } if (!vbus_attach) rockchip_usb2phy_power_off(rport->phy); /* fall through */ @@ -568,6 +579,14 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work) if (extcon_get_state(rphy->edev, EXTCON_USB_HOST) > 0) { dev_dbg(&rport->phy->dev, "usb otg host connect\n"); rport->state = OTG_STATE_A_HOST; + /* When leaving device mode force end the session */ + if (rport->force_bvalid) { + property_enable(rphy->grf, + &rport->port_cfg->bvalid_session, + false); + dev_dbg(&rport->phy->dev, + "clear the B-Device Session Valid\n"); + } rockchip_usb2phy_power_on(rport->phy); return; } else if (vbus_attach) { @@ -642,6 +661,14 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work) if (extcon_get_state(rphy->edev, EXTCON_USB_HOST) == 0) { dev_dbg(&rport->phy->dev, "usb otg host disconnect\n"); rport->state = OTG_STATE_B_IDLE; + /* When leaving host mode force start the session */ + if (rport->force_bvalid) { + property_enable(rphy->grf, + &rport->port_cfg->bvalid_session, + true); + dev_dbg(&rport->phy->dev, + "set the B-Device Session Valid\n"); + } rockchip_usb2phy_power_off(rport->phy); } break; @@ -1024,6 +1051,12 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, INIT_DELAYED_WORK(&rport->chg_work, rockchip_chg_detect_work); INIT_DELAYED_WORK(&rport->otg_sm_work, rockchip_usb2phy_otg_sm_work); + rport->force_bvalid = false; + if (of_device_is_compatible(rphy->dev->of_node, + "rockchip,rk3399-usb2phy")) + rport->force_bvalid = of_property_read_bool(child_np, + "rockchip,force-bvalid"); + rport->utmi_avalid = of_property_read_bool(child_np, "rockchip,utmi-avalid"); @@ -1349,6 +1382,7 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = { .bvalid_det_en = { 0xe3c0, 3, 3, 0, 1 }, .bvalid_det_st = { 0xe3e0, 3, 3, 0, 1 }, .bvalid_det_clr = { 0xe3d0, 3, 3, 0, 1 }, + .bvalid_session = { 0x4498, 4, 4, 0, 1 }, .utmi_avalid = { 0xe2ac, 7, 7, 0, 1 }, .utmi_bvalid = { 0xe2ac, 12, 12, 0, 1 }, }, @@ -1384,6 +1418,7 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = { .bvalid_det_en = { 0xe3c0, 8, 8, 0, 1 }, .bvalid_det_st = { 0xe3e0, 8, 8, 0, 1 }, .bvalid_det_clr = { 0xe3d0, 8, 8, 0, 1 }, + .bvalid_session = { 0x4518, 4, 4, 0, 1 }, .utmi_avalid = { 0xe2ac, 10, 10, 0, 1 }, .utmi_bvalid = { 0xe2ac, 16, 16, 0, 1 }, },