diff for duplicates of <520A7B00.8060405@arm.com> diff --git a/a/1.txt b/N1/1.txt index b760b5f..6b85e89 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On 13/08/13 16:40, Sudeep KarkadaNagesha wrote: > Adding PowerPC list -> +>=20 > On 13/08/13 14:00, Rafael J. Wysocki wrote: >> On Monday, August 12, 2013 02:27:47 PM Sudeep KarkadaNagesha wrote: >>> The following changes since commit @@ -15,19 +15,19 @@ On 13/08/13 16:40, Sudeep KarkadaNagesha wrote: >>> for you to fetch changes up to >>> 9e9e26dde91f22635c87d0e45f3938b5ded96f0d: >>> ->>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes +>>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes=20 >>> (2013-08-12 10:22:29 +0100) >>> ->>> ---------------------------------------------------------------- +>>> ----------------------------------------------------------------=20 >>> Sudeep KarkadaNagesha (16): of: add support for retrieving cpu node >>> for a given logical cpu index ARM: DT/kernel: define ARM specific >>> arch_match_cpu_phys_id driver/core: cpu: initialize of_node in >>> cpu's device struture of/device: add helper to get cpu device node >>> from logical cpu index ARM: topology: remove hwid/MPIDR dependency >>> from cpu_capacity ARM: mvebu: remove device tree parsing for cpu ->>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes ->>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes ->>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes +>>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes=20 +>>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes=20 +>>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes=20 >>> cpufreq: highbank-cpufreq: remove device tree parsing for cpu >>> nodes cpufreq: spear-cpufreq: remove device tree parsing for cpu >>> nodes cpufreq: kirkwood-cpufreq: remove device tree parsing for cpu @@ -37,31 +37,32 @@ On 13/08/13 16:40, Sudeep KarkadaNagesha wrote: >>> nodes cpufreq: pmac32-cpufreq: remove device tree parsing for cpu >>> nodes >>> ->>> arch/arm/kernel/devtree.c | 5 +++++ ->>> arch/arm/kernel/topology.c | 61 ->>> +++++++++++++++++++------------------------------------------ ->>> arch/arm/mach-imx/mach-imx6q.c | 3 +-- ->>> arch/arm/mach-mvebu/platsmp.c | 52 ->>> ++++++++++++++++++++++++---------------------------- +>>> arch/arm/kernel/devtree.c | 5 +++++=20 +>>> arch/arm/kernel/topology.c | 61=20 +>>> +++++++++++++++++++------------------------------------------=20 +>>> arch/arm/mach-imx/mach-imx6q.c | 3 +--=20 +>>> arch/arm/mach-mvebu/platsmp.c | 52=20 +>>> ++++++++++++++++++++++++----------------------------=20 >>> drivers/base/cpu.c | 2 ++ drivers/bus/arm-cci.c ->>> | 28 +++++++--------------------- ->>> drivers/cpufreq/arm_big_little_dt.c | 40 ->>> ++++++++++++++-------------------------- ->>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++------------------- ->>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------ ->>> drivers/cpufreq/imx6q-cpufreq.c | 4 +--- ->>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++--- ->>> drivers/cpufreq/maple-cpufreq.c | 23 +++-------------------- ->>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++-- ->>> drivers/cpufreq/pmac64-cpufreq.c | 47 ->>> +++++++++++------------------------------------ +>>> | 28 +++++++---------------------=20 +>>> drivers/cpufreq/arm_big_little_dt.c | 40=20 +>>> ++++++++++++++--------------------------=20 +>>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++-------------------=20 +>>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------=20 +>>> drivers/cpufreq/imx6q-cpufreq.c | 4 +---=20 +>>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++---=20 +>>> drivers/cpufreq/maple-cpufreq.c | 23 +++--------------------=20 +>>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++--=20 +>>> drivers/cpufreq/pmac64-cpufreq.c | 47=20 +>>> +++++++++++------------------------------------=20 >>> drivers/cpufreq/spear-cpufreq.c | 4 ++-- drivers/of/base.c ->>> | 73 ->>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +>>> | 73=20 +>>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++ >>> >>> > include/linux/cpu.h | 1 + ->>> include/linux/of.h | 6 ++++++ +>>> include/linux/of.h | 6 ++++++=20 >>> include/linux/of_device.h | 15 +++++++++++++++ 19 files >>> changed, 202 insertions(+), 216 deletions(-) >>> @@ -75,14 +76,14 @@ On 13/08/13 16:40, Sudeep KarkadaNagesha wrote: >> Pulled, thanks! >> > Hi Rob, Rafael, -> +>=20 > On 13/08/13 15:16, kbuild test robot wrote:> tree: > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git > bleeding-edge >> head: 0d4bcb5dc7d3040c0ce7572ea30ab9e5d9455bfa commit: >> 7939ff8d991de2c0b15064e76ee549a6df5ae67f [151/204] of: add >> support for retrieving cpu node for a given logical cpu index ->> config: make ARCH=powerpc allmodconfig +>> config: make ARCH=3Dpowerpc allmodconfig >> >> All error/warnings: >> @@ -91,7 +92,7 @@ On 13/08/13 16:40, Sudeep KarkadaNagesha wrote: >> warning: (MPC836x_RDK && MTD_NAND_FSL_ELBC && MTD_NAND_FSL_UPM) >> selects FSL_LBC which has unmet direct dependencies (FSL_SOC) >> In file included from arch/powerpc/include/asm/kvm_para.h:26:0, from ->> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, +>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20 >> from include/linux/kvm_host.h:30, from >> arch/powerpc/kernel/asm-offsets.c:53: >> include/linux/of.h:269:28: error: conflicting types for @@ -99,18 +100,18 @@ On 13/08/13 16:40, Sudeep KarkadaNagesha wrote: >> extern struct device_node *of_get_cpu_node(int cpu); ^ In file >> included from include/linux/of.h:139:0, from >> arch/powerpc/include/asm/kvm_para.h:26, from ->> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, +>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20 >> from include/linux/kvm_host.h:30, from ->> arch/powerpc/kernel/asm-offsets.c:53: +>> arch/powerpc/kernel/asm-offsets.c:53:=20 >> arch/powerpc/include/asm/prom.h:47:21: note: previous declaration >> of 'of_get_cpu_node' was here ->> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); +>> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);=20 >> ^ make[2]: *** [arch/powerpc/kernel/asm-offsets.s] Error 1 make[2]: >> Target `__build' not remade because of errors. make[1]: *** >> [prepare0] Error 2 make[1]: Target `prepare' not remade because of >> errors. make: *** [sub-make] Error 2 >> -> +>=20 > There seems to be conflict in the new function "of_get_cpu_node" added. > PowerPC also defines the same function name. Further microblaze and > openrisc declares it(can be removed) but doesn't define it. @@ -122,7 +123,7 @@ On 13/08/13 16:40, Sudeep KarkadaNagesha wrote: > renamed to some thing like arch_of_get_cpu_node. > Also most of the calls to arch specific function can be moved to > generic code. -> +>=20 > Let me know your thoughts. Hi Benjamin, @@ -161,23 +162,23 @@ index 9262cf2..c60eef9 100644 @@ -434,7 +434,7 @@ static struct cache *cache_chain_instantiate(unsigned int cpu_id) - pr_debug("creating cache object(s) for CPU %i\n", cpu_id); + =09pr_debug("creating cache object(s) for CPU %i\n", cpu_id); -- cpu_node = of_get_cpu_node(cpu_id, NULL); -+ cpu_node = of_get_cpu_node(cpu_id); - WARN_ONCE(!cpu_node, "no OF node found for CPU %i\n", cpu_id); - if (!cpu_node) - goto out; +-=09cpu_node =3D of_get_cpu_node(cpu_id, NULL); ++=09cpu_node =3D of_get_cpu_node(cpu_id); + =09WARN_ONCE(!cpu_node, "no OF node found for CPU %i\n", cpu_id); + =09if (!cpu_node) + =09=09goto out; @@ -764,7 +764,7 @@ static struct cache *cache_lookup_by_cpu(unsigned int cpu_id) - struct device_node *cpu_node; - struct cache *cache; - -- cpu_node = of_get_cpu_node(cpu_id, NULL); -+ cpu_node = of_get_cpu_node(cpu_id); - WARN_ONCE(!cpu_node, "no OF node found for CPU %i\n", cpu_id); - if (!cpu_node) - return NULL; + =09struct device_node *cpu_node; + =09struct cache *cache; + +-=09cpu_node =3D of_get_cpu_node(cpu_id, NULL); ++=09cpu_node =3D of_get_cpu_node(cpu_id); + =09WARN_ONCE(!cpu_node, "no OF node found for CPU %i\n", cpu_id); + =09if (!cpu_node) + =09=09return NULL; diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index af09e32..fe48a70 100644 --- a/arch/powerpc/kernel/prom.c @@ -196,7 +197,7 @@ index af09e32..fe48a70 100644 +bool arch_match_cpu_phys_id(int cpu, u64 phys_id) +{ -+ return phys_id == get_hard_smp_processor_id(cpu); ++=09return phys_id =3D=3D get_hard_smp_processor_id(cpu); +} + /* Find the device node for a given logical cpu number, also returns @@ -208,38 +209,38 @@ the cpu +struct device_node *arch_of_get_cpunode_by_tid(int cpu, unsigned int *thread) { - int hardid; - struct device_node *np; + =09int hardid; + =09struct device_node *np; -+ if (thread == NULL) -+ return of_get_cpu_node(cpu); ++=09if (thread =3D=3D NULL) ++=09=09return of_get_cpu_node(cpu); + - hardid = get_hard_smp_processor_id(cpu); + =09hardid =3D get_hard_smp_processor_id(cpu); - for_each_node_by_type(np, "cpu") { + =09for_each_node_by_type(np, "cpu") { @@ -855,14 +864,9 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread) - intserv = of_get_property(np, "ibm,ppc-interrupt-server#s", - &plen); - if (intserv == NULL) { -- const u32 *reg = of_get_property(np, "reg", NULL); -- if (reg == NULL) -- continue; -- if (*reg == hardid) { -- if (thread) -- *thread = 0; -- return np; -- } -+ np = of_get_cpu_node(cpu); -+ *thread = 0; -+ return np; - } else { - plen /= sizeof(u32); - for (t = 0; t < plen; t++) { + =09=09intserv =3D of_get_property(np, "ibm,ppc-interrupt-server#s", + =09=09=09=09&plen); + =09=09if (intserv =3D=3D NULL) { +-=09=09=09const u32 *reg =3D of_get_property(np, "reg", NULL); +-=09=09=09if (reg =3D=3D NULL) +-=09=09=09=09continue; +-=09=09=09if (*reg =3D=3D hardid) { +-=09=09=09=09if (thread) +-=09=09=09=09=09*thread =3D 0; +-=09=09=09=09return np; +-=09=09=09} ++=09=09=09np =3D of_get_cpu_node(cpu); ++=09=09=09*thread =3D 0; ++=09=09=09return np; + =09=09} else { + =09=09=09plen /=3D sizeof(u32); + =09=09=09for (t =3D 0; t < plen; t++) { @@ -876,7 +880,6 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread) - } - return NULL; + =09} + =09return NULL; } -EXPORT_SYMBOL(of_get_cpu_node); @@ -250,22 +251,22 @@ index 38b0ba6..cc0e3a27 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -560,7 +560,7 @@ int cpu_to_core_id(int cpu) - const int *reg; - int id = -1; + =09const int *reg; + =09int id =3D -1; -- np = of_get_cpu_node(cpu, NULL); -+ np = of_get_cpu_node(cpu); - if (!np) - goto out; +-=09np =3D of_get_cpu_node(cpu, NULL); ++=09np =3D of_get_cpu_node(cpu); + =09if (!np) + =09=09goto out; @@ -598,7 +598,7 @@ static struct device_node *cpu_to_l2cache(int cpu) - if (!cpu_present(cpu)) - return NULL; + =09if (!cpu_present(cpu)) + =09=09return NULL; -- np = of_get_cpu_node(cpu, NULL); -+ np = of_get_cpu_node(cpu); - if (np == NULL) - return NULL; +-=09np =3D of_get_cpu_node(cpu, NULL); ++=09np =3D of_get_cpu_node(cpu); + =09if (np =3D=3D NULL) + =09=09return NULL; diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 5850798..4b06158 100644 @@ -275,21 +276,21 @@ index 5850798..4b06158 100644 of_drconf_cell *drmem, static int numa_setup_cpu(unsigned long lcpu) { - int nid = 0; -- struct device_node *cpu = of_get_cpu_node(lcpu, NULL); -+ struct device_node *cpu = of_get_cpu_node(lcpu); + =09int nid =3D 0; +-=09struct device_node *cpu =3D of_get_cpu_node(lcpu, NULL); ++=09struct device_node *cpu =3D of_get_cpu_node(lcpu); - if (!cpu) { - WARN_ON(1); + =09if (!cpu) { + =09=09WARN_ON(1); @@ -699,7 +699,7 @@ static int __init parse_numa_properties(void) - struct device_node *cpu; - int nid; - -- cpu = of_get_cpu_node(i, NULL); -+ cpu = of_get_cpu_node(i); - BUG_ON(!cpu); - nid = of_node_to_nid_single(cpu); - of_node_put(cpu); + =09=09struct device_node *cpu; + =09=09int nid; + +-=09=09cpu =3D of_get_cpu_node(i, NULL); ++=09=09cpu =3D of_get_cpu_node(i); + =09=09BUG_ON(!cpu); + =09=09nid =3D of_node_to_nid_single(cpu); + =09=09of_node_put(cpu); diff --git a/arch/powerpc/platforms/44x/currituck.c b/arch/powerpc/platforms/44x/currituck.c index 7f1b71a..84eb64e 100644 @@ -299,11 +300,11 @@ index 7f1b71a..84eb64e 100644 static int smp_ppc47x_kick_cpu(int cpu) { -- struct device_node *cpunode = of_get_cpu_node(cpu, NULL); -+ struct device_node *cpunode = of_get_cpu_node(cpu); - const u64 *spin_table_addr_prop; - u32 *spin_table; - extern void start_secondary_47x(void); +-=09struct device_node *cpunode =3D of_get_cpu_node(cpu, NULL); ++=09struct device_node *cpunode =3D of_get_cpu_node(cpu); + =09const u64 *spin_table_addr_prop; + =09u32 *spin_table; + =09extern void start_secondary_47x(void); diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c index 4241bc8..8195456 100644 @@ -313,11 +314,11 @@ index 4241bc8..8195456 100644 static int smp_iss4xx_kick_cpu(int cpu) { -- struct device_node *cpunode = of_get_cpu_node(cpu, NULL); -+ struct device_node *cpunode = of_get_cpu_node(cpu); - const u64 *spin_table_addr_prop; - u32 *spin_table; - extern void start_secondary_47x(void); +-=09struct device_node *cpunode =3D of_get_cpu_node(cpu, NULL); ++=09struct device_node *cpunode =3D of_get_cpu_node(cpu); + =09const u64 *spin_table_addr_prop; + =09u32 *spin_table; + =09extern void start_secondary_47x(void); diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index 5ced4f5..e32c532 100644 @@ -325,38 +326,39 @@ index 5ced4f5..e32c532 100644 +++ b/arch/powerpc/platforms/85xx/smp.c @@ -156,7 +156,7 @@ static int smp_85xx_kick_cpu(int nr) - pr_debug("smp_85xx_kick_cpu: kick CPU #%d\n", nr); + =09pr_debug("smp_85xx_kick_cpu: kick CPU #%d\n", nr); -- np = of_get_cpu_node(nr, NULL); -+ np = of_get_cpu_node(nr); - cpu_rel_addr = of_get_property(np, "cpu-release-addr", NULL); +-=09np =3D of_get_cpu_node(nr, NULL); ++=09np =3D of_get_cpu_node(nr); + =09cpu_rel_addr =3D of_get_property(np, "cpu-release-addr", NULL); - if (cpu_rel_addr == NULL) { + =09if (cpu_rel_addr =3D=3D NULL) { diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c index 1428d58..a055b74 100644 --- a/arch/powerpc/platforms/cell/cbe_regs.c +++ b/arch/powerpc/platforms/cell/cbe_regs.c @@ -182,7 +182,7 @@ static struct device_node *cbe_get_be_node(int cpu_id) - return np; + =09=09=09return np; - for (i=0; i<len; i++) -- if (of_find_node_by_phandle(cpu_handle[i]) == + =09=09for (i=3D0; i<len; i++) +-=09=09=09if (of_find_node_by_phandle(cpu_handle[i]) =3D=3D of_get_cpu_node(cpu_id, NULL)) -+ if (of_find_node_by_phandle(cpu_handle[i]) == of_get_cpu_node(cpu_id)) - return np; - } ++=09=09=09if (of_find_node_by_phandle(cpu_handle[i]) =3D=3D of_get_cpu_node= +(cpu_id)) + =09=09=09=09return np; + =09} @@ -240,7 +240,8 @@ void __init cbe_regs_init(void) - /* Build local fast map of CPUs */ - for_each_possible_cpu(i) { -- cbe_thread_map[i].cpu_node = of_get_cpu_node(i, &thread_id); -+ cbe_thread_map[i].cpu_node = -+ arch_of_get_cpunode_by_tid(i, &thread_id); - cbe_thread_map[i].be_node = cbe_get_be_node(i); - cbe_thread_map[i].thread_id = thread_id; - } + =09/* Build local fast map of CPUs */ + =09for_each_possible_cpu(i) { +-=09=09cbe_thread_map[i].cpu_node =3D of_get_cpu_node(i, &thread_id); ++=09=09cbe_thread_map[i].cpu_node =3D ++=09=09=09=09arch_of_get_cpunode_by_tid(i, &thread_id); + =09=09cbe_thread_map[i].be_node =3D cbe_get_be_node(i); + =09=09cbe_thread_map[i].thread_id =3D thread_id; + =09} diff --git a/arch/powerpc/platforms/wsp/ics.c b/arch/powerpc/platforms/wsp/ics.c index 2d3b1dd..b83bc2e 100644 @@ -365,35 +367,35 @@ index 2d3b1dd..b83bc2e 100644 @@ -137,7 +137,7 @@ void cpus_on_chip(int chip_id, cpumask_t *mask, cpumask_t *ret) - cpumask_clear(ret); - for_each_cpu(cpu, mask) { -- cpu_dn = of_get_cpu_node(cpu, NULL); -+ cpu_dn = of_get_cpu_node(cpu); - if (!cpu_dn) - continue; + =09cpumask_clear(ret); + =09for_each_cpu(cpu, mask) { +-=09=09cpu_dn =3D of_get_cpu_node(cpu, NULL); ++=09=09cpu_dn =3D of_get_cpu_node(cpu); + =09=09if (!cpu_dn) + =09=09=09continue; @@ -649,7 +649,7 @@ static void __init wsp_ics_set_default_server(void) - u32 hwid; + =09u32 hwid; - /* Find the server number for the boot cpu. */ -- np = of_get_cpu_node(boot_cpuid, NULL); -+ np = of_get_cpu_node(boot_cpuid); - BUG_ON(!np); + =09/* Find the server number for the boot cpu. */ +-=09np =3D of_get_cpu_node(boot_cpuid, NULL); ++=09np =3D of_get_cpu_node(boot_cpuid); + =09BUG_ON(!np); - hwid = get_hard_smp_processor_id(boot_cpuid); + =09hwid =3D get_hard_smp_processor_id(boot_cpuid); diff --git a/arch/powerpc/platforms/wsp/smp.c b/arch/powerpc/platforms/wsp/smp.c index 332a18b..2abe794 100644 --- a/arch/powerpc/platforms/wsp/smp.c +++ b/arch/powerpc/platforms/wsp/smp.c @@ -40,7 +40,7 @@ int smp_a2_kick_cpu(int nr) - if (nr < 0 || nr >= NR_CPUS) - return -ENOENT; + =09if (nr < 0 || nr >=3D NR_CPUS) + =09=09return -ENOENT; -- np = of_get_cpu_node(nr, &thr_idx); -+ np = arch_of_get_cpunode_by_tid(nr, &thr_idx); - if (!np) - return -ENODEV; +-=09np =3D of_get_cpu_node(nr, &thr_idx); ++=09np =3D arch_of_get_cpunode_by_tid(nr, &thr_idx); + =09if (!np) + =09=09return -ENODEV; diff --git a/arch/powerpc/platforms/wsp/wsp.c b/arch/powerpc/platforms/wsp/wsp.c @@ -401,28 +403,28 @@ index d25cc96..43a17a2 100644 --- a/arch/powerpc/platforms/wsp/wsp.c +++ b/arch/powerpc/platforms/wsp/wsp.c @@ -90,7 +90,7 @@ void wsp_halt(void) - struct device_node *mine; - struct device_node *me; + =09struct device_node *mine; + =09struct device_node *me; -- me = of_get_cpu_node(smp_processor_id(), NULL); -+ me = of_get_cpu_node(smp_processor_id()); - mine = scom_find_parent(me); +-=09me =3D of_get_cpu_node(smp_processor_id(), NULL); ++=09me =3D of_get_cpu_node(smp_processor_id()); + =09mine =3D scom_find_parent(me); - /* This will halt all the A2s but not power off the chip */ + =09/* This will halt all the A2s but not power off the chip */ diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c index 9049d9f..d16082f 100644 --- a/arch/powerpc/sysdev/xics/xics-common.c +++ b/arch/powerpc/sysdev/xics/xics-common.c @@ -53,7 +53,7 @@ void xics_update_irq_servers(void) - u32 hcpuid; + =09u32 hcpuid; - /* Find the server numbers for the boot cpu. */ -- np = of_get_cpu_node(boot_cpuid, NULL); -+ np = of_get_cpu_node(boot_cpuid); - BUG_ON(!np); + =09/* Find the server numbers for the boot cpu. */ +-=09np =3D of_get_cpu_node(boot_cpuid, NULL); ++=09np =3D of_get_cpu_node(boot_cpuid); + =09BUG_ON(!np); - hcpuid = get_hard_smp_processor_id(boot_cpuid); + =09hcpuid =3D get_hard_smp_processor_id(boot_cpuid); diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c index b704da4..692755f 100644 @@ -430,14 +432,14 @@ index b704da4..692755f 100644 +++ b/drivers/cpufreq/pasemi-cpufreq.c @@ -149,7 +149,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) - struct device_node *cpu, *dn; - int err = -ENODEV; + =09struct device_node *cpu, *dn; + =09int err =3D -ENODEV; -- cpu = of_get_cpu_node(policy->cpu, NULL); -+ cpu = of_get_cpu_node(policy->cpu); +-=09cpu =3D of_get_cpu_node(policy->cpu, NULL); ++=09cpu =3D of_get_cpu_node(policy->cpu); - if (!cpu) - goto out; + =09if (!cpu) + =09=09goto out; diff --git a/drivers/cpufreq/ppc-corenet-cpufreq.c b/drivers/cpufreq/ppc-corenet-cpufreq.c index 3cae452..64fb70a 100644 @@ -445,13 +447,13 @@ index 3cae452..64fb70a 100644 +++ b/drivers/cpufreq/ppc-corenet-cpufreq.c @@ -150,7 +150,7 @@ static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy) - struct cpu_data *data; - unsigned int cpu = policy->cpu; + =09struct cpu_data *data; + =09unsigned int cpu =3D policy->cpu; -- np = of_get_cpu_node(cpu, NULL); -+ np = of_get_cpu_node(cpu); - if (!np) - return -ENODEV; +-=09np =3D of_get_cpu_node(cpu, NULL); ++=09np =3D of_get_cpu_node(cpu); + =09if (!np) + =09=09return -ENODEV; diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c @@ -460,11 +462,11 @@ index 5936f8d..0700445 100644 +++ b/drivers/cpufreq/ppc_cbe_cpufreq.c @@ -75,7 +75,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy) - int i, cur_pmode; - struct device_node *cpu; + =09int i, cur_pmode; + =09struct device_node *cpu; -- cpu = of_get_cpu_node(policy->cpu, NULL); -+ cpu = of_get_cpu_node(policy->cpu); +-=09cpu =3D of_get_cpu_node(policy->cpu, NULL); ++=09cpu =3D of_get_cpu_node(policy->cpu); - if (!cpu) - return -ENODEV; + =09if (!cpu) + =09=09return -ENODEV; diff --git a/a/content_digest b/N1/content_digest index f8c2889..5f86757 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,20 +6,20 @@ "Date\0Tue, 13 Aug 2013 19:29:20 +0100\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" " linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org>\0" - "Cc\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>" - Rafael J. Wysocki <rjw@sisk.pl> - rob.herring@calxeda.com <rob.herring@calxeda.com> - Viresh Kumar <viresh.kumar@linaro.org> - Olof Johansson <olof@lixom.net> + "Cc\0devicetree@vger.kernel.org <devicetree@vger.kernel.org>" linux-pm@vger.kernel.org <linux-pm@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com> + Viresh Kumar <viresh.kumar@linaro.org> linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + rob.herring@calxeda.com <rob.herring@calxeda.com> + Rafael J. Wysocki <rjw@sisk.pl> + Olof Johansson <olof@lixom.net> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "On 13/08/13 16:40, Sudeep KarkadaNagesha wrote:\n" "> Adding PowerPC list\n" - "> \n" + ">=20\n" "> On 13/08/13 14:00, Rafael J. Wysocki wrote:\n" ">> On Monday, August 12, 2013 02:27:47 PM Sudeep KarkadaNagesha wrote:\n" ">>> The following changes since commit\n" @@ -34,19 +34,19 @@ ">>> for you to fetch changes up to\n" ">>> 9e9e26dde91f22635c87d0e45f3938b5ded96f0d:\n" ">>>\n" - ">>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes \n" + ">>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes=20\n" ">>> (2013-08-12 10:22:29 +0100)\n" ">>>\n" - ">>> ---------------------------------------------------------------- \n" + ">>> ----------------------------------------------------------------=20\n" ">>> Sudeep KarkadaNagesha (16): of: add support for retrieving cpu node\n" ">>> for a given logical cpu index ARM: DT/kernel: define ARM specific\n" ">>> arch_match_cpu_phys_id driver/core: cpu: initialize of_node in\n" ">>> cpu's device struture of/device: add helper to get cpu device node\n" ">>> from logical cpu index ARM: topology: remove hwid/MPIDR dependency\n" ">>> from cpu_capacity ARM: mvebu: remove device tree parsing for cpu\n" - ">>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes \n" - ">>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes \n" - ">>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes \n" + ">>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes=20\n" + ">>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes=20\n" + ">>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes=20\n" ">>> cpufreq: highbank-cpufreq: remove device tree parsing for cpu\n" ">>> nodes cpufreq: spear-cpufreq: remove device tree parsing for cpu\n" ">>> nodes cpufreq: kirkwood-cpufreq: remove device tree parsing for cpu\n" @@ -56,31 +56,32 @@ ">>> nodes cpufreq: pmac32-cpufreq: remove device tree parsing for cpu\n" ">>> nodes\n" ">>>\n" - ">>> arch/arm/kernel/devtree.c | 5 +++++ \n" - ">>> arch/arm/kernel/topology.c | 61 \n" - ">>> +++++++++++++++++++------------------------------------------ \n" - ">>> arch/arm/mach-imx/mach-imx6q.c | 3 +-- \n" - ">>> arch/arm/mach-mvebu/platsmp.c | 52 \n" - ">>> ++++++++++++++++++++++++---------------------------- \n" + ">>> arch/arm/kernel/devtree.c | 5 +++++=20\n" + ">>> arch/arm/kernel/topology.c | 61=20\n" + ">>> +++++++++++++++++++------------------------------------------=20\n" + ">>> arch/arm/mach-imx/mach-imx6q.c | 3 +--=20\n" + ">>> arch/arm/mach-mvebu/platsmp.c | 52=20\n" + ">>> ++++++++++++++++++++++++----------------------------=20\n" ">>> drivers/base/cpu.c | 2 ++ drivers/bus/arm-cci.c\n" - ">>> | 28 +++++++--------------------- \n" - ">>> drivers/cpufreq/arm_big_little_dt.c | 40 \n" - ">>> ++++++++++++++-------------------------- \n" - ">>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++------------------- \n" - ">>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------ \n" - ">>> drivers/cpufreq/imx6q-cpufreq.c | 4 +--- \n" - ">>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++--- \n" - ">>> drivers/cpufreq/maple-cpufreq.c | 23 +++-------------------- \n" - ">>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++-- \n" - ">>> drivers/cpufreq/pmac64-cpufreq.c | 47 \n" - ">>> +++++++++++------------------------------------ \n" + ">>> | 28 +++++++---------------------=20\n" + ">>> drivers/cpufreq/arm_big_little_dt.c | 40=20\n" + ">>> ++++++++++++++--------------------------=20\n" + ">>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++-------------------=20\n" + ">>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------=20\n" + ">>> drivers/cpufreq/imx6q-cpufreq.c | 4 +---=20\n" + ">>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++---=20\n" + ">>> drivers/cpufreq/maple-cpufreq.c | 23 +++--------------------=20\n" + ">>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++--=20\n" + ">>> drivers/cpufreq/pmac64-cpufreq.c | 47=20\n" + ">>> +++++++++++------------------------------------=20\n" ">>> drivers/cpufreq/spear-cpufreq.c | 4 ++-- drivers/of/base.c\n" - ">>> | 73 \n" - ">>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n" + ">>> | 73=20\n" + ">>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++=\n" + "++\n" ">>>\n" ">>>\n" "> include/linux/cpu.h | 1 +\n" - ">>> include/linux/of.h | 6 ++++++ \n" + ">>> include/linux/of.h | 6 ++++++=20\n" ">>> include/linux/of_device.h | 15 +++++++++++++++ 19 files\n" ">>> changed, 202 insertions(+), 216 deletions(-)\n" ">>>\n" @@ -94,14 +95,14 @@ ">> Pulled, thanks!\n" ">>\n" "> Hi Rob, Rafael,\n" - "> \n" + ">=20\n" "> On 13/08/13 15:16, kbuild test robot wrote:> tree:\n" "> git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git\n" "> bleeding-edge\n" ">> head: 0d4bcb5dc7d3040c0ce7572ea30ab9e5d9455bfa commit:\n" ">> 7939ff8d991de2c0b15064e76ee549a6df5ae67f [151/204] of: add\n" ">> support for retrieving cpu node for a given logical cpu index\n" - ">> config: make ARCH=powerpc allmodconfig\n" + ">> config: make ARCH=3Dpowerpc allmodconfig\n" ">>\n" ">> All error/warnings:\n" ">>\n" @@ -110,7 +111,7 @@ ">> warning: (MPC836x_RDK && MTD_NAND_FSL_ELBC && MTD_NAND_FSL_UPM)\n" ">> selects FSL_LBC which has unmet direct dependencies (FSL_SOC)\n" ">> In file included from arch/powerpc/include/asm/kvm_para.h:26:0, from\n" - ">> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, \n" + ">> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20\n" ">> from include/linux/kvm_host.h:30, from\n" ">> arch/powerpc/kernel/asm-offsets.c:53:\n" ">> include/linux/of.h:269:28: error: conflicting types for\n" @@ -118,18 +119,18 @@ ">> extern struct device_node *of_get_cpu_node(int cpu); ^ In file\n" ">> included from include/linux/of.h:139:0, from\n" ">> arch/powerpc/include/asm/kvm_para.h:26, from\n" - ">> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, \n" + ">> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20\n" ">> from include/linux/kvm_host.h:30, from\n" - ">> arch/powerpc/kernel/asm-offsets.c:53: \n" + ">> arch/powerpc/kernel/asm-offsets.c:53:=20\n" ">> arch/powerpc/include/asm/prom.h:47:21: note: previous declaration\n" ">> of 'of_get_cpu_node' was here\n" - ">> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); \n" + ">> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);=20\n" ">> ^ make[2]: *** [arch/powerpc/kernel/asm-offsets.s] Error 1 make[2]:\n" ">> Target `__build' not remade because of errors. make[1]: ***\n" ">> [prepare0] Error 2 make[1]: Target `prepare' not remade because of\n" ">> errors. make: *** [sub-make] Error 2\n" ">>\n" - "> \n" + ">=20\n" "> There seems to be conflict in the new function \"of_get_cpu_node\" added.\n" "> PowerPC also defines the same function name. Further microblaze and\n" "> openrisc declares it(can be removed) but doesn't define it.\n" @@ -141,7 +142,7 @@ "> renamed to some thing like arch_of_get_cpu_node.\n" "> Also most of the calls to arch specific function can be moved to\n" "> generic code.\n" - "> \n" + ">=20\n" "> Let me know your thoughts.\n" "\n" "Hi Benjamin,\n" @@ -180,23 +181,23 @@ "@@ -434,7 +434,7 @@ static struct cache\n" "*cache_chain_instantiate(unsigned int cpu_id)\n" "\n" - " \tpr_debug(\"creating cache object(s) for CPU %i\\n\", cpu_id);\n" + " =09pr_debug(\"creating cache object(s) for CPU %i\\n\", cpu_id);\n" "\n" - "-\tcpu_node = of_get_cpu_node(cpu_id, NULL);\n" - "+\tcpu_node = of_get_cpu_node(cpu_id);\n" - " \tWARN_ONCE(!cpu_node, \"no OF node found for CPU %i\\n\", cpu_id);\n" - " \tif (!cpu_node)\n" - " \t\tgoto out;\n" + "-=09cpu_node =3D of_get_cpu_node(cpu_id, NULL);\n" + "+=09cpu_node =3D of_get_cpu_node(cpu_id);\n" + " =09WARN_ONCE(!cpu_node, \"no OF node found for CPU %i\\n\", cpu_id);\n" + " =09if (!cpu_node)\n" + " =09=09goto out;\n" "@@ -764,7 +764,7 @@ static struct cache *cache_lookup_by_cpu(unsigned\n" "int cpu_id)\n" - " \tstruct device_node *cpu_node;\n" - " \tstruct cache *cache;\n" - "\n" - "-\tcpu_node = of_get_cpu_node(cpu_id, NULL);\n" - "+\tcpu_node = of_get_cpu_node(cpu_id);\n" - " \tWARN_ONCE(!cpu_node, \"no OF node found for CPU %i\\n\", cpu_id);\n" - " \tif (!cpu_node)\n" - " \t\treturn NULL;\n" + " =09struct device_node *cpu_node;\n" + " =09struct cache *cache;\n" + "\n" + "-=09cpu_node =3D of_get_cpu_node(cpu_id, NULL);\n" + "+=09cpu_node =3D of_get_cpu_node(cpu_id);\n" + " =09WARN_ONCE(!cpu_node, \"no OF node found for CPU %i\\n\", cpu_id);\n" + " =09if (!cpu_node)\n" + " =09=09return NULL;\n" "diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c\n" "index af09e32..fe48a70 100644\n" "--- a/arch/powerpc/kernel/prom.c\n" @@ -215,7 +216,7 @@ "\n" "+bool arch_match_cpu_phys_id(int cpu, u64 phys_id)\n" "+{\n" - "+\treturn phys_id == get_hard_smp_processor_id(cpu);\n" + "+=09return phys_id =3D=3D get_hard_smp_processor_id(cpu);\n" "+}\n" "+\n" " /* Find the device node for a given logical cpu number, also returns\n" @@ -227,38 +228,38 @@ "+struct device_node *arch_of_get_cpunode_by_tid(int cpu, unsigned int\n" "*thread)\n" " {\n" - " \tint hardid;\n" - " \tstruct device_node *np;\n" + " =09int hardid;\n" + " =09struct device_node *np;\n" "\n" - "+\tif (thread == NULL)\n" - "+\t\treturn of_get_cpu_node(cpu);\n" + "+=09if (thread =3D=3D NULL)\n" + "+=09=09return of_get_cpu_node(cpu);\n" "+\n" - " \thardid = get_hard_smp_processor_id(cpu);\n" + " =09hardid =3D get_hard_smp_processor_id(cpu);\n" "\n" - " \tfor_each_node_by_type(np, \"cpu\") {\n" + " =09for_each_node_by_type(np, \"cpu\") {\n" "@@ -855,14 +864,9 @@ struct device_node *of_get_cpu_node(int cpu,\n" "unsigned int *thread)\n" - " \t\tintserv = of_get_property(np, \"ibm,ppc-interrupt-server#s\",\n" - " \t\t\t\t&plen);\n" - " \t\tif (intserv == NULL) {\n" - "-\t\t\tconst u32 *reg = of_get_property(np, \"reg\", NULL);\n" - "-\t\t\tif (reg == NULL)\n" - "-\t\t\t\tcontinue;\n" - "-\t\t\tif (*reg == hardid) {\n" - "-\t\t\t\tif (thread)\n" - "-\t\t\t\t\t*thread = 0;\n" - "-\t\t\t\treturn np;\n" - "-\t\t\t}\n" - "+\t\t\tnp = of_get_cpu_node(cpu);\n" - "+\t\t\t*thread = 0;\n" - "+\t\t\treturn np;\n" - " \t\t} else {\n" - " \t\t\tplen /= sizeof(u32);\n" - " \t\t\tfor (t = 0; t < plen; t++) {\n" + " =09=09intserv =3D of_get_property(np, \"ibm,ppc-interrupt-server#s\",\n" + " =09=09=09=09&plen);\n" + " =09=09if (intserv =3D=3D NULL) {\n" + "-=09=09=09const u32 *reg =3D of_get_property(np, \"reg\", NULL);\n" + "-=09=09=09if (reg =3D=3D NULL)\n" + "-=09=09=09=09continue;\n" + "-=09=09=09if (*reg =3D=3D hardid) {\n" + "-=09=09=09=09if (thread)\n" + "-=09=09=09=09=09*thread =3D 0;\n" + "-=09=09=09=09return np;\n" + "-=09=09=09}\n" + "+=09=09=09np =3D of_get_cpu_node(cpu);\n" + "+=09=09=09*thread =3D 0;\n" + "+=09=09=09return np;\n" + " =09=09} else {\n" + " =09=09=09plen /=3D sizeof(u32);\n" + " =09=09=09for (t =3D 0; t < plen; t++) {\n" "@@ -876,7 +880,6 @@ struct device_node *of_get_cpu_node(int cpu,\n" "unsigned int *thread)\n" - " \t}\n" - " \treturn NULL;\n" + " =09}\n" + " =09return NULL;\n" " }\n" "-EXPORT_SYMBOL(of_get_cpu_node);\n" "\n" @@ -269,22 +270,22 @@ "--- a/arch/powerpc/kernel/smp.c\n" "+++ b/arch/powerpc/kernel/smp.c\n" "@@ -560,7 +560,7 @@ int cpu_to_core_id(int cpu)\n" - " \tconst int *reg;\n" - " \tint id = -1;\n" + " =09const int *reg;\n" + " =09int id =3D -1;\n" "\n" - "-\tnp = of_get_cpu_node(cpu, NULL);\n" - "+\tnp = of_get_cpu_node(cpu);\n" - " \tif (!np)\n" - " \t\tgoto out;\n" + "-=09np =3D of_get_cpu_node(cpu, NULL);\n" + "+=09np =3D of_get_cpu_node(cpu);\n" + " =09if (!np)\n" + " =09=09goto out;\n" "\n" "@@ -598,7 +598,7 @@ static struct device_node *cpu_to_l2cache(int cpu)\n" - " \tif (!cpu_present(cpu))\n" - " \t\treturn NULL;\n" + " =09if (!cpu_present(cpu))\n" + " =09=09return NULL;\n" "\n" - "-\tnp = of_get_cpu_node(cpu, NULL);\n" - "+\tnp = of_get_cpu_node(cpu);\n" - " \tif (np == NULL)\n" - " \t\treturn NULL;\n" + "-=09np =3D of_get_cpu_node(cpu, NULL);\n" + "+=09np =3D of_get_cpu_node(cpu);\n" + " =09if (np =3D=3D NULL)\n" + " =09=09return NULL;\n" "\n" "diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c\n" "index 5850798..4b06158 100644\n" @@ -294,21 +295,21 @@ "of_drconf_cell *drmem,\n" " static int numa_setup_cpu(unsigned long lcpu)\n" " {\n" - " \tint nid = 0;\n" - "-\tstruct device_node *cpu = of_get_cpu_node(lcpu, NULL);\n" - "+\tstruct device_node *cpu = of_get_cpu_node(lcpu);\n" + " =09int nid =3D 0;\n" + "-=09struct device_node *cpu =3D of_get_cpu_node(lcpu, NULL);\n" + "+=09struct device_node *cpu =3D of_get_cpu_node(lcpu);\n" "\n" - " \tif (!cpu) {\n" - " \t\tWARN_ON(1);\n" + " =09if (!cpu) {\n" + " =09=09WARN_ON(1);\n" "@@ -699,7 +699,7 @@ static int __init parse_numa_properties(void)\n" - " \t\tstruct device_node *cpu;\n" - " \t\tint nid;\n" - "\n" - "-\t\tcpu = of_get_cpu_node(i, NULL);\n" - "+\t\tcpu = of_get_cpu_node(i);\n" - " \t\tBUG_ON(!cpu);\n" - " \t\tnid = of_node_to_nid_single(cpu);\n" - " \t\tof_node_put(cpu);\n" + " =09=09struct device_node *cpu;\n" + " =09=09int nid;\n" + "\n" + "-=09=09cpu =3D of_get_cpu_node(i, NULL);\n" + "+=09=09cpu =3D of_get_cpu_node(i);\n" + " =09=09BUG_ON(!cpu);\n" + " =09=09nid =3D of_node_to_nid_single(cpu);\n" + " =09=09of_node_put(cpu);\n" "diff --git a/arch/powerpc/platforms/44x/currituck.c\n" "b/arch/powerpc/platforms/44x/currituck.c\n" "index 7f1b71a..84eb64e 100644\n" @@ -318,11 +319,11 @@ "\n" " static int smp_ppc47x_kick_cpu(int cpu)\n" " {\n" - "-\tstruct device_node *cpunode = of_get_cpu_node(cpu, NULL);\n" - "+\tstruct device_node *cpunode = of_get_cpu_node(cpu);\n" - " \tconst u64 *spin_table_addr_prop;\n" - " \tu32 *spin_table;\n" - " \textern void start_secondary_47x(void);\n" + "-=09struct device_node *cpunode =3D of_get_cpu_node(cpu, NULL);\n" + "+=09struct device_node *cpunode =3D of_get_cpu_node(cpu);\n" + " =09const u64 *spin_table_addr_prop;\n" + " =09u32 *spin_table;\n" + " =09extern void start_secondary_47x(void);\n" "diff --git a/arch/powerpc/platforms/44x/iss4xx.c\n" "b/arch/powerpc/platforms/44x/iss4xx.c\n" "index 4241bc8..8195456 100644\n" @@ -332,11 +333,11 @@ "\n" " static int smp_iss4xx_kick_cpu(int cpu)\n" " {\n" - "-\tstruct device_node *cpunode = of_get_cpu_node(cpu, NULL);\n" - "+\tstruct device_node *cpunode = of_get_cpu_node(cpu);\n" - " \tconst u64 *spin_table_addr_prop;\n" - " \tu32 *spin_table;\n" - " \textern void start_secondary_47x(void);\n" + "-=09struct device_node *cpunode =3D of_get_cpu_node(cpu, NULL);\n" + "+=09struct device_node *cpunode =3D of_get_cpu_node(cpu);\n" + " =09const u64 *spin_table_addr_prop;\n" + " =09u32 *spin_table;\n" + " =09extern void start_secondary_47x(void);\n" "diff --git a/arch/powerpc/platforms/85xx/smp.c\n" "b/arch/powerpc/platforms/85xx/smp.c\n" "index 5ced4f5..e32c532 100644\n" @@ -344,38 +345,39 @@ "+++ b/arch/powerpc/platforms/85xx/smp.c\n" "@@ -156,7 +156,7 @@ static int smp_85xx_kick_cpu(int nr)\n" "\n" - " \tpr_debug(\"smp_85xx_kick_cpu: kick CPU #%d\\n\", nr);\n" + " =09pr_debug(\"smp_85xx_kick_cpu: kick CPU #%d\\n\", nr);\n" "\n" - "-\tnp = of_get_cpu_node(nr, NULL);\n" - "+\tnp = of_get_cpu_node(nr);\n" - " \tcpu_rel_addr = of_get_property(np, \"cpu-release-addr\", NULL);\n" + "-=09np =3D of_get_cpu_node(nr, NULL);\n" + "+=09np =3D of_get_cpu_node(nr);\n" + " =09cpu_rel_addr =3D of_get_property(np, \"cpu-release-addr\", NULL);\n" "\n" - " \tif (cpu_rel_addr == NULL) {\n" + " =09if (cpu_rel_addr =3D=3D NULL) {\n" "diff --git a/arch/powerpc/platforms/cell/cbe_regs.c\n" "b/arch/powerpc/platforms/cell/cbe_regs.c\n" "index 1428d58..a055b74 100644\n" "--- a/arch/powerpc/platforms/cell/cbe_regs.c\n" "+++ b/arch/powerpc/platforms/cell/cbe_regs.c\n" "@@ -182,7 +182,7 @@ static struct device_node *cbe_get_be_node(int cpu_id)\n" - " \t\t\treturn np;\n" + " =09=09=09return np;\n" "\n" - " \t\tfor (i=0; i<len; i++)\n" - "-\t\t\tif (of_find_node_by_phandle(cpu_handle[i]) ==\n" + " =09=09for (i=3D0; i<len; i++)\n" + "-=09=09=09if (of_find_node_by_phandle(cpu_handle[i]) =3D=3D\n" "of_get_cpu_node(cpu_id, NULL))\n" - "+\t\t\tif (of_find_node_by_phandle(cpu_handle[i]) == of_get_cpu_node(cpu_id))\n" - " \t\t\t\treturn np;\n" - " \t}\n" + "+=09=09=09if (of_find_node_by_phandle(cpu_handle[i]) =3D=3D of_get_cpu_node=\n" + "(cpu_id))\n" + " =09=09=09=09return np;\n" + " =09}\n" "\n" "@@ -240,7 +240,8 @@ void __init cbe_regs_init(void)\n" "\n" - " \t/* Build local fast map of CPUs */\n" - " \tfor_each_possible_cpu(i) {\n" - "-\t\tcbe_thread_map[i].cpu_node = of_get_cpu_node(i, &thread_id);\n" - "+\t\tcbe_thread_map[i].cpu_node =\n" - "+\t\t\t\tarch_of_get_cpunode_by_tid(i, &thread_id);\n" - " \t\tcbe_thread_map[i].be_node = cbe_get_be_node(i);\n" - " \t\tcbe_thread_map[i].thread_id = thread_id;\n" - " \t}\n" + " =09/* Build local fast map of CPUs */\n" + " =09for_each_possible_cpu(i) {\n" + "-=09=09cbe_thread_map[i].cpu_node =3D of_get_cpu_node(i, &thread_id);\n" + "+=09=09cbe_thread_map[i].cpu_node =3D\n" + "+=09=09=09=09arch_of_get_cpunode_by_tid(i, &thread_id);\n" + " =09=09cbe_thread_map[i].be_node =3D cbe_get_be_node(i);\n" + " =09=09cbe_thread_map[i].thread_id =3D thread_id;\n" + " =09}\n" "diff --git a/arch/powerpc/platforms/wsp/ics.c\n" "b/arch/powerpc/platforms/wsp/ics.c\n" "index 2d3b1dd..b83bc2e 100644\n" @@ -384,35 +386,35 @@ "@@ -137,7 +137,7 @@ void cpus_on_chip(int chip_id, cpumask_t *mask,\n" "cpumask_t *ret)\n" "\n" - " \tcpumask_clear(ret);\n" - " \tfor_each_cpu(cpu, mask) {\n" - "-\t\tcpu_dn = of_get_cpu_node(cpu, NULL);\n" - "+\t\tcpu_dn = of_get_cpu_node(cpu);\n" - " \t\tif (!cpu_dn)\n" - " \t\t\tcontinue;\n" + " =09cpumask_clear(ret);\n" + " =09for_each_cpu(cpu, mask) {\n" + "-=09=09cpu_dn =3D of_get_cpu_node(cpu, NULL);\n" + "+=09=09cpu_dn =3D of_get_cpu_node(cpu);\n" + " =09=09if (!cpu_dn)\n" + " =09=09=09continue;\n" "\n" "@@ -649,7 +649,7 @@ static void __init wsp_ics_set_default_server(void)\n" - " \tu32 hwid;\n" + " =09u32 hwid;\n" "\n" - " \t/* Find the server number for the boot cpu. */\n" - "-\tnp = of_get_cpu_node(boot_cpuid, NULL);\n" - "+\tnp = of_get_cpu_node(boot_cpuid);\n" - " \tBUG_ON(!np);\n" + " =09/* Find the server number for the boot cpu. */\n" + "-=09np =3D of_get_cpu_node(boot_cpuid, NULL);\n" + "+=09np =3D of_get_cpu_node(boot_cpuid);\n" + " =09BUG_ON(!np);\n" "\n" - " \thwid = get_hard_smp_processor_id(boot_cpuid);\n" + " =09hwid =3D get_hard_smp_processor_id(boot_cpuid);\n" "diff --git a/arch/powerpc/platforms/wsp/smp.c\n" "b/arch/powerpc/platforms/wsp/smp.c\n" "index 332a18b..2abe794 100644\n" "--- a/arch/powerpc/platforms/wsp/smp.c\n" "+++ b/arch/powerpc/platforms/wsp/smp.c\n" "@@ -40,7 +40,7 @@ int smp_a2_kick_cpu(int nr)\n" - " \tif (nr < 0 || nr >= NR_CPUS)\n" - " \t\treturn -ENOENT;\n" + " =09if (nr < 0 || nr >=3D NR_CPUS)\n" + " =09=09return -ENOENT;\n" "\n" - "-\tnp = of_get_cpu_node(nr, &thr_idx);\n" - "+\tnp = arch_of_get_cpunode_by_tid(nr, &thr_idx);\n" - " \tif (!np)\n" - " \t\treturn -ENODEV;\n" + "-=09np =3D of_get_cpu_node(nr, &thr_idx);\n" + "+=09np =3D arch_of_get_cpunode_by_tid(nr, &thr_idx);\n" + " =09if (!np)\n" + " =09=09return -ENODEV;\n" "\n" "diff --git a/arch/powerpc/platforms/wsp/wsp.c\n" "b/arch/powerpc/platforms/wsp/wsp.c\n" @@ -420,28 +422,28 @@ "--- a/arch/powerpc/platforms/wsp/wsp.c\n" "+++ b/arch/powerpc/platforms/wsp/wsp.c\n" "@@ -90,7 +90,7 @@ void wsp_halt(void)\n" - " \tstruct device_node *mine;\n" - " \tstruct device_node *me;\n" + " =09struct device_node *mine;\n" + " =09struct device_node *me;\n" "\n" - "-\tme = of_get_cpu_node(smp_processor_id(), NULL);\n" - "+\tme = of_get_cpu_node(smp_processor_id());\n" - " \tmine = scom_find_parent(me);\n" + "-=09me =3D of_get_cpu_node(smp_processor_id(), NULL);\n" + "+=09me =3D of_get_cpu_node(smp_processor_id());\n" + " =09mine =3D scom_find_parent(me);\n" "\n" - " \t/* This will halt all the A2s but not power off the chip */\n" + " =09/* This will halt all the A2s but not power off the chip */\n" "diff --git a/arch/powerpc/sysdev/xics/xics-common.c\n" "b/arch/powerpc/sysdev/xics/xics-common.c\n" "index 9049d9f..d16082f 100644\n" "--- a/arch/powerpc/sysdev/xics/xics-common.c\n" "+++ b/arch/powerpc/sysdev/xics/xics-common.c\n" "@@ -53,7 +53,7 @@ void xics_update_irq_servers(void)\n" - " \tu32 hcpuid;\n" + " =09u32 hcpuid;\n" "\n" - " \t/* Find the server numbers for the boot cpu. */\n" - "-\tnp = of_get_cpu_node(boot_cpuid, NULL);\n" - "+\tnp = of_get_cpu_node(boot_cpuid);\n" - " \tBUG_ON(!np);\n" + " =09/* Find the server numbers for the boot cpu. */\n" + "-=09np =3D of_get_cpu_node(boot_cpuid, NULL);\n" + "+=09np =3D of_get_cpu_node(boot_cpuid);\n" + " =09BUG_ON(!np);\n" "\n" - " \thcpuid = get_hard_smp_processor_id(boot_cpuid);\n" + " =09hcpuid =3D get_hard_smp_processor_id(boot_cpuid);\n" "diff --git a/drivers/cpufreq/pasemi-cpufreq.c\n" "b/drivers/cpufreq/pasemi-cpufreq.c\n" "index b704da4..692755f 100644\n" @@ -449,14 +451,14 @@ "+++ b/drivers/cpufreq/pasemi-cpufreq.c\n" "@@ -149,7 +149,7 @@ static int pas_cpufreq_cpu_init(struct\n" "cpufreq_policy *policy)\n" - " \tstruct device_node *cpu, *dn;\n" - " \tint err = -ENODEV;\n" + " =09struct device_node *cpu, *dn;\n" + " =09int err =3D -ENODEV;\n" "\n" - "-\tcpu = of_get_cpu_node(policy->cpu, NULL);\n" - "+\tcpu = of_get_cpu_node(policy->cpu);\n" + "-=09cpu =3D of_get_cpu_node(policy->cpu, NULL);\n" + "+=09cpu =3D of_get_cpu_node(policy->cpu);\n" "\n" - " \tif (!cpu)\n" - " \t\tgoto out;\n" + " =09if (!cpu)\n" + " =09=09goto out;\n" "diff --git a/drivers/cpufreq/ppc-corenet-cpufreq.c\n" "b/drivers/cpufreq/ppc-corenet-cpufreq.c\n" "index 3cae452..64fb70a 100644\n" @@ -464,13 +466,13 @@ "+++ b/drivers/cpufreq/ppc-corenet-cpufreq.c\n" "@@ -150,7 +150,7 @@ static int corenet_cpufreq_cpu_init(struct\n" "cpufreq_policy *policy)\n" - " \tstruct cpu_data *data;\n" - " \tunsigned int cpu = policy->cpu;\n" + " =09struct cpu_data *data;\n" + " =09unsigned int cpu =3D policy->cpu;\n" "\n" - "-\tnp = of_get_cpu_node(cpu, NULL);\n" - "+\tnp = of_get_cpu_node(cpu);\n" - " \tif (!np)\n" - " \t\treturn -ENODEV;\n" + "-=09np =3D of_get_cpu_node(cpu, NULL);\n" + "+=09np =3D of_get_cpu_node(cpu);\n" + " =09if (!np)\n" + " =09=09return -ENODEV;\n" "\n" "diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c\n" "b/drivers/cpufreq/ppc_cbe_cpufreq.c\n" @@ -479,13 +481,13 @@ "+++ b/drivers/cpufreq/ppc_cbe_cpufreq.c\n" "@@ -75,7 +75,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy\n" "*policy)\n" - " \tint i, cur_pmode;\n" - " \tstruct device_node *cpu;\n" + " =09int i, cur_pmode;\n" + " =09struct device_node *cpu;\n" "\n" - "-\tcpu = of_get_cpu_node(policy->cpu, NULL);\n" - "+\tcpu = of_get_cpu_node(policy->cpu);\n" + "-=09cpu =3D of_get_cpu_node(policy->cpu, NULL);\n" + "+=09cpu =3D of_get_cpu_node(policy->cpu);\n" "\n" - " \tif (!cpu)\n" - " \t\treturn -ENODEV;" + " =09if (!cpu)\n" + =09=09return -ENODEV; -fe7f4f94d9a3d35c1b6333dca7ff53ed0493d0b239eed654cf6b706650fcab0c +a16cc7389e8d89709815289cc65260d010e715675d738794e1b295076fceb09b
diff --git a/a/content_digest b/N2/content_digest index f8c2889..a9f45b4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,10 @@ "ref\05208E2D3.7060005@arm.com\0" "ref\03356439.a21MloFP7n@vostro.rjw.lan\0" "ref\0520A536C.3030600@arm.com\0" - "From\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>\0" - "Subject\0Re: [GIT PULL] DT/core: cpu_ofnode updates for v3.12\0" + "From\0Sudeep.KarkadaNagesha@arm.com (Sudeep KarkadaNagesha)\0" + "Subject\0[GIT PULL] DT/core: cpu_ofnode updates for v3.12\0" "Date\0Tue, 13 Aug 2013 19:29:20 +0100\0" - "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" - " linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org>\0" - "Cc\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>" - Rafael J. Wysocki <rjw@sisk.pl> - rob.herring@calxeda.com <rob.herring@calxeda.com> - Viresh Kumar <viresh.kumar@linaro.org> - Olof Johansson <olof@lixom.net> - linux-pm@vger.kernel.org <linux-pm@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 13/08/13 16:40, Sudeep KarkadaNagesha wrote:\n" @@ -488,4 +478,4 @@ " \tif (!cpu)\n" " \t\treturn -ENODEV;" -fe7f4f94d9a3d35c1b6333dca7ff53ed0493d0b239eed654cf6b706650fcab0c +4a97d02fc022b574288029720dea3e3ea699f45d331c8e5b79ad9f1dc5f5fdd0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.