xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu: Rename struct iommu_param to dev_iommu

Browse Source 
The term dev_iommu aligns better with other existing structures and
their accessor functions.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Will Deacon <will@kernel.org> # arm-smmu
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20200326150841.10083-6-joro@8bytes.org
This commit is contained in:
Joerg Roedel
2020-03-26 16:08:30 +01:00
parent 8c3d69237e
commit 045a704260
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/iommu/iommu.c
View File

@@ -152,9 +152,9 @@ void iommu_device_unregister(struct iommu_device *iommu)
} }
EXPORT_SYMBOL_GPL(iommu_device_unregister); EXPORT_SYMBOL_GPL(iommu_device_unregister);
static struct iommu_param *iommu_get_dev_param(struct device *dev) static struct dev_iommu *dev_iommu_get(struct device *dev)
{ {
struct iommu_param *param = dev->iommu_param; struct dev_iommu *param = dev->iommu;
if (param) if (param)
return param; return param;
@@ -164,14 +164,14 @@ static struct iommu_param *iommu_get_dev_param(struct device *dev)
return NULL; return NULL;
mutex_init(&param->lock); mutex_init(&param->lock);
dev->iommu_param = param; dev->iommu = param;
return param; return param;
} }
static void iommu_free_dev_param(struct device *dev) static void dev_iommu_free(struct device *dev)
{ {
kfree(dev->iommu_param); kfree(dev->iommu);
dev->iommu_param = NULL; dev->iommu = NULL;
} }
int iommu_probe_device(struct device *dev) int iommu_probe_device(struct device *dev)
@@ -183,7 +183,7 @@ int iommu_probe_device(struct device *dev)
if (!ops) if (!ops)
return -EINVAL; return -EINVAL;
if (!iommu_get_dev_param(dev)) if (!dev_iommu_get(dev))
return -ENOMEM; return -ENOMEM;
if (!try_module_get(ops->owner)) { if (!try_module_get(ops->owner)) {
@@ -200,7 +200,7 @@ int iommu_probe_device(struct device *dev)
err_module_put: err_module_put:
module_put(ops->owner); module_put(ops->owner);
err_free_dev_param: err_free_dev_param:
iommu_free_dev_param(dev); dev_iommu_free(dev);
return ret; return ret;
} }
@@ -211,9 +211,9 @@ void iommu_release_device(struct device *dev)
if (dev->iommu_group) if (dev->iommu_group)
ops->remove_device(dev); ops->remove_device(dev);
if (dev->iommu_param) { if (dev->iommu) {
module_put(ops->owner); module_put(ops->owner);
iommu_free_dev_param(dev); dev_iommu_free(dev);
} }
} }
@@ -972,7 +972,7 @@ int iommu_register_device_fault_handler(struct device *dev,
iommu_dev_fault_handler_t handler, iommu_dev_fault_handler_t handler,
void *data) void *data)
{ {
struct iommu_param *param = dev->iommu_param; struct dev_iommu *param = dev->iommu;
int ret = 0; int ret = 0;
if (!param) if (!param)
@@ -1015,7 +1015,7 @@ EXPORT_SYMBOL_GPL(iommu_register_device_fault_handler);
*/ */
int iommu_unregister_device_fault_handler(struct device *dev) int iommu_unregister_device_fault_handler(struct device *dev)
{ {
struct iommu_param *param = dev->iommu_param; struct dev_iommu *param = dev->iommu;
int ret = 0; int ret = 0;
if (!param) if (!param)
@@ -1055,7 +1055,7 @@ EXPORT_SYMBOL_GPL(iommu_unregister_device_fault_handler);
*/ */
int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt) int iommu_report_device_fault(struct device *dev, struct iommu_fault_event *evt)
{ {
struct iommu_param *param = dev->iommu_param; struct dev_iommu *param = dev->iommu;
struct iommu_fault_event *evt_pending = NULL; struct iommu_fault_event *evt_pending = NULL;
struct iommu_fault_param *fparam; struct iommu_fault_param *fparam;
int ret = 0; int ret = 0;
@@ -1104,7 +1104,7 @@ int iommu_page_response(struct device *dev,
int ret = -EINVAL; int ret = -EINVAL;
struct iommu_fault_event *evt; struct iommu_fault_event *evt;
struct iommu_fault_page_request *prm; struct iommu_fault_page_request *prm;
struct iommu_param *param = dev->iommu_param; struct dev_iommu *param = dev->iommu;
struct iommu_domain *domain = iommu_get_domain_for_dev(dev); struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
if (!domain || !domain->ops->page_response) if (!domain || !domain->ops->page_response)

6
include/linux/device.h
View File

@@ -44,7 +44,7 @@ struct iommu_ops;
struct iommu_group; struct iommu_group;
struct iommu_fwspec; struct iommu_fwspec;
struct dev_pin_info; struct dev_pin_info;
struct iommu_param; struct dev_iommu;
/** /**
* struct subsys_interface - interfaces to device functions * struct subsys_interface - interfaces to device functions
@@ -514,7 +514,7 @@ struct dev_links_info {
* device (i.e. the bus driver that discovered the device). * device (i.e. the bus driver that discovered the device).
* @iommu_group: IOMMU group the device belongs to. * @iommu_group: IOMMU group the device belongs to.
* @iommu_fwspec: IOMMU-specific properties supplied by firmware. * @iommu_fwspec: IOMMU-specific properties supplied by firmware.
* @iommu_param: Per device generic IOMMU runtime data * @iommu: Per device generic IOMMU runtime data
* *
* @offline_disabled: If set, the device is permanently online. * @offline_disabled: If set, the device is permanently online.
* @offline: Set after successful invocation of bus type's .offline(). * @offline: Set after successful invocation of bus type's .offline().
@@ -614,7 +614,7 @@ struct device {
void (*release)(struct device *dev); void (*release)(struct device *dev);
struct iommu_group *iommu_group; struct iommu_group *iommu_group;
struct iommu_fwspec *iommu_fwspec; struct iommu_fwspec *iommu_fwspec;
struct iommu_param *iommu_param; struct dev_iommu *iommu;
bool offline_disabled:1; bool offline_disabled:1;
bool offline:1; bool offline:1;

4
include/linux/iommu.h
View File

@@ -365,7 +365,7 @@ struct iommu_fault_param {
}; };
/** /**
* struct iommu_param - collection of per-device IOMMU data * struct dev_iommu - Collection of per-device IOMMU data
* *
* @fault_param: IOMMU detected device fault reporting data * @fault_param: IOMMU detected device fault reporting data
* *
@@ -373,7 +373,7 @@ struct iommu_fault_param {
* struct iommu_group *iommu_group; * struct iommu_group *iommu_group;
* struct iommu_fwspec *iommu_fwspec; * struct iommu_fwspec *iommu_fwspec;
*/ */
struct iommu_param { struct dev_iommu {
struct mutex lock; struct mutex lock;
struct iommu_fault_param *fault_param; struct iommu_fault_param *fault_param;
}; };