From patchwork Tue May 16 23:17:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13243989 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 36687101E2 for ; Tue, 16 May 2023 23:17:28 +0000 (UTC) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE69E72AA for ; Tue, 16 May 2023 16:17:22 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7590aa05af6so22793585a.0 for ; Tue, 16 May 2023 16:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1684279042; x=1686871042; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=k7Rhh/CZipU9oP0MynKUlXVUrhnbO/Qff00LqX71mrE=; b=Vto05JusPBiUAHVcBLBJBtpwI5P8pwNwXc0vb0sHfSidIJKQVZ419cqenoXDHcGvbT bXC48rdITIkiPjWPPfN5RsKZd9c7ZIHijaSgoTbm9UmPZLyj5o9VGOzFuqWc1OmzEUxY VcigDm0TfmndkoXJkCZYEfWWJGLkyxJimWYq4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684279042; x=1686871042; 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=k7Rhh/CZipU9oP0MynKUlXVUrhnbO/Qff00LqX71mrE=; b=lpwfwQc8EaX6DKPEDPtfLBWLMrwYJCzm40VIiRGQZT/P6UziveySi+0nuw2Cssu7KN i4PBO2M+kJ0/0eBEhi7qyHNbzCLJSISFeWcqJx7HPFy4XY1nHLq4XOXLCUSQO2COLQhl ONNWirGTjY2H4KVSNtZNdr1R96typ+OeYblkisz9wY636zWiHYwmrx/Wu6b+t+16rFi7 T1sY6DERChLiElZ0dP4Zrw3bdUgRSi5XDMBiNvyyzkSShF+o+6/pGSo3c9po6C4AfGep c7YYX/NtUSIzJhlGod6voPH5x9H+nsHOw/Wbpv6nA9XkV56cLtgWMHsW/zT98AJ7Bmha lgcw== X-Gm-Message-State: AC+VfDyUL9OK/YGUsAkqy0J/LQZqmTWLEi1Wk9u6Uxow9wVbR6Dhjjz5 KyK2jsVxXVhuN2XrHk9bRlpLj9Td+zamQU8ovNUs7kDJVJ5b2j8Oe32z0vhyG7Vap/FMDSrmkS4 e6coVdw8stAQpb/YOEvt6U1252wd3SGRwRO/CUt7XR4bao9dfAEbsHAePv+ybCQnx6G+/4Kx+tW Lu1WT27fW3Qw== X-Google-Smtp-Source: ACHHUZ6qvLQ1W1kJf5bqtkPYf1y2R5JktigxOdsOb4Rp/9eNx7LJtd700CFxOKuxRJigbvkoT+WDyA== X-Received: by 2002:ad4:5bca:0:b0:5ef:519:b1a with SMTP id t10-20020ad45bca000000b005ef05190b1amr51748448qvt.24.1684279041586; Tue, 16 May 2023 16:17:21 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id g17-20020a0cf851000000b0061b7784b3basm5495427qvo.84.2023.05.16.16.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 16:17:21 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Doug Berger , Florian Fainelli , Broadcom internal kernel review list , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Heiner Kallweit , Russell King , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next 2/3] net: phy: broadcom: Add support for WAKE_FILTER Date: Tue, 16 May 2023 16:17:12 -0700 Message-Id: <20230516231713.2882879-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516231713.2882879-1-florian.fainelli@broadcom.com> References: <20230516231713.2882879-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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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.1, 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 | 147 +++++++++++++++++++++++++++++++++- drivers/net/phy/bcm-phy-lib.h | 6 ++ drivers/net/phy/broadcom.c | 15 ++++ 3 files changed, 167 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c index 5603d0a9ce96..546c21ce9775 100644 --- a/drivers/net/phy/bcm-phy-lib.c +++ b/drivers/net/phy/bcm-phy-lib.c @@ -822,7 +822,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) { @@ -876,6 +877,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. @@ -930,6 +937,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; @@ -1034,6 +1042,143 @@ irqreturn_t bcm_phy_wol_isr(int irq, void *dev_id) } EXPORT_SYMBOL_GPL(bcm_phy_wol_isr); +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); + + 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; + const u8 *da; + + /* We support only matching on the MAC DA, reject anything else */ + if (nfc->fs.ring_cookie != RX_CLS_FLOW_WAKE || + nfc->fs.location != 0 || + nfc->fs.flow_type != ETHER_FLOW || + nfc->fs.h_u.ether_spec.h_proto || + !is_zero_ether_addr(nfc->fs.h_u.ether_spec.h_source) || + nfc->fs.m_u.ether_spec.h_proto || + !is_zero_ether_addr(nfc->fs.m_u.ether_spec.h_source)) + return ret; + + 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; + } + + return 0; +} + +int bcm_phy_get_rxnfc(struct phy_device *phydev, + struct ethtool_rxnfc *cmd, u32 *rule_locs) +{ + int err = 0; + + switch (cmd->cmd) { + case ETHTOOL_GRXCLSRLCNT: + cmd->rule_cnt = 1; + 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: + rule_locs[0] = 0; + cmd->rule_cnt = 1; + 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, + bool *installed) +{ + int err = 0; + + switch (cmd->cmd) { + case ETHTOOL_SRXCLSRLINS: + err = bcm_phy_set_rule(phydev, cmd); + if (err) + return err; + + *installed = true; + break; + case ETHTOOL_SRXCLSRLDEL: + if (cmd->fs.location != 0) + return err; + + *installed = false; + 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 2f30ce0cab0e..4881ea34e99c 100644 --- a/drivers/net/phy/bcm-phy-lib.h +++ b/drivers/net/phy/bcm-phy-lib.h @@ -118,4 +118,10 @@ int bcm_phy_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol); void bcm_phy_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol); irqreturn_t bcm_phy_wol_isr(int irq, void *dev_id); +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, + bool *installed); + #endif /* _LINUX_BCM_PHY_LIB_H */ diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 822c8b01dc53..b4a8aba7d5ef 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -36,6 +36,7 @@ struct bcm54xx_phy_priv { struct bcm_ptp_private *ptp; int wake_irq; bool wake_irq_enabled; + bool wake_filter_installed; }; static bool bcm54xx_phy_can_wakeup(struct phy_device *phydev) @@ -860,6 +861,8 @@ static int brcm_fet_suspend(struct phy_device *phydev) static void bcm54xx_phy_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) { + struct bcm54xx_phy_priv *priv = phydev->priv; + /* We cannot wake-up if we do not have a dedicated PHY interrupt line * or an out of band GPIO descriptor for wake-up. Zeroing * wol->supported allows the caller (MAC driver) to play through and @@ -871,6 +874,8 @@ static void bcm54xx_phy_get_wol(struct phy_device *phydev, } bcm_phy_get_wol(phydev, wol); + if (priv->wake_filter_installed) + wol->wolopts |= WAKE_FILTER; } static int bcm54xx_phy_set_wol(struct phy_device *phydev, @@ -893,6 +898,14 @@ static int bcm54xx_phy_set_wol(struct phy_device *phydev, return 0; } +static int bcm54xx_phy_set_rxnfc(struct phy_device *phydev, + struct ethtool_rxnfc *cmd) +{ + struct bcm54xx_phy_priv *priv = phydev->priv; + + return bcm_phy_set_rxnfc(phydev, cmd, &priv->wake_filter_installed); +} + static int bcm54xx_phy_probe(struct phy_device *phydev) { struct bcm54xx_phy_priv *priv; @@ -1031,6 +1044,8 @@ static struct phy_driver broadcom_drivers[] = { .resume = bcm54xx_resume, .get_wol = bcm54xx_phy_get_wol, .set_wol = bcm54xx_phy_set_wol, + .get_rxnfc = bcm_phy_get_rxnfc, + .set_rxnfc = bcm54xx_phy_set_rxnfc, }, { .phy_id = PHY_ID_BCM5461, .phy_id_mask = 0xfffffff0,