* [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel
@ 2020-02-12 0:37 Li Yang
2020-02-12 10:49 ` Will Deacon
0 siblings, 1 reply; 4+ messages in thread
From: Li Yang @ 2020-02-12 0:37 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy
Cc: Russell King - ARM Linux admin, Li Yang, iommu, linux-kernel,
linux-arm-kernel
Commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module")
introduced a side effect that changed the module name from arm-smmu to
arm-smmu-mod. This breaks the users of kernel parameters for the driver
(e.g. arm-smmu.disable_bypass). This patch changes the module name back
to be consistent.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
drivers/iommu/Makefile | 4 ++--
drivers/iommu/{arm-smmu.c => arm-smmu-common.c} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/iommu/{arm-smmu.c => arm-smmu-common.c} (100%)
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 2104fb8afc06..f39e82e68640 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -14,8 +14,8 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o
obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o
obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o
obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
-obj-$(CONFIG_ARM_SMMU) += arm-smmu-mod.o
-arm-smmu-mod-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o
+obj-$(CONFIG_ARM_SMMU) += arm-smmu.o
+arm-smmu-objs := arm-smmu-common.o arm-smmu-impl.o arm-smmu-qcom.o
obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
obj-$(CONFIG_DMAR_TABLE) += dmar.o
obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu-common.c
similarity index 100%
rename from drivers/iommu/arm-smmu.c
rename to drivers/iommu/arm-smmu-common.c
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel
2020-02-12 0:37 [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel Li Yang
@ 2020-02-12 10:49 ` Will Deacon
2020-02-12 19:59 ` Li Yang
0 siblings, 1 reply; 4+ messages in thread
From: Will Deacon @ 2020-02-12 10:49 UTC (permalink / raw)
To: Li Yang
Cc: Joerg Roedel, Will Deacon, Robin Murphy, linux-kernel, iommu,
Russell King - ARM Linux admin, linux-arm-kernel
On Tue, Feb 11, 2020 at 06:37:20PM -0600, Li Yang wrote:
> Commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module")
> introduced a side effect that changed the module name from arm-smmu to
> arm-smmu-mod. This breaks the users of kernel parameters for the driver
> (e.g. arm-smmu.disable_bypass). This patch changes the module name back
> to be consistent.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> drivers/iommu/Makefile | 4 ++--
> drivers/iommu/{arm-smmu.c => arm-smmu-common.c} | 0
> 2 files changed, 2 insertions(+), 2 deletions(-)
> rename drivers/iommu/{arm-smmu.c => arm-smmu-common.c} (100%)
Can't we just override MODULE_PARAM_PREFIX instead of renaming the file?
Will
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel
2020-02-12 10:49 ` Will Deacon
@ 2020-02-12 19:59 ` Li Yang
2020-02-13 9:16 ` Will Deacon
0 siblings, 1 reply; 4+ messages in thread
From: Li Yang @ 2020-02-12 19:59 UTC (permalink / raw)
To: Will Deacon
Cc: Joerg Roedel, Will Deacon, Robin Murphy, lkml, Linux IOMMU,
Russell King - ARM Linux admin,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Feb 12, 2020 at 4:50 AM Will Deacon <will@kernel.org> wrote:
>
> On Tue, Feb 11, 2020 at 06:37:20PM -0600, Li Yang wrote:
> > Commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module")
> > introduced a side effect that changed the module name from arm-smmu to
> > arm-smmu-mod. This breaks the users of kernel parameters for the driver
> > (e.g. arm-smmu.disable_bypass). This patch changes the module name back
> > to be consistent.
> >
> > Signed-off-by: Li Yang <leoyang.li@nxp.com>
> > ---
> > drivers/iommu/Makefile | 4 ++--
> > drivers/iommu/{arm-smmu.c => arm-smmu-common.c} | 0
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> > rename drivers/iommu/{arm-smmu.c => arm-smmu-common.c} (100%)
>
> Can't we just override MODULE_PARAM_PREFIX instead of renaming the file?
I can do that. But on the other hand, the "mod" in the module name
arm-smmu-mod.ko seems to be redundant and looks a little bit weird.
Wouldn't it be cleaner to make it just arm-smmu.ko?
Regards,
Leo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel
2020-02-12 19:59 ` Li Yang
@ 2020-02-13 9:16 ` Will Deacon
0 siblings, 0 replies; 4+ messages in thread
From: Will Deacon @ 2020-02-13 9:16 UTC (permalink / raw)
To: Li Yang
Cc: Joerg Roedel, Will Deacon, Robin Murphy, lkml, Linux IOMMU,
Russell King - ARM Linux admin,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Feb 12, 2020 at 01:59:46PM -0600, Li Yang wrote:
> On Wed, Feb 12, 2020 at 4:50 AM Will Deacon <will@kernel.org> wrote:
> >
> > On Tue, Feb 11, 2020 at 06:37:20PM -0600, Li Yang wrote:
> > > Commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module")
> > > introduced a side effect that changed the module name from arm-smmu to
> > > arm-smmu-mod. This breaks the users of kernel parameters for the driver
> > > (e.g. arm-smmu.disable_bypass). This patch changes the module name back
> > > to be consistent.
> > >
> > > Signed-off-by: Li Yang <leoyang.li@nxp.com>
> > > ---
> > > drivers/iommu/Makefile | 4 ++--
> > > drivers/iommu/{arm-smmu.c => arm-smmu-common.c} | 0
> > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > > rename drivers/iommu/{arm-smmu.c => arm-smmu-common.c} (100%)
> >
> > Can't we just override MODULE_PARAM_PREFIX instead of renaming the file?
>
> I can do that. But on the other hand, the "mod" in the module name
> arm-smmu-mod.ko seems to be redundant and looks a little bit weird.
> Wouldn't it be cleaner to make it just arm-smmu.ko?
I just didn't fancy renaming the file because it's a pain for backports
and why does the name of the module matter?
Will
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-13 9:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-12 0:37 [PATCH] iommu/arm-smmu: fix the module name to be consistent with older kernel Li Yang
2020-02-12 10:49 ` Will Deacon
2020-02-12 19:59 ` Li Yang
2020-02-13 9:16 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).