[RFC,1/4] ARM: imx: use device_initcall for imx_soc_device_init
diff mbox series

Message ID 1579167145-1480-2-git-send-email-peng.fan@nxp.com
State New
Headers show
Series
  • ARM: imx: move cpu code to drivers/soc/imx
Related show

Commit Message

Peng Fan Jan. 16, 2020, 9:36 a.m. UTC
From: Peng Fan <peng.fan@nxp.com>

This is preparation to move imx_soc_device_init to drivers/soc/imx/

There is no reason to must put dt devices under /sys/devices/soc0,
they could also be under /sys/devices/platform, so we could
pass NULL as parent when calling of_platform_default_populate.

Following soc-imx8.c soc-imx-scu.c using device_initcall, need
to change return type to int type for imx_soc_device_init.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 arch/arm/mach-imx/common.h       | 1 -
 arch/arm/mach-imx/cpu.c          | 9 +++++----
 arch/arm/mach-imx/mach-imx6q.c   | 8 +-------
 arch/arm/mach-imx/mach-imx6sl.c  | 8 +-------
 arch/arm/mach-imx/mach-imx6sx.c  | 8 +-------
 arch/arm/mach-imx/mach-imx6ul.c  | 8 +-------
 arch/arm/mach-imx/mach-imx7d.c   | 6 ------
 arch/arm/mach-imx/mach-imx7ulp.c | 2 +-
 8 files changed, 10 insertions(+), 40 deletions(-)

Comments

Jacky Bai Jan. 17, 2020, 2:04 a.m. UTC | #1
> -----Original Message-----
> From: Peng Fan <peng.fan@nxp.com>
> Sent: Thursday, January 16, 2020 5:37 PM
> To: shawnguo@kernel.org; s.hauer@pengutronix.de
> Cc: kernel@pengutronix.de; festevam@gmail.com; dl-linux-imx
> <linux-imx@nxp.com>; allison@lohutok.net; info@metux.net; Anson Huang
> <anson.huang@nxp.com>; Leonard Crestez <leonard.crestez@nxp.com>;
> git@andred.net; Abel Vesa <abel.vesa@nxp.com>; ard.biesheuvel@linaro.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org; Peng Fan
> <peng.fan@nxp.com>
> Subject: [RFC 1/4] ARM: imx: use device_initcall for imx_soc_device_init
> 
> From: Peng Fan <peng.fan@nxp.com>
> 
> This is preparation to move imx_soc_device_init to drivers/soc/imx/
> 
> There is no reason to must put dt devices under /sys/devices/soc0, they could
> also be under /sys/devices/platform, so we could pass NULL as parent when
> calling of_platform_default_populate.
> 

This change will impact various internal test case & userspace lib, I think.
Need to ask test team & other developer to double check the impact.

