From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,2/4] usb: dwc2: optionally assert phy reset when waking up From: Doug Anderson Message-Id: <20190416215351.242246-3-dianders@chromium.org> Date: Tue, 16 Apr 2019 14:53:49 -0700 To: Rob Herring , Minas Harutyunyan , Heiko Stuebner , Felipe Balbi Cc: amstan@chromium.org, linux-rockchip@lists.infradead.org, linux-usb@vger.kernel.org, Randy Li , mka@chromium.org, ryandcase@chromium.org, jwerner@chromium.org, Elaine Zhang , Douglas Anderson , Yunzhi Li , Greg Kroah-Hartman , linux-kernel@vger.kernel.org List-ID: T24gdGhlIHJrMzI4OCBVU0IgaG9zdC1vbmx5IHBvcnQgKHRoZSBvbmUgdGhhdCdzIG5vdCB0aGUg T1RHLWVuYWJsZWQKcG9ydCkgdGhlIFBIWSBjYW4gZ2V0IGludG8gYSBiYWQgc3RhdGUgd2hlbiBh IHdha2V1cCBpcyBhc3NlcnRlZCAobm90Cmp1c3QgYSB3YWtldXAgZnJvbSBmdWxsIHN5c3RlbSBz dXNwZW5kIGJ1dCBhbHNvIGEgd2FrZXVwIGZyb20KYXV0b3N1c3BlbmQpLgoKV2UgY2FuIGdldCB0 aGUgUEhZIG91dCBvZiBpdHMgYmFkIHN0YXRlIGJ5IGFzc2VydGluZyBpdHMgInBvcnQgcmVzZXQi LApidXQgdW5mb3J0dW5hdGVseSB0aGF0IHNlZW1zIHRvIGFzc2VydCBhIHJlc2V0IG9udG8gdGhl IFVTQiBidXMgc28gaXQKY291bGQgY29uZnVzZSB0aGluZ3MgaWYgd2UgZG9uJ3QgYWN0dWFsbHkg ZGVlbnVtZXJhdGUgLyByZWVudW1lcmF0ZSB0aGUKZGV2aWNlLgoKV2UgY2FuIGFsc28gZ2V0IHRo ZSBQSFkgb3V0IG9mIGl0cyBiYWQgc3RhdGUgYnkgZnVsbHkgcmVzZXR0aW5nIGl0IHVzaW5nCnRo ZSByZXNldCBmcm9tIHRoZSBDUlUgKGNsb2NrIHJlc2V0IHVuaXQpLCB3aGljaCBkb2VzIGEgbW9y ZSBmdWxsCnJlc2V0LiAgVGhlIENSVS1iYXNlZCByZXNldCBhcHBlYXJzIHRvIGFjdHVhbGx5IGNh dXNlIGRldmljZXMgb24gdGhlIGJ1cwp0byBiZSByZW1vdmVkIGFuZCByZWluc2VydGVkLCB3aGlj aCBmaXhlcyB0aGUgcHJvYmxlbSAoYWxiZWl0IGluIGEgaGFja3kKd2F5KS4KCkl0J3MgdW5mb3J0 dW5hdGUgdGhhdCB3ZSBuZWVkIHRvIGRvIGEgZnVsbCByZS1lbnVtZXJhdGlvbiBvZiBkZXZpY2Vz IGF0Cndha2V1cCB0aW1lLCBidXQgdGhpcyBpcyBiZXR0ZXIgdGhhbiBhbHRlcm5hdGl2ZSBvZiBs ZXR0aW5nIHRoZSBidXMgZ2V0CndlZGdlZC4KClNpZ25lZC1vZmYtYnk6IERvdWdsYXMgQW5kZXJz b24gPGRpYW5kZXJzQGNocm9taXVtLm9yZz4KU2lnbmVkLW9mZi1ieTogWXVuemhpIExpIDxseXpA cm9jay1jaGlwcy5jb20+Ci0tLQoKQ2hhbmdlcyBpbiB2MjoKLSBDYW5jZWwgdGhlIHdvcmsgd2hl biBkd2MyIGlzIGZyZWVkIChNYXR0aGlhcykuCgogZHJpdmVycy91c2IvZHdjMi9jb3JlLmggICAg ICB8ICA1ICsrKysrCiBkcml2ZXJzL3VzYi9kd2MyL2NvcmVfaW50ci5jIHwgMTIgKysrKysrKysr KysrCiBkcml2ZXJzL3VzYi9kd2MyL2hjZC5jICAgICAgIHwgMTggKysrKysrKysrKysrKysrLS0t CiBkcml2ZXJzL3VzYi9kd2MyL3BsYXRmb3JtLmMgIHwgIDkgKysrKysrKysrCiA0IGZpbGVzIGNo YW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy91c2IvZHdjMi9jb3JlLmggYi9kcml2ZXJzL3VzYi9kd2MyL2NvcmUuaAppbmRleCAzMGJh Yjg0NjNjOTYuLmYzMDc0OGY0ZmU3ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvZHdjMi9jb3Jl LmgKKysrIGIvZHJpdmVycy91c2IvZHdjMi9jb3JlLmgKQEAgLTg1OSw2ICs4NTksOCBAQCBzdHJ1 Y3QgZHdjMl9ocmVnc19iYWNrdXAgewogICogQGdhZGdldF9lbmFibGVkOglQZXJpcGhlcmFsIG1v ZGUgc3ViLWRyaXZlciBpbml0aWFsaXphdGlvbiBpbmRpY2F0b3IuCiAgKiBAbGxfaHdfZW5hYmxl ZDoJU3RhdHVzIG9mIGxvdy1sZXZlbCBoYXJkd2FyZSByZXNvdXJjZXMuCiAgKiBAaGliZXJuYXRl ZDoJCVRydWUgaWYgY29yZSBpcyBoaWJlcm5hdGVkCisgKiBAcmVzZXRfcGh5X29uX3dha2U6CVF1 aXJrIHNheWluZyB0aGF0IHdlIHNob3VsZCBhc3NlcnQgUEhZIHJlc2V0IG9uIGEKKyAqCQkJcmVt b3RlIHdha2V1cC4KICAqIEBmcmFtZV9udW1iZXI6ICAgICAgIEZyYW1lIG51bWJlciByZWFkIGZy b20gdGhlIGNvcmUuIEZvciBib3RoIGRldmljZQogICoJCQlhbmQgaG9zdCBtb2Rlcy4gVGhlIHZh bHVlIHJhbmdlcyBhcmUgZnJvbSAwCiAgKgkJCXRvIEhGTlVNX01BWF9GUk5VTS4KQEAgLTk3Miw2 ICs5NzQsNyBAQCBzdHJ1Y3QgZHdjMl9ocmVnc19iYWNrdXAgewogICogQHN0YXR1c19idWZfZG1h OiAgICAgRE1BIGFkZHJlc3MgZm9yIHN0YXR1c19idWYKICAqIEBzdGFydF93b3JrOiAgICAgICAg IERlbGF5ZWQgd29yayBmb3IgaGFuZGxpbmcgaG9zdCBBLWNhYmxlIGNvbm5lY3Rpb24KICAqIEBy ZXNldF93b3JrOiAgICAgICAgIERlbGF5ZWQgd29yayBmb3IgaGFuZGxpbmcgYSBwb3J0IHJlc2V0 CisgKiBAcGh5X3Jlc2V0X3dvcms6ICAgICBXb3JrIHN0cnVjdHVyZSBmb3IgZG9pbmcgYSBQSFkg cmVzZXQKICAqIEBvdGdfcG9ydDogICAgICAgICAgIE9URyBwb3J0IG51bWJlcgogICogQGZyYW1l X2xpc3Q6ICAgICAgICAgRnJhbWUgbGlzdAogICogQGZyYW1lX2xpc3RfZG1hOiAgICAgRnJhbWUg bGlzdCBETUEgYWRkcmVzcwpAQCAtMTA0NSw2ICsxMDQ4LDcgQEAgc3RydWN0IGR3YzJfaHNvdGcg ewogCXVuc2lnbmVkIGludCBnYWRnZXRfZW5hYmxlZDoxOwogCXVuc2lnbmVkIGludCBsbF9od19l bmFibGVkOjE7CiAJdW5zaWduZWQgaW50IGhpYmVybmF0ZWQ6MTsKKwl1bnNpZ25lZCBpbnQgcmVz ZXRfcGh5X29uX3dha2U6MTsKIAl1MTYgZnJhbWVfbnVtYmVyOwogCiAJc3RydWN0IHBoeSAqcGh5 OwpAQCAtMTE0Nyw2ICsxMTUxLDcgQEAgc3RydWN0IGR3YzJfaHNvdGcgewogCiAJc3RydWN0IGRl bGF5ZWRfd29yayBzdGFydF93b3JrOwogCXN0cnVjdCBkZWxheWVkX3dvcmsgcmVzZXRfd29yazsK KwlzdHJ1Y3Qgd29ya19zdHJ1Y3QgcGh5X3Jlc2V0X3dvcms7CiAJdTggb3RnX3BvcnQ7CiAJdTMy ICpmcmFtZV9saXN0OwogCWRtYV9hZGRyX3QgZnJhbWVfbGlzdF9kbWE7CmRpZmYgLS1naXQgYS9k cml2ZXJzL3VzYi9kd2MyL2NvcmVfaW50ci5jIGIvZHJpdmVycy91c2IvZHdjMi9jb3JlX2ludHIu YwppbmRleCAxOWFlMjU5NWYxYzMuLjE2ZmYzMzU3NDExNiAxMDA2NDQKLS0tIGEvZHJpdmVycy91 c2IvZHdjMi9jb3JlX2ludHIuYworKysgYi9kcml2ZXJzL3VzYi9kd2MyL2NvcmVfaW50ci5jCkBA IC00MzUsNiArNDM1LDE4IEBAIHN0YXRpYyB2b2lkIGR3YzJfaGFuZGxlX3dha2V1cF9kZXRlY3Rl ZF9pbnRyKHN0cnVjdCBkd2MyX2hzb3RnICpoc290ZykKIAkJCS8qIFJlc3RhcnQgdGhlIFBoeSBD bG9jayAqLwogCQkJcGNnY2N0bCAmPSB+UENHQ1RMX1NUT1BQQ0xLOwogCQkJZHdjMl93cml0ZWwo aHNvdGcsIHBjZ2NjdGwsIFBDR0NUTCk7CisKKwkJCS8qCisJCQkgKiBJZiB3ZSd2ZSBnb3QgdGhp cyBxdWlyayB0aGVuIHRoZSBQSFkgaXMgc3R1Y2sgdXBvbgorCQkJICogd2FrZXVwLiAgQXNzZXJ0 IHJlc2V0LiAgVGhpcyB3aWxsIHByb3BhZ2F0ZSBvdXQgYW5kCisJCQkgKiBldmVudHVhbGx5IHdl J2xsIHJlLWVudW1lcmF0ZSB0aGUgZGV2aWNlLiAgTm90IGdyZWF0CisJCQkgKiBidXQgdGhlIGJl c3Qgd2UgY2FuIGRvLiAgV2UgY2FuJ3QgY2FsbCBwaHlfcmVzZXQoKQorCQkJICogYXQgaW50ZXJy dXB0IHRpbWUgYnV0IHRoZXJlJ3Mgbm8gaHVycnksIHNvIHdlJ2xsCisJCQkgKiBzY2hlZHVsZSBp dCBmb3IgbGF0ZXIuCisJCQkgKi8KKwkJCWlmIChoc290Zy0+cmVzZXRfcGh5X29uX3dha2UpCisJ CQkJc2NoZWR1bGVfd29yaygmaHNvdGctPnBoeV9yZXNldF93b3JrKTsKKwogCQkJbW9kX3RpbWVy KCZoc290Zy0+d2twX3RpbWVyLAogCQkJCSAgamlmZmllcyArIG1zZWNzX3RvX2ppZmZpZXMoNzEp KTsKIAkJfSBlbHNlIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2R3YzIvaGNkLmMgYi9kcml2 ZXJzL3VzYi9kd2MyL2hjZC5jCmluZGV4IDNmMDg3OTYyZjQ5OC4uZTI3MmQwMjAwMTJlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL3VzYi9kd2MyL2hjZC5jCisrKyBiL2RyaXZlcnMvdXNiL2R3YzIvaGNk LmMKQEAgLTQzNzYsNiArNDM3NiwxNyBAQCBzdGF0aWMgdm9pZCBkd2MyX2hjZF9yZXNldF9mdW5j KHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZoc290 Zy0+bG9jaywgZmxhZ3MpOwogfQogCitzdGF0aWMgdm9pZCBkd2MyX2hjZF9waHlfcmVzZXRfZnVu YyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCit7CisJc3RydWN0IGR3YzJfaHNvdGcgKmhzb3Rn ID0gY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBkd2MyX2hzb3RnLAorCQkJCQkJcGh5X3Jlc2V0 X3dvcmspOworCWludCByZXQ7CisKKwlyZXQgPSBwaHlfcmVzZXQoaHNvdGctPnBoeSk7CisJaWYg KHJldCkKKwkJZGV2X3dhcm4oaHNvdGctPmRldiwgIlBIWSByZXNldCBmYWlsZWRcbiIpOworfQor CiAvKgogICogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQogICogIExpbnV4IEhDIERyaXZlciBGdW5jdGlvbnMK QEAgLTUxMzAsNiArNTE0MSw4IEBAIHN0YXRpYyB2b2lkIGR3YzJfaGNkX2ZyZWUoc3RydWN0IGR3 YzJfaHNvdGcgKmhzb3RnKQogCQlkZXN0cm95X3dvcmtxdWV1ZShoc290Zy0+d3Ffb3RnKTsKIAl9 CiAKKwljYW5jZWxfd29ya19zeW5jKCZoc290Zy0+cGh5X3Jlc2V0X3dvcmspOworCiAJZGVsX3Rp bWVyKCZoc290Zy0+d2twX3RpbWVyKTsKIH0KIApAQCAtNTI3MSwxMSArNTI4NCwxMCBAQCBpbnQg ZHdjMl9oY2RfaW5pdChzdHJ1Y3QgZHdjMl9oc290ZyAqaHNvdGcpCiAJCWhzb3RnLT5oY19wdHJf YXJyYXlbaV0gPSBjaGFubmVsOwogCX0KIAotCS8qIEluaXRpYWxpemUgaHNvdGcgc3RhcnQgd29y ayAqLworCS8qIEluaXRpYWxpemUgd29yayAqLwogCUlOSVRfREVMQVlFRF9XT1JLKCZoc290Zy0+ c3RhcnRfd29yaywgZHdjMl9oY2Rfc3RhcnRfZnVuYyk7Ci0KLQkvKiBJbml0aWFsaXplIHBvcnQg cmVzZXQgd29yayAqLwogCUlOSVRfREVMQVlFRF9XT1JLKCZoc290Zy0+cmVzZXRfd29yaywgZHdj Ml9oY2RfcmVzZXRfZnVuYyk7CisJSU5JVF9XT1JLKCZoc290Zy0+cGh5X3Jlc2V0X3dvcmssIGR3 YzJfaGNkX3BoeV9yZXNldF9mdW5jKTsKIAogCS8qCiAJICogQWxsb2NhdGUgc3BhY2UgZm9yIHN0 b3JpbmcgZGF0YSBvbiBzdGF0dXMgdHJhbnNhY3Rpb25zLiBOb3JtYWxseSBubwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy91c2IvZHdjMi9wbGF0Zm9ybS5jIGIvZHJpdmVycy91c2IvZHdjMi9wbGF0Zm9y bS5jCmluZGV4IGMwYjY0ZDQ4MzU1Mi4uOWI2NWI3NjZlMGI5IDEwMDY0NAotLS0gYS9kcml2ZXJz L3VzYi9kd2MyL3BsYXRmb3JtLmMKKysrIGIvZHJpdmVycy91c2IvZHdjMi9wbGF0Zm9ybS5jCkBA IC00ODEsNiArNDgxLDE1IEBAIHN0YXRpYyBpbnQgZHdjMl9kcml2ZXJfcHJvYmUoc3RydWN0IHBs YXRmb3JtX2RldmljZSAqZGV2KQogCQloc290Zy0+Z2FkZ2V0X2VuYWJsZWQgPSAxOwogCX0KIAor CWhzb3RnLT5yZXNldF9waHlfb25fd2FrZSA9CisJCW9mX3Byb3BlcnR5X3JlYWRfYm9vbChkZXYt PmRldi5vZl9ub2RlLAorCQkJCSAgICAgICJzbnBzLHJlc2V0LXBoeS1vbi13YWtlIik7CisJaWYg KGhzb3RnLT5yZXNldF9waHlfb25fd2FrZSAmJiAhaHNvdGctPnBoeSkgeworCQlkZXZfd2Fybiho c290Zy0+ZGV2LAorCQkJICJRdWlyayByZXNldC1waHktb24td2FrZSBvbmx5IHN1cHBvcnRzIGdl bmVyaWMgUEhZc1xuIik7CisJCWhzb3RnLT5yZXNldF9waHlfb25fd2FrZSA9IGZhbHNlOworCX0K KwogCWlmIChoc290Zy0+ZHJfbW9kZSAhPSBVU0JfRFJfTU9ERV9QRVJJUEhFUkFMKSB7CiAJCXJl dHZhbCA9IGR3YzJfaGNkX2luaXQoaHNvdGcpOwogCQlpZiAocmV0dmFsKSB7Cg== 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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT 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 914F8C10F13 for ; Tue, 16 Apr 2019 21:54:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56297206B6 for ; Tue, 16 Apr 2019 21:54:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="IjV8HYyk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730692AbfDPVyQ (ORCPT ); Tue, 16 Apr 2019 17:54:16 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37945 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730670AbfDPVyP (ORCPT ); Tue, 16 Apr 2019 17:54:15 -0400 Received: by mail-pf1-f195.google.com with SMTP id 10so11060515pfo.5 for ; Tue, 16 Apr 2019 14:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NhuTBkbvTznNaFrq+/UUrhs6fQWEX2O1Uah2moqJDlM=; b=IjV8HYykawLHC7qSQF8ZCPMx2iXuKBbg6BrwsSdi/sqT47SwXT7yS/1daiZcQbYyEQ KAvZU3uR3Rj9qST+yJTgRatoMZxGub6HGOfObi6/qchoOc/cycdo2i3ljJ0AUIc3N4bk n1XYDraCquh0eaM6EmEVthxg/KhawnI/5vy4E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NhuTBkbvTznNaFrq+/UUrhs6fQWEX2O1Uah2moqJDlM=; b=WHbMVqO27NypzcUmKGT8+jOV5cFQrGhD0U0kiOKS7fq4FmD7PiBTpH0bxMV2Y6DJK1 i9I5L4APr92jrL6O6GPHrwvSnkbY758Vh2vbvfymmbHflCCmcgg/Yl4B9IWuhgnQn90x FCyN7pFLw9tQf5vvW167pPIHQ2rriU6BBYhHdH1hgIPqw13tGglFVfFEAZ1RoqWR+Xhn mWizOZOCtW7Qw1aQNjtY3T3XbeygCj4G2ocXr6C2I+39LjaM74H/liKAr0AMK5lvcU/B /5LrGl5W8BWJ0sIfdjMkb0sEUeHBJ+/yapqbDupdqIxlL9C6YDhOgNeQxfHJXv694jYC FY5g== X-Gm-Message-State: APjAAAVlsdDvpLzqhs9MUObkH0v/UGojmHu9+nwlYAgeklOKz8FaU21/ FtikpQSLv+Coc9b6bgQGXYi1NA== X-Google-Smtp-Source: APXvYqwWfoKWZsdXqWpwL1pK8HNiauVy7bRxPDqc5xd2wCgGg0sCdZsMJe7mMKv0YKBeuGVe0i7uyg== X-Received: by 2002:a63:ef0a:: with SMTP id u10mr61563309pgh.199.1555451654170; Tue, 16 Apr 2019 14:54:14 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id b6sm8156770pgt.58.2019.04.16.14.54.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 14:54:13 -0700 (PDT) From: Douglas Anderson To: Rob Herring , Minas Harutyunyan , Heiko Stuebner , Felipe Balbi Cc: amstan@chromium.org, linux-rockchip@lists.infradead.org, linux-usb@vger.kernel.org, Randy Li , mka@chromium.org, ryandcase@chromium.org, jwerner@chromium.org, Elaine Zhang , Douglas Anderson , Yunzhi Li , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] usb: dwc2: optionally assert phy reset when waking up Date: Tue, 16 Apr 2019 14:53:49 -0700 Message-Id: <20190416215351.242246-3-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190416215351.242246-1-dianders@chromium.org> References: <20190416215351.242246-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190416215349.b09lV0ZQHd7pop-d6P5fno8a9a-8oja8t7CT50WxUKk@z> On the rk3288 USB host-only port (the one that's not the OTG-enabled port) the PHY can get into a bad state when a wakeup is asserted (not just a wakeup from full system suspend but also a wakeup from autosuspend). We can get the PHY out of its bad state by asserting its "port reset", but unfortunately that seems to assert a reset onto the USB bus so it could confuse things if we don't actually deenumerate / reenumerate the device. We can also get the PHY out of its bad state by fully resetting it using the reset from the CRU (clock reset unit), which does a more full reset. The CRU-based reset appears to actually cause devices on the bus to be removed and reinserted, which fixes the problem (albeit in a hacky way). It's unfortunate that we need to do a full re-enumeration of devices at wakeup time, but this is better than alternative of letting the bus get wedged. Signed-off-by: Douglas Anderson Signed-off-by: Yunzhi Li --- Changes in v2: - Cancel the work when dwc2 is freed (Matthias). drivers/usb/dwc2/core.h | 5 +++++ drivers/usb/dwc2/core_intr.c | 12 ++++++++++++ drivers/usb/dwc2/hcd.c | 18 +++++++++++++++--- drivers/usb/dwc2/platform.c | 9 +++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 30bab8463c96..f30748f4fe7e 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -859,6 +859,8 @@ struct dwc2_hregs_backup { * @gadget_enabled: Peripheral mode sub-driver initialization indicator. * @ll_hw_enabled: Status of low-level hardware resources. * @hibernated: True if core is hibernated + * @reset_phy_on_wake: Quirk saying that we should assert PHY reset on a + * remote wakeup. * @frame_number: Frame number read from the core. For both device * and host modes. The value ranges are from 0 * to HFNUM_MAX_FRNUM. @@ -972,6 +974,7 @@ struct dwc2_hregs_backup { * @status_buf_dma: DMA address for status_buf * @start_work: Delayed work for handling host A-cable connection * @reset_work: Delayed work for handling a port reset + * @phy_reset_work: Work structure for doing a PHY reset * @otg_port: OTG port number * @frame_list: Frame list * @frame_list_dma: Frame list DMA address @@ -1045,6 +1048,7 @@ struct dwc2_hsotg { unsigned int gadget_enabled:1; unsigned int ll_hw_enabled:1; unsigned int hibernated:1; + unsigned int reset_phy_on_wake:1; u16 frame_number; struct phy *phy; @@ -1147,6 +1151,7 @@ struct dwc2_hsotg { struct delayed_work start_work; struct delayed_work reset_work; + struct work_struct phy_reset_work; u8 otg_port; u32 *frame_list; dma_addr_t frame_list_dma; diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c index 19ae2595f1c3..16ff33574116 100644 --- a/drivers/usb/dwc2/core_intr.c +++ b/drivers/usb/dwc2/core_intr.c @@ -435,6 +435,18 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) /* Restart the Phy Clock */ pcgcctl &= ~PCGCTL_STOPPCLK; dwc2_writel(hsotg, pcgcctl, PCGCTL); + + /* + * If we've got this quirk then the PHY is stuck upon + * wakeup. Assert reset. This will propagate out and + * eventually we'll re-enumerate the device. Not great + * but the best we can do. We can't call phy_reset() + * at interrupt time but there's no hurry, so we'll + * schedule it for later. + */ + if (hsotg->reset_phy_on_wake) + schedule_work(&hsotg->phy_reset_work); + mod_timer(&hsotg->wkp_timer, jiffies + msecs_to_jiffies(71)); } else { diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index 3f087962f498..e272d020012e 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -4376,6 +4376,17 @@ static void dwc2_hcd_reset_func(struct work_struct *work) spin_unlock_irqrestore(&hsotg->lock, flags); } +static void dwc2_hcd_phy_reset_func(struct work_struct *work) +{ + struct dwc2_hsotg *hsotg = container_of(work, struct dwc2_hsotg, + phy_reset_work); + int ret; + + ret = phy_reset(hsotg->phy); + if (ret) + dev_warn(hsotg->dev, "PHY reset failed\n"); +} + /* * ========================================================================= * Linux HC Driver Functions @@ -5130,6 +5141,8 @@ static void dwc2_hcd_free(struct dwc2_hsotg *hsotg) destroy_workqueue(hsotg->wq_otg); } + cancel_work_sync(&hsotg->phy_reset_work); + del_timer(&hsotg->wkp_timer); } @@ -5271,11 +5284,10 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg) hsotg->hc_ptr_array[i] = channel; } - /* Initialize hsotg start work */ + /* Initialize work */ INIT_DELAYED_WORK(&hsotg->start_work, dwc2_hcd_start_func); - - /* Initialize port reset work */ INIT_DELAYED_WORK(&hsotg->reset_work, dwc2_hcd_reset_func); + INIT_WORK(&hsotg->phy_reset_work, dwc2_hcd_phy_reset_func); /* * Allocate space for storing data on status transactions. Normally no diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index c0b64d483552..9b65b766e0b9 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -481,6 +481,15 @@ static int dwc2_driver_probe(struct platform_device *dev) hsotg->gadget_enabled = 1; } + hsotg->reset_phy_on_wake = + of_property_read_bool(dev->dev.of_node, + "snps,reset-phy-on-wake"); + if (hsotg->reset_phy_on_wake && !hsotg->phy) { + dev_warn(hsotg->dev, + "Quirk reset-phy-on-wake only supports generic PHYs\n"); + hsotg->reset_phy_on_wake = false; + } + if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) { retval = dwc2_hcd_init(hsotg); if (retval) { -- 2.21.0.593.g511ec345e18-goog From mboxrd@z Thu Jan 1 00:00:00 1970 From: Douglas Anderson Subject: [PATCH v2 2/4] usb: dwc2: optionally assert phy reset when waking up Date: Tue, 16 Apr 2019 14:53:49 -0700 Message-ID: <20190416215351.242246-3-dianders@chromium.org> References: <20190416215351.242246-1-dianders@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20190416215351.242246-1-dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+glpar-linux-rockchip=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: Rob Herring , Minas Harutyunyan , Heiko Stuebner , Felipe Balbi Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, amstan-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, Greg Kroah-Hartman , Randy Li , Douglas Anderson , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, mka-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, ryandcase-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, Yunzhi Li , Elaine Zhang , jwerner-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org List-Id: linux-rockchip.vger.kernel.org On the rk3288 USB host-only port (the one that's not the OTG-enabled port) the PHY can get into a bad state when a wakeup is asserted (not just a wakeup from full system suspend but also a wakeup from autosuspend). We can get the PHY out of its bad state by asserting its "port reset", but unfortunately that seems to assert a reset onto the USB bus so it could confuse things if we don't actually deenumerate / reenumerate the device. We can also get the PHY out of its bad state by fully resetting it using the reset from the CRU (clock reset unit), which does a more full reset. The CRU-based reset appears to actually cause devices on the bus to be removed and reinserted, which fixes the problem (albeit in a hacky way). It's unfortunate that we need to do a full re-enumeration of devices at wakeup time, but this is better than alternative of letting the bus get wedged. Signed-off-by: Douglas Anderson Signed-off-by: Yunzhi Li --- Changes in v2: - Cancel the work when dwc2 is freed (Matthias). drivers/usb/dwc2/core.h | 5 +++++ drivers/usb/dwc2/core_intr.c | 12 ++++++++++++ drivers/usb/dwc2/hcd.c | 18 +++++++++++++++--- drivers/usb/dwc2/platform.c | 9 +++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 30bab8463c96..f30748f4fe7e 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -859,6 +859,8 @@ struct dwc2_hregs_backup { * @gadget_enabled: Peripheral mode sub-driver initialization indicator. * @ll_hw_enabled: Status of low-level hardware resources. * @hibernated: True if core is hibernated + * @reset_phy_on_wake: Quirk saying that we should assert PHY reset on a + * remote wakeup. * @frame_number: Frame number read from the core. For both device * and host modes. The value ranges are from 0 * to HFNUM_MAX_FRNUM. @@ -972,6 +974,7 @@ struct dwc2_hregs_backup { * @status_buf_dma: DMA address for status_buf * @start_work: Delayed work for handling host A-cable connection * @reset_work: Delayed work for handling a port reset + * @phy_reset_work: Work structure for doing a PHY reset * @otg_port: OTG port number * @frame_list: Frame list * @frame_list_dma: Frame list DMA address @@ -1045,6 +1048,7 @@ struct dwc2_hsotg { unsigned int gadget_enabled:1; unsigned int ll_hw_enabled:1; unsigned int hibernated:1; + unsigned int reset_phy_on_wake:1; u16 frame_number; struct phy *phy; @@ -1147,6 +1151,7 @@ struct dwc2_hsotg { struct delayed_work start_work; struct delayed_work reset_work; + struct work_struct phy_reset_work; u8 otg_port; u32 *frame_list; dma_addr_t frame_list_dma; diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c index 19ae2595f1c3..16ff33574116 100644 --- a/drivers/usb/dwc2/core_intr.c +++ b/drivers/usb/dwc2/core_intr.c @@ -435,6 +435,18 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) /* Restart the Phy Clock */ pcgcctl &= ~PCGCTL_STOPPCLK; dwc2_writel(hsotg, pcgcctl, PCGCTL); + + /* + * If we've got this quirk then the PHY is stuck upon + * wakeup. Assert reset. This will propagate out and + * eventually we'll re-enumerate the device. Not great + * but the best we can do. We can't call phy_reset() + * at interrupt time but there's no hurry, so we'll + * schedule it for later. + */ + if (hsotg->reset_phy_on_wake) + schedule_work(&hsotg->phy_reset_work); + mod_timer(&hsotg->wkp_timer, jiffies + msecs_to_jiffies(71)); } else { diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index 3f087962f498..e272d020012e 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -4376,6 +4376,17 @@ static void dwc2_hcd_reset_func(struct work_struct *work) spin_unlock_irqrestore(&hsotg->lock, flags); } +static void dwc2_hcd_phy_reset_func(struct work_struct *work) +{ + struct dwc2_hsotg *hsotg = container_of(work, struct dwc2_hsotg, + phy_reset_work); + int ret; + + ret = phy_reset(hsotg->phy); + if (ret) + dev_warn(hsotg->dev, "PHY reset failed\n"); +} + /* * ========================================================================= * Linux HC Driver Functions @@ -5130,6 +5141,8 @@ static void dwc2_hcd_free(struct dwc2_hsotg *hsotg) destroy_workqueue(hsotg->wq_otg); } + cancel_work_sync(&hsotg->phy_reset_work); + del_timer(&hsotg->wkp_timer); } @@ -5271,11 +5284,10 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg) hsotg->hc_ptr_array[i] = channel; } - /* Initialize hsotg start work */ + /* Initialize work */ INIT_DELAYED_WORK(&hsotg->start_work, dwc2_hcd_start_func); - - /* Initialize port reset work */ INIT_DELAYED_WORK(&hsotg->reset_work, dwc2_hcd_reset_func); + INIT_WORK(&hsotg->phy_reset_work, dwc2_hcd_phy_reset_func); /* * Allocate space for storing data on status transactions. Normally no diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index c0b64d483552..9b65b766e0b9 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -481,6 +481,15 @@ static int dwc2_driver_probe(struct platform_device *dev) hsotg->gadget_enabled = 1; } + hsotg->reset_phy_on_wake = + of_property_read_bool(dev->dev.of_node, + "snps,reset-phy-on-wake"); + if (hsotg->reset_phy_on_wake && !hsotg->phy) { + dev_warn(hsotg->dev, + "Quirk reset-phy-on-wake only supports generic PHYs\n"); + hsotg->reset_phy_on_wake = false; + } + if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) { retval = dwc2_hcd_init(hsotg); if (retval) { -- 2.21.0.593.g511ec345e18-goog