* [PATCH] iommu/arm-smmu: fix the module name for disable_bypass parameter
@ 2020-02-11 23:36 Li Yang
2020-02-11 23:45 ` Russell King - ARM Linux admin
0 siblings, 1 reply; 4+ messages in thread
From: Li Yang @ 2020-02-11 23:36 UTC (permalink / raw)
To: Joerg Roedel, Will Deacon, Robin Murphy
Cc: Li Yang, iommu, linux-kernel, linux-arm-kernel
Since commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module"),
there is a side effect that the module name is changed from arm-smmu to
arm-smmu-mod. So the kernel parameter for disable_bypass need to be
changed too. Fix the Kconfig help and error message to the correct
parameter name.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
drivers/iommu/Kconfig | 2 +-
drivers/iommu/arm-smmu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d2fade984999..fb54be903c60 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -415,7 +415,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
hardcode the bypass disable in the code.
NOTE: the kernel command line parameter
- 'arm-smmu.disable_bypass' will continue to override this
+ 'arm-smmu-mod.disable_bypass' will continue to override this
config.
config ARM_SMMU_V3
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 16c4b87af42b..2ffe8ff04393 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -512,7 +512,7 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev)
if (IS_ENABLED(CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT) &&
(gfsr & ARM_SMMU_sGFSR_USF))
dev_err(smmu->dev,
- "Blocked unknown Stream ID 0x%hx; boot with \"arm-smmu.disable_bypass=0\" to allow, but this may have security implications\n",
+ "Blocked unknown Stream ID 0x%hx; boot with \"arm-smmu-mod.disable_bypass=0\" to allow, but this may have security implications\n",
(u16)gfsynr1);
else
dev_err(smmu->dev,
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] iommu/arm-smmu: fix the module name for disable_bypass parameter
2020-02-11 23:36 [PATCH] iommu/arm-smmu: fix the module name for disable_bypass parameter Li Yang
@ 2020-02-11 23:45 ` Russell King - ARM Linux admin
2020-02-11 23:56 ` Leo Li
2020-02-12 0:39 ` Li Yang
0 siblings, 2 replies; 4+ messages in thread
From: Russell King - ARM Linux admin @ 2020-02-11 23:45 UTC (permalink / raw)
To: Li Yang
Cc: Joerg Roedel, Will Deacon, Robin Murphy, iommu, linux-kernel,
linux-arm-kernel
On Tue, Feb 11, 2020 at 05:36:55PM -0600, Li Yang wrote:
> Since commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module"),
> there is a side effect that the module name is changed from arm-smmu to
> arm-smmu-mod. So the kernel parameter for disable_bypass need to be
> changed too. Fix the Kconfig help and error message to the correct
> parameter name.
Hmm, this seems to be a user-visible change - so those of us who have
been booting with "arm-smmu.disable_bypass=0" now need to change that
depending on which kernel is being booted - which is not nice, and
makes the support side on platforms that need this kernel parameter
harder.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> drivers/iommu/Kconfig | 2 +-
> drivers/iommu/arm-smmu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> index d2fade984999..fb54be903c60 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -415,7 +415,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
> hardcode the bypass disable in the code.
>
> NOTE: the kernel command line parameter
> - 'arm-smmu.disable_bypass' will continue to override this
> + 'arm-smmu-mod.disable_bypass' will continue to override this
> config.
>
> config ARM_SMMU_V3
> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index 16c4b87af42b..2ffe8ff04393 100644
> --- a/drivers/iommu/arm-smmu.c
> +++ b/drivers/iommu/arm-smmu.c
> @@ -512,7 +512,7 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev)
> if (IS_ENABLED(CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT) &&
> (gfsr & ARM_SMMU_sGFSR_USF))
> dev_err(smmu->dev,
> - "Blocked unknown Stream ID 0x%hx; boot with \"arm-smmu.disable_bypass=0\" to allow, but this may have security implications\n",
> + "Blocked unknown Stream ID 0x%hx; boot with \"arm-smmu-mod.disable_bypass=0\" to allow, but this may have security implications\n",
> (u16)gfsynr1);
> else
> dev_err(smmu->dev,
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH] iommu/arm-smmu: fix the module name for disable_bypass parameter
2020-02-11 23:45 ` Russell King - ARM Linux admin
@ 2020-02-11 23:56 ` Leo Li
2020-02-12 0:39 ` Li Yang
1 sibling, 0 replies; 4+ messages in thread
From: Leo Li @ 2020-02-11 23:56 UTC (permalink / raw)
To: Russell King - ARM Linux admin
Cc: Joerg Roedel, Will Deacon, Robin Murphy, iommu, linux-kernel,
linux-arm-kernel
> -----Original Message-----
> From: Russell King - ARM Linux admin <linux@armlinux.org.uk>
> Sent: Tuesday, February 11, 2020 5:46 PM
> To: Leo Li <leoyang.li@nxp.com>
> Cc: Joerg Roedel <joro@8bytes.org>; Will Deacon <will.deacon@arm.com>;
> Robin Murphy <robin.murphy@arm.com>; iommu@lists.linux-
> foundation.org; linux-kernel@vger.kernel.org; linux-arm-
> kernel@lists.infradead.org
> Subject: Re: [PATCH] iommu/arm-smmu: fix the module name for
> disable_bypass parameter
>
> On Tue, Feb 11, 2020 at 05:36:55PM -0600, Li Yang wrote:
> > Since commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a
> > module"), there is a side effect that the module name is changed from
> > arm-smmu to arm-smmu-mod. So the kernel parameter for
> disable_bypass
> > need to be changed too. Fix the Kconfig help and error message to the
> > correct parameter name.
>
> Hmm, this seems to be a user-visible change - so those of us who have been
> booting with "arm-smmu.disable_bypass=0" now need to change that
> depending on which kernel is being booted - which is not nice, and makes
> the support side on platforms that need this kernel parameter harder.
I agree. Probably a better fix is to update the Makefile to change the module name back to the original one.
Regards,
Leo
>
> >
> > Signed-off-by: Li Yang <leoyang.li@nxp.com>
> > ---
> > drivers/iommu/Kconfig | 2 +-
> > drivers/iommu/arm-smmu.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index
> > d2fade984999..fb54be903c60 100644
> > --- a/drivers/iommu/Kconfig
> > +++ b/drivers/iommu/Kconfig
> > @@ -415,7 +415,7 @@ config
> ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
> > hardcode the bypass disable in the code.
> >
> > NOTE: the kernel command line parameter
> > - 'arm-smmu.disable_bypass' will continue to override this
> > + 'arm-smmu-mod.disable_bypass' will continue to override this
> > config.
> >
> > config ARM_SMMU_V3
> > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index
> > 16c4b87af42b..2ffe8ff04393 100644
> > --- a/drivers/iommu/arm-smmu.c
> > +++ b/drivers/iommu/arm-smmu.c
> > @@ -512,7 +512,7 @@ static irqreturn_t arm_smmu_global_fault(int irq,
> void *dev)
> > if
> (IS_ENABLED(CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT) &&
> > (gfsr & ARM_SMMU_sGFSR_USF))
> > dev_err(smmu->dev,
> > - "Blocked unknown Stream ID 0x%hx; boot
> with \"arm-smmu.disable_bypass=0\" to allow, but this may have security
> implications\n",
> > + "Blocked unknown Stream ID 0x%hx; boot
> with
> > +\"arm-smmu-mod.disable_bypass=0\" to allow, but this may have
> > +security implications\n",
> > (u16)gfsynr1);
> > else
> > dev_err(smmu->dev,
> > --
> > 2.17.1
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists
> > .infradead.org%2Fmailman%2Flistinfo%2Flinux-arm-
> kernel&data=02%7C0
> >
> 1%7Cleoyang.li%40nxp.com%7Cf2f7f3c7c8fa4df0fb0608d7af4c84d1%7C686ea
> 1d3
> >
> bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637170615487429054&sdata=
> NO4VZ1
> > sSMKyeXiL%2BUc5K6gIW5Uld%2BRsGAICLgI2nnd8%3D&reserved=0
> >
>
> --
> RMK's Patch system:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww
> .armlinux.org.uk%2Fdeveloper%2Fpatches%2F&data=02%7C01%7Cleoy
> ang.li%40nxp.com%7Cf2f7f3c7c8fa4df0fb0608d7af4c84d1%7C686ea1d3bc2b4
> c6fa92cd99c5c301635%7C0%7C0%7C637170615487429054&sdata=eMRT
> wZGZPeq3DvkBwjBjGbsS1Qsy3LYMnjH%2B9FJm2aE%3D&reserved=0
> FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps
> up According to speedtest.net: 11.9Mbps down 500kbps up
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] iommu/arm-smmu: fix the module name for disable_bypass parameter
2020-02-11 23:45 ` Russell King - ARM Linux admin
2020-02-11 23:56 ` Leo Li
@ 2020-02-12 0:39 ` Li Yang
1 sibling, 0 replies; 4+ messages in thread
From: Li Yang @ 2020-02-12 0:39 UTC (permalink / raw)
To: Russell King - ARM Linux admin
Cc: Joerg Roedel, Will Deacon, Robin Murphy, Linux IOMMU, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Tue, Feb 11, 2020 at 5:47 PM Russell King - ARM Linux admin
<linux@armlinux.org.uk> wrote:
>
> On Tue, Feb 11, 2020 at 05:36:55PM -0600, Li Yang wrote:
> > Since commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module"),
> > there is a side effect that the module name is changed from arm-smmu to
> > arm-smmu-mod. So the kernel parameter for disable_bypass need to be
> > changed too. Fix the Kconfig help and error message to the correct
> > parameter name.
>
> Hmm, this seems to be a user-visible change - so those of us who have
> been booting with "arm-smmu.disable_bypass=0" now need to change that
> depending on which kernel is being booted - which is not nice, and
> makes the support side on platforms that need this kernel parameter
> harder.
I have sent a new patch replacing this patch. That patch will keep
the command line unchanged.
>
> >
> > Signed-off-by: Li Yang <leoyang.li@nxp.com>
> > ---
> > drivers/iommu/Kconfig | 2 +-
> > drivers/iommu/arm-smmu.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> > index d2fade984999..fb54be903c60 100644
> > --- a/drivers/iommu/Kconfig
> > +++ b/drivers/iommu/Kconfig
> > @@ -415,7 +415,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
> > hardcode the bypass disable in the code.
> >
> > NOTE: the kernel command line parameter
> > - 'arm-smmu.disable_bypass' will continue to override this
> > + 'arm-smmu-mod.disable_bypass' will continue to override this
> > config.
> >
> > config ARM_SMMU_V3
> > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> > index 16c4b87af42b..2ffe8ff04393 100644
> > --- a/drivers/iommu/arm-smmu.c
> > +++ b/drivers/iommu/arm-smmu.c
> > @@ -512,7 +512,7 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev)
> > if (IS_ENABLED(CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT) &&
> > (gfsr & ARM_SMMU_sGFSR_USF))
> > dev_err(smmu->dev,
> > - "Blocked unknown Stream ID 0x%hx; boot with \"arm-smmu.disable_bypass=0\" to allow, but this may have security implications\n",
> > + "Blocked unknown Stream ID 0x%hx; boot with \"arm-smmu-mod.disable_bypass=0\" to allow, but this may have security implications\n",
> > (u16)gfsynr1);
> > else
> > dev_err(smmu->dev,
> > --
> > 2.17.1
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
>
> --
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
> According to speedtest.net: 11.9Mbps down 500kbps up
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-12 0:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-11 23:36 [PATCH] iommu/arm-smmu: fix the module name for disable_bypass parameter Li Yang
2020-02-11 23:45 ` Russell King - ARM Linux admin
2020-02-11 23:56 ` Leo Li
2020-02-12 0:39 ` Li Yang
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).