net: atlantic: change the order of arguments for TC weight/credit setters

This patch changes the order of arguments for TC weight/credit setter
functions.
Having the "value to be set" on the right is slightly more robust in
a sense that it's more natural for the humans, so it's a bit more
error-proof this way.

Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
index 88b17cf7762585a6fd4a8cf2f5e729ac1006106a..a312864969afe0fba5182413089881fb0125a4d2 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
@@ -136,10 +136,10 @@ static int hw_atl_a0_hw_qos_set(struct aq_hw_s *self)
        hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(self, 0U);
        hw_atl_tps_tx_pkt_shed_data_arb_mode_set(self, 0U);
 
-       hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, 0xFFF, 0U);
-       hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, 0x64, 0U);
-       hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, 0x50, 0U);
-       hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, 0x1E, 0U);
+       hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, 0U, 0xFFF);
+       hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, 0U, 0x64);
+       hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, 0U, 0x50);
+       hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, 0U, 0x1E);
 
        /* Tx buf size */
        buff_size = HW_ATL_A0_TXBUF_MAX;

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index abc86eb4f52548f8f51f0d0fbedcd67a612e1c28..2448a09ef7b9a334ec1a732c15fa3913ca6ebdb2 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -161,8 +161,8 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)
                u32 threshold = 0U;
 
                /* TX Packet Scheduler Data TC0 */
-               hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, 0xFFF, tc);
-               hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, 0x64, tc);
+               hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, tc, 0xFFF);
+               hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, tc, 0x64);
 
                /* Tx buf size TC0 */
                hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, tx_buff_size, tc);
@@ -334,8 +334,8 @@ int hw_atl_b0_hw_init_tx_tc_rate_limit(struct aq_hw_s *self)
                const u32 en = (nic_cfg->tc_max_rate[tc] != 0) ? 1U : 0U;
                const u32 desc = AQ_NIC_CFG_TCVEC2RING(nic_cfg, tc, 0);
 
-               hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, 0x50, tc);
-               hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, 0x1E, tc);
+               hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, tc, 0x50);
+               hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, tc, 0x1E);
 
                hw_atl_tps_tx_desc_rate_en_set(self, desc, en);
 

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
index 0ea791a9c100c2a0a4c5eee1fe258389e9c00f6b..3c8e8047ea1ed0ca6cca95fbfa29b1c9953f9db0 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
@@ -1463,8 +1463,8 @@ void hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(struct aq_hw_s *aq_hw,
 }
 
 void hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(struct aq_hw_s *aq_hw,
-                                                  u32 max_credit,
-                                                  u32 tc)
+                                                  const u32 tc,
+                                                  const u32 max_credit)
 {
        aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DESC_TCTCREDIT_MAX_ADR(tc),
                            HW_ATL_TPS_DESC_TCTCREDIT_MAX_MSK,
@@ -1473,13 +1473,13 @@ void hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(struct aq_hw_s *aq_hw,
 }
 
 void hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(struct aq_hw_s *aq_hw,
-                                              u32 tx_pkt_shed_desc_tc_weight,
-                                              u32 tc)
+                                              const u32 tc,
+                                              const u32 weight)
 {
        aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DESC_TCTWEIGHT_ADR(tc),
                            HW_ATL_TPS_DESC_TCTWEIGHT_MSK,
                            HW_ATL_TPS_DESC_TCTWEIGHT_SHIFT,
-                           tx_pkt_shed_desc_tc_weight);
+                           weight);
 }
 
 void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,
@@ -1492,8 +1492,8 @@ void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,
 }
 
 void hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,
-                                                  u32 max_credit,
-                                                  u32 tc)
+                                                  const u32 tc,
+                                                  const u32 max_credit)
 {
        aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DATA_TCTCREDIT_MAX_ADR(tc),
                            HW_ATL_TPS_DATA_TCTCREDIT_MAX_MSK,
@@ -1502,13 +1502,13 @@ void hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,
 }
 
 void hw_atl_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,
