| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20201106200753.GA332342@kozik-lap>
Date: Fri, 6 Nov 2020 21:07:53 +0100
From: Krzysztof Kozlowski <krzk@...nel.org>
To: Alice Guo <alice.guo@....com>
Cc: "robh+dt@...nel.org" <robh+dt@...nel.org>,
"shawnguo@...nel.org" <shawnguo@...nel.org>,
"s.hauer@...gutronix.de" <s.hauer@...gutronix.de>,
dl-linux-imx <linux-imx@....com>, Peng Fan <peng.fan@....com>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [EXT] Re: [PATCH v2 4/4] soc: imx8m: change to use platform
driver
On Fri, Nov 06, 2020 at 10:35:35AM +0000, Alice Guo wrote:
>
>
> > -----Original Message-----
> > From: Krzysztof Kozlowski <krzk@...nel.org>
> > Sent: 2020年11月5日 17:06
> > To: Alice Guo <alice.guo@....com>
> > Cc: robh+dt@...nel.org; shawnguo@...nel.org; s.hauer@...gutronix.de;
> > dl-linux-imx <linux-imx@....com>; Peng Fan <peng.fan@....com>;
> > devicetree@...r.kernel.org; linux-kernel@...r.kernel.org;
> > linux-arm-kernel@...ts.infradead.org
> > Subject: [EXT] Re: [PATCH v2 4/4] soc: imx8m: change to use platform driver
> >
> > Caution: EXT Email
> >
> > On Thu, Nov 05, 2020 at 03:26:29PM +0800, Alice Guo wrote:
> > > Directly reading ocotp register depends on that bootloader enables
> > > ocotp clk, which is not always effective, so change to use nvmem API.
> > > Using nvmem API requires to support driver defer probe and thus change
> > > soc-imx8m.c to use platform driver.
> > >
> > > The other reason is that directly reading ocotp register causes kexec
> > > kernel hang because the 1st kernel running will disable unused clks
> > > after kernel boots up, and then ocotp clk will be disabled even if
> > > bootloader enables it. When kexec kernel, ocotp clk needs to be
> > > enabled before reading ocotp registers, and nvmem API with platform
> > > driver supported can accomplish this.
> > >
> > > Signed-off-by: Alice Guo <alice.guo@....com>
> > > ---
> > > drivers/soc/imx/soc-imx8m.c | 75
> > > +++++++++++++++++++++----------------
> > > 1 file changed, 42 insertions(+), 33 deletions(-)
> > >
> > > diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c
> > > index cc57a384d74d..83f3297509be 100644
> > > --- a/drivers/soc/imx/soc-imx8m.c
> > > +++ b/drivers/soc/imx/soc-imx8m.c
> > > @@ -5,6 +5,8 @@
> > >
> > > #include <linux/init.h>
> > > #include <linux/io.h>
> > > +#include <linux/module.h>
> > > +#include <linux/nvmem-consumer.h>
> > > #include <linux/of_address.h>
> > > #include <linux/slab.h>
> > > #include <linux/sys_soc.h>
> > > @@ -29,7 +31,7 @@
> > >
> > > struct imx8_soc_data {
> > > char *name;
> > > - u32 (*soc_revision)(void);
> > > + u32 (*soc_revision)(struct device *dev);
> > > };
> > >
> > > static u64 soc_uid;
> > > @@ -50,12 +52,15 @@ static u32 imx8mq_soc_revision_from_atf(void)
> > > static inline u32 imx8mq_soc_revision_from_atf(void) { return 0; };
> > > #endif
> > >
> > > -static u32 __init imx8mq_soc_revision(void)
> > > +static u32 __init imx8mm_soc_uid(struct device *dev);
> > > +
> > > +static u32 __init imx8mq_soc_revision(struct device *dev)
> > > {
> > > struct device_node *np;
> > > void __iomem *ocotp_base;
> > > u32 magic;
> > > u32 rev;
> > > + int ret = 0;
> > >
> > > np = of_find_compatible_node(NULL, NULL, "fsl,imx8mq-ocotp");
> > > if (!np)
> > > @@ -75,9 +80,9 @@ static u32 __init imx8mq_soc_revision(void)
> > > rev = REV_B1;
> > > }
> > >
> > > - soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH);
> > > - soc_uid <<= 32;
> > > - soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
> > > + ret = imx8mm_soc_uid(dev);
> > > + if (ret)
> > > + return ret;
> > >
> > > iounmap(ocotp_base);
> > > of_node_put(np);
> > > @@ -85,33 +90,20 @@ static u32 __init imx8mq_soc_revision(void)
> > > return rev;
> > > }
> > >
> > > -static void __init imx8mm_soc_uid(void)
> > > +static u32 __init imx8mm_soc_uid(struct device *dev)
> > > {
> > > - void __iomem *ocotp_base;
> > > - struct device_node *np;
> > > - u32 offset = of_machine_is_compatible("fsl,imx8mp") ?
> > > - IMX8MP_OCOTP_UID_OFFSET : 0;
> > > -
> > > - np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-ocotp");
> > > - if (!np)
> > > - return;
> > > -
> > > - ocotp_base = of_iomap(np, 0);
> > > - WARN_ON(!ocotp_base);
> > > -
> > > - soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH + offset);
> > > - soc_uid <<= 32;
> > > - soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + offset);
> > > + int ret = 0;
> > >
> > > - iounmap(ocotp_base);
> > > - of_node_put(np);
> > > + ret = nvmem_cell_read_u64(dev, "soc_unique_id", &soc_uid);
> > > + return ret;
> > > }
> > >
> > > -static u32 __init imx8mm_soc_revision(void)
> > > +static u32 __init imx8mm_soc_revision(struct device *dev)
> > > {
> > > struct device_node *np;
> > > void __iomem *anatop_base;
> > > u32 rev;
> > > + int ret;
> > >
> > > np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-anatop");
> > > if (!np)
> > > @@ -125,7 +117,9 @@ static u32 __init imx8mm_soc_revision(void)
> > > iounmap(anatop_base);
> > > of_node_put(np);
> > >
> > > - imx8mm_soc_uid();
> > > + ret = imx8mm_soc_uid(dev);
> > > + if (ret)
> > > + return ret;
> >
> > I think this breaks old existing DTBs. If applied on separate branch than DTS
> > patches, it will cause bisect regressions. Regardless of it, all out-of-tree
> > (customer DTBs) will start failing here as well.
> >
> > Best regards,
> > Krzysztof
> >
> >
> [Alice Guo] Compatible with old existing DTBs, I did not find a good solution. I want to use soc device to match this driver. Do you have some suggestions? Thank you.
How the change above (returning imx8mm_soc_uid error value) and few
others similar are related to topic mentioned in commit msg?
The patch should implement only one thing (one feature or fix one bug)
and then it is easier to manage ABI breakage.
For the ABI breakage, the usual solution is to support old DTBs.
Best regards,
Krzysztof
Powered by blists - more mailing lists