BR
Jacky Bai
> Following soc-imx8.c soc-imx-scu.c using device_initcall, need to change
> return type to int type for imx_soc_device_init.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  arch/arm/mach-imx/common.h       | 1 -
>  arch/arm/mach-imx/cpu.c          | 9 +++++----
>  arch/arm/mach-imx/mach-imx6q.c   | 8 +-------
>  arch/arm/mach-imx/mach-imx6sl.c  | 8 +-------
> arch/arm/mach-imx/mach-imx6sx.c  | 8 +-------
> arch/arm/mach-imx/mach-imx6ul.c  | 8 +-------
>  arch/arm/mach-imx/mach-imx7d.c   | 6 ------
>  arch/arm/mach-imx/mach-imx7ulp.c | 2 +-
>  8 files changed, 10 insertions(+), 40 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
> index 912aeceb4ff8..09e89aa7be50 100644
> --- a/arch/arm/mach-imx/common.h
> +++ b/arch/arm/mach-imx/common.h
> @@ -49,7 +49,6 @@ void imx_aips_allow_unprivileged_access(const char
> *compat);  int mxc_device_init(void);  void imx_set_soc_revision(unsigned
> int rev);  void imx_init_revision_from_anatop(void);
> -struct device *imx_soc_device_init(void);  void imx6_enable_rbc(bool
> enable);  void imx_gpc_check_dt(void);  void
> imx_gpc_set_arm_power_in_lpm(bool power_off); diff --git
> a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index
> 06f8d64b65af..2df649a84697 100644
> --- a/arch/arm/mach-imx/cpu.c
> +++ b/arch/arm/mach-imx/cpu.c
> @@ -83,7 +83,7 @@ void __init imx_aips_allow_unprivileged_access(
>  	}
>  }
> 
> -struct device * __init imx_soc_device_init(void)
> +static int __init imx_soc_device_init(void)
>  {
>  	struct soc_device_attribute *soc_dev_attr;
>  	const char *ocotp_compat = NULL;
> @@ -97,7 +97,7 @@ struct device * __init imx_soc_device_init(void)
> 
>  	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
>  	if (!soc_dev_attr)
> -		return NULL;
> +		return PTR_ERR(soc_dev_attr);
> 
>  	soc_dev_attr->family = "Freescale i.MX";
> 
> @@ -219,7 +219,7 @@ struct device * __init imx_soc_device_init(void)
>  	if (IS_ERR(soc_dev))
>  		goto free_serial_number;
> 
> -	return soc_device_to_device(soc_dev);
> +	return 0;
> 
>  free_serial_number:
>  	kfree(soc_dev_attr->serial_number);
> @@ -227,5 +227,6 @@ struct device * __init imx_soc_device_init(void)
>  	kfree(soc_dev_attr->revision);
>  free_soc:
>  	kfree(soc_dev_attr);
> -	return NULL;
> +	return -ENOMEM;
>  }
> +device_initcall(imx_soc_device_init);
> diff --git a/arch/arm/mach-imx/mach-imx6q.c
> b/arch/arm/mach-imx/mach-imx6q.c index edd26e0ffeec..735da3311320
> 100644
> --- a/arch/arm/mach-imx/mach-imx6q.c
> +++ b/arch/arm/mach-imx/mach-imx6q.c
> @@ -258,21 +258,15 @@ static void __init imx6q_axi_init(void)
> 
>  static void __init imx6q_init_machine(void)  {
> -	struct device *parent;
> -
>  	if (cpu_is_imx6q() && imx_get_soc_revision() ==
> IMX_CHIP_REVISION_2_0)
>  		imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);
>  	else
>  		imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
>  				imx_get_soc_revision());
> 
> -	parent = imx_soc_device_init();
> -	if (parent == NULL)
> -		pr_warn("failed to initialize soc device\n");
> -
>  	imx6q_enet_phy_init();
> 
> -	of_platform_default_populate(NULL, NULL, parent);
> +	of_platform_default_populate(NULL, NULL, NULL);
> 
>  	imx_anatop_init();
>  	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init(); diff --git
> a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
> index e00818abe54d..0f046a37dc73 100644
> --- a/arch/arm/mach-imx/mach-imx6sl.c
> +++ b/arch/arm/mach-imx/mach-imx6sl.c
> @@ -46,13 +46,7 @@ static void __init imx6sl_init_late(void)
> 
>  static void __init imx6sl_init_machine(void)  {
> -	struct device *parent;
> -
> -	parent = imx_soc_device_init();
> -	if (parent == NULL)
> -		pr_warn("failed to initialize soc device\n");
> -
> -	of_platform_default_populate(NULL, NULL, parent);
> +	of_platform_default_populate(NULL, NULL, NULL);
> 
>  	if (cpu_is_imx6sl())
>  		imx6sl_fec_init();
> diff --git a/arch/arm/mach-imx/mach-imx6sx.c
> b/arch/arm/mach-imx/mach-imx6sx.c index d5310bf307ff..781e2a94fdd7
> 100644
> --- a/arch/arm/mach-imx/mach-imx6sx.c
> +++ b/arch/arm/mach-imx/mach-imx6sx.c
> @@ -63,13 +63,7 @@ static inline void imx6sx_enet_init(void)
> 
>  static void __init imx6sx_init_machine(void)  {
> -	struct device *parent;
> -
> -	parent = imx_soc_device_init();
> -	if (parent == NULL)
> -		pr_warn("failed to initialize soc device\n");
> -
> -	of_platform_default_populate(NULL, NULL, parent);
> +	of_platform_default_populate(NULL, NULL, NULL);
> 
>  	imx6sx_enet_init();
>  	imx_anatop_init();
> diff --git a/arch/arm/mach-imx/mach-imx6ul.c
> b/arch/arm/mach-imx/mach-imx6ul.c index 311f5e4ff723..9db8e567c6b5
> 100644
> --- a/arch/arm/mach-imx/mach-imx6ul.c
> +++ b/arch/arm/mach-imx/mach-imx6ul.c
> @@ -56,13 +56,7 @@ static inline void imx6ul_enet_init(void)
> 
>  static void __init imx6ul_init_machine(void)  {
> -	struct device *parent;
> -
> -	parent = imx_soc_device_init();
> -	if (parent == NULL)
> -		pr_warn("failed to initialize soc device\n");
> -
> -	of_platform_default_populate(NULL, NULL, parent);
> +	of_platform_default_populate(NULL, NULL, NULL);
>  	imx6ul_enet_init();
>  	imx_anatop_init();
>  	imx6ul_pm_init();
> diff --git a/arch/arm/mach-imx/mach-imx7d.c
> b/arch/arm/mach-imx/mach-imx7d.c index ebb27592a9f7..879c35929a13
> 100644
> --- a/arch/arm/mach-imx/mach-imx7d.c
> +++ b/arch/arm/mach-imx/mach-imx7d.c
> @@ -78,12 +78,6 @@ static inline void imx7d_enet_init(void)
> 
>  static void __init imx7d_init_machine(void)  {
> -	struct device *parent;
> -
> -	parent = imx_soc_device_init();
> -	if (parent == NULL)
> -		pr_warn("failed to initialize soc device\n");
> -
>  	imx_anatop_init();
>  	imx7d_enet_init();
>  }
> diff --git a/arch/arm/mach-imx/mach-imx7ulp.c
> b/arch/arm/mach-imx/mach-imx7ulp.c
> index 11ac71aaf965..128cf4c92aab 100644
> --- a/arch/arm/mach-imx/mach-imx7ulp.c
> +++ b/arch/arm/mach-imx/mach-imx7ulp.c
> @@ -57,7 +57,7 @@ static void __init imx7ulp_init_machine(void)
> 
>  	mxc_set_cpu_type(MXC_CPU_IMX7ULP);
>  	imx7ulp_set_revision();
> -	of_platform_default_populate(NULL, NULL, imx_soc_device_init());
> +	of_platform_default_populate(NULL, NULL, NULL);
>  }
> 
>  static const char *const imx7ulp_dt_compat[] __initconst = {
> --
> 2.16.4
Peng Fan Jan. 17, 2020, 8:15 a.m. UTC | #2
> > Subject: [RFC 1/4] ARM: imx: use device_initcall for
> > imx_soc_device_init
> >
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > This is preparation to move imx_soc_device_init to drivers/soc/imx/
> >
> > There is no reason to must put dt devices under /sys/devices/soc0,
> > they could also be under /sys/devices/platform, so we could pass NULL
> > as parent when calling of_platform_default_populate.
> >
> 
> This change will impact various internal test case & userspace lib, I think.
> Need to ask test team & other developer to double check the impact.

/sys/devices/soc0 is still there, the patchset only moves
the platform devices which under /sys/devices/soc0 to /sys/devices/platform

In this way, we aligned with ARM64. And simplify arch code by moving
the code to drivers/soc/imx. In future, considering more cleanup,
we could merge the code to soc-imx8.c, since they share similar
silicon rev ocotp logic.

Thanks,
Peng.

> 
> BR
> Jacky Bai
> > Following soc-imx8.c soc-imx-scu.c using device_initcall, need to
> > change return type to int type for imx_soc_device_init.
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  arch/arm/mach-imx/common.h       | 1 -
> >  arch/arm/mach-imx/cpu.c          | 9 +++++----
> >  arch/arm/mach-imx/mach-imx6q.c   | 8 +-------
> >  arch/arm/mach-imx/mach-imx6sl.c  | 8 +-------
> > arch/arm/mach-imx/mach-imx6sx.c  | 8 +-------
> > arch/arm/mach-imx/mach-imx6ul.c  | 8 +-------
> >  arch/arm/mach-imx/mach-imx7d.c   | 6 ------
> >  arch/arm/mach-imx/mach-imx7ulp.c | 2 +-
> >  8 files changed, 10 insertions(+), 40 deletions(-)
> >
> > diff --git a/arch/arm/mach-imx/common.h
> b/arch/arm/mach-imx/common.h
> > index 912aeceb4ff8..09e89aa7be50 100644
> > --- a/arch/arm/mach-imx/common.h
> > +++ b/arch/arm/mach-imx/common.h
> > @@ -49,7 +49,6 @@ void imx_aips_allow_unprivileged_access(const char
> > *compat);  int mxc_device_init(void);  void
> > imx_set_soc_revision(unsigned int rev);  void
> > imx_init_revision_from_anatop(void);
> > -struct device *imx_soc_device_init(void);  void imx6_enable_rbc(bool
> > enable);  void imx_gpc_check_dt(void);  void
> > imx_gpc_set_arm_power_in_lpm(bool power_off); diff --git
> > a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index
> > 06f8d64b65af..2df649a84697 100644
> > --- a/arch/arm/mach-imx/cpu.c
> > +++ b/arch/arm/mach-imx/cpu.c
> > @@ -83,7 +83,7 @@ void __init imx_aips_allow_unprivileged_access(
> >  	}
> >  }
> >
> > -struct device * __init imx_soc_device_init(void)
> > +static int __init imx_soc_device_init(void)
> >  {
> >  	struct soc_device_attribute *soc_dev_attr;
> >  	const char *ocotp_compat = NULL;
> > @@ -97,7 +97,7 @@ struct device * __init imx_soc_device_init(void)
> >
> >  	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
> >  	if (!soc_dev_attr)
> > -		return NULL;
> > +		return PTR_ERR(soc_dev_attr);
> >
> >  	soc_dev_attr->family = "Freescale i.MX";
> >
> > @@ -219,7 +219,7 @@ struct device * __init imx_soc_device_init(void)
> >  	if (IS_ERR(soc_dev))
> >  		goto free_serial_number;
> >
> > -	return soc_device_to_device(soc_dev);
> > +	return 0;
> >
> >  free_serial_number:
> >  	kfree(soc_dev_attr->serial_number);
> > @@ -227,5 +227,6 @@ struct device * __init imx_soc_device_init(void)
> >  	kfree(soc_dev_attr->revision);
> >  free_soc:
> >  	kfree(soc_dev_attr);
> > -	return NULL;
> > +	return -ENOMEM;
> >  }
> > +device_initcall(imx_soc_device_init);
> > diff --git a/arch/arm/mach-imx/mach-imx6q.c
> > b/arch/arm/mach-imx/mach-imx6q.c index edd26e0ffeec..735da3311320
> > 100644
> > --- a/arch/arm/mach-imx/mach-imx6q.c
> > +++ b/arch/arm/mach-imx/mach-imx6q.c
> > @@ -258,21 +258,15 @@ static void __init imx6q_axi_init(void)
> >
> >  static void __init imx6q_init_machine(void)  {
> > -	struct device *parent;
> > -
> >  	if (cpu_is_imx6q() && imx_get_soc_revision() ==
> > IMX_CHIP_REVISION_2_0)
> >  		imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);
> >  	else
> >  		imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
> >  				imx_get_soc_revision());
> >
> > -	parent = imx_soc_device_init();
> > -	if (parent == NULL)
> > -		pr_warn("failed to initialize soc device\n");
> > -
> >  	imx6q_enet_phy_init();
> >
> > -	of_platform_default_populate(NULL, NULL, parent);
> > +	of_platform_default_populate(NULL, NULL, NULL);
> >
> >  	imx_anatop_init();
> >  	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init(); diff --git
> > a/arch/arm/mach-imx/mach-imx6sl.c
> b/arch/arm/mach-imx/mach-imx6sl.c
> > index e00818abe54d..0f046a37dc73 100644
> > --- a/arch/arm/mach-imx/mach-imx6sl.c
> > +++ b/arch/arm/mach-imx/mach-imx6sl.c
> > @@ -46,13 +46,7 @@ static void __init imx6sl_init_late(void)
> >
> >  static void __init imx6sl_init_machine(void)  {
> > -	struct device *parent;
> > -
> > -	parent = imx_soc_device_init();
> > -	if (parent == NULL)
> > -		pr_warn("failed to initialize soc device\n");
> > -
> > -	of_platform_default_populate(NULL, NULL, parent);
> > +	of_platform_default_populate(NULL, NULL, NULL);
> >
> >  	if (cpu_is_imx6sl())
> >  		imx6sl_fec_init();
> > diff --git a/arch/arm/mach-imx/mach-imx6sx.c
> > b/arch/arm/mach-imx/mach-imx6sx.c index d5310bf307ff..781e2a94fdd7
> > 100644
> > --- a/arch/arm/mach-imx/mach-imx6sx.c
> > +++ b/arch/arm/mach-imx/mach-imx6sx.c
> > @@ -63,13 +63,7 @@ static inline void imx6sx_enet_init(void)
> >
> >  static void __init imx6sx_init_machine(void)  {
> > -	struct device *parent;
> > -
> > -	parent = imx_soc_device_init();
> > -	if (parent == NULL)
> > -		pr_warn("failed to initialize soc device\n");
> > -
> > -	of_platform_default_populate(NULL, NULL, parent);
> > +	of_platform_default_populate(NULL, NULL, NULL);
> >
> >  	imx6sx_enet_init();
> >  	imx_anatop_init();
> > diff --git a/arch/arm/mach-imx/mach-imx6ul.c
> > b/arch/arm/mach-imx/mach-imx6ul.c index 311f5e4ff723..9db8e567c6b5
> > 100644
> > --- a/arch/arm/mach-imx/mach-imx6ul.c
> > +++ b/arch/arm/mach-imx/mach-imx6ul.c
> > @@ -56,13 +56,7 @@ static inline void imx6ul_enet_init(void)
> >
> >  static void __init imx6ul_init_machine(void)  {
> > -	struct device *parent;
> > -
> > -	parent = imx_soc_device_init();
> > -	if (parent == NULL)
> > -		pr_warn("failed to initialize soc device\n");
> > -
> > -	of_platform_default_populate(NULL, NULL, parent);
> > +	of_platform_default_populate(NULL, NULL, NULL);
> >  	imx6ul_enet_init();
> >  	imx_anatop_init();
> >  	imx6ul_pm_init();
> > diff --git a/arch/arm/mach-imx/mach-imx7d.c
> > b/arch/arm/mach-imx/mach-imx7d.c index ebb27592a9f7..879c35929a13
> > 100644
> > --- a/arch/arm/mach-imx/mach-imx7d.c
> > +++ b/arch/arm/mach-imx/mach-imx7d.c
> > @@ -78,12 +78,6 @@ static inline void imx7d_enet_init(void)
> >
> >  static void __init imx7d_init_machine(void)  {
> > -	struct device *parent;
> > -
> > -	parent = imx_soc_device_init();
> > -	if (parent == NULL)
> > -		pr_warn("failed to initialize soc device\n");
> > -
> >  	imx_anatop_init();
> >  	imx7d_enet_init();
> >  }
> > diff --git a/arch/arm/mach-imx/mach-imx7ulp.c
> > b/arch/arm/mach-imx/mach-imx7ulp.c
> > index 11ac71aaf965..128cf4c92aab 100644
> > --- a/arch/arm/mach-imx/mach-imx7ulp.c
> > +++ b/arch/arm/mach-imx/mach-imx7ulp.c
> > @@ -57,7 +57,7 @@ static void __init imx7ulp_init_machine(void)
> >
> >  	mxc_set_cpu_type(MXC_CPU_IMX7ULP);
> >  	imx7ulp_set_revision();
> > -	of_platform_default_populate(NULL, NULL, imx_soc_device_init());
> > +	of_platform_default_populate(NULL, NULL, NULL);
> >  }
> >
> >  static const char *const imx7ulp_dt_compat[] __initconst = {
> > --
> > 2.16.4
Shawn Guo Feb. 13, 2020, 5:43 a.m. UTC | #3
On Fri, Jan 17, 2020 at 08:15:54AM +0000, Peng Fan wrote:
> > > Subject: [RFC 1/4] ARM: imx: use device_initcall for
> > > imx_soc_device_init
> > >
> > > From: Peng Fan <peng.fan@nxp.com>
> > >
> > > This is preparation to move imx_soc_device_init to drivers/soc/imx/
> > >
> > > There is no reason to must put dt devices under /sys/devices/soc0,
> > > they could also be under /sys/devices/platform, so we could pass NULL
> > > as parent when calling of_platform_default_populate.
> > >
> > 
> > This change will impact various internal test case & userspace lib, I think.
> > Need to ask test team & other developer to double check the impact.
> 
> /sys/devices/soc0 is still there, the patchset only moves
> the platform devices which under /sys/devices/soc0 to /sys/devices/platform

Jacky's concern still stands, as there are many user spaces which will be
broken and need update.

> In this way, we aligned with ARM64. And simplify arch code by moving
> the code to drivers/soc/imx. In future, considering more cleanup,
> we could merge the code to soc-imx8.c, since they share similar
> silicon rev ocotp logic.

Though this is a good thing from maintenance point of view, we do not
want to break user spaces.

Shawn
Peng Fan Feb. 13, 2020, 5:47 a.m. UTC | #4
> Subject: Re: [RFC 1/4] ARM: imx: use device_initcall for imx_soc_device_init
> 
> On Fri, Jan 17, 2020 at 08:15:54AM +0000, Peng Fan wrote:
> > > > Subject: [RFC 1/4] ARM: imx: use device_initcall for
> > > > imx_soc_device_init
> > > >
> > > > From: Peng Fan <peng.fan@nxp.com>
> > > >
> > > > This is preparation to move imx_soc_device_init to
> > > > drivers/soc/imx/
> > > >
> > > > There is no reason to must put dt devices under /sys/devices/soc0,
> > > > they could also be under /sys/devices/platform, so we could pass
> > > > NULL as parent when calling of_platform_default_populate.
> > > >
> > >
> > > This change will impact various internal test case & userspace lib, I think.
> > > Need to ask test team & other developer to double check the impact.
> >
> > /sys/devices/soc0 is still there, the patchset only moves the platform
> > devices which under /sys/devices/soc0 to /sys/devices/platform
> 
> Jacky's concern still stands, as there are many user spaces which will be
> broken and need update.

The soc device itself still under /sys/devices/soc0, the soc_id/revision still there.
It is just the platform devices moved to /sys/devices/platform.

When I confirm with Jacky before, his concern is soc_id/revision will be
moved. But this is not true, they are still there as before.

> 
> > In this way, we aligned with ARM64. And simplify arch code by moving
> > the code to drivers/soc/imx. In future, considering more cleanup, we
> > could merge the code to soc-imx8.c, since they share similar silicon
> > rev ocotp logic.
> 
> Though this is a good thing from maintenance point of view, we do not want
> to break user spaces.

Actually not break user spaces, since this is RFC, I not expect this be merged.
If you agree, I could post normal V1 patchset.

Thanks,
Peng.

> 
> Shawn
Shawn Guo Feb. 13, 2020, 5:55 a.m. UTC | #5
On Thu, Feb 13, 2020 at 05:47:41AM +0000, Peng Fan wrote:
> > Subject: Re: [RFC 1/4] ARM: imx: use device_initcall for imx_soc_device_init
> > 
> > On Fri, Jan 17, 2020 at 08:15:54AM +0000, Peng Fan wrote:
> > > > > Subject: [RFC 1/4] ARM: imx: use device_initcall for
> > > > > imx_soc_device_init
> > > > >
> > > > > From: Peng Fan <peng.fan@nxp.com>
> > > > >
> > > > > This is preparation to move imx_soc_device_init to
> > > > > drivers/soc/imx/
> > > > >
> > > > > There is no reason to must put dt devices under /sys/devices/soc0,
> > > > > they could also be under /sys/devices/platform, so we could pass
> > > > > NULL as parent when calling of_platform_default_populate.
> > > > >
> > > >
> > > > This change will impact various internal test case & userspace lib, I think.
> > > > Need to ask test team & other developer to double check the impact.
> > >
> > > /sys/devices/soc0 is still there, the patchset only moves the platform
> > > devices which under /sys/devices/soc0 to /sys/devices/platform
> > 
> > Jacky's concern still stands, as there are many user spaces which will be
> > broken and need update.
> 
> The soc device itself still under /sys/devices/soc0, the soc_id/revision still there.
> It is just the platform devices moved to /sys/devices/platform.
> 
> When I confirm with Jacky before, his concern is soc_id/revision will be
> moved. But this is not true, they are still there as before.
> 
> > 
> > > In this way, we aligned with ARM64. And simplify arch code by moving
> > > the code to drivers/soc/imx. In future, considering more cleanup, we
> > > could merge the code to soc-imx8.c, since they share similar silicon
> > > rev ocotp logic.
> > 
> > Though this is a good thing from maintenance point of view, we do not want
> > to break user spaces.
> 
> Actually not break user spaces, since this is RFC, I not expect this be merged.
> If you agree, I could post normal V1 patchset.

Okay.  You send formal patches, and we get them into linux-next to see
if people will complain any breakage.

Shawn

Patch
diff mbox series

diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 912aeceb4ff8..09e89aa7be50 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -49,7 +49,6 @@  void imx_aips_allow_unprivileged_access(const char *compat);
 int mxc_device_init(void);
 void imx_set_soc_revision(unsigned int rev);
 void imx_init_revision_from_anatop(void);
-struct device *imx_soc_device_init(void);
 void imx6_enable_rbc(bool enable);
 void imx_gpc_check_dt(void);
 void imx_gpc_set_arm_power_in_lpm(bool power_off);
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 06f8d64b65af..2df649a84697 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -83,7 +83,7 @@  void __init imx_aips_allow_unprivileged_access(
 	}
 }
 
-struct device * __init imx_soc_device_init(void)
+static int __init imx_soc_device_init(void)
 {
 	struct soc_device_attribute *soc_dev_attr;
 	const char *ocotp_compat = NULL;
@@ -97,7 +97,7 @@  struct device * __init imx_soc_device_init(void)
 
 	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
 	if (!soc_dev_attr)
-		return NULL;
+		return PTR_ERR(soc_dev_attr);
 
 	soc_dev_attr->family = "Freescale i.MX";
 
@@ -219,7 +219,7 @@  struct device * __init imx_soc_device_init(void)
 	if (IS_ERR(soc_dev))
 		goto free_serial_number;
 
-	return soc_device_to_device(soc_dev);
+	return 0;
 
 free_serial_number:
 	kfree(soc_dev_attr->serial_number);
@@ -227,5 +227,6 @@  struct device * __init imx_soc_device_init(void)
 	kfree(soc_dev_attr->revision);
 free_soc:
 	kfree(soc_dev_attr);
-	return NULL;
+	return -ENOMEM;
 }
+device_initcall(imx_soc_device_init);
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index edd26e0ffeec..735da3311320 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -258,21 +258,15 @@  static void __init imx6q_axi_init(void)
 
 static void __init imx6q_init_machine(void)
 {
-	struct device *parent;
-
 	if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)
 		imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);
 	else
 		imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
 				imx_get_soc_revision());
 
-	parent = imx_soc_device_init();
-	if (parent == NULL)
-		pr_warn("failed to initialize soc device\n");
-
 	imx6q_enet_phy_init();
 
-	of_platform_default_populate(NULL, NULL, parent);
+	of_platform_default_populate(NULL, NULL, NULL);
 
 	imx_anatop_init();
 	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index e00818abe54d..0f046a37dc73 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -46,13 +46,7 @@  static void __init imx6sl_init_late(void)
 
 static void __init imx6sl_init_machine(void)
 {
-	struct device *parent;
-
-	parent = imx_soc_device_init();
-	if (parent == NULL)
-		pr_warn("failed to initialize soc device\n");
-
-	of_platform_default_populate(NULL, NULL, parent);
+	of_platform_default_populate(NULL, NULL, NULL);
 
 	if (cpu_is_imx6sl())
 		imx6sl_fec_init();
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index d5310bf307ff..781e2a94fdd7 100644
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -63,13 +63,7 @@  static inline void imx6sx_enet_init(void)
 
 static void __init imx6sx_init_machine(void)
 {
-	struct device *parent;
-
-	parent = imx_soc_device_init();
-	if (parent == NULL)
-		pr_warn("failed to initialize soc device\n");
-
-	of_platform_default_populate(NULL, NULL, parent);
+	of_platform_default_populate(NULL, NULL, NULL);
 
 	imx6sx_enet_init();
 	imx_anatop_init();
diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c
index 311f5e4ff723..9db8e567c6b5 100644
--- a/arch/arm/mach-imx/mach-imx6ul.c
+++ b/arch/arm/mach-imx/mach-imx6ul.c
@@ -56,13 +56,7 @@  static inline void imx6ul_enet_init(void)
 
 static void __init imx6ul_init_machine(void)
 {
-	struct device *parent;
-
-	parent = imx_soc_device_init();
-	if (parent == NULL)
-		pr_warn("failed to initialize soc device\n");
-
-	of_platform_default_populate(NULL, NULL, parent);
+	of_platform_default_populate(NULL, NULL, NULL);
 	imx6ul_enet_init();
 	imx_anatop_init();
 	imx6ul_pm_init();
diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c
index ebb27592a9f7..879c35929a13 100644
--- a/arch/arm/mach-imx/mach-imx7d.c
+++ b/arch/arm/mach-imx/mach-imx7d.c
@@ -78,12 +78,6 @@  static inline void imx7d_enet_init(void)
 
 static void __init imx7d_init_machine(void)
 {
-	struct device *parent;
-
-	parent = imx_soc_device_init();
-	if (parent == NULL)
-		pr_warn("failed to initialize soc device\n");
-
 	imx_anatop_init();
 	imx7d_enet_init();
 }
diff --git a/arch/arm/mach-imx/mach-imx7ulp.c b/arch/arm/mach-imx/mach-imx7ulp.c
index 11ac71aaf965..128cf4c92aab 100644
--- a/arch/arm/mach-imx/mach-imx7ulp.c
+++ b/arch/arm/mach-imx/mach-imx7ulp.c
@@ -57,7 +57,7 @@  static void __init imx7ulp_init_machine(void)
 
 	mxc_set_cpu_type(MXC_CPU_IMX7ULP);
 	imx7ulp_set_revision();
-	of_platform_default_populate(NULL, NULL, imx_soc_device_init());
+	of_platform_default_populate(NULL, NULL, NULL);
 }
 
 static const char *const imx7ulp_dt_compat[] __initconst = {