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: [2/4] usb: dwc2: optionally assert phy reset when waking up From: Doug Anderson Message-Id: <20190412224149.106971-3-dianders@chromium.org> Date: Fri, 12 Apr 2019 15:41:47 -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+Ci0tLQoKIGRyaXZlcnMvdXNiL2R3YzIvY29yZS5oICAgICAgfCAgNSAr KysrKwogZHJpdmVycy91c2IvZHdjMi9jb3JlX2ludHIuYyB8IDEyICsrKysrKysrKysrKwogZHJp dmVycy91c2IvZHdjMi9oY2QuYyAgICAgICB8IDE2ICsrKysrKysrKysrKystLS0KIGRyaXZlcnMv dXNiL2R3YzIvcGxhdGZvcm0uYyAgfCAgOSArKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgMzkg aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9k d2MyL2NvcmUuaCBiL2RyaXZlcnMvdXNiL2R3YzIvY29yZS5oCmluZGV4IDMwYmFiODQ2M2M5Ni4u ZjMwNzQ4ZjRmZTdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9kd2MyL2NvcmUuaAorKysgYi9k cml2ZXJzL3VzYi9kd2MyL2NvcmUuaApAQCAtODU5LDYgKzg1OSw4IEBAIHN0cnVjdCBkd2MyX2hy ZWdzX2JhY2t1cCB7CiAgKiBAZ2FkZ2V0X2VuYWJsZWQ6CVBlcmlwaGVyYWwgbW9kZSBzdWItZHJp dmVyIGluaXRpYWxpemF0aW9uIGluZGljYXRvci4KICAqIEBsbF9od19lbmFibGVkOglTdGF0dXMg b2YgbG93LWxldmVsIGhhcmR3YXJlIHJlc291cmNlcy4KICAqIEBoaWJlcm5hdGVkOgkJVHJ1ZSBp ZiBjb3JlIGlzIGhpYmVybmF0ZWQKKyAqIEByZXNldF9waHlfb25fd2FrZToJUXVpcmsgc2F5aW5n IHRoYXQgd2Ugc2hvdWxkIGFzc2VydCBQSFkgcmVzZXQgb24gYQorICoJCQlyZW1vdGUgd2FrZXVw LgogICogQGZyYW1lX251bWJlcjogICAgICAgRnJhbWUgbnVtYmVyIHJlYWQgZnJvbSB0aGUgY29y ZS4gRm9yIGJvdGggZGV2aWNlCiAgKgkJCWFuZCBob3N0IG1vZGVzLiBUaGUgdmFsdWUgcmFuZ2Vz IGFyZSBmcm9tIDAKICAqCQkJdG8gSEZOVU1fTUFYX0ZSTlVNLgpAQCAtOTcyLDYgKzk3NCw3IEBA IHN0cnVjdCBkd2MyX2hyZWdzX2JhY2t1cCB7CiAgKiBAc3RhdHVzX2J1Zl9kbWE6ICAgICBETUEg YWRkcmVzcyBmb3Igc3RhdHVzX2J1ZgogICogQHN0YXJ0X3dvcms6ICAgICAgICAgRGVsYXllZCB3 b3JrIGZvciBoYW5kbGluZyBob3N0IEEtY2FibGUgY29ubmVjdGlvbgogICogQHJlc2V0X3dvcms6 ICAgICAgICAgRGVsYXllZCB3b3JrIGZvciBoYW5kbGluZyBhIHBvcnQgcmVzZXQKKyAqIEBwaHlf cmVzZXRfd29yazogICAgIFdvcmsgc3RydWN0dXJlIGZvciBkb2luZyBhIFBIWSByZXNldAogICog QG90Z19wb3J0OiAgICAgICAgICAgT1RHIHBvcnQgbnVtYmVyCiAgKiBAZnJhbWVfbGlzdDogICAg ICAgICBGcmFtZSBsaXN0CiAgKiBAZnJhbWVfbGlzdF9kbWE6ICAgICBGcmFtZSBsaXN0IERNQSBh ZGRyZXNzCkBAIC0xMDQ1LDYgKzEwNDgsNyBAQCBzdHJ1Y3QgZHdjMl9oc290ZyB7CiAJdW5zaWdu ZWQgaW50IGdhZGdldF9lbmFibGVkOjE7CiAJdW5zaWduZWQgaW50IGxsX2h3X2VuYWJsZWQ6MTsK IAl1bnNpZ25lZCBpbnQgaGliZXJuYXRlZDoxOworCXVuc2lnbmVkIGludCByZXNldF9waHlfb25f d2FrZToxOwogCXUxNiBmcmFtZV9udW1iZXI7CiAKIAlzdHJ1Y3QgcGh5ICpwaHk7CkBAIC0xMTQ3 LDYgKzExNTEsNyBAQCBzdHJ1Y3QgZHdjMl9oc290ZyB7CiAKIAlzdHJ1Y3QgZGVsYXllZF93b3Jr IHN0YXJ0X3dvcms7CiAJc3RydWN0IGRlbGF5ZWRfd29yayByZXNldF93b3JrOworCXN0cnVjdCB3 b3JrX3N0cnVjdCBwaHlfcmVzZXRfd29yazsKIAl1OCBvdGdfcG9ydDsKIAl1MzIgKmZyYW1lX2xp c3Q7CiAJZG1hX2FkZHJfdCBmcmFtZV9saXN0X2RtYTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNi L2R3YzIvY29yZV9pbnRyLmMgYi9kcml2ZXJzL3VzYi9kd2MyL2NvcmVfaW50ci5jCmluZGV4IDE5 YWUyNTk1ZjFjMy4uMTZmZjMzNTc0MTE2IDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9kd2MyL2Nv cmVfaW50ci5jCisrKyBiL2RyaXZlcnMvdXNiL2R3YzIvY29yZV9pbnRyLmMKQEAgLTQzNSw2ICs0 MzUsMTggQEAgc3RhdGljIHZvaWQgZHdjMl9oYW5kbGVfd2FrZXVwX2RldGVjdGVkX2ludHIoc3Ry dWN0IGR3YzJfaHNvdGcgKmhzb3RnKQogCQkJLyogUmVzdGFydCB0aGUgUGh5IENsb2NrICovCiAJ CQlwY2djY3RsICY9IH5QQ0dDVExfU1RPUFBDTEs7CiAJCQlkd2MyX3dyaXRlbChoc290ZywgcGNn Y2N0bCwgUENHQ1RMKTsKKworCQkJLyoKKwkJCSAqIElmIHdlJ3ZlIGdvdCB0aGlzIHF1aXJrIHRo ZW4gdGhlIFBIWSBpcyBzdHVjayB1cG9uCisJCQkgKiB3YWtldXAuICBBc3NlcnQgcmVzZXQuICBU aGlzIHdpbGwgcHJvcGFnYXRlIG91dCBhbmQKKwkJCSAqIGV2ZW50dWFsbHkgd2UnbGwgcmUtZW51 bWVyYXRlIHRoZSBkZXZpY2UuICBOb3QgZ3JlYXQKKwkJCSAqIGJ1dCB0aGUgYmVzdCB3ZSBjYW4g ZG8uICBXZSBjYW4ndCBjYWxsIHBoeV9yZXNldCgpCisJCQkgKiBhdCBpbnRlcnJ1cHQgdGltZSBi dXQgdGhlcmUncyBubyBodXJyeSwgc28gd2UnbGwKKwkJCSAqIHNjaGVkdWxlIGl0IGZvciBsYXRl ci4KKwkJCSAqLworCQkJaWYgKGhzb3RnLT5yZXNldF9waHlfb25fd2FrZSkKKwkJCQlzY2hlZHVs ZV93b3JrKCZoc290Zy0+cGh5X3Jlc2V0X3dvcmspOworCiAJCQltb2RfdGltZXIoJmhzb3RnLT53 a3BfdGltZXIsCiAJCQkJICBqaWZmaWVzICsgbXNlY3NfdG9famlmZmllcyg3MSkpOwogCQl9IGVs c2UgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvZHdjMi9oY2QuYyBiL2RyaXZlcnMvdXNiL2R3 YzIvaGNkLmMKaW5kZXggM2YwODc5NjJmNDk4Li4zMzIzNDkxNDhkM2YgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvdXNiL2R3YzIvaGNkLmMKKysrIGIvZHJpdmVycy91c2IvZHdjMi9oY2QuYwpAQCAtNDM3 Niw2ICs0Mzc2LDE3IEBAIHN0YXRpYyB2b2lkIGR3YzJfaGNkX3Jlc2V0X2Z1bmMoc3RydWN0IHdv cmtfc3RydWN0ICp3b3JrKQogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmhzb3RnLT5sb2NrLCBm bGFncyk7CiB9CiAKK3N0YXRpYyB2b2lkIGR3YzJfaGNkX3BoeV9yZXNldF9mdW5jKHN0cnVjdCB3 b3JrX3N0cnVjdCAqd29yaykKK3sKKwlzdHJ1Y3QgZHdjMl9oc290ZyAqaHNvdGcgPSBjb250YWlu ZXJfb2Yod29yaywgc3RydWN0IGR3YzJfaHNvdGcsCisJCQkJCQlwaHlfcmVzZXRfd29yayk7CisJ aW50IHJldDsKKworCXJldCA9IHBoeV9yZXNldChoc290Zy0+cGh5KTsKKwlpZiAocmV0KQorCQlk ZXZfd2Fybihoc290Zy0+ZGV2LCAiUEhZIHJlc2V0IGZhaWxlZFxuIik7Cit9CisKIC8qCiAgKiA9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09CiAgKiAgTGludXggSEMgRHJpdmVyIEZ1bmN0aW9ucwpAQCAtNTI3MSwx MSArNTI4MiwxMCBAQCBpbnQgZHdjMl9oY2RfaW5pdChzdHJ1Y3QgZHdjMl9oc290ZyAqaHNvdGcp CiAJCWhzb3RnLT5oY19wdHJfYXJyYXlbaV0gPSBjaGFubmVsOwogCX0KIAotCS8qIEluaXRpYWxp emUgaHNvdGcgc3RhcnQgd29yayAqLworCS8qIEluaXRpYWxpemUgd29yayAqLwogCUlOSVRfREVM QVlFRF9XT1JLKCZoc290Zy0+c3RhcnRfd29yaywgZHdjMl9oY2Rfc3RhcnRfZnVuYyk7Ci0KLQkv KiBJbml0aWFsaXplIHBvcnQgcmVzZXQgd29yayAqLwogCUlOSVRfREVMQVlFRF9XT1JLKCZoc290 Zy0+cmVzZXRfd29yaywgZHdjMl9oY2RfcmVzZXRfZnVuYyk7CisJSU5JVF9XT1JLKCZoc290Zy0+ cGh5X3Jlc2V0X3dvcmssIGR3YzJfaGNkX3BoeV9yZXNldF9mdW5jKTsKIAogCS8qCiAJICogQWxs b2NhdGUgc3BhY2UgZm9yIHN0b3JpbmcgZGF0YSBvbiBzdGF0dXMgdHJhbnNhY3Rpb25zLiBOb3Jt YWxseSBubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvZHdjMi9wbGF0Zm9ybS5jIGIvZHJpdmVy cy91c2IvZHdjMi9wbGF0Zm9ybS5jCmluZGV4IGMwYjY0ZDQ4MzU1Mi4uOWI2NWI3NjZlMGI5IDEw MDY0NAotLS0gYS9kcml2ZXJzL3VzYi9kd2MyL3BsYXRmb3JtLmMKKysrIGIvZHJpdmVycy91c2Iv ZHdjMi9wbGF0Zm9ybS5jCkBAIC00ODEsNiArNDgxLDE1IEBAIHN0YXRpYyBpbnQgZHdjMl9kcml2 ZXJfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqZGV2KQogCQloc290Zy0+Z2FkZ2V0X2Vu YWJsZWQgPSAxOwogCX0KIAorCWhzb3RnLT5yZXNldF9waHlfb25fd2FrZSA9CisJCW9mX3Byb3Bl cnR5X3JlYWRfYm9vbChkZXYtPmRldi5vZl9ub2RlLAorCQkJCSAgICAgICJzbnBzLHJlc2V0LXBo eS1vbi13YWtlIik7CisJaWYgKGhzb3RnLT5yZXNldF9waHlfb25fd2FrZSAmJiAhaHNvdGctPnBo eSkgeworCQlkZXZfd2Fybihoc290Zy0+ZGV2LAorCQkJICJRdWlyayByZXNldC1waHktb24td2Fr ZSBvbmx5IHN1cHBvcnRzIGdlbmVyaWMgUEhZc1xuIik7CisJCWhzb3RnLT5yZXNldF9waHlfb25f d2FrZSA9IGZhbHNlOworCX0KKwogCWlmIChoc290Zy0+ZHJfbW9kZSAhPSBVU0JfRFJfTU9ERV9Q RVJJUEhFUkFMKSB7CiAJCXJldHZhbCA9IGR3YzJfaGNkX2luaXQoaHNvdGcpOwogCQlpZiAocmV0 dmFsKSB7Cg== 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 E265EC10F0E for ; Fri, 12 Apr 2019 22:42:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A8C8C20818 for ; Fri, 12 Apr 2019 22:42:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fbSrJK0g" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727154AbfDLWmS (ORCPT ); Fri, 12 Apr 2019 18:42:18 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42566 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727130AbfDLWmS (ORCPT ); Fri, 12 Apr 2019 18:42:18 -0400 Received: by mail-pf1-f194.google.com with SMTP id w25so5784056pfi.9 for ; Fri, 12 Apr 2019 15:42:17 -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=m7bMG3CshorQmg1lKkeTmGf1nYdxxwbwlljLNgyUqRE=; b=fbSrJK0g0fV9BeN6bDPthd9lwEe9RLJC+eoaMbx0RbbjJBVQAYnXPHCBoED/Iwmtoy 43NBpBf2SWtGJXyPHTMBb6VifLYayinWnZmQZQc/fNKtRQB8E+htKim93DGLixzSaRGI 9XLSySNPGmeKLiswXK6NlSTK6HU0CXSn6zWis= 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=m7bMG3CshorQmg1lKkeTmGf1nYdxxwbwlljLNgyUqRE=; b=GunXFp/D1EYkn47SwEJZJxt8FaVuHMv48J2S/c7xgSwRfTHrtW+4VZsaEJpnZGEzWy NzXDzZMkoaZ2+4mN96HcMA6TqHlK6OIXGFUd/QcvSUq5QNTfJk2gbckPQ+bzqo058Qny jDes1r9znFjou2kCJSIElJmAt1+0cCvQIdxxdqa+eSWb8SS18CifJ7sMvMUWbn4TywYq +U3bFnuUAOLeEyUNMnAgRsytpMYoLMUr3f/wHNQW3gc0j+6C29/MRFaMJg9Qg8Eg/WgM v3CoIhw+VZNjHtxJzmFMdNH1j7/XwzE4D71cGvGiLH+xGuefA4f7dsnjJASt99DP+UrN Et3g== X-Gm-Message-State: APjAAAWiKUI2D0jX/MS8RquB1vRKvWyfulAadEjfnYK4lV47EAKv5lYf b/v2zlZP4+0Vr0t5qh3NTU1K+A== X-Google-Smtp-Source: APXvYqweeBTDzcVs0mDhVE440cgj90OdEU1JkqINcR2OMkCnTKxWPM/VbLWGNBobMDyb4Goe8LhlsA== X-Received: by 2002:a63:6193:: with SMTP id v141mr56642537pgb.392.1555108937371; Fri, 12 Apr 2019 15:42:17 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id j22sm57170579pfn.129.2019.04.12.15.42.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 15:42:16 -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 2/4] usb: dwc2: optionally assert phy reset when waking up Date: Fri, 12 Apr 2019 15:41:47 -0700 Message-Id: <20190412224149.106971-3-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190412224149.106971-1-dianders@chromium.org> References: <20190412224149.106971-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: <20190412224147.X-GYrOpBtt7XGMCKCtvgQUVMh84lXu0M5mpNOUEtiQY@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 --- drivers/usb/dwc2/core.h | 5 +++++ drivers/usb/dwc2/core_intr.c | 12 ++++++++++++ drivers/usb/dwc2/hcd.c | 16 +++++++++++++--- drivers/usb/dwc2/platform.c | 9 +++++++++ 4 files changed, 39 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..332349148d3f 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 @@ -5271,11 +5282,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.392.gf8f6787159e-goog