Commit eb20758f authored by Nicolin Chen's avatar Nicolin Chen Committed by Will Deacon
Browse files

iommu/tegra241-cmdqv: Decouple driver from ACPI 



A platform device is created by acpi_create_platform_device() per CMDQV's
adev. That means there is no point in going through _CRS of ACPI.

Replace all the ACPI functions with standard platform functions. And drop
all ACPI dependencies. This will make the driver compatible with DT also.

Suggested-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 14e9a138

drivers/iommu/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ config ARM_SMMU_V3_KUNIT_TEST 


config TEGRA241_CMDQV

	bool "NVIDIA Tegra241 CMDQ-V extension support for ARM SMMUv3"

	depends on ACPI

	help

	  Support for NVIDIA CMDQ-Virtualization extension for ARM SMMUv3. The

	  CMDQ-V extension is similar to v3.3 ECMDQ for multi command queues

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+2 −1
Original line number Diff line number Diff line
@@ -4545,10 +4545,11 @@ static void acpi_smmu_dsdt_probe_tegra241_cmdqv(struct acpi_iort_node *node, 
	adev = acpi_dev_get_first_match_dev("NVDA200C", uid, -1);

	if (adev) {

		/* Tegra241 CMDQV driver is responsible for put_device() */

		smmu->impl_dev = &adev->dev;

		smmu->impl_dev = get_device(acpi_get_first_physical_node(adev));

		smmu->options |= ARM_SMMU_OPT_TEGRA241_CMDQV;

		dev_info(smmu->dev, "found companion CMDQV device: %s\n",

			 dev_name(smmu->impl_dev));

		acpi_dev_put(adev);

	}

	kfree(uid);

}

drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c

+12 −72
Original line number Diff line number Diff line
@@ -3,17 +3,15 @@ 


#define dev_fmt(fmt) "tegra241_cmdqv: " fmt



#include <linux/acpi.h>

#include <linux/debugfs.h>

#include <linux/dma-mapping.h>

#include <linux/interrupt.h>

#include <linux/iommu.h>

#include <linux/iommufd.h>

#include <linux/iopoll.h>

#include <linux/platform_device.h>

#include <uapi/linux/iommufd.h>



#include <acpi/acpixf.h>



#include "arm-smmu-v3.h"



/* CMDQV register page base and size defines */
@@ -854,69 +852,6 @@ static struct arm_smmu_impl_ops tegra241_cmdqv_impl_ops = { 


/* Probe Functions */



static int tegra241_cmdqv_acpi_is_memory(struct acpi_resource *res, void *data)

{

	struct resource_win win;



	return !acpi_dev_resource_address_space(res, &win);

}



static int tegra241_cmdqv_acpi_get_irqs(struct acpi_resource *ares, void *data)

{

	struct resource r;

	int *irq = data;



	if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r))

		*irq = r.start;

	return 1; /* No need to add resource to the list */

}



static struct resource *

tegra241_cmdqv_find_acpi_resource(struct device *dev, int *irq)

{

	struct acpi_device *adev = to_acpi_device(dev);

	struct list_head resource_list;

	struct resource_entry *rentry;

	struct resource *res = NULL;

	int ret;



	INIT_LIST_HEAD(&resource_list);

	ret = acpi_dev_get_resources(adev, &resource_list,

				     tegra241_cmdqv_acpi_is_memory, NULL);

	if (ret < 0) {

		dev_err(dev, "failed to get memory resource: %d\n", ret);

		return NULL;

	}



	rentry = list_first_entry_or_null(&resource_list,

					  struct resource_entry, node);

	if (!rentry) {

		dev_err(dev, "failed to get memory resource entry\n");

		goto free_list;

	}



	/* Caller must free the res */

	res = kzalloc(sizeof(*res), GFP_KERNEL);

	if (!res)

		goto free_list;



	*res = *rentry->res;



	acpi_dev_free_resource_list(&resource_list);



	INIT_LIST_HEAD(&resource_list);



	if (irq)

		ret = acpi_dev_get_resources(adev, &resource_list,

					     tegra241_cmdqv_acpi_get_irqs, irq);

	if (ret < 0 || !irq || *irq <= 0)

		dev_warn(dev, "no interrupt. errors will not be reported\n");



free_list:

	acpi_dev_free_resource_list(&resource_list);

	return res;

}



static int tegra241_cmdqv_init_structures(struct arm_smmu_device *smmu)

{

	struct tegra241_cmdqv *cmdqv =
@@ -1042,18 +977,23 @@ __tegra241_cmdqv_probe(struct arm_smmu_device *smmu, struct resource *res, 


struct arm_smmu_device *tegra241_cmdqv_probe(struct arm_smmu_device *smmu)

{

	struct platform_device *pdev = to_platform_device(smmu->impl_dev);

	struct arm_smmu_device *new_smmu;

	struct resource *res = NULL;

	struct resource *res;

	int irq;



	if (!smmu->dev->of_node)

		res = tegra241_cmdqv_find_acpi_resource(smmu->impl_dev, &irq);

	if (!res)

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "no memory resource found for CMDQV\n");

		goto out_fallback;

	}



	new_smmu = __tegra241_cmdqv_probe(smmu, res, irq);

	kfree(res);

	irq = platform_get_irq_optional(pdev, 0);

	if (irq <= 0)

		dev_warn(&pdev->dev,

			 "no interrupt. errors will not be reported\n");



	new_smmu = __tegra241_cmdqv_probe(smmu, res, irq);

	if (new_smmu)

		return new_smmu;