From: Igor Russkikh <irusskikh@marvell.com>
To: <netdev@vger.kernel.org>
Cc: "David S . Miller" <davem@davemloft.net>,
Mark Starovoytov <mstarovoitov@marvell.com>,
Dmitry Bezrukov <dbezrukov@marvell.com>,
"Igor Russkikh" <irusskikh@marvell.com>
Subject: [PATCH net-next 02/12] net: atlantic: move PTP TC initialization to a separate function
Date: Wed, 20 May 2020 16:47:24 +0300 [thread overview]
Message-ID: <20200520134734.2014-3-irusskikh@marvell.com> (raw)
In-Reply-To: <20200520134734.2014-1-irusskikh@marvell.com>
From: Dmitry Bezrukov <dbezrukov@marvell.com>
This patch moves the PTP TC initialization into a separate function.
Signed-off-by: Dmitry Bezrukov <dbezrukov@marvell.com>
Co-developed-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
---
.../aquantia/atlantic/hw_atl/hw_atl_b0.c | 31 ++++++++++++-------
1 file changed, 19 insertions(+), 12 deletions(-)
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 bee4fb3c8741..0ff3f6eea022 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -114,6 +114,21 @@ static int hw_atl_b0_set_fc(struct aq_hw_s *self, u32 fc, u32 tc)
return 0;
}
+static int hw_atl_b0_tc_ptp_set(struct aq_hw_s *self)
+{
+ /* Init TC2 for PTP_TX */
+ hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, HW_ATL_B0_PTP_TXBUF_SIZE,
+ AQ_HW_PTP_TC);
+
+ /* Init TC2 for PTP_RX */
+ hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, HW_ATL_B0_PTP_RXBUF_SIZE,
+ AQ_HW_PTP_TC);
+ /* No flow control for PTP */
+ hw_atl_rpb_rx_xoff_en_per_tc_set(self, 0U, AQ_HW_PTP_TC);
+
+ return aq_hw_err_from_flags(self);
+}
+
static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)
{
u32 tx_buff_size = HW_ATL_B0_TXBUF_MAX;
@@ -121,6 +136,9 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)
unsigned int i_priority = 0U;
u32 tc = 0U;
+ tx_buff_size -= HW_ATL_B0_PTP_TXBUF_SIZE;
+ rx_buff_size -= HW_ATL_B0_PTP_RXBUF_SIZE;
+
/* TPS Descriptor rate init */
hw_atl_tps_tx_pkt_shed_desc_rate_curr_time_res_set(self, 0x0U);
hw_atl_tps_tx_pkt_shed_desc_rate_lim_set(self, 0xA);
@@ -139,8 +157,6 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)
hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, 0x1E, tc);
/* Tx buf size TC0 */
- tx_buff_size -= HW_ATL_B0_PTP_TXBUF_SIZE;
-
hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, tx_buff_size, tc);
hw_atl_tpb_tx_buff_hi_threshold_per_tc_set(self,
(tx_buff_size *
@@ -150,13 +166,8 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)
(tx_buff_size *
(1024 / 32U) * 50U) /
100U, tc);
- /* Init TC2 for PTP_TX */
- hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, HW_ATL_B0_PTP_TXBUF_SIZE,
- AQ_HW_PTP_TC);
/* QoS Rx buf size per TC */
- rx_buff_size -= HW_ATL_B0_PTP_RXBUF_SIZE;
-
hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, rx_buff_size, tc);
hw_atl_rpb_rx_buff_hi_threshold_per_tc_set(self,
(rx_buff_size *
@@ -169,11 +180,7 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)
hw_atl_b0_set_fc(self, self->aq_nic_cfg->fc.req, tc);
- /* Init TC2 for PTP_RX */
- hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, HW_ATL_B0_PTP_RXBUF_SIZE,
- AQ_HW_PTP_TC);
- /* No flow control for PTP */
- hw_atl_rpb_rx_xoff_en_per_tc_set(self, 0U, AQ_HW_PTP_TC);
+ hw_atl_b0_tc_ptp_set(self);
/* QoS 802.1p priority -> TC mapping */
for (i_priority = 8U; i_priority--;)
--
2.25.1
next prev parent reply other threads:[~2020-05-20 13:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 13:47 [PATCH net-next 00/12] net: atlantic: QoS implementation Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 01/12] net: atlantic: changes for multi-TC support Igor Russkikh
2020-05-20 13:47 ` Igor Russkikh [this message]
2020-05-20 13:47 ` [PATCH net-next 03/12] " Igor Russkikh
2020-05-20 17:08 ` Jakub Kicinski
2020-05-20 21:01 ` Jakub Kicinski
2020-05-21 9:18 ` [EXT] " Mark Starovoytov
2020-05-21 19:11 ` Jakub Kicinski
2020-05-21 20:38 ` Igor Russkikh
2020-05-21 21:36 ` David Miller
2020-05-20 23:18 ` kbuild test robot
2020-05-21 2:15 ` kbuild test robot
2020-05-21 2:15 ` [RFC PATCH] net: atlantic: ptp_ring_idx() can be static kbuild test robot
2020-05-20 13:47 ` [PATCH net-next 04/12] net: atlantic: QoS implementation: multi-TC support Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 05/12] net: atlantic: per-TC queue statistics Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 06/12] net: atlantic: make TCVEC2RING accept nic_cfg Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 07/12] net: atlantic: QoS implementation: max_rate Igor Russkikh
2020-05-20 17:11 ` Jakub Kicinski
2020-05-20 18:05 ` [EXT] " Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 08/12] net: atlantic: automatically downgrade the number of queues if necessary Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 09/12] net: atlantic: always use random TC-queue mapping for TX on A2 Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 10/12] net: atlantic: change the order of arguments for TC weight/credit setters Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 11/12] net: atlantic: QoS implementation: min_rate Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 12/12] net: atlantic: proper rss_ctrl1 (54c0) initialization Igor Russkikh
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=20200520134734.2014-3-irusskikh@marvell.com \
--to=irusskikh@marvell.com \
--cc=davem@davemloft.net \
--cc=dbezrukov@marvell.com \
--cc=mstarovoitov@marvell.com \
--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).