Skip to content

L
linux
Commit a9bf2eec authored by Joerg Roedel's avatar Joerg Roedel
Browse files
Options

iommu/mediatek: Use helper functions to access dev->iommu_fwspec 

Use the new helpers dev_iommu_fwspec_get()/set() to access
the dev->iommu_fwspec pointer. This makes it easier to move
that pointer later into another struct.

Cc: Matthias Brugger <matthias.bgg@gmail.com>
Tested-by: default avatarYong Wu <yong.wu@mediatek.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent df903655
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 21 deletions
drivers/iommu/mtk_iommu.c
View file @ a9bf2eec
...@@ -244,7 +244,7 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, ...@@ -244,7 +244,7 @@ static void mtk_iommu_config(struct mtk_iommu_data *data,
{ {
struct mtk_smi_larb_iommu *larb_mmu; struct mtk_smi_larb_iommu *larb_mmu;
unsigned int larbid, portid; unsigned int larbid, portid;
struct iommu_fwspec *fwspec = dev->iommu_fwspec; struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
int i; int i;
for (i = 0; i < fwspec->num_ids; ++i) { for (i = 0; i < fwspec->num_ids; ++i) {
...@@ -336,7 +336,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, ...@@ -336,7 +336,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
struct device *dev) struct device *dev)
{ {
struct mtk_iommu_domain *dom = to_mtk_domain(domain); struct mtk_iommu_domain *dom = to_mtk_domain(domain);
struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv;
if (!data) if (!data)
return -ENODEV; return -ENODEV;
...@@ -355,7 +355,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, ...@@ -355,7 +355,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
static void mtk_iommu_detach_device(struct iommu_domain *domain, static void mtk_iommu_detach_device(struct iommu_domain *domain,
struct device *dev) struct device *dev)
{ {
struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv;
if (!data) if (!data)
return; return;
...@@ -417,13 +417,14 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, ...@@ -417,13 +417,14 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
static int mtk_iommu_add_device(struct device *dev) static int mtk_iommu_add_device(struct device *dev)
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data; struct mtk_iommu_data *data;
struct iommu_group *group; struct iommu_group *group;
if (!dev->iommu_fwspec || dev->iommu_fwspec->ops != &mtk_iommu_ops) if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return -ENODEV; /* Not a iommu client device */ return -ENODEV; /* Not a iommu client device */
data = dev->iommu_fwspec->iommu_priv; data = fwspec->iommu_priv;
iommu_device_link(&data->iommu, dev); iommu_device_link(&data->iommu, dev);
group = iommu_group_get_for_dev(dev); group = iommu_group_get_for_dev(dev);
...@@ -436,12 +437,13 @@ static int mtk_iommu_add_device(struct device *dev) ...@@ -436,12 +437,13 @@ static int mtk_iommu_add_device(struct device *dev)
static void mtk_iommu_remove_device(struct device *dev) static void mtk_iommu_remove_device(struct device *dev)
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data; struct mtk_iommu_data *data;
if (!dev->iommu_fwspec || dev->iommu_fwspec->ops != &mtk_iommu_ops) if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return; return;
data = dev->iommu_fwspec->iommu_priv; data = fwspec->iommu_priv;
iommu_device_unlink(&data->iommu, dev); iommu_device_unlink(&data->iommu, dev);
iommu_group_remove_device(dev); iommu_group_remove_device(dev);
...@@ -468,6 +470,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) ...@@ -468,6 +470,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)
static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct platform_device *m4updev; struct platform_device *m4updev;
if (args->args_count != 1) { if (args->args_count != 1) {
...@@ -476,13 +479,13 @@ static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args) ...@@ -476,13 +479,13 @@ static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
return -EINVAL; return -EINVAL;
} }
if (!dev->iommu_fwspec->iommu_priv) { if (!fwspec->iommu_priv) {
/* Get the m4u device */ /* Get the m4u device */
m4updev = of_find_device_by_node(args->np); m4updev = of_find_device_by_node(args->np);
if (WARN_ON(!m4updev)) if (WARN_ON(!m4updev))
return -EINVAL; return -EINVAL;
dev->iommu_fwspec->iommu_priv = platform_get_drvdata(m4updev); fwspec->iommu_priv = platform_get_drvdata(m4updev);
} }
return iommu_fwspec_add_ids(dev, args->args, 1); return iommu_fwspec_add_ids(dev, args->args, 1);
......
drivers/iommu/mtk_iommu_v1.c
View file @ a9bf2eec
...@@ -208,7 +208,7 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, ...@@ -208,7 +208,7 @@ static void mtk_iommu_config(struct mtk_iommu_data *data,
{ {
struct mtk_smi_larb_iommu *larb_mmu; struct mtk_smi_larb_iommu *larb_mmu;
unsigned int larbid, portid; unsigned int larbid, portid;
struct iommu_fwspec *fwspec = dev->iommu_fwspec; struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
int i; int i;
for (i = 0; i < fwspec->num_ids; ++i) { for (i = 0; i < fwspec->num_ids; ++i) {
...@@ -273,7 +273,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, ...@@ -273,7 +273,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
struct device *dev) struct device *dev)
{ {
struct mtk_iommu_domain *dom = to_mtk_domain(domain); struct mtk_iommu_domain *dom = to_mtk_domain(domain);
struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv;
int ret; int ret;
if (!data) if (!data)
...@@ -295,7 +295,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, ...@@ -295,7 +295,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
static void mtk_iommu_detach_device(struct iommu_domain *domain, static void mtk_iommu_detach_device(struct iommu_domain *domain,
struct device *dev) struct device *dev)
{ {
struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_data *data = dev_iommu_fwspec_get(dev)->iommu_priv;
if (!data) if (!data)
return; return;
...@@ -373,6 +373,7 @@ static struct iommu_ops mtk_iommu_ops; ...@@ -373,6 +373,7 @@ static struct iommu_ops mtk_iommu_ops;
static int mtk_iommu_create_mapping(struct device *dev, static int mtk_iommu_create_mapping(struct device *dev,
struct of_phandle_args *args) struct of_phandle_args *args)
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data; struct mtk_iommu_data *data;
struct platform_device *m4updev; struct platform_device *m4updev;
struct dma_iommu_mapping *mtk_mapping; struct dma_iommu_mapping *mtk_mapping;
...@@ -385,28 +386,29 @@ static int mtk_iommu_create_mapping(struct device *dev, ...@@ -385,28 +386,29 @@ static int mtk_iommu_create_mapping(struct device *dev,
return -EINVAL; return -EINVAL;
} }
if (!dev->iommu_fwspec) { if (!fwspec) {
ret = iommu_fwspec_init(dev, &args->np->fwnode, &mtk_iommu_ops); ret = iommu_fwspec_init(dev, &args->np->fwnode, &mtk_iommu_ops);
if (ret) if (ret)
return ret; return ret;
} else if (dev->iommu_fwspec->ops != &mtk_iommu_ops) { fwspec = dev_iommu_fwspec_get(dev);
} else if (dev_iommu_fwspec_get(dev)->ops != &mtk_iommu_ops) {
return -EINVAL; return -EINVAL;
} }
if (!dev->iommu_fwspec->iommu_priv) { if (!fwspec->iommu_priv) {
/* Get the m4u device */ /* Get the m4u device */
m4updev = of_find_device_by_node(args->np); m4updev = of_find_device_by_node(args->np);
if (WARN_ON(!m4updev)) if (WARN_ON(!m4updev))
return -EINVAL; return -EINVAL;
dev->iommu_fwspec->iommu_priv = platform_get_drvdata(m4updev); fwspec->iommu_priv = platform_get_drvdata(m4updev);
} }
ret = iommu_fwspec_add_ids(dev, args->args, 1); ret = iommu_fwspec_add_ids(dev, args->args, 1);
if (ret) if (ret)
return ret; return ret;
data = dev->iommu_fwspec->iommu_priv; data = fwspec->iommu_priv;
m4udev = data->dev; m4udev = data->dev;
mtk_mapping = m4udev->archdata.iommu; mtk_mapping = m4udev->archdata.iommu;
if (!mtk_mapping) { if (!mtk_mapping) {
...@@ -424,6 +426,7 @@ static int mtk_iommu_create_mapping(struct device *dev, ...@@ -424,6 +426,7 @@ static int mtk_iommu_create_mapping(struct device *dev,
static int mtk_iommu_add_device(struct device *dev) static int mtk_iommu_add_device(struct device *dev)
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct dma_iommu_mapping *mtk_mapping; struct dma_iommu_mapping *mtk_mapping;
struct of_phandle_args iommu_spec; struct of_phandle_args iommu_spec;
struct of_phandle_iterator it; struct of_phandle_iterator it;
...@@ -442,7 +445,7 @@ static int mtk_iommu_add_device(struct device *dev) ...@@ -442,7 +445,7 @@ static int mtk_iommu_add_device(struct device *dev)
of_node_put(iommu_spec.np); of_node_put(iommu_spec.np);
} }
if (!dev->iommu_fwspec || dev->iommu_fwspec->ops != &mtk_iommu_ops) if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return -ENODEV; /* Not a iommu client device */ return -ENODEV; /* Not a iommu client device */
/* /*
...@@ -460,7 +463,7 @@ static int mtk_iommu_add_device(struct device *dev) ...@@ -460,7 +463,7 @@ static int mtk_iommu_add_device(struct device *dev)
if (err) if (err)
return err; return err;
data = dev->iommu_fwspec->iommu_priv; data = fwspec->iommu_priv;
mtk_mapping = data->dev->archdata.iommu; mtk_mapping = data->dev->archdata.iommu;
err = arm_iommu_attach_device(dev, mtk_mapping); err = arm_iommu_attach_device(dev, mtk_mapping);
if (err) { if (err) {
...@@ -473,12 +476,13 @@ static int mtk_iommu_add_device(struct device *dev) ...@@ -473,12 +476,13 @@ static int mtk_iommu_add_device(struct device *dev)
static void mtk_iommu_remove_device(struct device *dev) static void mtk_iommu_remove_device(struct device *dev)
{ {
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct mtk_iommu_data *data; struct mtk_iommu_data *data;
if (!dev->iommu_fwspec || dev->iommu_fwspec->ops != &mtk_iommu_ops) if (!fwspec || fwspec->ops != &mtk_iommu_ops)
return; return;
data = dev->iommu_fwspec->iommu_priv; data = fwspec->iommu_priv;
iommu_device_unlink(&data->iommu, dev); iommu_device_unlink(&data->iommu, dev);
iommu_group_remove_device(dev); iommu_group_remove_device(dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7