From 0003b0bf624a49ca4454aa972588ff75cb656691 Mon Sep 17 00:00:00 2001 From: nannaiah Date: Fri, 28 May 2021 11:33:29 -0700 Subject: [PATCH] Add virtualization check to configure CAR. In case of virtualization, server does the CAR configuration so SKIP the parse and configuring the CAR. Bug 2694285 Change-Id: I5c9e5d180f2cd88ca0a55b3259f0d25ce8156a13 Signed-off-by: Nagaraj annaiah Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2536560 --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 drivers/net/ethernet/nvidia/nvethernet/ether_linux.c diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c old mode 100644 new mode 100755 index 5394ab56..7a10ab17 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -4711,9 +4711,11 @@ static int ether_init_plat_resources(struct platform_device *pdev, osi_core->xpcs_base = NULL; } - ret = ether_configure_car(pdev, pdata); - if (ret < 0) { - dev_err(&pdev->dev, "failed to get clks/reset"); + if (osi_core->use_virtualization == OSI_DISABLE) { + ret = ether_configure_car(pdev, pdata); + if (ret < 0) { + dev_err(&pdev->dev, "failed to get clks/reset"); + } } return ret;