From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next v4 1/2] net: systemport: only update UMAC_CMD if something changed
Date: Fri, 9 May 2014 13:16:38 -0700 [thread overview]
Message-ID: <1399666599-19398-2-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1399666599-19398-1-git-send-email-f.fainelli@gmail.com>
The link adjustment callback can be called as frequently as desired by
the PHY library, as such, let's avoid doing a Read/Modify/Write sequence
if nothing changed, which is more than likely since we are interfaced
with a switch device.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes in v4:
- re-align 2nd and 3rd lines properly according to the network style
Changes in v3:
- attempted to re-align the CMD_HD_EN lines but failed miserably
Changes in v2:
- respin
drivers/net/ethernet/broadcom/bcmsysport.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 4dc8d1e9829b..ac42a9e91f3a 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -959,15 +959,16 @@ static void bcm_sysport_adj_link(struct net_device *dev)
if (!phydev->pause)
cmd_bits |= CMD_RX_PAUSE_IGNORE | CMD_TX_PAUSE_IGNORE;
- reg = umac_readl(priv, UMAC_CMD);
- reg &= ~((CMD_SPEED_MASK << CMD_SPEED_SHIFT) |
+ if (changed) {
+ reg = umac_readl(priv, UMAC_CMD);
+ reg &= ~((CMD_SPEED_MASK << CMD_SPEED_SHIFT) |
CMD_HD_EN | CMD_RX_PAUSE_IGNORE |
CMD_TX_PAUSE_IGNORE);
- reg |= cmd_bits;
- umac_writel(priv, reg, UMAC_CMD);
+ reg |= cmd_bits;
+ umac_writel(priv, reg, UMAC_CMD);
- if (changed)
phy_print_status(priv->phydev);
+ }
}
static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,
--
1.9.1
next prev parent reply other threads:[~2014-05-09 20:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 20:16 [PATCH net-next v4 0/2] net: systemport: couple fixes Florian Fainelli
2014-05-09 20:16 ` Florian Fainelli [this message]
2014-05-09 20:16 ` [PATCH net-next v4 2/2] net: systemport: pad packets to a minimum of 64 bytes Florian Fainelli
2014-05-12 12:45 ` David Laight
2014-05-14 0:18 ` Florian Fainelli
2014-05-14 0:36 ` Florian Fainelli
2014-05-14 8:51 ` David Laight
2014-05-14 16:09 ` Florian Fainelli
2014-05-13 16:48 ` [PATCH net-next v4 0/2] net: systemport: couple fixes 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=1399666599-19398-2-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--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).