From 78035314d0cc5d862fbd9eacfdc6ba7d11f5d7da Mon Sep 17 00:00:00 2001 From: Rakesh Goyal Date: Fri, 3 Sep 2021 11:40:13 +0530 Subject: [PATCH] nvethernet: define default PTP RxQ Issue: PTP packets are received on RxQ0, with legacy perf data, which cause PTP getting delayed. Fix: If DT entry not present, use ETHER_DEFAULT_PTP_QUEUE Bug 200766950 Change-Id: I25054caf23ffec37fcb422a7aa705b122da96394 Signed-off-by: Rakesh Goyal Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2588641 Tested-by: mobile promotions Reviewed-by: Bitan Biswas Reviewed-by: svcacv Reviewed-by: Bhadram Varka Reviewed-by: svc_kernel_abi Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 4 ++-- drivers/net/ethernet/nvidia/nvethernet/ether_linux.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index bd739400..c0d0ad04 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -5369,7 +5369,7 @@ static int ether_parse_dt(struct ether_priv_data *pdata) &osi_core->ptp_config.ptp_rx_queue); if (ret != 0) { dev_info(dev, "Setting default PTP RX queue\n"); - osi_core->ptp_config.ptp_rx_queue = osi_core->mtl_queues[0]; + osi_core->ptp_config.ptp_rx_queue = ETHER_DEFAULT_PTP_QUEUE; } else { /* Validate PTP Rx queue index */ for (i = 0; i < osi_core->num_mtl_queues; i++) { @@ -5381,7 +5381,7 @@ static int ether_parse_dt(struct ether_priv_data *pdata) dev_err(dev, "Invalid PTP RX queue in DT:%d\n", osi_core->ptp_config.ptp_rx_queue); osi_core->ptp_config.ptp_rx_queue = - osi_core->mtl_queues[0]; + ETHER_DEFAULT_PTP_QUEUE; } } diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h index 3bf84b30..71da0a64 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h @@ -107,6 +107,11 @@ */ #define ETHER_DFLT_PTP_CLK 312500000U +/** + * @brief Ethernet default PTP default RxQ + */ +#define ETHER_DEFAULT_PTP_QUEUE 3U + /** * @brief Ethernet clk rates */