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.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 5BDE9C3A5A9 for ; Mon, 4 May 2020 13:47:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 319D3215A4 for ; Mon, 4 May 2020 13:47:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Dzvo488r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728770AbgEDNrS (ORCPT ); Mon, 4 May 2020 09:47:18 -0400 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:21383 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728315AbgEDNrO (ORCPT ); Mon, 4 May 2020 09:47:14 -0400 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" , CC: , "David S. Miller" , Alexandre Belloni , , , , , , "Nicolas Ferre" , Sergio Prado 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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)); -- 2.26.2