From patchwork Wed Oct 25 17:32:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13436495 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02EBE30FAA for ; Wed, 25 Oct 2023 17:34:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="HpuAFmgj" Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADD22191 for ; Wed, 25 Oct 2023 10:34:46 -0700 (PDT) Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-77063481352so91182185a.1 for ; Wed, 25 Oct 2023 10:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1698255285; x=1698860085; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=c8+5YRU5In394lzK1h64/+1G0a5at+miMyMaqUxh4ZI=; b=HpuAFmgjmc78kI3f/ZUnB+gieniet3zXC8ZeY0wk1taGkHWCF5j5DgF9mc2hsN2ZFp bC43uwTzZaIAZSgfy3zjFpWvjaRb2T7/FtHoMd6dpVe9+gKZnBifH7+MwihybJK9Hu+a JD5UOxHLvnQpvCVbqk+reG1+5tWyAnyd175+4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698255285; x=1698860085; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=c8+5YRU5In394lzK1h64/+1G0a5at+miMyMaqUxh4ZI=; b=BalCePVqxOmwJobalyvIJsZZTCIGTT+sxHURQrmTP9geIoZxwBsaHEkclZm776Oxa2 GO1rj5KEp8QUP707ckSNpkUNMI1Zur1cr4yybX3tYW7wcqMB33B/MzaWWIgehnP1vbyR LcbsNDHFecNjmAOLAYf/mWbp21A8VBZCn/eFyII1YV4tBAaOIj4bc2xRwG/lMywa2Ros GQ8qYqukOdKV/ohbIv2Hjbx200x/jfE4b17JbpNdFw60yRzmmhKskDlQsVk2i08gxfXL eruDO0f48WM9ikH+scQwY9u6a1MDAs7QTuTWv3z9kO4L+Hr0ulEyDQm4z2a7jshJFzCp M8lw== X-Gm-Message-State: AOJu0Yxj9tK6+j4lvgOm2ZOumUc4CH+oteIhQXv8pLEwdmjYuRpVK+IJ McAOc3Bk1MJOqzc+vpDX1AxRjNSWADs+ggJXeEmS5aUpimYfr/xdBsVjBH3TEPuhDRYfinBs0mF U4UbnTtQkPH0I5Mwz11x8gT2h58MKmI/O7T/o0FaOtAx4xAnFf8IttO47d3vDCPwMparGJAC5y2 ZwJ3e//hHU6Dxh X-Google-Smtp-Source: AGHT+IFZ3v7uyHLlZyF+4u7hT906f65PCbZ4ddr1Z+093ZEiOkO0ZgKBiYz7kELbXCJvuF59/SDvmA== X-Received: by 2002:a05:620a:394c:b0:777:5d4:bb4 with SMTP id qs12-20020a05620a394c00b0077705d40bb4mr435302qkn.3.1698255285167; Wed, 25 Oct 2023 10:34:45 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bp37-20020a05620a45a500b00767dcf6f4adsm4332384qkb.51.2023.10.25.10.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 10:34:44 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Doug Berger , Broadcom internal kernel review list , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Heiner Kallweit , Russell King , Vladimir Oltean , Tariq Toukan , Gal Pressman , Willem de Bruijn , Daniil Tatianin , Simon Horman , Justin Chen , Ratheesh Kannoth , Joe Damato , Vincent Mailhol , Jiri Pirko , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next 4/5] net: phy: broadcom: Add support for WAKE_FILTER Date: Wed, 25 Oct 2023 10:32:59 -0700 Message-Id: <20231025173300.1776832-5-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231025173300.1776832-1-florian.fainelli@broadcom.com> References: <20231025173300.1776832-1-florian.fainelli@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Since the PHY is capable of matching any arbitrary Ethernet MAC destination as a programmable wake-up pattern, add support for doing that using the WAKE_FILTER and ethtool::rxnfc API. For instance, in order to wake-up from the Ethernet MAC address corresponding to the IPv4 multicast IP address of 224.0.0.251 (e.g.: multicast DNS), one could do: ethtool -N eth0 flow-type ether dst 01:00:5e:00:00:fb loc 0 action -2 ethtool -n eth0 Total 1 rules Filter: 0 Flow Type: Raw Ethernet Src MAC addr: 00:00:00:00:00:00 mask: FF:FF:FF:FF:FF:FF Dest MAC addr: 01:00:5E:00:00:FB mask: 00:00:00:00:00:00 Ethertype: 0x0 mask: 0xFFFF Action: Wake-on-LAN ethtool -s eth0 wol f Signed-off-by: Florian Fainelli --- drivers/net/phy/bcm-phy-lib.c | 195 +++++++++++++++++++++++++++++++++- drivers/net/phy/bcm-phy-lib.h | 5 + drivers/net/phy/broadcom.c | 2 + 3 files changed, 201 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c index 876f28fd8256..cfbeedc5ee81 100644 --- a/drivers/net/phy/bcm-phy-lib.c +++ b/drivers/net/phy/bcm-phy-lib.c @@ -827,7 +827,8 @@ EXPORT_SYMBOL_GPL(bcm_phy_cable_test_get_status_rdb); WAKE_MCAST | \ WAKE_BCAST | \ WAKE_MAGIC | \ - WAKE_MAGICSECURE) + WAKE_MAGICSECURE | \ + WAKE_FILTER) int bcm_phy_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) { @@ -881,6 +882,12 @@ int bcm_phy_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) ctl &= ~BCM54XX_WOL_DIR_PKT_EN; ctl &= ~(BCM54XX_WOL_SECKEY_OPT_MASK << BCM54XX_WOL_SECKEY_OPT_SHIFT); + /* For WAKE_FILTER, we have already programmed the desired MAC DA + * and associated mask by the time we get there. + */ + if (wol->wolopts & WAKE_FILTER) + goto program_ctl; + /* When using WAKE_MAGIC, we program the magic pattern filter to match * the device's MAC address and we accept any MAC DA in the Ethernet * frame. @@ -935,6 +942,7 @@ int bcm_phy_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) return ret; } +program_ctl: if (wol->wolopts & WAKE_MAGICSECURE) { ctl |= BCM54XX_WOL_SECKEY_OPT_6B << BCM54XX_WOL_SECKEY_OPT_SHIFT; @@ -999,6 +1007,16 @@ void bcm_phy_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) if (!(ctl & BCM54XX_WOL_EN)) return; + ret = bcm_phy_read_exp(phydev, BCM54XX_WOL_SEC_KEY_8B); + if (ret < 0) + return; + + /* Mutualy exclusive with other modes */ + if (ret) { + wol->wolopts |= WAKE_FILTER; + return; + } + for (i = 0; i < sizeof(da) / 2; i++) { ret = bcm_phy_read_exp(phydev, BCM54XX_WOL_MPD_DATA2(2 - i)); @@ -1066,6 +1084,181 @@ int bcm_phy_led_brightness_set(struct phy_device *phydev, } EXPORT_SYMBOL_GPL(bcm_phy_led_brightness_set); +static int bcm_phy_get_rule(struct phy_device *phydev, + struct ethtool_rxnfc *nfc, + int loc) +{ + u8 da[ETH_ALEN]; + unsigned int i; + int ret; + + if (loc != 0) + return -EINVAL; + + memset(nfc, 0, sizeof(*nfc)); + nfc->flow_type = ETHER_FLOW; + nfc->fs.flow_type = ETHER_FLOW; + + for (i = 0; i < sizeof(da) / 2; i++) { + ret = bcm_phy_read_exp(phydev, + BCM54XX_WOL_MPD_DATA2(2 - i)); + if (ret < 0) + return ret; + + da[i * 2] = ret >> 8; + da[i * 2 + 1] = ret & 0xff; + } + ether_addr_copy(nfc->fs.h_u.ether_spec.h_dest, da); + + for (i = 0; i < sizeof(da) / 2; i++) { + ret = bcm_phy_read_exp(phydev, + BCM54XX_WOL_MASK(2 - i)); + if (ret < 0) + return ret; + + da[i * 2] = ~(ret >> 8); + da[i * 2 + 1] = ~(ret & 0xff); + } + ether_addr_copy(nfc->fs.m_u.ether_spec.h_dest, da); + + ret = bcm_phy_read_exp(phydev, BCM54XX_WOL_INNER_PROTO); + if (ret < 0) + return ret; + + nfc->fs.h_u.ether_spec.h_proto = be16_to_cpu(ret); + + nfc->fs.ring_cookie = RX_CLS_FLOW_WAKE; + nfc->fs.location = 0; + + return 0; +} + +static int bcm_phy_set_rule(struct phy_device *phydev, + struct ethtool_rxnfc *nfc) +{ + int ret = -EOPNOTSUPP; + unsigned int i; + __be16 h_proto; + const u8 *da; + + /* We support only matching on the MAC DA with a custom mask and + * optionally with a specific Ethernet type, reject anything else. + */ + if (nfc->fs.ring_cookie != RX_CLS_FLOW_WAKE || + (nfc->fs.location != 0 && + nfc->fs.location != RX_CLS_LOC_ANY && + nfc->fs.location != RX_CLS_LOC_FIRST) || + nfc->fs.flow_type != ETHER_FLOW || + !is_zero_ether_addr(nfc->fs.h_u.ether_spec.h_source) || + !is_zero_ether_addr(nfc->fs.m_u.ether_spec.h_source)) + return ret; + + ret = bcm_phy_read_exp(phydev, BCM54XX_WOL_SEC_KEY_8B); + if (ret < 0) + return ret; + + if (ret) + return -EBUSY; + + if (nfc->fs.location == RX_CLS_LOC_ANY || + nfc->fs.location == RX_CLS_LOC_FIRST) + nfc->fs.location = 0; + + da = nfc->fs.h_u.ether_spec.h_dest; + for (i = 0; i < ETH_ALEN / 2; i++) { + ret = bcm_phy_write_exp(phydev, + BCM54XX_WOL_MPD_DATA2(2 - i), + da[i * 2] << 8 | da[i * 2 + 1]); + if (ret < 0) + return ret; + } + + da = nfc->fs.m_u.ether_spec.h_dest; + for (i = 0; i < ETH_ALEN / 2; i++) { + ret = bcm_phy_write_exp(phydev, + BCM54XX_WOL_MASK(2 - i), + da[i * 2] << 8 | da[i * 2 + 1]); + if (ret < 0) + return ret; + } + + /* Restore default inner protocol field unless overridden by the flow + * specification. + */ + h_proto = be16_to_cpu(nfc->fs.h_u.ether_spec.h_proto); + if (!h_proto) + h_proto = ETH_P_8021Q; + + ret = bcm_phy_write_exp(phydev, BCM54XX_WOL_INNER_PROTO, + h_proto); + if (ret) + return ret; + + /* Use BCM54XX_WOL_SEC_KEY_8B as a scratch register to record + * that we installed a filter rule. + */ + return bcm_phy_write_exp(phydev, BCM54XX_WOL_SEC_KEY_8B, 1); +} + +int bcm_phy_get_rxnfc(struct phy_device *phydev, + struct ethtool_rxnfc *cmd, u32 *rule_locs) +{ + int err = 0, rule_cnt = 0; + + err = bcm_phy_read_exp(phydev, BCM54XX_WOL_SEC_KEY_8B); + if (err < 0) + return err; + + rule_cnt = err; + err = 0; + + switch (cmd->cmd) { + case ETHTOOL_GRXCLSRLCNT: + cmd->rule_cnt = rule_cnt; + cmd->data = 1 | RX_CLS_LOC_SPECIAL; + break; + case ETHTOOL_GRXCLSRULE: + err = bcm_phy_get_rule(phydev, cmd, cmd->fs.location); + break; + case ETHTOOL_GRXCLSRLALL: + if (rule_cnt) + rule_locs[0] = 0; + cmd->rule_cnt = rule_cnt; + cmd->data = 1; + break; + default: + err = -EOPNOTSUPP; + break; + } + + return err; +} +EXPORT_SYMBOL_GPL(bcm_phy_get_rxnfc); + +int bcm_phy_set_rxnfc(struct phy_device *phydev, + struct ethtool_rxnfc *cmd) +{ + int err = 0; + + switch (cmd->cmd) { + case ETHTOOL_SRXCLSRLINS: + err = bcm_phy_set_rule(phydev, cmd); + break; + case ETHTOOL_SRXCLSRLDEL: + if (cmd->fs.location != 0) + return err; + + err = bcm_phy_write_exp(phydev, BCM54XX_WOL_SEC_KEY_8B, 0); + break; + default: + err = -EOPNOTSUPP; + break; + } + + return err; +} +EXPORT_SYMBOL_GPL(bcm_phy_set_rxnfc); + MODULE_DESCRIPTION("Broadcom PHY Library"); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Broadcom Corporation"); diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h index b52189e45a84..7081edcec06b 100644 --- a/drivers/net/phy/bcm-phy-lib.h +++ b/drivers/net/phy/bcm-phy-lib.h @@ -121,4 +121,9 @@ irqreturn_t bcm_phy_wol_isr(int irq, void *dev_id); int bcm_phy_led_brightness_set(struct phy_device *phydev, u8 index, enum led_brightness value); +int bcm_phy_get_rxnfc(struct phy_device *phydev, + struct ethtool_rxnfc *nfc, u32 *rule_locs); +int bcm_phy_set_rxnfc(struct phy_device *phydev, + struct ethtool_rxnfc *nfc); + #endif /* _LINUX_BCM_PHY_LIB_H */ diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 3a627105675a..6c2212bd2779 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -1107,6 +1107,8 @@ static struct phy_driver broadcom_drivers[] = { .get_wol = bcm54xx_phy_get_wol, .set_wol = bcm54xx_phy_set_wol, .led_brightness_set = bcm_phy_led_brightness_set, + .get_rxnfc = bcm_phy_get_rxnfc, + .set_rxnfc = bcm_phy_set_rxnfc, }, { .phy_id = PHY_ID_BCM5461, .phy_id_mask = 0xfffffff0,