From: Doug Berger <opendmb@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Doug Berger <opendmb@gmail.com>
Subject: [PATCH net-next v2 5/8] net: bcmgenet: Utilize bcmgenet_set_features() during resume/open
Date: Tue, 17 Dec 2019 16:51:12 -0800 [thread overview]
Message-ID: <1576630275-17591-6-git-send-email-opendmb@gmail.com> (raw)
In-Reply-To: <1576630275-17591-1-git-send-email-opendmb@gmail.com>
During driver resume and open, the HW may have lost its context/state,
utilize bcmgenet_set_features() to make sure we do restore the correct
set of features that were previously configured.
Signed-off-by: Doug Berger <opendmb@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 811713e3d230..0e57effd5b19 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2884,6 +2884,11 @@ static int bcmgenet_open(struct net_device *dev)
init_umac(priv);
+ /* Apply features again in case we changed them while interface was
+ * down
+ */
+ bcmgenet_set_features(dev, dev->features);
+
bcmgenet_set_hw_addr(priv, dev->dev_addr);
if (priv->internal_phy) {
@@ -3687,6 +3692,9 @@ static int bcmgenet_resume(struct device *d)
genphy_config_aneg(dev->phydev);
bcmgenet_mii_config(priv->dev, false);
+ /* Restore enabled features */
+ bcmgenet_set_features(dev, dev->features);
+
bcmgenet_set_hw_addr(priv, dev->dev_addr);
if (priv->internal_phy) {
--
2.7.4
next prev parent reply other threads:[~2019-12-18 0:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 0:51 [PATCH net-next v2 0/8] net: bcmgenet: Turn on offloads by default Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 1/8] net: bcmgenet: enable NETIF_F_HIGHDMA flag Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 2/8] net: bcmgenet: enable NETIF_F_HW_CSUM feature Doug Berger
2019-12-18 1:06 ` Florian Fainelli
2019-12-18 0:51 ` [PATCH net-next v2 3/8] net: bcmgenet: use CHECKSUM_COMPLETE for NETIF_F_RXCSUM Doug Berger
2019-12-18 1:03 ` Florian Fainelli
2019-12-18 0:51 ` [PATCH net-next v2 4/8] net: bcmgenet: Refactor bcmgenet_set_features() Doug Berger
2019-12-18 0:51 ` Doug Berger [this message]
2019-12-18 0:51 ` [PATCH net-next v2 6/8] net: bcmgenet: Turn on offloads by default Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 7/8] net: bcmgenet: Be drop monitor friendly while re-allocating headroom Doug Berger
2019-12-18 0:51 ` [PATCH net-next v2 8/8] net: bcmgenet: Add software counters to track reallocations Doug Berger
2019-12-20 2:13 ` [PATCH net-next v2 0/8] net: bcmgenet: Turn on offloads by default David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1576630275-17591-6-git-send-email-opendmb@gmail.com \
--to=opendmb@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).