diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 87adfd14..0ef71deb 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -2895,6 +2895,7 @@ static int ether_init_plat_resources(struct platform_device *pdev, struct ether_priv_data *pdata) { struct osi_core_priv_data *osi_core = pdata->osi_core; + struct osi_dma_priv_data *osi_dma = pdata->osi_dma; struct resource *res; int ret = 0; @@ -2906,6 +2907,20 @@ static int ether_init_plat_resources(struct platform_device *pdev, return PTR_ERR(osi_core->base); } + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, + "dma_base"); + if (res) { + /* Update dma base */ + osi_dma->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(osi_dma->base)) { + dev_err(&pdev->dev, "failed to ioremap DMA address\n"); + return PTR_ERR(osi_dma->base); + } + } else { + /* Update core base to dma/common base */ + osi_dma->base = osi_core->base; + } + ret = ether_configure_car(pdev, pdata); if (ret < 0) { dev_err(&pdev->dev, "failed to get clks/reset"); @@ -3532,9 +3547,6 @@ static int ether_probe(struct platform_device *pdev) goto err_init_res; } - /* Assign core base to dma/common base, since we are using single VM */ - osi_dma->base = osi_core->base; - osi_get_hw_features(osi_core->base, &pdata->hw_feat); ret = ether_set_dma_mask(pdata);