From 7b4432e5c2b49636922ad647e05d4cebcd795ee8 Mon Sep 17 00:00:00 2001 From: Ketan Patil Date: Sat, 14 Sep 2024 17:38:58 +0000 Subject: [PATCH] Revert "NVIDIA: SAUCE: arm-smmuv3: Restrict ATS supported check to ACPI/IORT" BugLink: https://bugs.launchpad.net/bugs/2080908 This reverts commit ae38fe53bd7cb273d1ee6380be97083c680df5a8. http://nvbugs/4241379 Signed-off-by: Ketan Patil Signed-off-by: Bodla Rakesh Babu Signed-off-by: Laxman Dewangan Acked-by: Noah Wager Acked-by: Jacob Martin Signed-off-by: Noah Wager --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 5a9bf7c1cae3..29316c27e2df 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3,7 +3,7 @@ * IOMMU API for ARM architected SMMUv3 implementations. * * Copyright (C) 2015 ARM Limited - * Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved. * * Author: Will Deacon * @@ -2262,7 +2262,7 @@ static bool arm_smmu_ats_supported(struct arm_smmu_master *master) if (!(smmu->features & ARM_SMMU_FEAT_ATS)) return false; - if (is_acpi_node(dev_fwnode(dev)) && !(fwspec->flags & IOMMU_FWSPEC_PCI_RC_ATS)) + if (!(fwspec->flags & IOMMU_FWSPEC_PCI_RC_ATS)) return false; return dev_is_pci(dev) && pci_ats_supported(to_pci_dev(dev));