Merge "qcacld-3.0: add PLD API to support SMMU-S1 unmap in moselle" (1014f377) · Commits · e / devices / android_kernel_fairphone_FP5

core/pld/src/pld_common.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2017,7 +2017,7 @@ int pld_smmu_unmap(struct device *dev,
		case PLD_BUS_TYPE_PCIE_FW_SIM:
		case PLD_BUS_TYPE_SNOC_FW_SIM:
		case PLD_BUS_TYPE_IPCI:
		pr_err("Not supported on type %d\n", type);
		ret = pld_ipci_smmu_unmap(dev, iova_addr, size);
		break;
		default:
		pr_err("Invalid device type %d\n", type);

+22 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2021 The Linux Foundation. All rights reserved.
		*
		* Permission to use, copy, modify, and/or distribute this software for
		* any purpose with or without fee is hereby granted, provided that the
		@@ -120,6 +120,12 @@ static inline int pld_ipci_smmu_map(struct device *dev, phys_addr_t paddr,
		return 0;
		}

		static inline int pld_ipci_smmu_unmap(struct device *dev,
		uint32_t iova_addr, size_t size)
		{
		return 0;
		}

		static inline int pld_ipci_force_wake_request(struct device *dev)
		{
		return 0;
		@@ -257,6 +263,21 @@ static inline int pld_ipci_smmu_map(struct device *dev, phys_addr_t paddr,
		return icnss_smmu_map(dev, paddr, iova_addr, size);
		}

		#ifdef CONFIG_SMMU_S1_UNMAP
		static inline int pld_ipci_smmu_unmap(struct device *dev,
		uint32_t iova_addr, size_t size)
		{
		return icnss_smmu_unmap(dev, iova_addr, size);
		}

		#else
		static inline int pld_ipci_smmu_unmap(struct device *dev,
		uint32_t iova_addr, size_t size)
		{
		return 0;
		}
		#endif

		static inline int pld_ipci_force_wake_request(struct device *dev)
		{
		return icnss_force_wake_request(dev);