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] USB: quirks: disable LPM for Logitech UVC devices From: Kyle Williams Message-Id: <20181208004641.240699-1-kdgwill@google.com> Date: Fri, 7 Dec 2018 19:46:38 -0500 To: linux-kernel@vger.kernel.org Cc: kdgwill@chromium.org, Greg Kroah-Hartman , Alan Stern , Mathias Nyman , Nicolas Boichat , Jon Flatley , Felipe Balbi , Kai-Heng Feng , Danilo Krummrich , Kuppuswamy Sathyanarayanan , =?UTF-8?q?Maxence=20Dupr=C3=A8s?= , Kamil Lulko , Emmanuel Pescosta , linux-usb@vger.kernel.org List-ID: RnJvbTogS3lsZSBXaWxsaWFtcyA8a2Rnd2lsbEBjaHJvbWl1bS5vcmc+CgpEZXNjcmlwdGlvbjog U29tZSBVU0IgZGV2aWNlIC8gaG9zdCBjb250cm9sbGVyIGNvbWJpbmF0aW9ucyBzZWVtIHRvIGhh dmUKcHJvYmxlbXMgd2l0aCBMaW5rIFBvd2VyIG1hbmFnZW1lbnQuIEluIHBhcnRpY3VsYXIgaXQg aXMgZGVzY3JpYmVkIHRoYXQKdGhlIGNvbWJpbmF0aW9uIG9mIGNlcnRhaW4gTG9naXRlY2ggdXZj IGRldmljZXMgYW5kIG90aGVyIHBvd2VyZWQgbWVkaWEKZGV2aWNlcyBzdWNoIGNhdXNlcyAnbm90 IGVub3VnaCBiYW5kd2lkdGggZm9yIG5ldyBkZXZpY2Ugc3RhdGUnIGVycm9yLgoKVGhpcyBwYXRj aCBlbmFibGVzIHRoZSBVU0JfUVVJUktfTk9fTFBNIHF1aXJrIGVudHJpZXMgZm9yIGFsbCBjb25u ZWN0ZWQKTG9naXRlY2ggVVZDIGRldmljZXMgaW5kaWNhdGluZyBMUE0gc2hvdWxkIHJlbWFpbiBk aXNhYmxlZCBmb3IgdGhlIGRldmljZS4KClNpZ25lZC1vZmYtYnk6IEt5bGUgV2lsbGlhbXMgPGtk Z3dpbGxAY2hyb21pdW0ub3JnPgotLS0KCkNoYW5nZXMgaW4gdjI6Ci0gY2hhbmdlZCBjb21taXQg bWVzc2FnZQotIGRpc2JsZSBscG0gZm9yIGFsbCBsb2dpdGVjaCB1dmMgZGV2aWNlcyBpbnN0ZWFk IG9mIGxpc3RpbmcgbWFudWFsbHkKLSBjaGFuZ2VzIHRvIGFsbG93IHRoZSBscG0gdG8gY29ycmVj dGx5IGJlIGRpc2FibGVkIGFmdGVyIGVudW1lcmF0aW9uCgogZHJpdmVycy91c2IvY29yZS9odWIu YyAgICB8IDg3ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVy cy91c2IvY29yZS9xdWlya3MuYyB8ICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlv bnMoKyksIDQwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2NvcmUvaHVi LmMgYi9kcml2ZXJzL3VzYi9jb3JlL2h1Yi5jCmluZGV4IDBmOTM4MWI2OWEzYi4uOGYzNjZlYzRk MjFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9jb3JlL2h1Yi5jCisrKyBiL2RyaXZlcnMvdXNi L2NvcmUvaHViLmMKQEAgLTM2NSw2ICszNjUsNTEgQEAgc3RhdGljIHZvaWQgdXNiX3NldF9scG1f cGFyYW1ldGVycyhzdHJ1Y3QgdXNiX2RldmljZSAqdWRldikKIAl1c2Jfc2V0X2xwbV9zZWwodWRl diwgJnVkZXYtPnUyX3BhcmFtcyk7CiB9CiAKKy8qCisgKiBUaGVyZSBhcmUgcmVwb3J0cyBvZiBV U0IgMy4wIGRldmljZXMgdGhhdCBzYXkgdGhleSBzdXBwb3J0IFVTQiAyLjAgTGluayBQTQorICog d2hlbiB0aGV5J3JlIHBsdWdnZWQgaW50byBhIFVTQiAyLjAgcG9ydCwgYnV0IHRoZXkgZG9uJ3Qg d29yayB3aGVuIExQTSBpcworICogZW5hYmxlZC4KKyAqCisgKiBPbmx5IGVuYWJsZSBVU0IgMi4w IExpbmsgUE0gaWYgdGhlIHBvcnQgaXMgaW50ZXJuYWwgKGhhcmR3aXJlZCksIG9yIHRoZQorICog ZGV2aWNlIHNheXMgaXQgc3VwcG9ydHMgdGhlIG5ldyBVU0IgMi4wIExpbmsgUE0gZXJyYXRhIGJ5 IHNldHRpbmcgdGhlIEJFU0wKKyAqIHN1cHBvcnQgYml0IGluIHRoZSBCT1MgZGVzY3JpcHRvci4K KyAqLworc3RhdGljIHZvaWQgaHViX3NldF9pbml0aWFsX3VzYjJfbHBtX3BvbGljeShzdHJ1Y3Qg dXNiX2RldmljZSAqdWRldikKK3sKKwlzdHJ1Y3QgdXNiX2h1YiAqaHViID0gdXNiX2h1Yl90b19z dHJ1Y3RfaHViKHVkZXYtPnBhcmVudCk7CisJaW50IGNvbm5lY3RfdHlwZSA9IFVTQl9QT1JUX0NP Tk5FQ1RfVFlQRV9VTktOT1dOOworCisJaWYgKCF1ZGV2LT51c2IyX2h3X2xwbV9jYXBhYmxlIHx8 ICF1ZGV2LT5ib3MpCisJCXJldHVybjsKKworCWlmIChodWIpCisJCWNvbm5lY3RfdHlwZSA9IGh1 Yi0+cG9ydHNbdWRldi0+cG9ydG51bSAtIDFdLT5jb25uZWN0X3R5cGU7CisKKwlpZiAoKHVkZXYt PmJvcy0+ZXh0X2NhcC0+Ym1BdHRyaWJ1dGVzICYgY3B1X3RvX2xlMzIoVVNCX0JFU0xfU1VQUE9S VCkpCisJCQl8fCBjb25uZWN0X3R5cGUgPT0gVVNCX1BPUlRfQ09OTkVDVF9UWVBFX0hBUkRfV0lS RUQpIHsKKwkJdWRldi0+dXNiMl9od19scG1fYWxsb3dlZCA9IDE7CisJCXVzYl9zZXRfdXNiMl9o YXJkd2FyZV9scG0odWRldiwgMSk7CisJfQorfQorCit2b2lkIHVzYl91cGRhdGVfZGV2aWNlX2xw bShzdHJ1Y3QgdXNiX2hjZCAqaGNkLCBzdHJ1Y3QgdXNiX2RldmljZSAqdWRldikKK3sKKwlpbnQg cmV0dmFsOworCisJaWYgKHVkZXYtPnd1c2IgPT0gMCAmJiBsZTE2X3RvX2NwdSh1ZGV2LT5kZXNj cmlwdG9yLmJjZFVTQikgPj0gMHgwMjAxKSB7CisJCXJldHZhbCA9IHVzYl9nZXRfYm9zX2Rlc2Ny aXB0b3IodWRldik7CisJCWlmICghcmV0dmFsKSB7CisJCQl1ZGV2LT5scG1fY2FwYWJsZSA9IHVz Yl9kZXZpY2Vfc3VwcG9ydHNfbHBtKHVkZXYpOworCQkJdXNiX3NldF9scG1fcGFyYW1ldGVycyh1 ZGV2KTsKKwkJfQorCX0KKworCS8qIG5vdGlmeSBIQ0QgdGhhdCB3ZSBoYXZlIGEgZGV2aWNlIGNv bm5lY3RlZCBhbmQgYWRkcmVzc2VkICovCisJaWYgKGhjZC0+ZHJpdmVyLT51cGRhdGVfZGV2aWNl KQorCQloY2QtPmRyaXZlci0+dXBkYXRlX2RldmljZShoY2QsIHVkZXYpOworCWh1Yl9zZXRfaW5p dGlhbF91c2IyX2xwbV9wb2xpY3kodWRldik7Cit9CisKIC8qIFVTQiAyLjAgc3BlYyBTZWN0aW9u IDExLjI0LjQuNSAqLwogc3RhdGljIGludCBnZXRfaHViX2Rlc2NyaXB0b3Ioc3RydWN0IHVzYl9k ZXZpY2UgKmhkZXYsCiAJCXN0cnVjdCB1c2JfaHViX2Rlc2NyaXB0b3IgKmRlc2MpCkBAIC0yMjk1 LDcgKzIzNDAsNiBAQCBzdGF0aWMgaW50IHVzYl9lbnVtZXJhdGVfZGV2aWNlX290ZyhzdHJ1Y3Qg dXNiX2RldmljZSAqdWRldikKIAlyZXR1cm4gZXJyOwogfQogCi0KIC8qKgogICogdXNiX2VudW1l cmF0ZV9kZXZpY2UgLSBSZWFkIGRldmljZSBjb25maWdzL2ludGZzL290ZyAodXNiY29yZS1pbnRl cm5hbCkKICAqIEB1ZGV2OiBuZXdseSBhZGRyZXNzZWQgZGV2aWNlIChpbiBBRERSRVNTIHN0YXRl KQpAQCAtMjM1MSw2ICsyMzk1LDggQEAgc3RhdGljIGludCB1c2JfZW51bWVyYXRlX2RldmljZShz dHJ1Y3QgdXNiX2RldmljZSAqdWRldikKIAogCXVzYl9kZXRlY3RfaW50ZXJmYWNlX3F1aXJrcyh1 ZGV2KTsKIAorCXVzYl91cGRhdGVfZGV2aWNlX2xwbShoY2QsIHVkZXYpOworCiAJcmV0dXJuIDA7 CiB9CiAKQEAgLTQ0MDIsMzMgKzQ0NDgsNiBAQCBzdGF0aWMgaW50IGh1Yl9zZXRfYWRkcmVzcyhz dHJ1Y3QgdXNiX2RldmljZSAqdWRldiwgaW50IGRldm51bSkKIAlyZXR1cm4gcmV0dmFsOwogfQog Ci0vKgotICogVGhlcmUgYXJlIHJlcG9ydHMgb2YgVVNCIDMuMCBkZXZpY2VzIHRoYXQgc2F5IHRo ZXkgc3VwcG9ydCBVU0IgMi4wIExpbmsgUE0KLSAqIHdoZW4gdGhleSdyZSBwbHVnZ2VkIGludG8g YSBVU0IgMi4wIHBvcnQsIGJ1dCB0aGV5IGRvbid0IHdvcmsgd2hlbiBMUE0gaXMKLSAqIGVuYWJs ZWQuCi0gKgotICogT25seSBlbmFibGUgVVNCIDIuMCBMaW5rIFBNIGlmIHRoZSBwb3J0IGlzIGlu dGVybmFsIChoYXJkd2lyZWQpLCBvciB0aGUKLSAqIGRldmljZSBzYXlzIGl0IHN1cHBvcnRzIHRo ZSBuZXcgVVNCIDIuMCBMaW5rIFBNIGVycmF0YSBieSBzZXR0aW5nIHRoZSBCRVNMCi0gKiBzdXBw b3J0IGJpdCBpbiB0aGUgQk9TIGRlc2NyaXB0b3IuCi0gKi8KLXN0YXRpYyB2b2lkIGh1Yl9zZXRf aW5pdGlhbF91c2IyX2xwbV9wb2xpY3koc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYpCi17Ci0Jc3Ry dWN0IHVzYl9odWIgKmh1YiA9IHVzYl9odWJfdG9fc3RydWN0X2h1Yih1ZGV2LT5wYXJlbnQpOwot CWludCBjb25uZWN0X3R5cGUgPSBVU0JfUE9SVF9DT05ORUNUX1RZUEVfVU5LTk9XTjsKLQotCWlm ICghdWRldi0+dXNiMl9od19scG1fY2FwYWJsZSB8fCAhdWRldi0+Ym9zKQotCQlyZXR1cm47Ci0K LQlpZiAoaHViKQotCQljb25uZWN0X3R5cGUgPSBodWItPnBvcnRzW3VkZXYtPnBvcnRudW0gLSAx XS0+Y29ubmVjdF90eXBlOwotCi0JaWYgKCh1ZGV2LT5ib3MtPmV4dF9jYXAtPmJtQXR0cmlidXRl cyAmIGNwdV90b19sZTMyKFVTQl9CRVNMX1NVUFBPUlQpKSB8fAotCQkJY29ubmVjdF90eXBlID09 IFVTQl9QT1JUX0NPTk5FQ1RfVFlQRV9IQVJEX1dJUkVEKSB7Ci0JCXVkZXYtPnVzYjJfaHdfbHBt X2FsbG93ZWQgPSAxOwotCQl1c2Jfc2V0X3VzYjJfaGFyZHdhcmVfbHBtKHVkZXYsIDEpOwotCX0K LX0KLQogc3RhdGljIGludCBodWJfZW5hYmxlX2RldmljZShzdHJ1Y3QgdXNiX2RldmljZSAqdWRl dikKIHsKIAlzdHJ1Y3QgdXNiX2hjZCAqaGNkID0gYnVzX3RvX2hjZCh1ZGV2LT5idXMpOwpAQCAt NDc3OSwxOSArNDc5OCw5IEBAIGh1Yl9wb3J0X2luaXQoc3RydWN0IHVzYl9odWIgKmh1Yiwgc3Ry dWN0IHVzYl9kZXZpY2UgKnVkZXYsIGludCBwb3J0MSwKIAogCXVzYl9kZXRlY3RfcXVpcmtzKHVk ZXYpOwogCi0JaWYgKHVkZXYtPnd1c2IgPT0gMCAmJiBsZTE2X3RvX2NwdSh1ZGV2LT5kZXNjcmlw dG9yLmJjZFVTQikgPj0gMHgwMjAxKSB7Ci0JCXJldHZhbCA9IHVzYl9nZXRfYm9zX2Rlc2NyaXB0 b3IodWRldik7Ci0JCWlmICghcmV0dmFsKSB7Ci0JCQl1ZGV2LT5scG1fY2FwYWJsZSA9IHVzYl9k ZXZpY2Vfc3VwcG9ydHNfbHBtKHVkZXYpOwotCQkJdXNiX3NldF9scG1fcGFyYW1ldGVycyh1ZGV2 KTsKLQkJfQotCX0KKwl1c2JfdXBkYXRlX2RldmljZV9scG0oaGNkLCB1ZGV2KTsKIAogCXJldHZh bCA9IDA7Ci0JLyogbm90aWZ5IEhDRCB0aGF0IHdlIGhhdmUgYSBkZXZpY2UgY29ubmVjdGVkIGFu ZCBhZGRyZXNzZWQgKi8KLQlpZiAoaGNkLT5kcml2ZXItPnVwZGF0ZV9kZXZpY2UpCi0JCWhjZC0+ ZHJpdmVyLT51cGRhdGVfZGV2aWNlKGhjZCwgdWRldik7Ci0JaHViX3NldF9pbml0aWFsX3VzYjJf bHBtX3BvbGljeSh1ZGV2KTsKIGZhaWw6CiAJaWYgKHJldHZhbCkgewogCQlodWJfcG9ydF9kaXNh YmxlKGh1YiwgcG9ydDEsIDApOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvY29yZS9xdWlya3Mu YyBiL2RyaXZlcnMvdXNiL2NvcmUvcXVpcmtzLmMKaW5kZXggMDY5MGZjZmYwZWEyLi5iYmJiN2U2 ZGY5NTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2NvcmUvcXVpcmtzLmMKKysrIGIvZHJpdmVy cy91c2IvY29yZS9xdWlya3MuYwpAQCAtNDQwLDcgKzQ0MCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgdXNiX2RldmljZV9pZCB1c2JfcXVpcmtfbGlzdFtdID0gewogc3RhdGljIGNvbnN0IHN0cnVj dCB1c2JfZGV2aWNlX2lkIHVzYl9pbnRlcmZhY2VfcXVpcmtfbGlzdFtdID0gewogCS8qIExvZ2l0 ZWNoIFVWQyBDYW1lcmFzICovCiAJeyBVU0JfVkVORE9SX0FORF9JTlRFUkZBQ0VfSU5GTygweDA0 NmQsIFVTQl9DTEFTU19WSURFTywgMSwgMCksCi0JICAuZHJpdmVyX2luZm8gPSBVU0JfUVVJUktf UkVTRVRfUkVTVU1FIH0sCisJICAuZHJpdmVyX2luZm8gPSBVU0JfUVVJUktfUkVTRVRfUkVTVU1F IHwgVVNCX1FVSVJLX05PX0xQTSB9LAogCiAJeyB9ICAvKiB0ZXJtaW5hdGluZyBlbnRyeSBtdXN0 IGJlIGxhc3QgKi8KIH07Cg== 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.1 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=ham 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 F088EC64EB1 for ; Sat, 8 Dec 2018 00:48:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7C96208E7 for ; Sat, 8 Dec 2018 00:48:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Oc9KzfhW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7C96208E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726147AbeLHAsC (ORCPT ); Fri, 7 Dec 2018 19:48:02 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:44123 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726041AbeLHAsA (ORCPT ); Fri, 7 Dec 2018 19:48:00 -0500 Received: by mail-qt1-f193.google.com with SMTP id n32so6508781qte.11 for ; Fri, 07 Dec 2018 16:47:59 -0800 (PST) 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=NRkbgoAqHLBXEpXwn4nVEYMfs9jWYNDOZepIs2hElB8=; b=Oc9KzfhWC3PqPIseWX5ytSqyfD4ysuNYv0HOKyu7la8rPFf0aqmJ/tpD5xEMgjKGob l/wBeD84lm9duF01JwQRf9yuQKDIajQDQ7w/e5IbDAeOtx1e4wHGFj866d9TKBzZnTzb N8SB0+yJSRzGFEsUMb8TurR0w7wqY25XtPeSo= 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=NRkbgoAqHLBXEpXwn4nVEYMfs9jWYNDOZepIs2hElB8=; b=s/2yFnkN3SQJofn8oxZakO7a0aqec/qoDanl9uePzT0l05PJ+wDz5zr3ONmBk/xv8I cJ4X1UBAFcr3zeJ8zq6yGFy1LzPbrEW1hNr6VZ/gcerE8DHDRkWJ9rCo+X6+AOwT683x 8yehw+vx+td5theDpWca8fjdTEJJDmdJIyKfrZulgR1ASGv6W4zgRvm2MGBvUXJOEBCS Gpr0sncWOqJePX9zn54tgY9A7005rwtZLvP198qx0TcznVbT7kg5uSZB2U8/kBXRRwcR oT9PbIC25Vp65n9BVUAyy5QFuvck40OE0Xj+lHEPTRynRwG7urhLhkwzVOCmvVGeuns5 hcoQ== X-Gm-Message-State: AA+aEWaFEHq3nOmMNWTc3hfr+vmKOsMgMaR42lYrbpk0g5rMHAFjPoex U+rzWW9u5xEQrB6Coemw591quBmOOQpxoA== X-Google-Smtp-Source: AFSGD/Xl2nfJsuwj3xkJpCGt6CN0gZTpAOoQDaZFXdbPv46oJocBTTOemNKdPceddbP4tzdLiiQsxA== X-Received: by 2002:a0c:d174:: with SMTP id c49mr3954918qvh.231.1544230079305; Fri, 07 Dec 2018 16:47:59 -0800 (PST) Received: from kdgwill07.nyc.corp.google.com ([2620:0:1003:510:59af:10e9:2d49:6b0a]) by smtp.googlemail.com with ESMTPSA id u50sm3528231qta.23.2018.12.07.16.47.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Dec 2018 16:47:58 -0800 (PST) From: Kyle Williams X-Google-Original-From: Kyle Williams To: linux-kernel@vger.kernel.org Cc: kdgwill@chromium.org, Greg Kroah-Hartman , Alan Stern , Mathias Nyman , Nicolas Boichat , Jon Flatley , Felipe Balbi , Kai-Heng Feng , Danilo Krummrich , Kuppuswamy Sathyanarayanan , =?UTF-8?q?Maxence=20Dupr=C3=A8s?= , Kamil Lulko , Emmanuel Pescosta , linux-usb@vger.kernel.org Subject: [PATCH v2] USB: quirks: disable LPM for Logitech UVC devices Date: Fri, 7 Dec 2018 19:46:38 -0500 Message-Id: <20181208004641.240699-1-kdgwill@google.com> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181207222138.GB161210@google.com> References: <20181207222138.GB161210@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kyle Williams Description: Some USB device / host controller combinations seem to have problems with Link Power management. In particular it is described that the combination of certain Logitech uvc devices and other powered media devices such causes 'not enough bandwidth for new device state' error. This patch enables the USB_QUIRK_NO_LPM quirk entries for all connected Logitech UVC devices indicating LPM should remain disabled for the device. Signed-off-by: Kyle Williams --- Changes in v2: - changed commit message - disble lpm for all logitech uvc devices instead of listing manually - changes to allow the lpm to correctly be disabled after enumeration drivers/usb/core/hub.c | 87 +++++++++++++++++++++------------------ drivers/usb/core/quirks.c | 2 +- 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 0f9381b69a3b..8f366ec4d21b 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -365,6 +365,51 @@ static void usb_set_lpm_parameters(struct usb_device *udev) usb_set_lpm_sel(udev, &udev->u2_params); } +/* + * There are reports of USB 3.0 devices that say they support USB 2.0 Link PM + * when they're plugged into a USB 2.0 port, but they don't work when LPM is + * enabled. + * + * Only enable USB 2.0 Link PM if the port is internal (hardwired), or the + * device says it supports the new USB 2.0 Link PM errata by setting the BESL + * support bit in the BOS descriptor. + */ +static void hub_set_initial_usb2_lpm_policy(struct usb_device *udev) +{ + struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent); + int connect_type = USB_PORT_CONNECT_TYPE_UNKNOWN; + + if (!udev->usb2_hw_lpm_capable || !udev->bos) + return; + + if (hub) + connect_type = hub->ports[udev->portnum - 1]->connect_type; + + if ((udev->bos->ext_cap->bmAttributes & cpu_to_le32(USB_BESL_SUPPORT)) + || connect_type == USB_PORT_CONNECT_TYPE_HARD_WIRED) { + udev->usb2_hw_lpm_allowed = 1; + usb_set_usb2_hardware_lpm(udev, 1); + } +} + +void usb_update_device_lpm(struct usb_hcd *hcd, struct usb_device *udev) +{ + int retval; + + if (udev->wusb == 0 && le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0201) { + retval = usb_get_bos_descriptor(udev); + if (!retval) { + udev->lpm_capable = usb_device_supports_lpm(udev); + usb_set_lpm_parameters(udev); + } + } + + /* notify HCD that we have a device connected and addressed */ + if (hcd->driver->update_device) + hcd->driver->update_device(hcd, udev); + hub_set_initial_usb2_lpm_policy(udev); +} + /* USB 2.0 spec Section 11.24.4.5 */ static int get_hub_descriptor(struct usb_device *hdev, struct usb_hub_descriptor *desc) @@ -2295,7 +2340,6 @@ static int usb_enumerate_device_otg(struct usb_device *udev) return err; } - /** * usb_enumerate_device - Read device configs/intfs/otg (usbcore-internal) * @udev: newly addressed device (in ADDRESS state) @@ -2351,6 +2395,8 @@ static int usb_enumerate_device(struct usb_device *udev) usb_detect_interface_quirks(udev); + usb_update_device_lpm(hcd, udev); + return 0; } @@ -4402,33 +4448,6 @@ static int hub_set_address(struct usb_device *udev, int devnum) return retval; } -/* - * There are reports of USB 3.0 devices that say they support USB 2.0 Link PM - * when they're plugged into a USB 2.0 port, but they don't work when LPM is - * enabled. - * - * Only enable USB 2.0 Link PM if the port is internal (hardwired), or the - * device says it supports the new USB 2.0 Link PM errata by setting the BESL - * support bit in the BOS descriptor. - */ -static void hub_set_initial_usb2_lpm_policy(struct usb_device *udev) -{ - struct usb_hub *hub = usb_hub_to_struct_hub(udev->parent); - int connect_type = USB_PORT_CONNECT_TYPE_UNKNOWN; - - if (!udev->usb2_hw_lpm_capable || !udev->bos) - return; - - if (hub) - connect_type = hub->ports[udev->portnum - 1]->connect_type; - - if ((udev->bos->ext_cap->bmAttributes & cpu_to_le32(USB_BESL_SUPPORT)) || - connect_type == USB_PORT_CONNECT_TYPE_HARD_WIRED) { - udev->usb2_hw_lpm_allowed = 1; - usb_set_usb2_hardware_lpm(udev, 1); - } -} - static int hub_enable_device(struct usb_device *udev) { struct usb_hcd *hcd = bus_to_hcd(udev->bus); @@ -4779,19 +4798,9 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, usb_detect_quirks(udev); - if (udev->wusb == 0 && le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0201) { - retval = usb_get_bos_descriptor(udev); - if (!retval) { - udev->lpm_capable = usb_device_supports_lpm(udev); - usb_set_lpm_parameters(udev); - } - } + usb_update_device_lpm(hcd, udev); retval = 0; - /* notify HCD that we have a device connected and addressed */ - if (hcd->driver->update_device) - hcd->driver->update_device(hcd, udev); - hub_set_initial_usb2_lpm_policy(udev); fail: if (retval) { hub_port_disable(hub, port1, 0); diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 0690fcff0ea2..bbbb7e6df958 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -440,7 +440,7 @@ static const struct usb_device_id usb_quirk_list[] = { static const struct usb_device_id usb_interface_quirk_list[] = { /* Logitech UVC Cameras */ { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0), - .driver_info = USB_QUIRK_RESET_RESUME }, + .driver_info = USB_QUIRK_RESET_RESUME | USB_QUIRK_NO_LPM }, { } /* terminating entry must be last */ }; -- 2.20.0.rc2.403.gdbc3b29805-goog