From patchwork Wed Jun 14 22:30:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Chen X-Patchwork-Id: 108170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp269957vqr; Wed, 14 Jun 2023 15:49:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4D8MofVv5lOKRfv48dOfmz1y5sg/e2ACBqhLs3omve8SaAsedzt5a12wwMveij+8issSHg X-Received: by 2002:a05:6a00:1352:b0:64c:aa98:a69f with SMTP id k18-20020a056a00135200b0064caa98a69fmr4118704pfu.1.1686782942030; Wed, 14 Jun 2023 15:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686782942; cv=none; d=google.com; s=arc-20160816; b=oc/rkd9K2wEzQBL37HFV9qzO8asY9/X9ysMCN+sb7IEYE+GFngs/uHOkEp++D2hAR+ tuQ7+6T1tximplDlQ9J6OZmz3oqNx6ryaTmRClcD+O0mtX77KUBXgYr2idBb0qNzeXzk c3RlPlWHTQTEWTN5mnUy4XZ+BX+4EM/flSGiNcrD/cHXK7tVVlWqTyHbQPQBxZj9ERmV vJWCW1zmDPA5SCnXM+MAyCfbJE9DA4AJEF0JkPhyWbLJrogbN9+132u7sivcQcKavraS 1VkhabwzRx9nIjprSqHq4g639bPX8eYO1gUAaTBLce+FfEh8pl1pMakhExrbvSa+WBo4 82fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=kJLqQ9FhFWwuk8LJBp0AXYTAl4Md/QWMcj5Kn5SR6us=; b=W42UG7R22iTKTBMRvD69m3uPABeXdeKXXfY14uwPhOO2jCFRzp29qngXgcKz8Rd25X fmHgbUy47ajOZSfpAk6K42r3Ywtmd06D2DpIw0jPra1Aj1i6PkPAzccTQ+b0PFPN6eRA 4mopKCcCELw0prnoEdUIZGhHnhWIfY8osUb3isn6oHhpNOnQrBTV6V0jIp7EZRxdxNR8 jqLGIWNhW6uxQmv6NySo2QTSXRDBX6dzQDihdMaJWzKuO2XoswtvXQWslpGkuGqNEMXa 8LdhOcp7NytfjYG2tmq0CJ5dtvRJWzdcg6iha7nQFCisw+oOaxCFakSQwNpuvbkjGnDO 5iBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=AkRKxImz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v18-20020a637a12000000b0051fc9e06b8csi11591460pgc.378.2023.06.14.15.48.37; Wed, 14 Jun 2023 15:49:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=AkRKxImz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236839AbjFNWbF (ORCPT + 99 others); Wed, 14 Jun 2023 18:31:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236786AbjFNWaw (ORCPT ); Wed, 14 Jun 2023 18:30:52 -0400 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1A382719 for ; Wed, 14 Jun 2023 15:30:44 -0700 (PDT) Received: by mail-qt1-x82f.google.com with SMTP id d75a77b69052e-3f9c60bc99cso24110471cf.0 for ; Wed, 14 Jun 2023 15:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1686781844; x=1689373844; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=kJLqQ9FhFWwuk8LJBp0AXYTAl4Md/QWMcj5Kn5SR6us=; b=AkRKxImzEoi1tHpHkeV+MbZwMg1Ng53zIzAZxcLr+1iTTnoiguo86d8WnHga8usaJR TCRgmMNh1kRgywL58yDtb7SdqDyYnYng1Bqe+nPW9U2Xt4JlR+oZhl9RA0LGCpfrPNE5 Gi6iVSBAoYHidSJiQ/gqYeG4pySRHxJwoMjDM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686781844; x=1689373844; h=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=kJLqQ9FhFWwuk8LJBp0AXYTAl4Md/QWMcj5Kn5SR6us=; b=IwhHaQujYb+fqCi5n2InchW1rFcygK62zgY8ukj/2bQIavqsQMR0R49nCsMHUjr5gb Wx9+gV5NL2eUpndBoMkna8g4rH+U+U0Uv/N0Twd+4BJeInDCUAvkZgFnYTVGvnBIxisx AY31Aoe2YQC6+2ikCqwsH5R5Tb1g/axneuV1YOqVKggFoDVcULz5m3r3kW5ZdpYRZj47 VODS8VAvds1g+R/mGGAlau0mbyUIiQLLHs8cdcLUtl8dCuycMwRRZaVOk9C9rzR4vWPG l+/yDd+9oifL6rpPB6qNt+Se/f1d4arBon8P3HFb5ruVbBLpbKrEP/Cjp+8Xf0pleXtn WCMA== X-Gm-Message-State: AC+VfDzlasIiQQjZ+VMTxVSrbs8LuvPAmrkQZm3G3rX0ZVKJFwG5nppV rOuK5eWZW3jRI05oogmDlSkjMw== X-Received: by 2002:a05:622a:289:b0:3dc:fa58:97fd with SMTP id z9-20020a05622a028900b003dcfa5897fdmr4198619qtw.25.1686781843770; Wed, 14 Jun 2023 15:30:43 -0700 (PDT) Received: from stbirv-lnx-2.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d3-20020ac85443000000b003ef2db16e72sm5419360qtq.94.2023.06.14.15.30.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2023 15:30:43 -0700 (PDT) From: Justin Chen To: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, bcm-kernel-feedback-list@broadcom.com Cc: florian.fainelli@broadcom.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, opendmb@gmail.com, andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, richardcochran@gmail.com, sumit.semwal@linaro.org, christian.koenig@amd.com, simon.horman@corigine.com, Justin Chen Subject: [PATCH net-next v7 06/11] net: bcmasp: Add support for eee mode Date: Wed, 14 Jun 2023 15:30:15 -0700 Message-Id: <1686781820-832-7-git-send-email-justin.chen@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1686781820-832-1-git-send-email-justin.chen@broadcom.com> References: <1686781820-832-1-git-send-email-justin.chen@broadcom.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, MIME_HEADER_CTYPE_ONLY,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,T_TVD_MIME_NO_HEADERS,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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768720109911283666?= X-GMAIL-MSGID: =?utf-8?q?1768720109911283666?= Add support for eee mode. Signed-off-by: Justin Chen --- drivers/net/ethernet/broadcom/asp2/bcmasp.h | 4 ++ .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 61 ++++++++++++++++++++++ drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 6 +++ 3 files changed, 71 insertions(+) diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.h b/drivers/net/ethernet/broadcom/asp2/bcmasp.h index 521c9b4b7288..7dc597658ed7 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp.h +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.h @@ -313,6 +313,8 @@ struct bcmasp_intf { /* Used if per intf wol irq */ int wol_irq; unsigned int wol_irq_enabled:1; + + struct ethtool_eee eee; }; #define NUM_NET_FILTERS 32 @@ -559,4 +561,6 @@ void bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs, u32 *rule_cnt); void bcmasp_netfilt_suspend(struct bcmasp_intf *intf); + +void bcmasp_eee_enable_set(struct bcmasp_intf *intf, bool enable); #endif diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c index eddd1c43f00e..1e96a69043f3 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c @@ -191,6 +191,65 @@ static int bcmasp_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, return err; } +void bcmasp_eee_enable_set(struct bcmasp_intf *intf, bool enable) +{ + u32 reg; + + reg = umac_rl(intf, UMC_EEE_CTRL); + if (enable) + reg |= EEE_EN; + else + reg &= ~EEE_EN; + umac_wl(intf, reg, UMC_EEE_CTRL); + + intf->eee.eee_enabled = enable; + intf->eee.eee_active = enable; +} + +static int bcmasp_get_eee(struct net_device *dev, struct ethtool_eee *e) +{ + struct bcmasp_intf *intf = netdev_priv(dev); + struct ethtool_eee *p = &intf->eee; + + if (!dev->phydev) + return -ENODEV; + + e->eee_enabled = p->eee_enabled; + e->eee_active = p->eee_active; + e->tx_lpi_enabled = p->tx_lpi_enabled; + e->tx_lpi_timer = umac_rl(intf, UMC_EEE_LPI_TIMER); + + return phy_ethtool_get_eee(dev->phydev, e); +} + +static int bcmasp_set_eee(struct net_device *dev, struct ethtool_eee *e) +{ + struct bcmasp_intf *intf = netdev_priv(dev); + struct ethtool_eee *p = &intf->eee; + int ret; + + if (!dev->phydev) + return -ENODEV; + + if (!p->eee_enabled) { + bcmasp_eee_enable_set(intf, false); + } else { + ret = phy_init_eee(dev->phydev, 0); + if (ret) { + netif_err(intf, hw, dev, + "EEE initialization failed: %d\n", ret); + return ret; + } + + umac_wl(intf, e->tx_lpi_timer, UMC_EEE_LPI_TIMER); + intf->eee.eee_active = ret >= 0; + intf->eee.tx_lpi_enabled = e->tx_lpi_enabled; + bcmasp_eee_enable_set(intf, true); + } + + return phy_ethtool_set_eee(dev->phydev, e); +} + const struct ethtool_ops bcmasp_ethtool_ops = { .get_drvinfo = bcmasp_get_drvinfo, .get_link = ethtool_op_get_link, @@ -202,4 +261,6 @@ const struct ethtool_ops bcmasp_ethtool_ops = { .set_wol = bcmasp_set_wol, .get_rxnfc = bcmasp_get_rxnfc, .set_rxnfc = bcmasp_set_rxnfc, + .set_eee = bcmasp_set_eee, + .get_eee = bcmasp_get_eee, }; diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c index 0c59f4025965..899cb06a3fde 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c @@ -656,6 +656,9 @@ static void bcmasp_adj_link(struct net_device *dev) UMC_CMD_TX_PAUSE_IGNORE); reg |= cmd_bits; umac_wl(intf, reg, UMC_CMD); + + intf->eee.eee_active = phy_init_eee(phydev, 0) >= 0; + bcmasp_eee_enable_set(intf, intf->eee.eee_active); } reg = rgmii_rl(intf, RGMII_OOB_CNTRL); @@ -1407,6 +1410,9 @@ int bcmasp_interface_resume(struct bcmasp_intf *intf) bcmasp_resume_from_wol(intf); + if (intf->eee.eee_enabled) + bcmasp_eee_enable_set(intf, true); + netif_device_attach(dev); return 0;