nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 01:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "nvethernet: remove setting of dma_mask"

Browse Source 
Set appropriate dma-mask for ethernet device.

This reverts commit cc55897988610e4618860f5606d2e5b10a4a521f.

Bug 200776516
Bug 200681386

Change-Id: Ic0ce23c84fd043fd47fa21151a4ff0dd53091493
Signed-off-by: Ashish Mhetre <amhetre@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2644527
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Ashish Mhetre
2021-12-20 10:11:35 +05:30
committed by Revanth Kumar Uppala
parent 617a5f31a5
commit cac53247c0
1 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
View File

@@ -5954,6 +5954,53 @@ static void ether_get_num_dma_chan_mtl_q(struct platform_device *pdev,
} }
} }
/**
* @brief Set DMA address mask.
*
* Algorithm:
* Based on the addressing capability (address bit length) supported in the HW,
* the dma mask is set accordingly.
*
* @param[in] pdata: OS dependent private data structure.
*
* @note MAC_HW_Feature1 register need to read and store the value of ADDR64.
*
* @retval 0 on success
* @retval "negative value" on failure.
*/
static int ether_set_dma_mask(struct ether_priv_data *pdata)
{
int ret = 0;
/* Set DMA addressing limitations based on the value read from HW if
* dma_mask is not defined in DT
*/
if (pdata->dma_mask == DMA_MASK_NONE) {
switch (pdata->hw_feat.addr_64) {
case OSI_ADDRESS_32BIT:
pdata->dma_mask = DMA_BIT_MASK(32);
break;
case OSI_ADDRESS_40BIT:
pdata->dma_mask = DMA_BIT_MASK(40);
break;
case OSI_ADDRESS_48BIT:
pdata->dma_mask = DMA_BIT_MASK(48);
break;
default:
pdata->dma_mask = DMA_BIT_MASK(40);
break;
}
}
ret = dma_set_mask_and_coherent(pdata->dev, pdata->dma_mask);
if (ret < 0) {
dev_err(pdata->dev, "dma_set_mask_and_coherent failed\n");
return ret;
}
return ret;
}
/** /**
* @brief Set the network device feature flags * @brief Set the network device feature flags
* *
@@ -6249,6 +6296,12 @@ static int ether_probe(struct platform_device *pdev)
memcpy(&pdata->hw_feat, &ioctl_data.hw_feat, memcpy(&pdata->hw_feat, &ioctl_data.hw_feat,
sizeof(struct osi_hw_features)); sizeof(struct osi_hw_features));
ret = ether_set_dma_mask(pdata);
if (ret < 0) {
dev_err(&pdev->dev, "failed to set dma mask\n");
goto err_dma_mask;
}
if (pdata->hw_feat.fpe_sel) { if (pdata->hw_feat.fpe_sel) {
ret = ether_parse_residual_queue(pdata, "nvidia,residual-queue", ret = ether_parse_residual_queue(pdata, "nvidia,residual-queue",
&osi_core->residual_queue); &osi_core->residual_queue);