diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
index 202047c1..897f6943 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
@@ -5050,6 +5050,7 @@ exit:
 static int ether_init_plat_resources(struct platform_device *pdev,
 				     struct ether_priv_data *pdata)
 {
+	bool tegra_hypervisor_mode = is_tegra_hypervisor_mode();
 	struct osi_core_priv_data *osi_core = pdata->osi_core;
 	struct osi_dma_priv_data *osi_dma = pdata->osi_dma;
 	struct resource *res;
@@ -5063,6 +5064,26 @@ static int ether_init_plat_resources(struct platform_device *pdev,
 		return PTR_ERR(osi_core->base);
 	}
 
+	if (!tegra_hypervisor_mode) {
+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+						   "hv-base");
+		if (res) {
+			osi_core->hv_base = devm_ioremap_resource(&pdev->dev,
+								  res);
+			if (IS_ERR(osi_core->hv_base)) {
+				dev_err(&pdev->dev,
+					"failed to ioremap HV address\n");
+				return PTR_ERR(osi_core->hv_base);
+			}
+		} else {
+			osi_core->hv_base = NULL;
+			dev_dbg(&pdev->dev, "HV base address is not present\n");
+		}
+	} else {
+		osi_core->hv_base = NULL;
+		dev_dbg(&pdev->dev, "Hypervisor mode enabled\n");
+	}
+
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
 					   "dma_base");
 	if (res) {
diff --git a/drivers/net/ethernet/nvidia/nvethernet/macsec.c b/drivers/net/ethernet/nvidia/nvethernet/macsec.c
index 28fdb0d2..3d6a6524 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/macsec.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/macsec.c
@@ -1283,6 +1283,8 @@ int macsec_probe(struct ether_priv_data *pdata)
 		macsec_pdata->id = 0;
 	}
 
+	osi_core->instance_id = macsec_pdata->id;
+
 	/* Get OSI MACsec ops */
 	if (osi_init_macsec_ops(osi_core) != 0) {
 		dev_err(dev, "osi_init_macsec_ops failed\n");