You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
116 lines
4.1 KiB
116 lines
4.1 KiB
From 613137da8963190f61894421e8f266241738446e Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:37:51 -0500
|
|
Subject: [PATCH 094/139] [netdrv] net: atlantic: move PTP TC initialization to
|
|
a separate function
|
|
|
|
Message-id: <1604687916-15087-95-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338516
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 094/139] net: atlantic: move PTP TC initialization to a separate function
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit 593dd0fc202eed27de07c5df9ef24a3c00cf0c09
|
|
Author: Dmitry Bezrukov <dbezrukov@marvell.com>
|
|
Date: Fri May 22 11:19:38 2020 +0300
|
|
|
|
net: atlantic: move PTP TC initialization to a separate function
|
|
|
|
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>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
.../ethernet/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.13.6
|
|
|