From: Ong Boon Leong <boon.leong.ong@intel.com>
To: netdev@vger.kernel.org
Cc: Jose Abreu <Jose.Abreu@synopsys.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
"David S . Miller" <davem@davemloft.net>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Ong Boon Leong <boon.leong.ong@intel.com>,
Tan Tee Min <tee.min.tan@intel.com>,
Voon Weifeng <weifeng.voon@intel.com>,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net 4/7] net: stmmac: Fix priority steering for tx/rx queue >3
Date: Tue, 14 Jan 2020 10:01:13 +0800 [thread overview]
Message-ID: <1578967276-55956-5-git-send-email-boon.leong.ong@intel.com> (raw)
In-Reply-To: <1578967276-55956-1-git-send-email-boon.leong.ong@intel.com>
From: Voon Weifeng <weifeng.voon@intel.com>
Fix MACRO function define for TX and RX user priority queue steering for
register masking and shifting.
Fixes: a8f5102af2a7 ("net: stmmac: TX and RX queue priority configuration")
Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
index 2dc70d1..798a53a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
@@ -97,12 +97,14 @@
#define GMAC_RX_FLOW_CTRL_RFE BIT(0)
/* RX Queues Priorities */
-#define GMAC_RXQCTRL_PSRQX_MASK(x) GENMASK(7 + ((x) * 8), 0 + ((x) * 8))
-#define GMAC_RXQCTRL_PSRQX_SHIFT(x) ((x) * 8)
+#define GMAC_RXQCTRL_PSRQX_MASK(x) GENMASK(7 + (((x) % 4) * 8), \
+ 0 + (((x) % 4) * 8))
+#define GMAC_RXQCTRL_PSRQX_SHIFT(x) (((x) % 4) * 8)
/* TX Queues Priorities */
-#define GMAC_TXQCTRL_PSTQX_MASK(x) GENMASK(7 + ((x) * 8), 0 + ((x) * 8))
-#define GMAC_TXQCTRL_PSTQX_SHIFT(x) ((x) * 8)
+#define GMAC_TXQCTRL_PSTQX_MASK(x) GENMASK(7 + (((x) % 4) * 8), \
+ 0 + (((x) % 4) * 8))
+#define GMAC_TXQCTRL_PSTQX_SHIFT(x) (((x) % 4) * 8)
/* MAC Flow Control TX */
#define GMAC_TX_FLOW_CTRL_TFE BIT(1)
--
2.7.4
next prev parent reply other threads:[~2020-01-13 10:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 2:01 [PATCH net 0/7] net: stmmac: general fixes for Ethernet functionality Ong Boon Leong
2020-01-14 2:01 ` [PATCH net 1/7] net: stmmac: fix error in updating rx tail pointer to last free entry Ong Boon Leong
2020-01-13 10:29 ` Jose Abreu
2020-01-14 6:54 ` Ong, Boon Leong
2020-01-14 2:01 ` [PATCH net 2/7] net: stmmac: Fix incorrect location to set real_num_rx|tx_queues Ong Boon Leong
2020-01-14 2:01 ` [PATCH net 3/7] net: stmmac: fix missing netdev->features in stmmac_set_features Ong Boon Leong
2020-01-13 13:17 ` Jakub Kicinski
2020-01-14 6:56 ` Ong, Boon Leong
2020-01-14 2:01 ` Ong Boon Leong [this message]
2020-01-13 10:33 ` [PATCH net 4/7] net: stmmac: Fix priority steering for tx/rx queue >3 Jose Abreu
2020-01-14 15:24 ` Voon, Weifeng
2020-01-14 2:01 ` [PATCH net 5/7] net: stmmac: fix incorrect GMAC_VLAN_TAG register writting implementation Ong Boon Leong
2020-01-14 2:01 ` [PATCH net 6/7] net: stmmac: fix missing IFF_MULTICAST check in dwmac4_set_filter Ong Boon Leong
2020-01-14 2:01 ` [PATCH net 7/7] net: stmmac: update pci platform data to use phy_interface Ong Boon Leong
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=1578967276-55956-5-git-send-email-boon.leong.ong@intel.com \
--to=boon.leong.ong@intel.com \
--cc=Jose.Abreu@synopsys.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=tee.min.tan@intel.com \
--cc=weifeng.voon@intel.com \
/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).