From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32C68181B95 for ; Sun, 23 Jun 2024 14:28:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719152919; cv=none; b=YpDV4mJs8P48vST1S1GTQE8sAuDtrCxn/hQRSwHf+dy2bdA4IffcFVGsyXCfmAlYOHTcCTCLljS98Isw7c40Mp/U7XGnxaHeFB5V9FbgEwT3vBwelL9a/tF5BwP8DtjGBaErh9qhnKuU8hVIvo5FjYUFsqJVcfTYOdFAwdjsBpk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719152919; c=relaxed/simple; bh=REj63Oeg1JNeMC+fIOJL4l0TFDuCRg+C0tubzHK0A04=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=gTX1x6dYruXbnuHXvHa+vh0NnAstf7G9B+6MdcteTT4sRTLi8eLCdkzU2Mmu92RIUC1V7I0fN3bdbyRi1n/7HLUvzmbZmv+1pIl8ChrxlbJPUsNO2Nenaf58DkgAdOt0skEBAy0uvcYM7keo7JTr62i+BUpzuL6K59NgVLh8sg4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tuxon.dev; spf=pass smtp.mailfrom=tuxon.dev; dkim=pass (2048-bit key) header.d=tuxon.dev header.i=@tuxon.dev header.b=gSgGyS3V; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tuxon.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tuxon.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tuxon.dev header.i=@tuxon.dev header.b="gSgGyS3V" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4247f36f689so24388615e9.1 for ; Sun, 23 Jun 2024 07:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1719152915; x=1719757715; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=xn71HCap8eEL8nc/50CL8K4hb31YS8cVq4g5f7tvtks=; b=gSgGyS3VWfcK/4VrA4fQlOXxXcBQNs7qKwEEHjVbBaYF/Yq0FH5inASiRBDsKPXQl+ qozVyyHmzo9CDsSBeMTm/xeDTTXwR7gwCfe1ObbmeZs4aSCUx+fb3MghpuJLEDx7Xpjj I4QCOxfi5GTtwmXDyKqdQqNnSPi22NXdWbdSbp4TL3/PSVvNLNVjXyiOH7xNq81Tg2Z7 99NncQVXQm954w4nOCzW15tCu8yxSoRnmXrZM1A86217P5YjNSlDMO5dxtRxzwyoWnuo hn7CnIHSk3MaKnlAv9O4yhafNbe961jdg4+DDqt7DYE0NFMGE5zxBQsaU9xr/RfMv5j3 XZDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719152915; x=1719757715; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xn71HCap8eEL8nc/50CL8K4hb31YS8cVq4g5f7tvtks=; b=HfAJ1zlMOeeBEdNuJmpvSuuVzOv4Tfsn/qWxkQVsfq9c3BcssB3t85cRxzNwYttQlK 1xMEB4MkBP9Mpxq/MZjKBtE0uicWty8Yei68IuPsyorOhQ8QVW7B2CRD6EOJ8DEHeShQ KgKDdevivzb155SX/WLQyYVZuKd6TMHLSLlYJbPDzA9AAEue0iQYldcywA2HJZStuVnK RoxSWOOi9Nya9+p77j6WfN+SzS6ZMxJIkyNM9yO/TmZ9O3H5dtqVSecOKLS3iVUle3IP +BAbTZ0FN2E/YGrJAfMBKJ2QqNecrnMtUKSwlb9c7+/kifmodLSHo6FpnzvXlkmgpKnn 1KQw== X-Forwarded-Encrypted: i=1; AJvYcCW1ByGRq0mee9DT1pMcoTev90wAaJA2RA8b7or6qjjQvcKHCephnxhznHMr5NpECOANRfZfnOIkYJjyasjefeNvSwR+DCRfUp47pQ== X-Gm-Message-State: AOJu0YwG0fF23QbkzEqrOVxX6wuqB0aCswcrKtLvtu96RcYFCneGshNK AnEBAhmNH85dYmVHgqdHnUJKTDWE7nyHL9T3ppVsDfom/fhP6bSCawrEG0cEQas= X-Google-Smtp-Source: AGHT+IHnXesk8HWe86BQQ2qZjawCmuQPtAA1Acd3GD7OFlRtZBm/ig1xVzNAdYmY7UF25lbm/Hv78Q== X-Received: by 2002:a05:600c:26d4:b0:422:aca:f887 with SMTP id 5b1f17b1804b1-4248b9cf993mr20858335e9.28.1719152915591; Sun, 23 Jun 2024 07:28:35 -0700 (PDT) Received: from [192.168.50.4] ([82.78.167.70]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d0be9fasm142958035e9.16.2024.06.23.07.28.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 Jun 2024 07:28:34 -0700 (PDT) Message-ID: <927dc197-03d6-4d1f-9037-eccbdb886e51@tuxon.dev> Date: Sun, 23 Jun 2024 17:28:33 +0300 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v7 3/4] net: macb: Add ARP support to WOL Content-Language: en-US To: Vineeth Karumanchi , nicolas.ferre@microchip.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, linux@armlinux.org.uk, vadim.fedorenko@linux.dev, andrew@lunn.ch Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, git@amd.com References: <20240621045735.3031357-1-vineeth.karumanchi@amd.com> <20240621045735.3031357-4-vineeth.karumanchi@amd.com> From: claudiu beznea In-Reply-To: <20240621045735.3031357-4-vineeth.karumanchi@amd.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 21.06.2024 07:57, Vineeth Karumanchi wrote: > Extend wake-on LAN support with an ARP packet. > > Currently, if PHY supports WOL, ethtool ignores the modes supported > by MACB. This change extends the WOL modes with MACB supported modes. > > Advertise wake-on LAN supported modes by default without relying on > dt node. By default, wake-on LAN will be in disabled state. > Using ethtool, users can enable/disable or choose packet types. > > For wake-on LAN via ARP, ensure the IP address is assigned and > report an error otherwise. > > Co-developed-by: Harini Katakam > Signed-off-by: Harini Katakam > Signed-off-by: Vineeth Karumanchi Reviewed-by: Claudiu Beznea Tested-by: Claudiu Beznea # on SAMA7G5 > --- > drivers/net/ethernet/cadence/macb.h | 1 + > drivers/net/ethernet/cadence/macb_main.c | 58 +++++++++++++----------- > 2 files changed, 33 insertions(+), 26 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h > index 50cd35ef21ad..122663ff7834 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -1306,6 +1306,7 @@ struct macb { > unsigned int jumbo_max_len; > > u32 wol; > + u32 wolopts; > > /* holds value of rx watermark value for pbuf_rxcutthru register */ > u32 rx_watermark; > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 4007b291526f..cecc3d6e630f 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -38,6 +38,7 @@ > #include > #include > #include > +#include > #include "macb.h" > > /* This structure is only used for MACB on SiFive FU540 devices */ > @@ -84,8 +85,7 @@ struct sifive_fu540_macb_mgmt { > #define GEM_MTU_MIN_SIZE ETH_MIN_MTU > #define MACB_NETIF_LSO NETIF_F_TSO > > -#define MACB_WOL_HAS_MAGIC_PACKET (0x1 << 0) > -#define MACB_WOL_ENABLED (0x1 << 1) > +#define MACB_WOL_ENABLED BIT(0) > > #define HS_SPEED_10000M 4 > #define MACB_SERDES_RATE_10G 1 > @@ -3278,13 +3278,11 @@ static void macb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) > { > struct macb *bp = netdev_priv(netdev); > > - if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET) { > - phylink_ethtool_get_wol(bp->phylink, wol); > - wol->supported |= WAKE_MAGIC; > + phylink_ethtool_get_wol(bp->phylink, wol); > + wol->supported |= (WAKE_MAGIC | WAKE_ARP); > > - if (bp->wol & MACB_WOL_ENABLED) > - wol->wolopts |= WAKE_MAGIC; > - } > + /* Add macb wolopts to phy wolopts */ > + wol->wolopts |= bp->wolopts; > } > > static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) > @@ -3294,22 +3292,15 @@ static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) > > /* Pass the order to phylink layer */ > ret = phylink_ethtool_set_wol(bp->phylink, wol); > - /* Don't manage WoL on MAC if handled by the PHY > - * or if there's a failure in talking to the PHY > - */ > - if (!ret || ret != -EOPNOTSUPP) > + /* Don't manage WoL on MAC, if PHY set_wol() fails */ > + if (ret && ret != -EOPNOTSUPP) > return ret; > > - if (!(bp->wol & MACB_WOL_HAS_MAGIC_PACKET) || > - (wol->wolopts & ~WAKE_MAGIC)) > - return -EOPNOTSUPP; > - > - if (wol->wolopts & WAKE_MAGIC) > - bp->wol |= MACB_WOL_ENABLED; > - else > - bp->wol &= ~MACB_WOL_ENABLED; > + bp->wolopts = (wol->wolopts & WAKE_MAGIC) ? WAKE_MAGIC : 0; > + bp->wolopts |= (wol->wolopts & WAKE_ARP) ? WAKE_ARP : 0; > + bp->wol = (wol->wolopts) ? MACB_WOL_ENABLED : 0; > > - device_set_wakeup_enable(&bp->pdev->dev, bp->wol & MACB_WOL_ENABLED); > + device_set_wakeup_enable(&bp->pdev->dev, bp->wol); > > return 0; > } > @@ -5086,9 +5077,7 @@ static int macb_probe(struct platform_device *pdev) > bp->max_tx_length = GEM_MAX_TX_LEN; > > bp->wol = 0; > - if (of_property_read_bool(np, "magic-packet")) > - bp->wol |= MACB_WOL_HAS_MAGIC_PACKET; > - device_set_wakeup_capable(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET); > + device_set_wakeup_capable(&pdev->dev, 1); > > bp->usrio = macb_config->usrio; > > @@ -5244,7 +5233,9 @@ static int __maybe_unused macb_suspend(struct device *dev) > { > struct net_device *netdev = dev_get_drvdata(dev); > struct macb *bp = netdev_priv(netdev); > + struct in_ifaddr *ifa = NULL; > struct macb_queue *queue; > + struct in_device *idev; > unsigned long flags; > unsigned int q; > int err; > @@ -5257,6 +5248,14 @@ static int __maybe_unused macb_suspend(struct device *dev) > return 0; > > if (bp->wol & MACB_WOL_ENABLED) { > + /* Check for IP address in WOL ARP mode */ > + idev = __in_dev_get_rcu(bp->dev); > + if (idev && idev->ifa_list) > + ifa = rcu_access_pointer(idev->ifa_list); > + if ((bp->wolopts & WAKE_ARP) && !ifa) { > + netdev_err(netdev, "IP address not assigned as required by WoL walk ARP\n"); > + return -EOPNOTSUPP; > + } > spin_lock_irqsave(&bp->lock, flags); > > /* Disable Tx and Rx engines before disabling the queues, > @@ -5290,6 +5289,13 @@ static int __maybe_unused macb_suspend(struct device *dev) > macb_writel(bp, TSR, -1); > macb_writel(bp, RSR, -1); > > + tmp = (bp->wolopts & WAKE_MAGIC) ? MACB_BIT(MAG) : 0; > + if (bp->wolopts & WAKE_ARP) { > + tmp |= MACB_BIT(ARP); > + /* write IP address into register */ > + tmp |= MACB_BFEXT(IP, be32_to_cpu(ifa->ifa_local)); > + } > + > /* Change interrupt handler and > * Enable WoL IRQ on queue 0 > */ > @@ -5305,7 +5311,7 @@ static int __maybe_unused macb_suspend(struct device *dev) > return err; > } > queue_writel(bp->queues, IER, GEM_BIT(WOL)); > - gem_writel(bp, WOL, MACB_BIT(MAG)); > + gem_writel(bp, WOL, tmp); > } else { > err = devm_request_irq(dev, bp->queues[0].irq, macb_wol_interrupt, > IRQF_SHARED, netdev->name, bp->queues); > @@ -5317,7 +5323,7 @@ static int __maybe_unused macb_suspend(struct device *dev) > return err; > } > queue_writel(bp->queues, IER, MACB_BIT(WOL)); > - macb_writel(bp, WOL, MACB_BIT(MAG)); > + macb_writel(bp, WOL, tmp); > } > spin_unlock_irqrestore(&bp->lock, flags); >