net: atlantic: add AQC113 PTP traffic class and TX path setup

Add PTP traffic class (TC) buffer reservation and TX path
improvements for AQC113:

- Reserve dedicated TX and RX buffer space for PTP TC when PTP is
  enabled, reducing user TC buffers accordingly (TX: 8KB, RX: 16KB).
- Configure PTP TC with no flow control and highest priority
  scheduling to ensure timely PTP packet transmission.

TX path improvements:
- Increase TX data and descriptor read-request limits when firmware
  has already enabled extended PCIe tag mode.

Also simplify RSS queue calculation in hw_atl2_hw_rss_set() by
extracting to a local variable and use unsigned types for loop
variables to match their usage.

Signed-off-by: Sukhdeep Singh <sukhdeeps@marvell.com>
Link: https://patch.msgid.link/20260610115448.272-9-sukhdeeps@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
index f48b7953274dd5fd5a0988a663ae15ead98b6b46..1fb72d83825a681405425812f9bfd55de1b8f067 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
@@ -151,6 +151,24 @@ static int hw_atl2_hw_reset(struct aq_hw_s *self)
        return err;
 }
 
+static int hw_atl2_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_ATL2_PTP_TXBUF_SIZE,
+                                              AQ_HW_PTP_TC);
+
+       /* Init TC2 for PTP_RX */
+       hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, HW_ATL2_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_atl2_tpb_tps_highest_priority_tc_set(self, AQ_HW_PTP_TC);
+
+       return aq_hw_err_from_flags(self);
+}
+
 static int hw_atl2_hw_queue_to_tc_map_set(struct aq_hw_s *self)
 {
        struct aq_nic_cfg_s *cfg = self->aq_nic_cfg;
@@ -209,6 +227,11 @@ static int hw_atl2_hw_qos_set(struct aq_hw_s *self)
        unsigned int prio = 0U;
        u32 tc = 0U;
 
+       if (cfg->is_ptp) {
+               tx_buff_size -= HW_ATL2_PTP_TXBUF_SIZE;
+               rx_buff_size -= HW_ATL2_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);
@@ -242,6 +265,9 @@ static int hw_atl2_hw_qos_set(struct aq_hw_s *self)
                hw_atl_b0_set_fc(self, self->aq_nic_cfg->fc.req, tc);
        }
 
+       if (cfg->is_ptp)
+               hw_atl2_tc_ptp_set(self);
+
        /* QoS 802.1p priority -> TC mapping */
        for (prio = 0; prio < 8; ++prio)
                hw_atl_rpf_rpb_user_priority_tc_map_set(self, prio,
@@ -259,8 +285,9 @@ static int hw_atl2_hw_rss_set(struct aq_hw_s *self,
        u8 *indirection_table = rss_params->indirection_table;
        const u32 num_tcs = aq_hw_num_tcs(self);
        u32 rpf_redir2_enable;
-       int tc;
-       int i;
+       u32 queue;
+       u32 tc;
+       u32 i;
 
        rpf_redir2_enable = num_tcs > 4 ? 1 : 0;
 
@@ -268,10 +295,9 @@ static int hw_atl2_hw_rss_set(struct aq_hw_s *self,
 
        for (i = HW_ATL2_RSS_REDIRECTION_MAX; i--;) {
                for (tc = 0; tc != num_tcs; tc++) {
-                       hw_atl2_new_rpf_rss_redir_set(self, tc, i,
-                                                     tc *
-                                                     aq_hw_q_per_tc(self) +
-                                                     indirection_table[i]);
+                       queue = tc * aq_hw_q_per_tc(self) +
+                               indirection_table[i];
+                       hw_atl2_new_rpf_rss_redir_set(self, tc, i, queue);
                }
        }
 
@@ -415,9 +441,20 @@ static int hw_atl2_hw_init_tx_path(struct aq_hw_s *self)
 
        hw_atl2_tpb_tx_buf_clk_gate_en_set(self, 0U);
 
+       if (hw_atl2_phi_ext_tag_get(self)) {
+               hw_atl2_tdm_tx_data_read_req_limit_set(self, 0x7F);
+               hw_atl2_tdm_tx_desc_read_req_limit_set(self, 0x0F);
+       }
+
        return aq_hw_err_from_flags(self);
 }
 
+/* Initialise new rx filters
+ * L2 promisc OFF
+ * VLAN promisc OFF
+ *
+ * User priority to TC
+ */
 static void hw_atl2_hw_init_new_rx_filters(struct aq_hw_s *self)
 {
        u8 *prio_tc_map = self->aq_nic_cfg->prio_tc_map;

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h
index 6b608918ec33dffa730617da2859f59f2709ba64..e66e0def79e7ff01495d348260e1bb1bc9a6a768 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h
@@ -27,8 +27,10 @@
 #define HW_ATL2_INT_MASK  (0xFFFFFFFFU)
 
 #define HW_ATL2_TXBUF_MAX              128U
-#define HW_ATL2_RXBUF_MAX              192U
+#define HW_ATL2_PTP_TXBUF_SIZE           8U
 
+#define HW_ATL2_RXBUF_MAX              192U
+#define HW_ATL2_PTP_RXBUF_SIZE          16U
 #define HW_ATL2_RSS_REDIRECTION_MAX 64U
 
 #define HW_ATL2_TC_MAX 8U