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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,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 A1FB3C10F03 for ; Fri, 1 Mar 2019 16:43:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EBDA2084D for ; Fri, 1 Mar 2019 16:43:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389218AbfCAQne (ORCPT ); Fri, 1 Mar 2019 11:43:34 -0500 Received: from unicorn.mansr.com ([81.2.72.234]:55346 "EHLO unicorn.mansr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728558AbfCAQnd (ORCPT ); Fri, 1 Mar 2019 11:43:33 -0500 Received: by unicorn.mansr.com (Postfix, from userid 51770) id 3269A15632; Fri, 1 Mar 2019 16:43:32 +0000 (GMT) From: Mans Rullgard To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] usb: core: make default autosuspend delay configurable Date: Fri, 1 Mar 2019 16:43:20 +0000 Message-Id: <20190301164320.13948-1-mans@mansr.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190301162341.GC19937@kroah.com> References: <20190301162341.GC19937@kroah.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 Make the default autosuspend delay configurable at build time. This is useful for systems that require a non-standard value as it avoids relying on the command line being properly set. Signed-off-by: Mans Rullgard --- Changes in v2: - add explanatory text to Kconfig help --- drivers/usb/core/Kconfig | 12 ++++++++++++ drivers/usb/core/usb.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index 4d75d9a80001..cd91006e3f84 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -90,3 +90,15 @@ config USB_LEDS_TRIGGER_USBPORT This driver allows LEDs to be controlled by USB events. Enabling this trigger allows specifying list of USB ports that should turn on LED when some USB device gets connected. + +config USB_AUTOSUSPEND_DELAY + int "Default autosuspend delay" + depends on USB + default 2 + help + The default autosuspend delay in seconds. Can be overridden + with the usbcore.autosuspend command line or module parameter. + + The default value Linux has always had is 2 seconds. Change + this value if you want a different delay and cannot modify + the command line or module parameter. diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 4ebfbd737905..52e749386c1c 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -65,8 +65,8 @@ int usb_disabled(void) EXPORT_SYMBOL_GPL(usb_disabled); #ifdef CONFIG_PM -static int usb_autosuspend_delay = 2; /* Default delay value, - * in seconds */ +/* Default delay value, in seconds */ +static int usb_autosuspend_delay = CONFIG_USB_AUTOSUSPEND_DELAY; module_param_named(autosuspend, usb_autosuspend_delay, int, 0644); MODULE_PARM_DESC(autosuspend, "default autosuspend delay"); -- 2.20.1 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: core: make default autosuspend delay configurable From: =?utf-8?b?TcOlbnMgUnVsbGfDpXJk?= Message-Id: <20190301164320.13948-1-mans@mansr.com> Date: Fri, 1 Mar 2019 16:43:20 +0000 To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: TWFrZSB0aGUgZGVmYXVsdCBhdXRvc3VzcGVuZCBkZWxheSBjb25maWd1cmFibGUgYXQgYnVpbGQg dGltZS4KVGhpcyBpcyB1c2VmdWwgZm9yIHN5c3RlbXMgdGhhdCByZXF1aXJlIGEgbm9uLXN0YW5k YXJkIHZhbHVlIGFzCml0IGF2b2lkcyByZWx5aW5nIG9uIHRoZSBjb21tYW5kIGxpbmUgYmVpbmcg cHJvcGVybHkgc2V0LgoKU2lnbmVkLW9mZi1ieTogTWFucyBSdWxsZ2FyZCA8bWFuc0BtYW5zci5j b20+Ci0tLQpDaGFuZ2VzIGluIHYyOgotIGFkZCBleHBsYW5hdG9yeSB0ZXh0IHRvIEtjb25maWcg aGVscAotLS0KIGRyaXZlcnMvdXNiL2NvcmUvS2NvbmZpZyB8IDEyICsrKysrKysrKysrKwogZHJp dmVycy91c2IvY29yZS91c2IuYyAgIHwgIDQgKystLQogMiBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNl cnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2NvcmUv S2NvbmZpZyBiL2RyaXZlcnMvdXNiL2NvcmUvS2NvbmZpZwppbmRleCA0ZDc1ZDlhODAwMDEuLmNk OTEwMDZlM2Y4NCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvY29yZS9LY29uZmlnCisrKyBiL2Ry aXZlcnMvdXNiL2NvcmUvS2NvbmZpZwpAQCAtOTAsMyArOTAsMTUgQEAgY29uZmlnIFVTQl9MRURT X1RSSUdHRVJfVVNCUE9SVAogCSAgVGhpcyBkcml2ZXIgYWxsb3dzIExFRHMgdG8gYmUgY29udHJv bGxlZCBieSBVU0IgZXZlbnRzLiBFbmFibGluZyB0aGlzCiAJICB0cmlnZ2VyIGFsbG93cyBzcGVj aWZ5aW5nIGxpc3Qgb2YgVVNCIHBvcnRzIHRoYXQgc2hvdWxkIHR1cm4gb24gTEVECiAJICB3aGVu IHNvbWUgVVNCIGRldmljZSBnZXRzIGNvbm5lY3RlZC4KKworY29uZmlnIFVTQl9BVVRPU1VTUEVO RF9ERUxBWQorCWludCAiRGVmYXVsdCBhdXRvc3VzcGVuZCBkZWxheSIKKwlkZXBlbmRzIG9uIFVT QgorCWRlZmF1bHQgMgorCWhlbHAKKwkgIFRoZSBkZWZhdWx0IGF1dG9zdXNwZW5kIGRlbGF5IGlu IHNlY29uZHMuICBDYW4gYmUgb3ZlcnJpZGRlbgorCSAgd2l0aCB0aGUgdXNiY29yZS5hdXRvc3Vz cGVuZCBjb21tYW5kIGxpbmUgb3IgbW9kdWxlIHBhcmFtZXRlci4KKworCSAgVGhlIGRlZmF1bHQg dmFsdWUgTGludXggaGFzIGFsd2F5cyBoYWQgaXMgMiBzZWNvbmRzLiAgQ2hhbmdlCisJICB0aGlz IHZhbHVlIGlmIHlvdSB3YW50IGEgZGlmZmVyZW50IGRlbGF5IGFuZCBjYW5ub3QgbW9kaWZ5CisJ ICB0aGUgY29tbWFuZCBsaW5lIG9yIG1vZHVsZSBwYXJhbWV0ZXIuCmRpZmYgLS1naXQgYS9kcml2 ZXJzL3VzYi9jb3JlL3VzYi5jIGIvZHJpdmVycy91c2IvY29yZS91c2IuYwppbmRleCA0ZWJmYmQ3 Mzc5MDUuLjUyZTc0OTM4NmMxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvY29yZS91c2IuYwor KysgYi9kcml2ZXJzL3VzYi9jb3JlL3VzYi5jCkBAIC02NSw4ICs2NSw4IEBAIGludCB1c2JfZGlz YWJsZWQodm9pZCkKIEVYUE9SVF9TWU1CT0xfR1BMKHVzYl9kaXNhYmxlZCk7CiAKICNpZmRlZglD T05GSUdfUE0KLXN0YXRpYyBpbnQgdXNiX2F1dG9zdXNwZW5kX2RlbGF5ID0gMjsJCS8qIERlZmF1 bHQgZGVsYXkgdmFsdWUsCi0JCQkJCQkgKiBpbiBzZWNvbmRzICovCisvKiBEZWZhdWx0IGRlbGF5 IHZhbHVlLCBpbiBzZWNvbmRzICovCitzdGF0aWMgaW50IHVzYl9hdXRvc3VzcGVuZF9kZWxheSA9 IENPTkZJR19VU0JfQVVUT1NVU1BFTkRfREVMQVk7CiBtb2R1bGVfcGFyYW1fbmFtZWQoYXV0b3N1 c3BlbmQsIHVzYl9hdXRvc3VzcGVuZF9kZWxheSwgaW50LCAwNjQ0KTsKIE1PRFVMRV9QQVJNX0RF U0MoYXV0b3N1c3BlbmQsICJkZWZhdWx0IGF1dG9zdXNwZW5kIGRlbGF5Iik7CiAK