From patchwork Thu Feb 9 10:56:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 54861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp264248wrn; Thu, 9 Feb 2023 02:59:37 -0800 (PST) X-Google-Smtp-Source: AK7set+01jV7lkmh1W3uxq2oQyfpIMCv2wptIBcnGsjdWZs0qGcpkoYmTSnFanj4It332ap3qocW X-Received: by 2002:a62:16ce:0:b0:59f:6211:e4b0 with SMTP id 197-20020a6216ce000000b0059f6211e4b0mr9076487pfw.32.1675940376851; Thu, 09 Feb 2023 02:59:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675940376; cv=none; d=google.com; s=arc-20160816; b=F8UqBxKyWf2riieNxb9Ufw0BHGQi8afuH6w98MvLGnXNfmg+43ySAvK73WczSOy7SM 23oLx6/3dWFiMlDy3LutpoWPGOld7EdXJW/ilUWxQFZPKxv/EO++kxOiuMDxiy/e6Hdf GQkT7ldy1RFb58j1A+8WP0hL6/EuqdOB8kWw32f8bd36fwkYOtMD3m3BhEzf3347OxQq QmQuTdsGKfXvXAWX95Zob19iYyUXRtaJ32CX1qi4cPx4bQfSmDA9r4VbVrzcOZJgqweI nvtMewX1bWQFgzrnhE6ocpQwKYb3YiJZn/GgBE+Qe4ZAu1KmH2OLAegwoXkGpP4kXuIW lzMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8Rj931UpR4sPfkYMBJNzZ2RhNPpS/Zxi0rg4US/2knY=; b=GI7N/IWeffloma7Ee4q2IZw9fXnnHRW83hUtjyGl1xMkDXhBJ5ec21wb7D8i++jtZ2 SRy1O6SP9am7QHbzBMe5oJK+Z/ZCgwnS6xeQTiSI1GtK8b2QJF7gZh6lo+Ua5dBfmmx4 nS2B3rdQYxR754Lo6bnQpi9Kzm0yqDZU+fNkYiJB3jDgQdX33mvxFzvpAyQJmEt2X8/5 a6BTbLP8z69heFH6rZMjhZlgtUXXXzCHNtXwQduR0cVTNiaBvm8T9I2L9F7GduvJ9eor 3m51WuwwBPP9jAAx1/YczJCsHwZ8OsXuehvOUSFHn3gPYrcneafiVttyUH5fQ4qov8Tt 1o6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=xAIctGGu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s65-20020a625e44000000b0059394677948si1483413pfb.164.2023.02.09.02.59.24; Thu, 09 Feb 2023 02:59:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=xAIctGGu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230038AbjBIK4j (ORCPT + 99 others); Thu, 9 Feb 2023 05:56:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229810AbjBIK4f (ORCPT ); Thu, 9 Feb 2023 05:56:35 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 004AF45F71; Thu, 9 Feb 2023 02:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1675940192; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=8Rj931UpR4sPfkYMBJNzZ2RhNPpS/Zxi0rg4US/2knY=; b=xAIctGGuOLVs3hAmUX9dtux/LaLJMwYJPqPWyx6PpPFfFLdf8c96TTOLzzpE5aAqiVuUK8 Kh3JQESJfInyGEvWl+/Kp9XVFu5Zh8UtTDKFEqX7y/pctyDRMqeMEiWzkvlyzgEU2tVEdq c0SU+JxYBViTJNZmCVgu8NwCTUOneo8= From: Paul Cercueil To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Sascha Hauer Subject: [PATCH][6.2] Revert "usb: gadget: u_ether: Do not make UDC parent of the net device" Date: Thu, 9 Feb 2023 10:56:26 +0000 Message-Id: <20230209105626.10597-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757350856481388490?= X-GMAIL-MSGID: =?utf-8?q?1757350856481388490?= This reverts commit 321b59870f850a10dbb211ecd2bd87b41497ea6f. This commit broke USB networking on Ingenic SoCs and maybe elsewhere. The actual reason is unknown; and while a proper fix would be better, we're sitting at -rc7 now, so a revert is justified - and we can work on re-introducing this change for 6.3. Fixes: 321b59870f85 ("usb: gadget: u_ether: Do not make UDC parent of the net device") Signed-off-by: Paul Cercueil Cc: Sascha Hauer Cc: Greg Kroah-Hartman Acked-by: Sascha Hauer --- drivers/usb/gadget/function/u_ether.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index 8f12f3f8f6ee..e06022873df1 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -798,6 +798,7 @@ struct eth_dev *gether_setup_name(struct usb_gadget *g, net->max_mtu = GETHER_MAX_MTU_SIZE; dev->gadget = g; + SET_NETDEV_DEV(net, &g->dev); SET_NETDEV_DEVTYPE(net, &gadget_type); status = register_netdev(net); @@ -872,6 +873,8 @@ int gether_register_netdev(struct net_device *net) struct usb_gadget *g; int status; + if (!net->dev.parent) + return -EINVAL; dev = netdev_priv(net); g = dev->gadget; @@ -902,6 +905,7 @@ void gether_set_gadget(struct net_device *net, struct usb_gadget *g) dev = netdev_priv(net); dev->gadget = g; + SET_NETDEV_DEV(net, &g->dev); } EXPORT_SYMBOL_GPL(gether_set_gadget);