net: stmmac: xgmac: Rename XGMAC_RQ to XGMAC_FPRQ

Synopsys XGMAC Databook defines MAC_RxQ_Ctrl1 register:
RQ: Frame Preemption Residue Queue

XGMAC_FPRQ is more readable and more consistent with GMAC4.

Signed-off-by: Furong Xu <0x1207@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://patch.msgid.link/611991edf9e9d6fac8b29c3fe952791b193ca179.1730449003.git.0x1207@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
index efd47db05dbc224ef2f2adb86eea0892b91234d9..a04a790036927fda7e8b8b19269c09879938d791 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
@@ -84,7 +84,7 @@
 #define XGMAC_MCBCQEN                  BIT(15)
 #define XGMAC_MCBCQ                    GENMASK(11, 8)
 #define XGMAC_MCBCQ_SHIFT              8
-#define XGMAC_RQ                       GENMASK(7, 4)
+#define XGMAC_FPRQ                     GENMASK(7, 4)
 #define XGMAC_UPQ                      GENMASK(3, 0)
 #define XGMAC_UPQ_SHIFT                        0
 #define XGMAC_RXQ_CTRL2                        0x000000a8

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c
index ab717c9bba417e9af273bf95f7e18de545357984..5ccdc6887b28e372678786bbf94939b99acd0f8d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c
@@ -364,7 +364,7 @@ const struct stmmac_fpe_reg dwxgmac3_fpe_reg = {
        .mac_fpe_reg = XGMAC_MAC_FPE_CTRL_STS,
        .mtl_fpe_reg = XGMAC_MTL_FPE_CTRL_STS,
        .rxq_ctrl1_reg = XGMAC_RXQ_CTRL1,
-       .fprq_mask = XGMAC_RQ,
+       .fprq_mask = XGMAC_FPRQ,
        .int_en_reg = XGMAC_INT_EN,
        .int_en_bit = XGMAC_FPEIE,
 };