lkml.org 
[lkml]   [2019]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] Revert "iommu/arm-smmu: Make arm-smmu-v3 explicitly non-modular"
    Date
    This reverts commit c07b6426df922d21a13a959cf785d46e9c531941.

    Let's get the SMMUv3 driver building as a module, which means putting
    back some dead code that we used to carry.

    Signed-off-by: Will Deacon <will@kernel.org>
    ---
    drivers/iommu/arm-smmu-v3.c | 25 ++++++++++++++++---------
    1 file changed, 16 insertions(+), 9 deletions(-)

    diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
    index 8da93e730d6f..2ad8e2ca0583 100644
    --- a/drivers/iommu/arm-smmu-v3.c
    +++ b/drivers/iommu/arm-smmu-v3.c
    @@ -21,8 +21,7 @@
    #include <linux/io-pgtable.h>
    #include <linux/iommu.h>
    #include <linux/iopoll.h>
    -#include <linux/init.h>
    -#include <linux/moduleparam.h>
    +#include <linux/module.h>
    #include <linux/msi.h>
    #include <linux/of.h>
    #include <linux/of_address.h>
    @@ -384,10 +383,6 @@
    #define MSI_IOVA_BASE 0x8000000
    #define MSI_IOVA_LENGTH 0x100000

    -/*
    - * not really modular, but the easiest way to keep compat with existing
    - * bootargs behaviour is to continue using module_param_named here.
    - */
    static bool disable_bypass = 1;
    module_param_named(disable_bypass, disable_bypass, bool, S_IRUGO);
    MODULE_PARM_DESC(disable_bypass,
    @@ -3683,25 +3678,37 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
    return 0;
    }

    -static void arm_smmu_device_shutdown(struct platform_device *pdev)
    +static int arm_smmu_device_remove(struct platform_device *pdev)
    {
    struct arm_smmu_device *smmu = platform_get_drvdata(pdev);

    arm_smmu_device_disable(smmu);
    +
    + return 0;
    +}
    +
    +static void arm_smmu_device_shutdown(struct platform_device *pdev)
    +{
    + arm_smmu_device_remove(pdev);
    }

    static const struct of_device_id arm_smmu_of_match[] = {
    { .compatible = "arm,smmu-v3", },
    { },
    };
    +MODULE_DEVICE_TABLE(of, arm_smmu_of_match);

    static struct platform_driver arm_smmu_driver = {
    .driver = {
    .name = "arm-smmu-v3",
    .of_match_table = of_match_ptr(arm_smmu_of_match),
    - .suppress_bind_attrs = true,
    },
    .probe = arm_smmu_device_probe,
    + .remove = arm_smmu_device_remove,
    .shutdown = arm_smmu_device_shutdown,
    };
    -builtin_platform_driver(arm_smmu_driver);
    +module_platform_driver(arm_smmu_driver);
    +
    +MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");
    +MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
    +MODULE_LICENSE("GPL v2");
    --
    2.24.0.rc0.303.g954a862665-goog
    \
     
     \ /
      Last update: 2019-10-30 15:52    [W:4.461 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site