-                                              u32 tx_pkt_shed_tc_data_weight,
-                                              u32 tc)
+                                              const u32 tc,
+                                              const u32 weight)
 {
        aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DATA_TCTWEIGHT_ADR(tc),
                            HW_ATL_TPS_DATA_TCTWEIGHT_MSK,
                            HW_ATL_TPS_DATA_TCTWEIGHT_SHIFT,
-                           tx_pkt_shed_tc_data_weight);
+                           weight);
 }
 
 void hw_atl_tps_tx_desc_rate_mode_set(struct aq_hw_s *aq_hw,

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
index c56cc4e8e13c51c502eb788bedee22b7ac16851c..61a6f70c51cd9b8c15ccd5d410bbd5dc0214fa7e 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
@@ -688,13 +688,13 @@ void hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(struct aq_hw_s *aq_hw,
 
 /* set tx packet scheduler descriptor tc max credit */
 void hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(struct aq_hw_s *aq_hw,
-                                                  u32 max_credit,
-                                           u32 tc);
+                                                  const u32 tc,
+                                                  const u32 max_credit);
 
 /* set tx packet scheduler descriptor tc weight */
 void hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(struct aq_hw_s *aq_hw,
-                                              u32 tx_pkt_shed_desc_tc_weight,
-                                       u32 tc);
+                                              const u32 tc,
+                                              const u32 weight);
 
 /* set tx packet scheduler descriptor vm arbitration mode */
 void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,
@@ -702,13 +702,13 @@ void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,
 
 /* set tx packet scheduler tc data max credit */
 void hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,
-                                                  u32 max_credit,
-                                           u32 tc);
+                                                  const u32 tc,
+                                                  const u32 max_credit);
 
 /* set tx packet scheduler tc data weight */
 void hw_atl_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,
-                                              u32 tx_pkt_shed_tc_data_weight,
-                                       u32 tc);
+                                              const u32 tc,
+                                              const u32 weight);
 
 /* set tx descriptor rate mode */
 void hw_atl_tps_tx_desc_rate_mode_set(struct aq_hw_s *aq_hw,

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c
index 6817fa57cc830e4a235150f44fd25704134ed7ed..c6a6ba66eb05be9ae12e9e6b1dd3135d59b1f8d4 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c
@@ -94,8 +94,8 @@ void hw_atl2_reg_tx_intr_moder_ctrl_set(struct aq_hw_s *aq_hw,
 }
 
 void hw_atl2_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,
-                                                   u32 max_credit,
-                                                   u32 tc)
+                                                   const u32 tc,
+                                                   const u32 max_credit)
 {
        aq_hw_write_reg_bit(aq_hw, HW_ATL2_TPS_DATA_TCTCREDIT_MAX_ADR(tc),
                            HW_ATL2_TPS_DATA_TCTCREDIT_MAX_MSK,
@@ -104,13 +104,13 @@ void hw_atl2_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,
 }
 
 void hw_atl2_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,
-                                               u32 tx_pkt_shed_tc_data_weight,
-                                               u32 tc)
+                                               const u32 tc,
+                                               const u32 weight)
 {
        aq_hw_write_reg_bit(aq_hw, HW_ATL2_TPS_DATA_TCTWEIGHT_ADR(tc),
                            HW_ATL2_TPS_DATA_TCTWEIGHT_MSK,
                            HW_ATL2_TPS_DATA_TCTWEIGHT_SHIFT,
-                           tx_pkt_shed_tc_data_weight);
+                           weight);
 }
 
 u32 hw_atl2_get_hw_version(struct aq_hw_s *aq_hw)

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h
index d4b087d1dec15c94ae3d53c8d2f15ff2e2b854fa..883fa009bc0e3b06694f717936fc341e6a0da11a 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h
@@ -47,13 +47,13 @@ void hw_atl2_tpb_tx_buf_clk_gate_en_set(struct aq_hw_s *aq_hw, u32 clk_gate_en);
 
 /* set tx packet scheduler tc data max credit */
 void hw_atl2_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,
-                                                   u32 max_credit,
-                                                   u32 tc);
+                                                   const u32 tc,
+                                                   const u32 max_credit);
 
 /* set tx packet scheduler tc data weight */
 void hw_atl2_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,
-                                               u32 tx_pkt_shed_tc_data_weight,
-                                               u32 tc);
+                                               const u32 tc,
+                                               const u32 weight);
 
 u32 hw_atl2_get_hw_version(struct aq_hw_s *aq_hw);