Skip to content

Commit 901f3cc

Browse files
Egor Pomozovdavem330
authored andcommitted
net: atlantic: fix PTP on AQC10X
This patch fixes PTP on AQC10X. PTP support on AQC10X requires FW involvement and FW configures the TPS data arb mode itself. So we must make sure driver doesn't touch TPS data arb mode on AQC10x if PTP is enabled. Otherwise, there are no timestamps even though packets are flowing. Fixes: 2deac71 ("net: atlantic: QoS implementation: min_rate") Signed-off-by: Egor Pomozov <[email protected]> Signed-off-by: Mark Starovoytov <[email protected]> Signed-off-by: Igor Russkikh <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8885bb0 commit 901f3cc

File tree

1 file changed

+6
-1
lines changed
  • drivers/net/ethernet/aquantia/atlantic/hw_atl

1 file changed

+6
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,13 @@ static int hw_atl_b0_hw_init_tx_tc_rate_limit(struct aq_hw_s *self)
373373

374374
/* WSP, if min_rate is set for at least one TC.
375375
* RR otherwise.
376+
*
377+
* NB! MAC FW sets arb mode itself if PTP is enabled. We shouldn't
378+
* overwrite it here in that case.
376379
*/
377-
hw_atl_tps_tx_pkt_shed_data_arb_mode_set(self, min_rate_msk ? 1U : 0U);
380+
if (!nic_cfg->is_ptp)
381+
hw_atl_tps_tx_pkt_shed_data_arb_mode_set(self, min_rate_msk ? 1U : 0U);
382+
378383
/* Data TC Arbiter takes precedence over Descriptor TC Arbiter,
379384
* leave Descriptor TC Arbiter as RR.
380385
*/

0 commit comments

Comments
 (0)