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_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 C418CC46470 for ; Tue, 28 May 2019 07:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A722720883 for ; Tue, 28 May 2019 07:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727939AbfE1HzX (ORCPT ); Tue, 28 May 2019 03:55:23 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:14207 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726789AbfE1HzW (ORCPT ); Tue, 28 May 2019 03:55:22 -0400 X-UUID: 2c54a368901941008760f6ac2ddf19e5-20190528 X-UUID: 2c54a368901941008760f6ac2ddf19e5-20190528 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1469220644; Tue, 28 May 2019 15:55:16 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 28 May 2019 15:55:15 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 28 May 2019 15:55:14 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman CC: Matthias Brugger , Randy Dunlap , Chunfeng Yun , , , , Subject: [v3 PATCH] usb: create usb_debug_root for gadget only Date: Tue, 28 May 2019 15:54:59 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_USB is not set, and CONFIG_USB_GADGET is set, there is an issue, e.g.: drivers/usb/mtu3/mtu3_debugfs.o: in function 'ssusb_debugfs_create_root': mtu3_debugfs.c:(.text+0xba3): undefined reference to 'usb_debug_root' usb_debug_root is currently only built when host is supported (CONFIG_USB is set), for convenience, we also want it created when gadget only is enabled, this patch try to support it. Reported-by: Randy Dunlap Signed-off-by: Chunfeng Yun --- v3: 1. still create usb_debug_root for gadget only 2. abandon mtu3's change 3. drop acked-by Randy v2(resend): add acked-by Randy v1: fix mtu3's build error, replace usb_debug_root by NULL; --- drivers/usb/core/usb.c | 2 +- drivers/usb/gadget/udc/core.c | 27 +++++++++++++++++++++++++++ include/linux/usb.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 7fcb9f782931..88b3ee03a12d 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1190,7 +1190,7 @@ EXPORT_SYMBOL_GPL(usb_debug_root); static void usb_debugfs_init(void) { - usb_debug_root = debugfs_create_dir("usb", NULL); + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); debugfs_create_file("devices", 0444, usb_debug_root, NULL, &usbfs_devices_fops); } diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 7cf34beb50df..ed45f9429e58 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -1587,12 +1588,37 @@ static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } +/* if CONFIG_USB is set, leave USB core to create usb_debug_root */ +#ifndef CONFIG_USB +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL(usb_debug_root); + +static void usb_debugfs_init(void) +{ + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); +} + +static void usb_debugfs_cleanup(void) +{ + debugfs_remove_recursive(usb_debug_root); +} +#else +static void usb_debugfs_init(void) +{} + +static void usb_debugfs_cleanup(void) +{} +#endif + static int __init usb_udc_init(void) { + usb_debugfs_init(); + udc_class = class_create(THIS_MODULE, "udc"); if (IS_ERR(udc_class)) { pr_err("failed to create udc class --> %ld\n", PTR_ERR(udc_class)); + usb_debugfs_cleanup(); return PTR_ERR(udc_class); } @@ -1604,6 +1630,7 @@ subsys_initcall(usb_udc_init); static void __exit usb_udc_exit(void) { class_destroy(udc_class); + usb_debugfs_cleanup(); } module_exit(usb_udc_exit); diff --git a/include/linux/usb.h b/include/linux/usb.h index ae82d9d1112b..9c6e7b3265af 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1994,6 +1994,7 @@ extern void usb_register_notify(struct notifier_block *nb); extern void usb_unregister_notify(struct notifier_block *nb); /* debugfs stuff */ +#define USB_DEBUG_ROOT_NAME "usb" extern struct dentry *usb_debug_root; /* LED triggers */ -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunfeng Yun Subject: [v3 PATCH] usb: create usb_debug_root for gadget only Date: Tue, 28 May 2019 15:54:59 +0800 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Greg Kroah-Hartman Cc: Matthias Brugger , Randy Dunlap , Chunfeng Yun , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: linux-mediatek@lists.infradead.org When CONFIG_USB is not set, and CONFIG_USB_GADGET is set, there is an issue, e.g.: drivers/usb/mtu3/mtu3_debugfs.o: in function 'ssusb_debugfs_create_root': mtu3_debugfs.c:(.text+0xba3): undefined reference to 'usb_debug_root' usb_debug_root is currently only built when host is supported (CONFIG_USB is set), for convenience, we also want it created when gadget only is enabled, this patch try to support it. Reported-by: Randy Dunlap Signed-off-by: Chunfeng Yun --- v3: 1. still create usb_debug_root for gadget only 2. abandon mtu3's change 3. drop acked-by Randy v2(resend): add acked-by Randy v1: fix mtu3's build error, replace usb_debug_root by NULL; --- drivers/usb/core/usb.c | 2 +- drivers/usb/gadget/udc/core.c | 27 +++++++++++++++++++++++++++ include/linux/usb.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 7fcb9f782931..88b3ee03a12d 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1190,7 +1190,7 @@ EXPORT_SYMBOL_GPL(usb_debug_root); static void usb_debugfs_init(void) { - usb_debug_root = debugfs_create_dir("usb", NULL); + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); debugfs_create_file("devices", 0444, usb_debug_root, NULL, &usbfs_devices_fops); } diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 7cf34beb50df..ed45f9429e58 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -1587,12 +1588,37 @@ static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } +/* if CONFIG_USB is set, leave USB core to create usb_debug_root */ +#ifndef CONFIG_USB +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL(usb_debug_root); + +static void usb_debugfs_init(void) +{ + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); +} + +static void usb_debugfs_cleanup(void) +{ + debugfs_remove_recursive(usb_debug_root); +} +#else +static void usb_debugfs_init(void) +{} + +static void usb_debugfs_cleanup(void) +{} +#endif + static int __init usb_udc_init(void) { + usb_debugfs_init(); + udc_class = class_create(THIS_MODULE, "udc"); if (IS_ERR(udc_class)) { pr_err("failed to create udc class --> %ld\n", PTR_ERR(udc_class)); + usb_debugfs_cleanup(); return PTR_ERR(udc_class); } @@ -1604,6 +1630,7 @@ subsys_initcall(usb_udc_init); static void __exit usb_udc_exit(void) { class_destroy(udc_class); + usb_debugfs_cleanup(); } module_exit(usb_udc_exit); diff --git a/include/linux/usb.h b/include/linux/usb.h index ae82d9d1112b..9c6e7b3265af 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1994,6 +1994,7 @@ extern void usb_register_notify(struct notifier_block *nb); extern void usb_unregister_notify(struct notifier_block *nb); /* debugfs stuff */ +#define USB_DEBUG_ROOT_NAME "usb" extern struct dentry *usb_debug_root; /* LED triggers */ -- 2.21.0 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, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,UNPARSEABLE_RELAY,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 89D94C04AB6 for ; Tue, 28 May 2019 07:55:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5AAD720883 for ; Tue, 28 May 2019 07:55:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gt+i9tJy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5AAD720883 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=ChT4IjWJZQU1QQTbdCLlQNAYfftGXiEVYmXtkpevSL4=; b=gt+i9tJyPBoOZ/ uU7XrS2myw+wly5DI9cl+BV6s/kGYd+3j62ijBW44crcVa5Zsy5bbQjnHXGJbl0f5h7dOQuqDQ92F zZXE8fm/4TNJXkq71XzUqCCr7lOHcuzoABFd1s+HE1UoXUCiyKmERauMxfXA71boU/hXWRO4zN7aA 5ytKJmG5HmC8eutNHlZpIyp0in3a7Z02Ku8aR/WVtPBlu1d0j6hXqPBqfoKHTvMFVwv8auKLJTLcQ EGGBzBJxO6oaylS8Eu6wD3YpudPf0wCjoL2QghdwWHzEeRbjb86HVEsSRuB5dM6b/YN0Op94cFECJ qWbCGyVavDifxj2UGMdQ==; 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 1hVWxG-0005g0-Cx; Tue, 28 May 2019 07:55:30 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVWxD-0005f0-5j; Tue, 28 May 2019 07:55:28 +0000 X-UUID: ddfd4b37246044219cd204a1121c6dde-20190527 X-UUID: ddfd4b37246044219cd204a1121c6dde-20190527 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 411010569; Mon, 27 May 2019 23:55:18 -0800 Received: from MTKMBS31N2.mediatek.inc (172.27.4.87) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 28 May 2019 00:55:17 -0700 Received: from mtkcas09.mediatek.inc (172.21.101.178) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 28 May 2019 15:55:15 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 28 May 2019 15:55:14 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman Subject: [v3 PATCH] usb: create usb_debug_root for gadget only Date: Tue, 28 May 2019 15:54:59 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190528_005527_220383_C2FCE8E2 X-CRM114-Status: GOOD ( 13.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-usb@vger.kernel.org, Randy Dunlap , linux-kernel@vger.kernel.org, Chunfeng Yun , linux-mediatek@lists.infradead.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org When CONFIG_USB is not set, and CONFIG_USB_GADGET is set, there is an issue, e.g.: drivers/usb/mtu3/mtu3_debugfs.o: in function 'ssusb_debugfs_create_root': mtu3_debugfs.c:(.text+0xba3): undefined reference to 'usb_debug_root' usb_debug_root is currently only built when host is supported (CONFIG_USB is set), for convenience, we also want it created when gadget only is enabled, this patch try to support it. Reported-by: Randy Dunlap Signed-off-by: Chunfeng Yun --- v3: 1. still create usb_debug_root for gadget only 2. abandon mtu3's change 3. drop acked-by Randy v2(resend): add acked-by Randy v1: fix mtu3's build error, replace usb_debug_root by NULL; --- drivers/usb/core/usb.c | 2 +- drivers/usb/gadget/udc/core.c | 27 +++++++++++++++++++++++++++ include/linux/usb.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 7fcb9f782931..88b3ee03a12d 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1190,7 +1190,7 @@ EXPORT_SYMBOL_GPL(usb_debug_root); static void usb_debugfs_init(void) { - usb_debug_root = debugfs_create_dir("usb", NULL); + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); debugfs_create_file("devices", 0444, usb_debug_root, NULL, &usbfs_devices_fops); } diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index 7cf34beb50df..ed45f9429e58 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -1587,12 +1588,37 @@ static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } +/* if CONFIG_USB is set, leave USB core to create usb_debug_root */ +#ifndef CONFIG_USB +struct dentry *usb_debug_root; +EXPORT_SYMBOL_GPL(usb_debug_root); + +static void usb_debugfs_init(void) +{ + usb_debug_root = debugfs_create_dir(USB_DEBUG_ROOT_NAME, NULL); +} + +static void usb_debugfs_cleanup(void) +{ + debugfs_remove_recursive(usb_debug_root); +} +#else +static void usb_debugfs_init(void) +{} + +static void usb_debugfs_cleanup(void) +{} +#endif + static int __init usb_udc_init(void) { + usb_debugfs_init(); + udc_class = class_create(THIS_MODULE, "udc"); if (IS_ERR(udc_class)) { pr_err("failed to create udc class --> %ld\n", PTR_ERR(udc_class)); + usb_debugfs_cleanup(); return PTR_ERR(udc_class); } @@ -1604,6 +1630,7 @@ subsys_initcall(usb_udc_init); static void __exit usb_udc_exit(void) { class_destroy(udc_class); + usb_debugfs_cleanup(); } module_exit(usb_udc_exit); diff --git a/include/linux/usb.h b/include/linux/usb.h index ae82d9d1112b..9c6e7b3265af 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1994,6 +1994,7 @@ extern void usb_register_notify(struct notifier_block *nb); extern void usb_unregister_notify(struct notifier_block *nb); /* debugfs stuff */ +#define USB_DEBUG_ROOT_NAME "usb" extern struct dentry *usb_debug_root; /* LED triggers */ -- 2.21.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel