* [PATCH 1/7] iommu/io-pgtable: Introduce dynamic io-pgtable format registration
2020-12-29 1:48 [PATCH 0/7] iommu: Permit modular builds of io-pgtable drivers Isaac J. Manjarres
@ 2020-12-29 1:48 ` Isaac J. Manjarres
2020-12-29 1:48 ` [PATCH 2/7] iommu/io-pgtable: Add refcounting for io-pgtable format modules Isaac J. Manjarres
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Isaac J. Manjarres @ 2020-12-29 1:48 UTC (permalink / raw)
To: will, robin.murphy, joro, robdclark, sean, airlied, daniel,
steven.price, alyssa.rosenzweig, robh, tomeu.vizoso
Cc: Isaac J. Manjarres, freedreno, pdaly, pratikp, dri-devel, iommu,
kernel-team, linux-arm-kernel
The io-pgtable code constructs an array of init functions for each
page table format at compile time. This is not ideal, as it prevents
io-pgtable formats from being built as kernel modules.
In preparation for modularizing the io-pgtable formats, switch to a
dynamic registration scheme, where each io-pgtable format can register
their init functions with the io-pgtable code at boot or module
insertion time.
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
---
drivers/iommu/io-pgtable-arm-v7s.c | 33 ++++++++++++-
drivers/iommu/io-pgtable-arm.c | 97 ++++++++++++++++++++++++++++----------
drivers/iommu/io-pgtable.c | 44 +++++++++++------
include/linux/io-pgtable.h | 50 ++++++++++++--------
4 files changed, 164 insertions(+), 60 deletions(-)
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 1d92ac9..080881b 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -28,6 +28,7 @@
#include <linux/iommu.h>
#include <linux/kernel.h>
#include <linux/kmemleak.h>
+#include <linux/module.h>
#include <linux/sizes.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
@@ -835,7 +836,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
return NULL;
}
-struct io_pgtable_init_fns io_pgtable_arm_v7s_init_fns = {
+static struct io_pgtable_init_fns io_pgtable_arm_v7s_init_fns = {
.alloc = arm_v7s_alloc_pgtable,
.free = arm_v7s_free_pgtable,
};
@@ -982,5 +983,33 @@ static int __init arm_v7s_do_selftests(void)
pr_info("self test ok\n");
return 0;
}
-subsys_initcall(arm_v7s_do_selftests);
+#else
+static int arm_v7s_do_selftests(void)
+{
+ return 0;
+}
#endif
+
+static int __init arm_v7s_init(void)
+{
+ int ret;
+
+ ret = io_pgtable_ops_register(ARM_V7S, &io_pgtable_arm_v7s_init_fns);
+ if (ret < 0) {
+ pr_err("Failed to register ARM v7s fmt ret = %d\n", ret);
+ return ret;
+ }
+
+ ret = arm_v7s_do_selftests();
+ if (ret < 0)
+ io_pgtable_ops_unregister(ARM_V7S);
+
+ return ret;
+}
+core_initcall(arm_v7s_init);
+
+static void __exit arm_v7s_exit(void)
+{
+ io_pgtable_ops_unregister(ARM_V7S);
+}
+module_exit(arm_v7s_exit);
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 87def58..e1f8d54 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -13,6 +13,7 @@
#include <linux/bitops.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/sizes.h>
#include <linux/slab.h>
#include <linux/types.h>
@@ -145,6 +146,11 @@ struct arm_lpae_io_pgtable {
void *pgd;
};
+struct arm_lpae_io_pgtable_init_fns {
+ enum io_pgtable_fmt fmt;
+ struct io_pgtable_init_fns init_fns;
+};
+
typedef u64 arm_lpae_iopte;
static inline bool iopte_leaf(arm_lpae_iopte pte, int lvl,
@@ -1043,29 +1049,32 @@ arm_mali_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg, void *cookie)
return NULL;
}
-struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s1_init_fns = {
- .alloc = arm_64_lpae_alloc_pgtable_s1,
- .free = arm_lpae_free_pgtable,
-};
-
-struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s2_init_fns = {
- .alloc = arm_64_lpae_alloc_pgtable_s2,
- .free = arm_lpae_free_pgtable,
-};
-
-struct io_pgtable_init_fns io_pgtable_arm_32_lpae_s1_init_fns = {
- .alloc = arm_32_lpae_alloc_pgtable_s1,
- .free = arm_lpae_free_pgtable,
-};
-
-struct io_pgtable_init_fns io_pgtable_arm_32_lpae_s2_init_fns = {
- .alloc = arm_32_lpae_alloc_pgtable_s2,
- .free = arm_lpae_free_pgtable,
-};
-
-struct io_pgtable_init_fns io_pgtable_arm_mali_lpae_init_fns = {
- .alloc = arm_mali_lpae_alloc_pgtable,
- .free = arm_lpae_free_pgtable,
+static struct arm_lpae_io_pgtable_init_fns arm_lpae_init_fns_table[] = {
+ {
+ .fmt = ARM_32_LPAE_S1,
+ .init_fns.alloc = arm_32_lpae_alloc_pgtable_s1,
+ .init_fns.free = arm_lpae_free_pgtable,
+ },
+ {
+ .fmt = ARM_32_LPAE_S2,
+ .init_fns.alloc = arm_32_lpae_alloc_pgtable_s2,
+ .init_fns.free = arm_lpae_free_pgtable,
+ },
+ {
+ .fmt = ARM_64_LPAE_S1,
+ .init_fns.alloc = arm_64_lpae_alloc_pgtable_s1,
+ .init_fns.free = arm_lpae_free_pgtable,
+ },
+ {
+ .fmt = ARM_64_LPAE_S2,
+ .init_fns.alloc = arm_64_lpae_alloc_pgtable_s2,
+ .init_fns.free = arm_lpae_free_pgtable,
+ },
+ {
+ .fmt = ARM_MALI_LPAE,
+ .init_fns.alloc = arm_mali_lpae_alloc_pgtable,
+ .init_fns.free = arm_lpae_free_pgtable,
+ },
};
#ifdef CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST
@@ -1250,5 +1259,45 @@ static int __init arm_lpae_do_selftests(void)
pr_info("selftest: completed with %d PASS %d FAIL\n", pass, fail);
return fail ? -EFAULT : 0;
}
-subsys_initcall(arm_lpae_do_selftests);
+#else
+static int __init arm_lpae_do_selftests(void)
+{
+ return 0;
+}
#endif
+
+static int __init arm_lpae_init(void)
+{
+ int ret, i;
+
+ for (i = 0; i < ARRAY_SIZE(arm_lpae_init_fns_table); i++) {
+ ret = io_pgtable_ops_register(arm_lpae_init_fns_table[i].fmt,
+ &arm_lpae_init_fns_table[i].init_fns);
+ if (ret < 0) {
+ pr_err("Failed to register ARM LPAE fmt: %d ret: %d\n",
+ arm_lpae_init_fns_table[i].fmt, ret);
+ goto err_io_pgtable_register;
+ }
+ }
+
+ ret = arm_lpae_do_selftests();
+ if (ret < 0)
+ goto err_io_pgtable_register;
+
+ return 0;
+
+err_io_pgtable_register:
+ while (i--)
+ io_pgtable_ops_unregister(arm_lpae_init_fns_table[i].fmt);
+ return ret;
+}
+core_initcall(arm_lpae_init);
+
+static void __exit arm_lpae_exit(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(arm_lpae_init_fns_table); i++)
+ io_pgtable_ops_unregister(arm_lpae_init_fns_table[i].fmt);
+}
+module_exit(arm_lpae_exit);
diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
index 94394c8..95e872d 100644
--- a/drivers/iommu/io-pgtable.c
+++ b/drivers/iommu/io-pgtable.c
@@ -12,26 +12,14 @@
#include <linux/kernel.h>
#include <linux/types.h>
-static const struct io_pgtable_init_fns *
-io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] = {
-#ifdef CONFIG_IOMMU_IO_PGTABLE_LPAE
- [ARM_32_LPAE_S1] = &io_pgtable_arm_32_lpae_s1_init_fns,
- [ARM_32_LPAE_S2] = &io_pgtable_arm_32_lpae_s2_init_fns,
- [ARM_64_LPAE_S1] = &io_pgtable_arm_64_lpae_s1_init_fns,
- [ARM_64_LPAE_S2] = &io_pgtable_arm_64_lpae_s2_init_fns,
- [ARM_MALI_LPAE] = &io_pgtable_arm_mali_lpae_init_fns,
-#endif
-#ifdef CONFIG_IOMMU_IO_PGTABLE_ARMV7S
- [ARM_V7S] = &io_pgtable_arm_v7s_init_fns,
-#endif
-};
+static struct io_pgtable_init_fns *io_pgtable_init_table[IO_PGTABLE_NUM_FMTS];
struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
struct io_pgtable_cfg *cfg,
void *cookie)
{
struct io_pgtable *iop;
- const struct io_pgtable_init_fns *fns;
+ struct io_pgtable_init_fns *fns;
if (fmt >= IO_PGTABLE_NUM_FMTS)
return NULL;
@@ -59,12 +47,38 @@ EXPORT_SYMBOL_GPL(alloc_io_pgtable_ops);
void free_io_pgtable_ops(struct io_pgtable_ops *ops)
{
struct io_pgtable *iop;
+ struct io_pgtable_init_fns *fns;
if (!ops)
return;
iop = io_pgtable_ops_to_pgtable(ops);
io_pgtable_tlb_flush_all(iop);
- io_pgtable_init_table[iop->fmt]->free(iop);
+ fns = io_pgtable_init_table[iop->fmt];
+ if (fns)
+ fns->free(iop);
}
EXPORT_SYMBOL_GPL(free_io_pgtable_ops);
+
+int io_pgtable_ops_register(enum io_pgtable_fmt fmt,
+ struct io_pgtable_init_fns *init_fns)
+{
+ if (fmt >= IO_PGTABLE_NUM_FMTS || !init_fns || !init_fns->alloc ||
+ !init_fns->free)
+ return -EINVAL;
+ else if (io_pgtable_init_table[fmt])
+ return -EEXIST;
+
+ io_pgtable_init_table[fmt] = init_fns;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(io_pgtable_ops_register);
+
+void io_pgtable_ops_unregister(enum io_pgtable_fmt fmt)
+{
+ if (fmt >= IO_PGTABLE_NUM_FMTS)
+ return;
+
+ io_pgtable_init_table[fmt] = NULL;
+}
+EXPORT_SYMBOL_GPL(io_pgtable_ops_unregister);
diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h
index ea727eb..a460ae1 100644
--- a/include/linux/io-pgtable.h
+++ b/include/linux/io-pgtable.h
@@ -163,6 +163,37 @@ struct io_pgtable_ops {
};
/**
+ * struct io_pgtable_init_fns - Alloc/free a set of page tables for a
+ * particular format.
+ *
+ * @alloc: Allocate a set of page tables described by cfg.
+ * @free: Free the page tables associated with iop.
+ */
+struct io_pgtable_init_fns {
+ struct io_pgtable *(*alloc)(struct io_pgtable_cfg *cfg, void *cookie);
+ void (*free)(struct io_pgtable *iop);
+};
+
+/**
+ * io_pgtable_ops_register() - Register the page table routines for a page table
+ * format.
+ *
+ * @fmt: The page table format for which we are registering ops for.
+ * @init_fns: The functions for allocating and freeing the page tables of
+ * a particular format.
+ */
+int io_pgtable_ops_register(enum io_pgtable_fmt fmt,
+ struct io_pgtable_init_fns *init_fns);
+
+/**
+ * io_pgtable_ops_unregister() - Unregister the page table routines for a page
+ * table format.
+ *
+ * @fmt: The format for which we are unregistering ops for.
+ */
+void io_pgtable_ops_unregister(enum io_pgtable_fmt fmt);
+
+/**
* alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
*
* @fmt: The page table format.
@@ -233,23 +264,4 @@ io_pgtable_tlb_add_page(struct io_pgtable *iop,
iop->cfg.tlb->tlb_add_page(gather, iova, granule, iop->cookie);
}
-/**
- * struct io_pgtable_init_fns - Alloc/free a set of page tables for a
- * particular format.
- *
- * @alloc: Allocate a set of page tables described by cfg.
- * @free: Free the page tables associated with iop.
- */
-struct io_pgtable_init_fns {
- struct io_pgtable *(*alloc)(struct io_pgtable_cfg *cfg, void *cookie);
- void (*free)(struct io_pgtable *iop);
-};
-
-extern struct io_pgtable_init_fns io_pgtable_arm_32_lpae_s1_init_fns;
-extern struct io_pgtable_init_fns io_pgtable_arm_32_lpae_s2_init_fns;
-extern struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s1_init_fns;
-extern struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s2_init_fns;
-extern struct io_pgtable_init_fns io_pgtable_arm_v7s_init_fns;
-extern struct io_pgtable_init_fns io_pgtable_arm_mali_lpae_init_fns;
-
#endif /* __IO_PGTABLE_H */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/7] iommu/io-pgtable: Add refcounting for io-pgtable format modules
2020-12-29 1:48 [PATCH 0/7] iommu: Permit modular builds of io-pgtable drivers Isaac J. Manjarres
2020-12-29 1:48 ` [PATCH 1/7] iommu/io-pgtable: Introduce dynamic io-pgtable format registration Isaac J. Manjarres
@ 2020-12-29 1:48 ` Isaac J. Manjarres
2020-12-29 1:48 ` [PATCH 3/7] iommu/arm-smmu: Add dependency on " Isaac J. Manjarres
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Isaac J. Manjarres @ 2020-12-29 1:48 UTC (permalink / raw)
To: will, robin.murphy, joro, robdclark, sean, airlied, daniel,
steven.price, alyssa.rosenzweig, robh, tomeu.vizoso
Cc: Isaac J. Manjarres, freedreno, pdaly, pratikp, dri-devel, iommu,
kernel-team, linux-arm-kernel
In preparation for modularizing io-pgtable formats, add support
for reference counting the io-pgtable format modules to ensure
that the modules are not unloaded while they are in use.
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
---
drivers/iommu/io-pgtable-arm-v7s.c | 1 +
drivers/iommu/io-pgtable-arm.c | 5 +++++
drivers/iommu/io-pgtable.c | 12 ++++++++++--
include/linux/io-pgtable.h | 2 ++
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 080881b..7e81135 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -839,6 +839,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
static struct io_pgtable_init_fns io_pgtable_arm_v7s_init_fns = {
.alloc = arm_v7s_alloc_pgtable,
.free = arm_v7s_free_pgtable,
+ .owner = THIS_MODULE,
};
#ifdef CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index e1f8d54..8ed52a0 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -1054,26 +1054,31 @@ static struct arm_lpae_io_pgtable_init_fns arm_lpae_init_fns_table[] = {
.fmt = ARM_32_LPAE_S1,
.init_fns.alloc = arm_32_lpae_alloc_pgtable_s1,
.init_fns.free = arm_lpae_free_pgtable,
+ .init_fns.owner = THIS_MODULE,
},
{
.fmt = ARM_32_LPAE_S2,
.init_fns.alloc = arm_32_lpae_alloc_pgtable_s2,
.init_fns.free = arm_lpae_free_pgtable,
+ .init_fns.owner = THIS_MODULE,
},
{
.fmt = ARM_64_LPAE_S1,
.init_fns.alloc = arm_64_lpae_alloc_pgtable_s1,
.init_fns.free = arm_lpae_free_pgtable,
+ .init_fns.owner = THIS_MODULE,
},
{
.fmt = ARM_64_LPAE_S2,
.init_fns.alloc = arm_64_lpae_alloc_pgtable_s2,
.init_fns.free = arm_lpae_free_pgtable,
+ .init_fns.owner = THIS_MODULE,
},
{
.fmt = ARM_MALI_LPAE,
.init_fns.alloc = arm_mali_lpae_alloc_pgtable,
.init_fns.free = arm_lpae_free_pgtable,
+ .init_fns.owner = THIS_MODULE,
},
};
diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
index 95e872d..9792e25 100644
--- a/drivers/iommu/io-pgtable.c
+++ b/drivers/iommu/io-pgtable.c
@@ -10,6 +10,7 @@
#include <linux/bug.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/types.h>
static struct io_pgtable_init_fns *io_pgtable_init_table[IO_PGTABLE_NUM_FMTS];
@@ -28,9 +29,14 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
if (!fns)
return NULL;
+ if (!try_module_get(fns->owner))
+ return NULL;
+
iop = fns->alloc(cfg, cookie);
- if (!iop)
+ if (!iop) {
+ module_put(fns->owner);
return NULL;
+ }
iop->fmt = fmt;
iop->cookie = cookie;
@@ -55,8 +61,10 @@ void free_io_pgtable_ops(struct io_pgtable_ops *ops)
iop = io_pgtable_ops_to_pgtable(ops);
io_pgtable_tlb_flush_all(iop);
fns = io_pgtable_init_table[iop->fmt];
- if (fns)
+ if (fns) {
fns->free(iop);
+ module_put(fns->owner);
+ }
}
EXPORT_SYMBOL_GPL(free_io_pgtable_ops);
diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h
index a460ae1..bdf0a01 100644
--- a/include/linux/io-pgtable.h
+++ b/include/linux/io-pgtable.h
@@ -168,10 +168,12 @@ struct io_pgtable_ops {
*
* @alloc: Allocate a set of page tables described by cfg.
* @free: Free the page tables associated with iop.
+ * @owner: Driver module providing these ops.
*/
struct io_pgtable_init_fns {
struct io_pgtable *(*alloc)(struct io_pgtable_cfg *cfg, void *cookie);
void (*free)(struct io_pgtable *iop);
+ struct module *owner;
};
/**
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/7] iommu/arm-smmu: Add dependency on io-pgtable format modules
2020-12-29 1:48 [PATCH 0/7] iommu: Permit modular builds of io-pgtable drivers Isaac J. Manjarres
2020-12-29 1:48 ` [PATCH 1/7] iommu/io-pgtable: Introduce dynamic io-pgtable format registration Isaac J. Manjarres
2020-12-29 1:48 ` [PATCH 2/7] iommu/io-pgtable: Add refcounting for io-pgtable format modules Isaac J. Manjarres
@ 2020-12-29 1:48 ` Isaac J. Manjarres
2020-12-29 1:48 ` [PATCH 4/7] iommu/arm-smmu-v3: Add dependency on io-pgtable-arm format module Isaac J. Manjarres
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Isaac J. Manjarres @ 2020-12-29 1:48 UTC (permalink / raw)
To: will, robin.murphy, joro, robdclark, sean, airlied, daniel,
steven.price, alyssa.rosenzweig, robh, tomeu.vizoso
Cc: Isaac J. Manjarres, freedreno, pdaly, pratikp, dri-devel, iommu,
kernel-team, linux-arm-kernel
The SMMU driver depends on the availability of the ARM LPAE
io-pgtable format code to work properly. In preparation
for having the io-pgtable formats as modules, add a "pre"
dependency with MODULE_SOFTDEP() to ensure that the ARM LPAE
io-pgtable format module is loaded before loading the ARM SMMU
driver module. Also, add a dependency on the ARMv7 short descriptor
io-pgtable format, so that it can be loaded before the SMMU driver
module, if available.
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
---
drivers/iommu/arm/arm-smmu/arm-smmu.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
index d8c6bfd..a72649f 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
@@ -2351,3 +2351,4 @@ MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations");
MODULE_AUTHOR("Will Deacon <will@kernel.org>");
MODULE_ALIAS("platform:arm-smmu");
MODULE_LICENSE("GPL v2");
+MODULE_SOFTDEP("pre: io-pgtable-arm io-pgtable-arm-v7s");
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/7] iommu/arm-smmu-v3: Add dependency on io-pgtable-arm format module
2020-12-29 1:48 [PATCH 0/7] iommu: Permit modular builds of io-pgtable drivers Isaac J. Manjarres
` (2 preceding siblings ...)
2020-12-29 1:48 ` [PATCH 3/7] iommu/arm-smmu: Add dependency on " Isaac J. Manjarres
@ 2020-12-29 1:48 ` Isaac J. Manjarres
2020-12-29 1:48 ` [PATCH 5/7] drm/msm: " Isaac J. Manjarres
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Isaac J. Manjarres @ 2020-12-29 1:48 UTC (permalink / raw)
To: will, robin.murphy, joro, robdclark, sean, airlied, daniel,
steven.price, alyssa.rosenzweig, robh, tomeu.vizoso
Cc: Isaac J. Manjarres, freedreno, pdaly, pratikp, dri-devel, iommu,
kernel-team, linux-arm-kernel
The SMMUv3 driver depends on the availability of the ARM LPAE io-pgtable
format code to work properly. In preparation for having the io-pgtable
formats as modules, add a "pre" dependency with MODULE_SOFTDEP() to
ensure that the io-pgtable-arm format module is loaded before loading
the ARM SMMUv3 driver module.
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 8ca7415..c498ac8 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -3650,3 +3650,4 @@ MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");
MODULE_AUTHOR("Will Deacon <will@kernel.org>");
MODULE_ALIAS("platform:arm-smmu-v3");
MODULE_LICENSE("GPL v2");
+MODULE_SOFTDEP("pre: io-pgtable-arm");
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/7] drm/msm: Add dependency on io-pgtable-arm format module
2020-12-29 1:48 [PATCH 0/7] iommu: Permit modular builds of io-pgtable drivers Isaac J. Manjarres
` (3 preceding siblings ...)
2020-12-29 1:48 ` [PATCH 4/7] iommu/arm-smmu-v3: Add dependency on io-pgtable-arm format module Isaac J. Manjarres
@ 2020-12-29 1:48 ` Isaac J. Manjarres
2020-12-29 1:49 ` [PATCH 6/7] drm/panfrost: " Isaac J. Manjarres
2020-12-29 1:49 ` [PATCH 7/7] iommu/io-pgtable-arm: Allow building modular io-pgtable formats Isaac J. Manjarres
6 siblings, 0 replies; 8+ messages in thread
From: Isaac J. Manjarres @ 2020-12-29 1:48 UTC (permalink / raw)
To: will, robin.murphy, joro, robdclark, sean, airlied, daniel,
steven.price, alyssa.rosenzweig, robh, tomeu.vizoso
Cc: Isaac J. Manjarres, freedreno, pdaly, pratikp, dri-devel, iommu,
kernel-team, linux-arm-kernel
The MSM DRM driver depends on the availability of the ARM LPAE io-pgtable
format code to work properly. In preparation for having the io-pgtable
formats as modules, add a "pre" dependency with MODULE_SOFTDEP() to
ensure that the io-pgtable-arm format module is loaded before loading
the MSM DRM driver module.
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
---
drivers/gpu/drm/msm/msm_drv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 535a026..8be3506 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1369,3 +1369,4 @@ module_exit(msm_drm_unregister);
MODULE_AUTHOR("Rob Clark <robdclark@gmail.com");
MODULE_DESCRIPTION("MSM DRM Driver");
MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: io-pgtable-arm");
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/7] drm/panfrost: Add dependency on io-pgtable-arm format module
2020-12-29 1:48 [PATCH 0/7] iommu: Permit modular builds of io-pgtable drivers Isaac J. Manjarres
` (4 preceding siblings ...)
2020-12-29 1:48 ` [PATCH 5/7] drm/msm: " Isaac J. Manjarres
@ 2020-12-29 1:49 ` Isaac J. Manjarres
2020-12-29 1:49 ` [PATCH 7/7] iommu/io-pgtable-arm: Allow building modular io-pgtable formats Isaac J. Manjarres
6 siblings, 0 replies; 8+ messages in thread
From: Isaac J. Manjarres @ 2020-12-29 1:49 UTC (permalink / raw)
To: will, robin.murphy, joro, robdclark, sean, airlied, daniel,
steven.price, alyssa.rosenzweig, robh, tomeu.vizoso
Cc: Isaac J. Manjarres, freedreno, pdaly, pratikp, dri-devel, iommu,
kernel-team, linux-arm-kernel
The Panfrost DRM driver depends on the availability of the ARM LPAE
io-pgtable format code to work properly. In preparation for having the
io-pgtable formats as modules, add a "pre" dependency with
MODULE_SOFTDEP() to ensure that the io-pgtable-arm format module is loaded
before loading the Panfrost DRM driver module.
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
---
drivers/gpu/drm/panfrost/panfrost_drv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 83a461b..7294622 100644
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -704,3 +704,4 @@ module_platform_driver(panfrost_driver);
MODULE_AUTHOR("Panfrost Project Developers");
MODULE_DESCRIPTION("Panfrost DRM Driver");
MODULE_LICENSE("GPL v2");
+MODULE_SOFTDEP("pre: io-pgtable-arm");
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 7/7] iommu/io-pgtable-arm: Allow building modular io-pgtable formats
2020-12-29 1:48 [PATCH 0/7] iommu: Permit modular builds of io-pgtable drivers Isaac J. Manjarres
` (5 preceding siblings ...)
2020-12-29 1:49 ` [PATCH 6/7] drm/panfrost: " Isaac J. Manjarres
@ 2020-12-29 1:49 ` Isaac J. Manjarres
6 siblings, 0 replies; 8+ messages in thread
From: Isaac J. Manjarres @ 2020-12-29 1:49 UTC (permalink / raw)
To: will, robin.murphy, joro, robdclark, sean, airlied, daniel,
steven.price, alyssa.rosenzweig, robh, tomeu.vizoso
Cc: Isaac J. Manjarres, freedreno, pdaly, pratikp, dri-devel, iommu,
kernel-team, linux-arm-kernel
Now that everything is in place for modular io-pgtable formats,
allow the ARM LPAE and ARMV7S io-pgtable formats to be built
as modules, and allow the io-pgtable framework to be enabled,
without having to explicitly enable an io-pgtable format.
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
---
drivers/iommu/Kconfig | 11 +++++++----
drivers/iommu/io-pgtable-arm-v7s.c | 2 ++
drivers/iommu/io-pgtable-arm.c | 2 ++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 192ef8f..d3c4e9a 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -25,12 +25,15 @@ if IOMMU_SUPPORT
menu "Generic IOMMU Pagetable Support"
-# Selected by the actual pagetable implementations
config IOMMU_IO_PGTABLE
- bool
+ bool "IOMMU Pagetable support"
+ help
+ Enable support for using IOMMU pagetables. This option enables
+ the generic IOMMU pagetable framework for registering IOMMU
+ pagetable formats, as well as managing IOMMU pagetable instances.
config IOMMU_IO_PGTABLE_LPAE
- bool "ARMv7/v8 Long Descriptor Format"
+ tristate "ARMv7/v8 Long Descriptor Format"
select IOMMU_IO_PGTABLE
depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64)
help
@@ -49,7 +52,7 @@ config IOMMU_IO_PGTABLE_LPAE_SELFTEST
If unsure, say N here.
config IOMMU_IO_PGTABLE_ARMV7S
- bool "ARMv7/v8 Short Descriptor Format"
+ tristate "ARMv7/v8 Short Descriptor Format"
select IOMMU_IO_PGTABLE
depends on ARM || ARM64 || COMPILE_TEST
help
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index 7e81135..69dbf86 100644
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -1014,3 +1014,5 @@ static void __exit arm_v7s_exit(void)
io_pgtable_ops_unregister(ARM_V7S);
}
module_exit(arm_v7s_exit);
+
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 8ed52a0..8d4805f 100644
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -1306,3 +1306,5 @@ static void __exit arm_lpae_exit(void)
io_pgtable_ops_unregister(arm_lpae_init_fns_table[i].fmt);
}
module_exit(arm_lpae_exit);
+
+MODULE_LICENSE("GPL v2");
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 8+ messages in thread