From patchwork Wed Jul 19 17:37:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Gagniuc X-Patchwork-Id: 122755 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2604604vqt; Wed, 19 Jul 2023 10:48:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlG1pQUJgxfb19X9SQlKk8WM6ypmjI3Ji9flX1CHYeki/SLPAeJMO6+3/uOZ1P3G+ARKcT5F X-Received: by 2002:a05:6512:3a87:b0:4fb:c881:be5b with SMTP id q7-20020a0565123a8700b004fbc881be5bmr578273lfu.2.1689788914458; Wed, 19 Jul 2023 10:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689788914; cv=none; d=google.com; s=arc-20160816; b=urddbW3egdsxavCxrAX6H8w+5dZ15MJBu5OQIKxaEBU3AYDVnRG0HSkulUZLgPLRKR c4RlHaMd4vFfL0+ZkZmK/eZ5Dy6OLWCUQE8T+egcEgv54mXwnDI65m2ZBbWHjiH50LQw qyYOAcBQLBuWhBy3nbCBVIHhyIHj7v4gLYNRMCvWFLABnBdDk9go1yQ0jZpVioSUixc5 5akOPr5W8CoYOhjTzoJXFpFTRMQms4ymS79FYi/IFfrIHD3PTlh6Crd2fXjxgiUKsG4S cp10O+jc+/I5es5HiPFq9Cxq8gBokCpTOUAkb9ol3f4nNwEgWjgh86pUx6Kop9NY5S5g MNOA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qxAHiS1dMKUPvSOrNPg4ns2JBXqCwmJKuYUyY8qtwHk=; fh=OGVcpkow+bW0eya4lNVJeZuukVDqW1SjwDdUyZmIjkA=; b=KKzw0KpAGg+o+9HX7BCdTFBrphx4mZcIL0IR2sbdcSa+vp3dIpJRfdwlMlwcFwTTf5 D6J9PIIOhkEf6++hB8CrYcIfo6X4/S6N6IhYp5qrlElZSnfSlBX8LBEdqrhAEthn+nwB f2WeHIrvKEK0QLi5IVH1gcU6imfPrcteHQ9eVs9MBWLdrAM3Sn+HLQ0PRMJQVKJnkggM kj93rSV8pucygR8Tu5uQSbYZh77Ibmum0I/pNSO5+qNYlu7VxaE7dI3uLMk4uJLOai/N O2Vp+qJ39uCGYiOKKLqb6W8kLggLNosN6KzvOZ3S6FMoVxhtMtlsRTlFH+McRfFaEUzZ K17w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hp.com header.s=mimecast20180716 header.b=XN2Z+wVz; 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=REJECT sp=REJECT dis=NONE) header.from=hp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p16-20020a056402075000b0051fee9567c0si3314775edy.312.2023.07.19.10.48.07; Wed, 19 Jul 2023 10:48:34 -0700 (PDT) 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=@hp.com header.s=mimecast20180716 header.b=XN2Z+wVz; 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=REJECT sp=REJECT dis=NONE) header.from=hp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229810AbjGSRi6 (ORCPT + 99 others); Wed, 19 Jul 2023 13:38:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbjGSRi4 (ORCPT ); Wed, 19 Jul 2023 13:38:56 -0400 Received: from us-smtp-delivery-162.mimecast.com (us-smtp-delivery-162.mimecast.com [170.10.129.162]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DF6519B4 for ; Wed, 19 Jul 2023 10:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hp.com; s=mimecast20180716; t=1689788288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qxAHiS1dMKUPvSOrNPg4ns2JBXqCwmJKuYUyY8qtwHk=; b=XN2Z+wVzrI7P8m/UrninbWUyJUqNwVa9n5D2GDAtWCaKBuwselXEWB5mYse5ux1VF8aTRA duwOe6GAJzee0pSVa4Fqm6tmPoj1Iq9own4wLT5bnxS1QSYRSGvsB4cBa7SyxuAt/3Ngct 67Ogi0KLo/d1/tXCh2d5XJ8nrDK6vi8= Received: from g2t4621.austin.hp.com (g2t4621.austin.hp.com [15.73.212.80]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-611-vkySPCFzPUOsuizxogouvw-1; Wed, 19 Jul 2023 13:38:02 -0400 X-MC-Unique: vkySPCFzPUOsuizxogouvw-1 Received: from g1t6217.austin.hpicorp.net (g1t6217.austin.hpicorp.net [15.67.1.144]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by g2t4621.austin.hp.com (Postfix) with ESMTPS id B083426F; Wed, 19 Jul 2023 17:37:59 +0000 (UTC) Received: from jam-buntu.lan (unknown [15.74.50.248]) by g1t6217.austin.hpicorp.net (Postfix) with ESMTP id 174AB65; Wed, 19 Jul 2023 17:37:58 +0000 (UTC) From: Alexandru Gagniuc To: linux-usb@vger.kernel.org, netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hayeswang@realtek.com, jflf_kernel@gmx.com, bjorn@mork.no, svenva@chromium.org, linux-kernel@vger.kernel.org, eniac-xw.zhang@hp.com, Alexandru Gagniuc , stable@vger.kernel.org Subject: [PATCH v2] r8152: Suspend USB device before shutdown when WoL is enabled Date: Wed, 19 Jul 2023 17:37:56 +0000 Message-Id: <20230719173756.380829-1-alexandru.gagniuc@hp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <2c12d7a0-3edb-48b3-abf7-135e1a8838ca@rowland.harvard.edu> References: <2c12d7a0-3edb-48b3-abf7-135e1a8838ca@rowland.harvard.edu> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: hp.com X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: INBOX X-GMAIL-THRID: 1770698537518637042 X-GMAIL-MSGID: 1771872100722510383 For Wake-on-LAN to work from S5 (shutdown), the USB link must be put in U3 state. If it is not, and the host "disappears", the chip will no longer respond to WoL triggers. To resolve this, add a notifier block and register it as a reboot notifier. When WoL is enabled, work through the usb_device struct to get to the suspend function. Calling this function puts the link in the correct state for WoL to function. Fixes: 21ff2e8976b1 ("r8152: support WOL") Cc: stable@vger.kernel.org Signed-off-by: Alexandru Gagniuc --- Changes since v1: * Add "Fixes:" tag to commit message drivers/net/usb/r8152.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 0738baa5b82e..abb82a80d262 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -876,6 +877,7 @@ struct r8152 { struct delayed_work schedule, hw_phy_work; struct mii_if_info mii; struct mutex control; /* use for hw setting */ + struct notifier_block reboot_notifier; #ifdef CONFIG_PM_SLEEP struct notifier_block pm_notifier; #endif @@ -9610,6 +9612,25 @@ static bool rtl8152_supports_lenovo_macpassthru(struct usb_device *udev) return 0; } +/* Suspend realtek chip before system shutdown + * + * For Wake-on-LAN to work from S5, the USB link must be put in U3 state. If + * the host otherwise "disappears", the chip will not respond to WoL triggers. + */ +static int rtl8152_notify(struct notifier_block *nb, unsigned long code, + void *unused) +{ + struct r8152 *tp = container_of(nb, struct r8152, reboot_notifier); + struct device *dev = &tp->udev->dev; + + if (code == SYS_POWER_OFF) { + if (tp->saved_wolopts && dev->type->pm->suspend) + dev->type->pm->suspend(dev); + } + + return NOTIFY_DONE; +} + static int rtl8152_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -9792,6 +9813,9 @@ static int rtl8152_probe(struct usb_interface *intf, else device_set_wakeup_enable(&udev->dev, false); + tp->reboot_notifier.notifier_call = rtl8152_notify; + register_reboot_notifier(&tp->reboot_notifier); + netif_info(tp, probe, netdev, "%s\n", DRIVER_VERSION); return 0; @@ -9812,6 +9836,7 @@ static void rtl8152_disconnect(struct usb_interface *intf) if (tp) { rtl_set_unplug(tp); + unregister_reboot_notifier(&tp->reboot_notifier); unregister_netdev(tp->netdev); tasklet_kill(&tp->tx_tl); cancel_delayed_work_sync(&tp->hw_phy_work);