From d4e9ecf359c6d110d2d4db7e3cf099fc013f9d1e Mon Sep 17 00:00:00 2001 From: Rakesh Goyal Date: Mon, 8 Aug 2022 10:11:56 +0530 Subject: [PATCH] nvethernet: use default selection algorithm Issue: EQOS supports SP as default algorithm where MGBE should support ETS as default algorithm. Fix: We are removing user configuration option from application. For MGBE there are CBS or ETS(default) as only options. For EQOS CBS and SP(default) is only options. Bug 3735907 Change-Id: I83ff3f59129e188335d9cec239d5eb0b2fa76412 Signed-off-by: Rakesh Goyal Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2757410 Reviewed-by: Bitan Biswas Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-cert GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/ether_tc.c | 3 +++ drivers/net/ethernet/nvidia/nvethernet/ptp.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_tc.c b/drivers/net/ethernet/nvidia/nvethernet/ether_tc.c index 4478a262..381c7c33 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_tc.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_tc.c @@ -228,6 +228,9 @@ int ether_tc_setup_cbs(struct ether_priv_data *pdata, ioctl_data.avb.oper_mode = OSI_MTL_QUEUE_AVB; ioctl_data.avb.credit_control = OSI_ENABLE; } else { + /* For EQOS harware library code use internally SP(0) and + For MGBE harware library code use internally ETS(2) if + algo != CBS. */ ioctl_data.avb.algo = OSI_MTL_TXQ_AVALG_SP; ioctl_data.avb.oper_mode = OSI_MTL_QUEUE_ENABLE; ioctl_data.avb.credit_control = OSI_DISABLE; diff --git a/drivers/net/ethernet/nvidia/nvethernet/ptp.c b/drivers/net/ethernet/nvidia/nvethernet/ptp.c index 3993e307..5aa334c9 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ptp.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ptp.c @@ -377,6 +377,9 @@ static void ether_config_slot_function(struct ether_priv_data *pdata, u32 set) sizeof(struct osi_core_avb_algorithm)); qinx = osi_core->mtl_queues[i]; ioctl_data.avb.qindex = qinx; + /* For EQOS harware library code use internally SP(0) and + For MGBE harware library code use internally ETS(2) if + algo != CBS. */ ioctl_data.avb.algo = OSI_MTL_TXQ_AVALG_SP; ioctl_data.avb.oper_mode = (set == OSI_ENABLE) ? OSI_MTL_QUEUE_AVB :