Commit b64f2ac9 authored by Mark Starovoytov's avatar Mark Starovoytov Committed by David S. Miller
Browse files

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: default avatarMark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5479e843

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c

+10 −10
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h

+8 −8
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c

+5 −5
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE