From c86ec7d3e5b6f9228896c7db92d3549843adc3ff Mon Sep 17 00:00:00 2001 From: Bitan Biswas Date: Wed, 19 Aug 2020 06:14:52 -0700 Subject: [PATCH] iommu: k5.9: remove archdata.iommu accesses k5.9 build needs below changes: read archdata.iommu replaced by iommu_get_domain_for_dev write archdata.iommu removed as alternative implementation used. k5.9 build error fixed by explicit include of header Change-Id: I464fd4144e4317b10aaa5460482f35e46527339a Signed-off-by: Bitan Biswas Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2400862 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 474900e2..45bfd50a 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -15,6 +15,7 @@ */ #include +#include #include "ether_linux.h" /** @@ -3805,7 +3806,7 @@ static int ether_parse_dt(struct ether_priv_data *pdata) } /* Check if IOMMU is enabled */ - if (pdev->dev.archdata.iommu != NULL) { + if (iommu_get_domain_for_dev(&pdev->dev) != NULL) { /* Read and set dma-mask from DT only if IOMMU is enabled*/ ret = of_property_read_u64(np, "dma-mask", &pdata->dma_mask); }