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=-8.0 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,URIBL_BLOCKED,USER_AGENT_SANE_1 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 2594ECA90AF for ; Wed, 13 May 2020 14:16:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C65CA204EF for ; Wed, 13 May 2020 14:16:10 +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="ZCqbDqjw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388848AbgEMOQK (ORCPT ); Wed, 13 May 2020 10:16:10 -0400 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:38722 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731192AbgEMOQJ (ORCPT ); Wed, 13 May 2020 10:16:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1589379368; x=1620915368; h=subject:to:cc:references:from:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=UzkFgk4KxPXdtpumytvjaT9DH3n8QRgbvV1ZsZ7ca9s=; b=ZCqbDqjwfFrgaa0bDcK+j5Voj+1Cqbe9ukQQwmgHOXq/9TgJkgKBdcwD qrnUZA8eQHNmbDzi3xFlQROaubIrNeCjsiYT3/vQmjoiJ/PtKAXhJuDRU 6DIYkTO3qxPpgte3AZ8ncmRKC+ZVZBxzmtG1PPzClHWuNcEC/kIjy8ssB Ae6Ao1LKkbpq4a00CXP91T4oCQmf1pdCU9ATVPcJlPGGqeMGDrGN9uXda 99vPx/Y2XSHw3ATFME8s4dDzjDrwJsuf6MrvkBscSfiiWprGBOcoNZbNn G9P0BuD8ZqCeov6HdsLa1kBKvT8JJc8XQLo6ApEMVSkgF24E4ouwZ2kx0 g==; IronPort-SDR: BAhFBmj8YgfLl9K0CKFV6Il6Sh3mNN5rA25bxiNtKTAFHTSbtw1UbUhFshasWmVsDmrUmh34OF 6V6JPqzxQ5e8fH9gJdbnXvkZS6ueKYbciyV84JBVSLybdKYySn2h39eApCA4yGMqbwSyCzbvRi 1WXiyYmrxUPcL+c0JEmHlzOMbdn7wFxc14zIurUdvC/9by6sHYiDbdrj8O1lTqx48LSTISNCGK 0mHXOw7MbZRfa8sRz171/iir+iS1yWQeYULipTTL777gBlA/OFTceROHJB1SQfarxYRdJrax7o v7g= X-IronPort-AV: E=Sophos;i="5.73,388,1583218800"; d="scan'208";a="76511186" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 13 May 2020 07:16:08 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 13 May 2020 07:16:08 -0700 Received: from [10.171.246.28] (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Wed, 13 May 2020 07:16:05 -0700 Subject: Re: [PATCH v4 3/5] net: macb: fix macb_get/set_wol() when moving to phylink To: Russell King - ARM Linux admin CC: , , "Claudiu Beznea" , , "Alexandre Belloni" , , , , "David S. Miller" References: <4aeebe901fde6db70a5ca12b10e793dd2ee6ce60.1588763703.git.nicolas.ferre@microchip.com> <20200513130536.GI1551@shell.armlinux.org.uk> From: Nicolas Ferre Organization: microchip Message-ID: Date: Wed, 13 May 2020 16:16:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200513130536.GI1551@shell.armlinux.org.uk> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Russell, Thanks for the feedback. On 13/05/2020 at 15:05, Russell King - ARM Linux admin wrote: > On Wed, May 06, 2020 at 01:37:39PM +0200, nicolas.ferre@microchip.com wrote: >> From: Nicolas Ferre >> >> Keep previous function goals and integrate phylink actions to them. >> >> phylink_ethtool_get_wol() is not enough to figure out if Ethernet driver >> supports Wake-on-Lan. >> Initialization of "supported" and "wolopts" members is done in phylink >> function, no need to keep them in calling function. >> >> phylink_ethtool_set_wol() return value is not enough to determine >> if WoL is enabled for the calling Ethernet driver. Call it first >> but don't rely on its return value as most of simple PHY drivers >> don't implement a set_wol() function. >> >> Fixes: 7897b071ac3b ("net: macb: convert to phylink") >> Signed-off-by: Nicolas Ferre >> Reviewed-by: Florian Fainelli >> Cc: Claudiu Beznea >> Cc: Harini Katakam >> Cc: Antoine Tenart >> --- >> drivers/net/ethernet/cadence/macb_main.c | 18 ++++++++++-------- >> 1 file changed, 10 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c >> index 53e81ab048ae..24c044dc7fa0 100644 >> --- a/drivers/net/ethernet/cadence/macb_main.c >> +++ b/drivers/net/ethernet/cadence/macb_main.c >> @@ -2817,21 +2817,23 @@ static void macb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) >> { >> struct macb *bp = netdev_priv(netdev); >> >> - wol->supported = 0; >> - wol->wolopts = 0; >> - >> - if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET) >> + if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET) { >> phylink_ethtool_get_wol(bp->phylink, wol); >> + wol->supported |= WAKE_MAGIC; >> + >> + if (bp->wol & MACB_WOL_ENABLED) >> + wol->wolopts |= WAKE_MAGIC; >> + } >> } >> >> static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) >> { >> struct macb *bp = netdev_priv(netdev); >> - int ret; >> >> - ret = phylink_ethtool_set_wol(bp->phylink, wol); >> - if (!ret) >> - return 0; >> + /* Pass the order to phylink layer. >> + * Don't test return value as set_wol() is often not supported. >> + */ >> + phylink_ethtool_set_wol(bp->phylink, wol); > > If this returns an error, does that mean WOL works or does it not? In my use case (simple phy: "Micrel KSZ8081"), if I have the error "-EOPNOTSUPP", it simply means that this phy driver doesn't have the set_wol() function. But on the MAC side, I can perfectly wake-up on WoL event as the phy acts as a pass-through. > Note that if set_wol() is not supported, this will return -EOPNOTSUPP. > What about other errors? True, I don't manage them. But for now this patch is a fix that only reverts to previous behavior. In other terms, it only fixes the regression. But can I make the difference, and how, between? 1/ the phy doesn't support WoL and could prevent the WoL to happen on the MAC 2/ the phy doesn't implement (yet) the set_wol() function, if MAC can manage, it's fine > If you want to just ignore the case where it's not supported, then > this looks like a sledge hammer to crack a nut. Do you suggest that I just don't call phylink_ethtool_set_wol() at all? But what if the underlying phy does support WoL? Best regards, -- Nicolas Ferre