From patchwork Mon May 4 13:44:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 11526019 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D67B15E6 for ; Mon, 4 May 2020 13:48:22 +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 3A81B21775 for ; Mon, 4 May 2020 13:48:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nLp2RlIF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Dzvo488r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A81B21775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:References:In-Reply-To: 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: List-Owner; bh=r7LE0FlTiszbwjusoN4J/2j6oXEp9X2zdx5HTBGl5rM=; b=nLp2RlIFIAZ1PW dd1a8uRDuULhysOHle0/xksh9iBoRu7U9vKjzABVsW+RtnmomS624tzbiBdeLSLEmcHdGRSr90AUo xBoCTDscHTHPLaUblrX0UY04inZfs2Zlj/+kSUuyZSEomuETefbBWJI3u95jSj881+pyIQD7saeBk BqdxLdVaztzAeHu4jjAXWxz+w+3Td+L3joQ/ITNU2mR2/PEq5amH8lEehpZNSpJf5b8/HvHrD7mV2 eJyf3gyDTRCtnBAdD4AW86uHEuHr/S7ojRk9pxZm5prKGnjov1hKGb5zcEJpvvTgsI3UHOk6XqOwX 7HEeWWxP7RDt3W5TpisA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jVbSF-0008Uw-Fz; Mon, 04 May 2020 13:48:19 +0000 Received: from esa2.microchip.iphmx.com ([68.232.149.84]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jVbRC-0007HX-4F for linux-arm-kernel@lists.infradead.org; Mon, 04 May 2020 13:47:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1588600034; x=1620136034; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mzrqr3G8iZcqzNlVDE8Bp5RQaqxIcZQVI/t/Po77lqo=; b=Dzvo488rFJa9UZTXw3ieACa6lO5TM2ZkVNSbdGR1fefCydRi8+djJAbB iJ+GQyxgwlzDFFvAUJDXJbU4wpRhnUnW2ZsOi5AKFWwoePSJqh0pRJqXz ontKjKxTPcqzTqncKyA5AXYUbBoit4VDR/+FWKzofCXtUQC0UpOIBIFK3 lI+eEoTO1+kgpo2WS2O9NVuZKwF3LMn0DKyHoVjh3Af3iNXHlC41Hv9gi xwBOmvKERyCl5v6cXMIxgWAIxp6CJx/Keid8sRpMmhWUrP0c5/EScQ3lk PgP43FFx+9ZEIzHFW0jnB2yppPvlu18vIbl9u/UQ3w/volzMPYIj23fC4 A==; IronPort-SDR: LeACB26FaamIcb3cWCu14cDkh7tkabI+Vn9g6mb3xiWVIhmhOIFGRmrVEaPdZYcyRxphPIvZDb bCeBfPdHJzJ0mmMOQ7lZSLepDazjBEc+AEMm66TG9HDNtrHpg1Bc8t/HUg8+hCagAZzOAvj6QU 3cqm82Tuq0a13UI//9/vdtaT394pfxcMM137Qx4Q9u8655KKUIgbHJdjK/RjqgX6dr5ZoEvLZ/ a3Yn0ml1wP7PlX8eqixy+x2euT/aUdRWeSDJl/5jCUS4Fp4k/3ZSZdy05ydRkTnBECJwQItQlb VYE= X-IronPort-AV: E=Sophos;i="5.73,352,1583218800"; d="scan'208";a="74135784" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 04 May 2020 06:46:46 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 4 May 2020 06:46:47 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Mon, 4 May 2020 06:46:43 -0700 From: To: , , "Claudiu Beznea" , Subject: [PATCH v3 5/7] net: macb: fix call to pm_runtime in the suspend/resume functions Date: Mon, 4 May 2020 15:44:20 +0200 Message-ID: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200504_064714_410906_C2960186 X-CRM114-Status: GOOD ( 11.09 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [68.232.149.84 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrew@lunn.ch, Alexandre Belloni , f.fainelli@gmail.com, michal.simek@xilinx.com, antoine.tenart@bootlin.com, linux@armlinux.org.uk, linux-kernel@vger.kernel.org, Sergio Prado , "David S. Miller" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Nicolas Ferre The calls to pm_runtime_force_suspend/resume() functions are only relevant if the device is not configured to act as a WoL wakeup source. Add the device_may_wakeup() test before calling them. Fixes: 3e2a5e153906 ("net: macb: add wake-on-lan support via magic packet") Cc: Claudiu Beznea Cc: Harini Katakam Cc: Sergio Prado Reviewed-by: Florian Fainelli Signed-off-by: Nicolas Ferre --- Changes in v3: - remove the parenthesis around device_may_wakeup() Changes in v2: - new in v2 serries drivers/net/ethernet/cadence/macb_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 72b8983a763a..b42831966ffa 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4564,7 +4564,8 @@ static int __maybe_unused macb_suspend(struct device *dev) if (bp->ptp_info) bp->ptp_info->ptp_remove(netdev); - pm_runtime_force_suspend(dev); + if (!device_may_wakeup(dev)) + pm_runtime_force_suspend(dev); return 0; } @@ -4579,7 +4580,8 @@ static int __maybe_unused macb_resume(struct device *dev) if (!netif_running(netdev)) return 0; - pm_runtime_force_resume(dev); + if (!device_may_wakeup(dev)) + pm_runtime_force_resume(dev); if (bp->wol & MACB_WOL_ENABLED) { macb_writel(bp, IDR, MACB_BIT(WOL));