linux-kernel - linux-next: manual merge of the pm tree with the imx-mxs tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20161025104729.35f5b009@canb.auug.org.au>
Date:   Tue, 25 Oct 2016 10:47:29 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Shawn Guo <shawn.guo@...aro.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Fabio Estevam <fabio.estevam@....com>,
        Lina Iyer <lina.iyer@...aro.org>
Subject: linux-next: manual merge of the pm tree with the imx-mxs tree

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in:

  arch/arm/mach-imx/gpc.c

between commits:

  eef0b282bb58 ("ARM: imx: gpc: Initialize all power domains")
  f9d1f7a7ad91 ("ARM: imx: gpc: Fix the imx_gpc_genpd_init() error path")

from the imx-mxs tree and commit:

  59d65b73a23c ("PM / Domains: Make genpd state allocation dynamic")

from the pm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/mach-imx/gpc.c
index b54db47f6f32,57a410bbb6a2..000000000000
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@@ -430,18 -423,20 +423,28 @@@ static int imx_gpc_genpd_init(struct de
  	if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))
  		return 0;
  
+ 	imx6q_pu_domain.base.states = devm_kzalloc(dev,
+ 					sizeof(*imx6q_pu_domain.base.states),
+ 					GFP_KERNEL);
+ 	if (!imx6q_pu_domain.base.states)
+ 		return -ENOMEM;
+ 
+ 	imx6q_pu_domain.base.states[0].power_off_latency_ns = 25000;
+ 	imx6q_pu_domain.base.states[0].power_on_latency_ns = 2000000;
+ 	imx6q_pu_domain.base.state_count = 1;
+ 
 -	pm_genpd_init(&imx6q_pu_domain.base, NULL, false);
 -	return of_genpd_add_provider_onecell(dev->of_node,
 +	for (i = 0; i < ARRAY_SIZE(imx_gpc_domains); i++)
 +		pm_genpd_init(imx_gpc_domains[i], NULL, false);
 +
 +	ret =  of_genpd_add_provider_onecell(dev->of_node,
  					     &imx_gpc_onecell_data);
 +	if (ret)
 +		goto power_off;
 +
 +	return 0;
  
 +power_off:
 +	imx6q_pm_pu_power_off(&imx6q_pu_domain.base);
  clk_err:
  	while (i--)
  		clk_put(imx6q_pu_domain.clk[i]);