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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D518ECDB465 for ; Tue, 17 Oct 2023 01:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233800AbjJQBgX (ORCPT ); Mon, 16 Oct 2023 21:36:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232457AbjJQBgV (ORCPT ); Mon, 16 Oct 2023 21:36:21 -0400 Received: from vps0.lunn.ch (vps0.lunn.ch [156.67.10.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DA9FA2; Mon, 16 Oct 2023 18:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=In-Reply-To:Content-Disposition:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:From:Sender:Reply-To:Subject: Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Content-Disposition:In-Reply-To:References; bh=PdmCK+QKhB4J65trAM73Xd6W0JFw+BGZhKeUw6mvorg=; b=szqc4imp7+Ln1Gn6z8hPn9agRW L6hW29IERHrs1GYLIQ0pre21at26HTGXenCxq4CSSXaiJOZc/EUKQZGuwWR6lLhk5OoyVEkrneGY/ tKFxVMrNdf7HqrEx8GbQ0VvNyBTYtjC7Nh6hwIiWx47g9vDKfJgC7TI96qq2FfQMSZ2c=; Received: from andrew by vps0.lunn.ch with local (Exim 4.94.2) (envelope-from ) id 1qsZ07-002Q9Y-Tk; Tue, 17 Oct 2023 03:36:03 +0200 Date: Tue, 17 Oct 2023 03:36:03 +0200 From: Andrew Lunn To: Oleksij Rempel Cc: "David S. Miller" , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss , Conor Dooley , Krzysztof Kozlowski , Rob Herring , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, "Russell King (Oracle)" , devicetree@vger.kernel.org Subject: Re: [PATCH net-next v4 5/9] net: dsa: microchip: ksz9477: Add Wake on Magic Packet support Message-ID: References: <20231016141256.2011861-1-o.rempel@pengutronix.de> <20231016141256.2011861-6-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231016141256.2011861-6-o.rempel@pengutronix.de> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > @@ -155,6 +158,14 @@ int ksz9477_set_wol(struct ksz_device *dev, int port, > if (ret) > return ret; > > + if (wol->wolopts & WAKE_MAGIC) { > + ret = ksz_switch_macaddr_get(dev->ds, port, NULL); > + if (ret) > + return ret; > + > + pme_ctrl |= PME_WOL_MAGICPKT; > + } There is no matching ksz_switch_macaddr_put() here when the user turns WAKE_MAGIC off. Ideally you need to keep track of the WoL state per port, and when the user disables it, release the MAC address. > + > if (wol->wolopts & WAKE_PHY) > pme_ctrl |= PME_WOL_LINKUP | PME_WOL_ENERGY; > > diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c > index 3f7c86e545a7..4601aaca5179 100644 > --- a/drivers/net/dsa/microchip/ksz_common.c > +++ b/drivers/net/dsa/microchip/ksz_common.c > @@ -3569,6 +3569,7 @@ static int ksz_port_set_mac_address(struct dsa_switch *ds, int port, > const unsigned char *addr) > { > struct dsa_port *dp = dsa_to_port(ds, port); > + struct ethtool_wolinfo wol; > > if (dp->hsr_dev) { > dev_err(ds->dev, > @@ -3577,6 +3578,14 @@ static int ksz_port_set_mac_address(struct dsa_switch *ds, int port, > return -EBUSY; > } > > + ksz_get_wol(ds, dp->index, &wol); > + if (wol.wolopts & WAKE_MAGIC) { > + dev_err(ds->dev, > + "Cannot change MAC address on port %d with active Wake on Magic Packet\n", > + port); This is not really an error, as in something went wrong. Its just a hardware restriction. So dev_warn() would be better, or nothing at all in the logs. Andrew