iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/arm-smmu-v3: Use device properties for pasid-num-bits

Browse Source 
The pasid-num-bits property shouldn't need a dedicated fwspec field,
it's a job for device properties. Add properties for IORT, and access
the number of PASID bits using device_property_read_u32().

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Will Deacon <will@kernel.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Acked-by: Hanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/r/20210401154718.307519-3-jean-philippe@linaro.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Jean-Philippe Brucker 2021-04-01 17:47:11 +02:00 committed by Joerg Roedel
parent 0d35309ab5
commit 434b73e61c
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/acpi/arm64/iort.c
View File

@ -968,15 +968,16 @@ static int iort_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)
static void iort_named_component_init(struct device *dev, static void iort_named_component_init(struct device *dev,
struct acpi_iort_node *node) struct acpi_iort_node *node)
{ {
struct property_entry props[2] = {};
struct acpi_iort_named_component *nc; struct acpi_iort_named_component *nc;
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
if (!fwspec)
return;
nc = (struct acpi_iort_named_component *)node->node_data; nc = (struct acpi_iort_named_component *)node->node_data;
fwspec->num_pasid_bits = FIELD_GET(ACPI_IORT_NC_PASID_BITS, props[0] = PROPERTY_ENTRY_U32("pasid-num-bits",
nc->node_flags); FIELD_GET(ACPI_IORT_NC_PASID_BITS,
nc->node_flags));
if (device_add_properties(dev, props))
dev_warn(dev, "Could not add device properties\n");
} }
static int iort_nc_iommu_map(struct device *dev, struct acpi_iort_node *node) static int iort_nc_iommu_map(struct device *dev, struct acpi_iort_node *node)

3
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
View File

@ -2392,7 +2392,8 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev)
} }
} }
master->ssid_bits = min(smmu->ssid_bits, fwspec->num_pasid_bits); device_property_read_u32(dev, "pasid-num-bits", &master->ssid_bits);
master->ssid_bits = min(smmu->ssid_bits, master->ssid_bits);
/* /*
* Note that PASID must be enabled before, and disabled after ATS: * Note that PASID must be enabled before, and disabled after ATS:

5
drivers/iommu/of_iommu.c
View File

@ -210,11 +210,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
of_pci_iommu_init, &info); of_pci_iommu_init, &info);
} else { } else {
err = of_iommu_configure_device(master_np, dev, id); err = of_iommu_configure_device(master_np, dev, id);
fwspec = dev_iommu_fwspec_get(dev);
if (!err && fwspec)
of_property_read_u32(master_np, "pasid-num-bits",
&fwspec->num_pasid_bits);
} }
/* /*

2
include/linux/iommu.h
View File

@ -572,7 +572,6 @@ struct iommu_group *fsl_mc_device_group(struct device *dev);
* @ops: ops for this device's IOMMU * @ops: ops for this device's IOMMU
* @iommu_fwnode: firmware handle for this device's IOMMU * @iommu_fwnode: firmware handle for this device's IOMMU
* @flags: IOMMU_FWSPEC_* flags * @flags: IOMMU_FWSPEC_* flags
* @num_pasid_bits: number of PASID bits supported by this device
* @num_ids: number of associated device IDs * @num_ids: number of associated device IDs
* @ids: IDs which this device may present to the IOMMU * @ids: IDs which this device may present to the IOMMU
*/ */
@ -580,7 +579,6 @@ struct iommu_fwspec {
const struct iommu_ops *ops; const struct iommu_ops *ops;
struct fwnode_handle *iommu_fwnode; struct fwnode_handle *iommu_fwnode;
u32 flags; u32 flags;
u32 num_pasid_bits;
unsigned int num_ids; unsigned int num_ids;
u32 ids[]; u32 ids[];
}; };