linaro-kernel

linaro-kernel@lists.linaro.org

10094 discussions

[PATCH 1/3] arm64: topology: Implement basic CPU topology support

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Add basic CPU topology support to arm64, based on the existing pre-v8 code and some work done by Mark Hambleton. This patch does not implement any topology discovery support since that should be based on information from firmware, it merely implements the scaffolding for integration of topology support in the architecture. The goal is to separate the architecture hookup for providing topology information from the DT parsing in order to ease review and avoid blocking the architecture code (which will be built on by other work) with the DT code review by providing something something simple and basic. A following patch will implement support for parsing the DT topology bindings for ARM, similar patches will be needed for ACPI. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- arch/arm64/Kconfig | 8 +++ arch/arm64/include/asm/topology.h | 42 +++++++++++++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/smp.c | 12 ++++ arch/arm64/kernel/topology.c | 124 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 187 insertions(+) create mode 100644 arch/arm64/include/asm/topology.h create mode 100644 arch/arm64/kernel/topology.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 6d4dd22ee4b7..c0975fea9bfe 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -154,6 +154,14 @@ config SMP If you don't know what to do here, say N. +config ARM_CPU_TOPOLOGY + bool "Support CPU topology definition" + depends on SMP + default y + help + Support CPU topology definition, based on configuration + provided by the firmware. + config NR_CPUS int "Maximum number of CPUs (2-32)" range 2 32 diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h new file mode 100644 index 000000000000..611edefaeaf1 --- /dev/null +++ b/arch/arm64/include/asm/topology.h @@ -0,0 +1,42 @@ +#ifndef _ASM_ARM_TOPOLOGY_H +#define _ASM_ARM_TOPOLOGY_H + +#ifdef CONFIG_ARM_CPU_TOPOLOGY + +#include <linux/cpumask.h> + +struct cputopo_arm { + int thread_id; + int core_id; + int socket_id; + cpumask_t thread_sibling; + cpumask_t core_sibling; +}; + +extern struct cputopo_arm cpu_topology[NR_CPUS]; + +#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id) +#define topology_core_id(cpu) (cpu_topology[cpu].core_id) +#define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_sibling) +#define topology_thread_cpumask(cpu) (&cpu_topology[cpu].thread_sibling) + +#define mc_capable() (cpu_topology[0].socket_id != -1) +#define smt_capable() (cpu_topology[0].thread_id != -1) + +void init_cpu_topology(void); +void store_cpu_topology(unsigned int cpuid); +const struct cpumask *cpu_coregroup_mask(int cpu); +int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask); + +#else + +static inline void init_cpu_topology(void) { } +static inline void store_cpu_topology(unsigned int cpuid) { } +static inline int cluster_to_logical_mask(unsigned int socket_id, + cpumask_t *cluster_mask) { return -EINVAL; } + +#endif + +#include <asm-generic/topology.h> + +#endif /* _ASM_ARM_TOPOLOGY_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 5ba2fd43a75b..2d145e38ad49 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -18,6 +18,7 @@ arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +arm64-obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o obj-y += $(arm64-obj-y) vdso/ obj-m += $(arm64-obj-m) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index a0c2ca602cf8..0271fbde5363 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -113,6 +113,11 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) return ret; } +static void __cpuinit smp_store_cpu_info(unsigned int cpuid) +{ + store_cpu_topology(cpuid); +} + /* * This is the secondary CPU boot entry. We're using this CPUs * idle thread stack, but a set of temporary page tables. @@ -150,6 +155,8 @@ asmlinkage void secondary_start_kernel(void) */ notify_cpu_starting(cpu); + smp_store_cpu_info(cpu); + /* * OK, now it's safe to let the boot CPU continue. Wait for * the CPU migration code to notice that the CPU is online @@ -388,6 +395,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus) int err; unsigned int cpu, ncores = num_possible_cpus(); + init_cpu_topology(); + + smp_store_cpu_info(smp_processor_id()); + + /* * are we trying to boot more cores than exist? */ diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c new file mode 100644 index 000000000000..aae9d4d72328 --- /dev/null +++ b/arch/arm64/kernel/topology.c @@ -0,0 +1,124 @@ +/* + * arch/arm64/kernel/topology.c + * + * Copyright (C) 2011,2013 Linaro Limited. + * Written by: Vincent Guittot + * + * based on arch/sh/kernel/topology.c + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ + +#include <linux/cpu.h> +#include <linux/cpumask.h> +#include <linux/export.h> +#include <linux/init.h> +#include <linux/percpu.h> +#include <linux/node.h> +#include <linux/nodemask.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include <asm/cputype.h> +#include <asm/smp_plat.h> +#include <asm/topology.h> + +/* + * cpu topology table + */ +struct cputopo_arm cpu_topology[NR_CPUS]; +EXPORT_SYMBOL_GPL(cpu_topology); + +const struct cpumask *cpu_coregroup_mask(int cpu) +{ + return &cpu_topology[cpu].core_sibling; +} + +static void update_siblings_masks(unsigned int cpuid) +{ + struct cputopo_arm *cpu_topo, *cpuid_topo = &cpu_topology[cpuid]; + int cpu; + + /* update core and thread sibling masks */ + for_each_possible_cpu(cpu) { + cpu_topo = &cpu_topology[cpu]; + + if (cpuid_topo->socket_id != cpu_topo->socket_id) + continue; + + cpumask_set_cpu(cpuid, &cpu_topo->core_sibling); + if (cpu != cpuid) + cpumask_set_cpu(cpu, &cpuid_topo->core_sibling); + + if (cpuid_topo->core_id != cpu_topo->core_id) + continue; + + cpumask_set_cpu(cpuid, &cpu_topo->thread_sibling); + if (cpu != cpuid) + cpumask_set_cpu(cpu, &cpuid_topo->thread_sibling); + } + smp_wmb(); +} + +void store_cpu_topology(unsigned int cpuid) +{ + struct cputopo_arm *cpuid_topo = &cpu_topology[cpuid]; + + /* DT should have been parsed by the time we get here */ + if (cpuid_topo->core_id == -1) + pr_info("CPU%u: No topology information configured\n", cpuid); + else + update_siblings_masks(cpuid); +} + + +/* + * cluster_to_logical_mask - return cpu logical mask of CPUs in a cluster + * @socket_id: cluster HW identifier + * @cluster_mask: the cpumask location to be initialized, modified by the + * function only if return value == 0 + * + * Return: + * + * 0 on success + * -EINVAL if cluster_mask is NULL or there is no record matching socket_id + */ +int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask) +{ + int cpu; + + if (!cluster_mask) + return -EINVAL; + + for_each_online_cpu(cpu) { + if (socket_id == topology_physical_package_id(cpu)) { + cpumask_copy(cluster_mask, topology_core_cpumask(cpu)); + return 0; + } + } + + return -EINVAL; +} + +/* + * init_cpu_topology is called at boot when only one cpu is running + * which prevent simultaneous write access to cpu_topology array + */ +void __init init_cpu_topology(void) +{ + unsigned int cpu; + + /* init core mask and power*/ + for_each_possible_cpu(cpu) { + struct cputopo_arm *cpu_topo = &(cpu_topology[cpu]); + + cpu_topo->thread_id = -1; + cpu_topo->core_id = -1; + cpu_topo->socket_id = -1; + cpumask_clear(&cpu_topo->core_sibling); + cpumask_clear(&cpu_topo->thread_sibling); + } + smp_wmb(); +} -- 1.8.5.1

11 years, 5 months

queue boot: 12 pass, 2 fail (v3.10.24)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: queue Git describe: v3.10.24 Failed boot tests (console logs at the end) =========================================== armada-xp-openblocks-ax3-4: FAIL: multi_v7_defconfig armada-370-mirabox: FAIL: multi_v7_defconfig Full Report =========== omap2plus_defconfig ------------------- omap3-beagle-xm PASS: 0 min 48.8 sec am335x-bone PASS: 0 min 26.4 sec omap4-panda PASS: 1 min 4.0 sec omap4-panda-es PASS: 1 min 5.3 sec omap3-tobi,3730storm PASS: 0 min 33.1 sec omap3-tobi,3530overo PASS: 0 min 33.6 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 18.0 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 16.7 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.5 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 21.6 sec armada-370-mirabox PASS: 0 min 19.7 sec multi_v7_defconfig ------------------ armada-xp-openblocks-ax3-4 FAIL: 0 min 19.9 sec armada-370-mirabox FAIL: 0 min 18.2 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 16.4 sec Console logs for failures ========================= multi_v7_defconfig ------------------ armada-xp-openblocks-ax3-4: FAIL: last 24 lines of boot log: ------------------------------------------------------------ [<c0013bcc>] (unwind_backtrace+0x0/0xf4) from [<c0011490>] (show_stack+0x10/0x14) [<c0011490>] (show_stack+0x10/0x14) from [<c0275c60>] (panic+0xa0/0x1e8) [<c0275c60>] (panic+0xa0/0x1e8) from [<c0329110>] (mount_block_root+0x294/0x298) [<c0329110>] (mount_block_root+0x294/0x298) from [<c03292c4>] (prepare_namespace+0x14c/0x184) [<c03292c4>] (prepare_namespace+0x14c/0x184) from [<c0328d60>] (kernel_init_freeable+0x1c8/0x1d8) [<c0328d60>] (kernel_init_freeable+0x1c8/0x1d8) from [<c02719c4>] (kernel_init+0x8/0x158) [<c02719c4>] (kernel_init+0x8/0x158) from [<c000df18>] (ret_from_fork+0x14/0x3c) CPU0: stopping CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.10.24 #1 [<c0013bcc>] (unwind_backtrace+0x0/0xf4) from [<c0011490>] (show_stack+0x10/0x14) [<c0011490>] (show_stack+0x10/0x14) from [<c001234c>] (handle_IPI+0x108/0x130) [<c001234c>] (handle_IPI+0x108/0x130) from [<c000851c>] (armada_370_xp_handle_irq+0x90/0xa8) [<c000851c>] (armada_370_xp_handle_irq+0x90/0xa8) from [<c000dac0>] (__irq_svc+0x40/0x50) Exception stack(0xc0359f70 to 0xc0359fb8) 9f60: c1d5b6d8 00000000 000000ba 000000ba 9f80: c03604a8 c0358000 c036045c c0383b6c c027deb0 c0358000 c0383b6c c0358000 9fa0: 0000001f c0359fb8 c000f070 c004f948 60000113 ffffffff [<c000dac0>] (__irq_svc+0x40/0x50) from [<c004f948>] (cpu_startup_entry+0xfc/0x140) [<c004f948>] (cpu_startup_entry+0xfc/0x140) from [<c0328a3c>] (start_kernel+0x2c4/0x2d0) [<c0328a3c>] (start_kernel+0x2c4/0x2d0) from [<00008074>] (0x8074) ~$off # PYBOOT: Exception: kernel: ERROR: failed to boot: Kernel panic # PYBOOT: Time: 19.95 seconds. # PYBOOT: Result: FAIL armada-370-mirabox: FAIL: last 24 lines of boot log: ---------------------------------------------------- mousedev: PS/2 mouse device common for all mice sdhci: Secure Digital Host Controller Interface driver sdhci: Copyright(c) Pierre Ossman sdhci-pltfm: SDHCI platform and OF driver helper usbcore: registered new interface driver usbhid usbhid: USB HID core driver VFP support v0.3: implementor 56 architecture 2 part 20 variant 9 rev 6 Registering SWP/SWPB emulation handler /home/build/work/batch/drivers/rtc/hctosys.c: unable to open rtc device (rtc0) List of all partitions: No filesystem could mount root, tried: Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.24 #1 [<c0013bcc>] (unwind_backtrace+0x0/0xf4) from [<c0011490>] (show_stack+0x10/0x14) [<c0011490>] (show_stack+0x10/0x14) from [<c0275c60>] (panic+0xa0/0x1e8) [<c0275c60>] (panic+0xa0/0x1e8) from [<c0329110>] (mount_block_root+0x294/0x298) [<c0329110>] (mount_block_root+0x294/0x298) from [<c03292c4>] (prepare_namespace+0x14c/0x184) [<c03292c4>] (prepare_namespace+0x14c/0x184) from [<c0328d60>] (kernel_init_freeable+0x1c8/0x1d8) [<c0328d60>] (kernel_init_freeable+0x1c8/0x1d8) from [<c02719c4>] (kernel_init+0x8/0x158) [<c02719c4>] (kernel_init+0x8/0x158) from [<c000df18>] (ret_from_fork+0x14/0x3c) ~$off # PYBOOT: Exception: kernel: ERROR: failed to boot: Kernel panic # PYBOOT: Time: 18.18 seconds. # PYBOOT: Result: FAIL

11 years, 5 months

[PATCH] mmc: sdhci-s3c: Check if clk_set_rate() succeeds

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> It is possible that we may fail to set the clock rate, if we do so then log the failure and don't bother reprogramming the IP. Signed-off-by: Mark Brown <broonie(a)linaro.org> Acked-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/host/sdhci-s3c.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 6debda952155..5c20f827d828 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -295,6 +295,7 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) struct device *dev = &ourhost->pdev->dev; unsigned long timeout; u16 clk = 0; + int ret; /* If the clock is going off, set to 0 at clock control register */ if (clock == 0) { @@ -305,7 +306,12 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) sdhci_s3c_set_clock(host, clock); - clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock); + ret = clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock); + if (ret != 0) { + dev_err(dev, "%s: failed to set clock rate %uHz\n", + mmc_hostname(host->mmc), clock); + return; + } host->clock = clock; -- 1.8.5.1

11 years, 5 months

queue boot: 30 pass, 0 fail (v3.12.5)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: queue Git describe: v3.12.5 Full Report =========== omap2plus_defconfig ------------------- am335x-boneblack PASS: 0 min 27.3 sec omap3-beagle-xm PASS: 0 min 50.3 sec am335x-bone PASS: 0 min 26.1 sec omap4-panda PASS: 1 min 6.5 sec omap4-panda-es PASS: 1 min 8.2 sec omap3-tobi,3730storm PASS: 0 min 23.8 sec omap3-tobi,3530overo PASS: 0 min 21.3 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.0 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 16.1 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.1 sec imx6q-wandboard PASS: 0 min 14.8 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 22.1 sec armada-370-mirabox PASS: 0 min 20.0 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 28.3 sec tegra30-beaver PASS: 0 min 16.9 sec am335x-boneblack PASS: 0 min 39.5 sec omap3-beagle-xm PASS: 0 min 50.9 sec sun7i-a20-cubieboard2 PASS: 0 min 13.0 sec armada-370-mirabox PASS: 0 min 20.6 sec omap4-panda PASS: 1 min 4.4 sec omap4-panda-es PASS: 1 min 3.3 sec armada-xp-openblocks-ax3-4 PASS: 0 min 22.7 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.3 sec am335x-bone PASS: 0 min 33.3 sec imx6q-wandboard PASS: 0 min 15.6 sec omap3-tobi,3730storm PASS: 0 min 22.4 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.6 sec omap3-tobi,3530overo PASS: 0 min 19.8 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 34.1 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.4 sec

11 years, 5 months

next boot: 31 pass, 0 fail (next-20131212)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: next Git describe: next-20131212 Full Report =========== omap2plus_defconfig ------------------- am335x-boneblack PASS: 0 min 28.0 sec omap3-beagle-xm PASS: 0 min 49.1 sec am335x-bone PASS: 0 min 26.8 sec omap4-panda PASS: 1 min 5.5 sec omap4-panda-es PASS: 0 min 59.0 sec omap3-tobi,3730storm PASS: 0 min 21.2 sec omap3-tobi,3530overo PASS: 0 min 22.0 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 16.9 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 16.9 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.5 sec imx6q-wandboard PASS: 0 min 16.7 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 12.2 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 22.1 sec armada-370-mirabox PASS: 0 min 20.2 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 32.6 sec tegra30-beaver PASS: 0 min 16.7 sec am335x-boneblack PASS: 0 min 24.8 sec omap3-beagle-xm PASS: 0 min 49.7 sec sun7i-a20-cubieboard2 PASS: 0 min 13.2 sec armada-370-mirabox PASS: 0 min 20.7 sec omap4-panda PASS: 1 min 0.6 sec omap4-panda-es PASS: 1 min 2.0 sec armada-xp-openblocks-ax3-4 PASS: 0 min 23.0 sec imx6dl-wandboard,wand-solo PASS: 0 min 16.6 sec am335x-bone PASS: 0 min 24.6 sec imx6q-wandboard PASS: 0 min 15.9 sec omap3-tobi,3730storm PASS: 0 min 22.8 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.9 sec omap3-tobi,3530overo PASS: 0 min 20.4 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 28.0 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.6 sec

11 years, 5 months

arm-soc boot: 31 pass, 0 fail (v3.13-rc3-254-g993aa5f)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: arm-soc Git describe: v3.13-rc3-254-g993aa5f Full Report =========== omap2plus_defconfig ------------------- am335x-boneblack PASS: 0 min 27.8 sec omap3-beagle-xm PASS: 0 min 52.3 sec am335x-bone PASS: 0 min 26.6 sec omap4-panda PASS: 1 min 4.5 sec omap4-panda-es PASS: 1 min 3.7 sec omap3-tobi,3730storm PASS: 0 min 24.1 sec omap3-tobi,3530overo PASS: 0 min 21.8 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 16.9 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 18.1 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.3 sec imx6q-wandboard PASS: 0 min 15.3 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 12.1 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 22.1 sec armada-370-mirabox PASS: 0 min 20.1 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 29.5 sec tegra30-beaver PASS: 0 min 17.3 sec am335x-boneblack PASS: 0 min 24.7 sec omap3-beagle-xm PASS: 0 min 51.4 sec sun7i-a20-cubieboard2 PASS: 0 min 13.1 sec armada-370-mirabox PASS: 0 min 20.7 sec omap4-panda PASS: 1 min 2.6 sec omap4-panda-es PASS: 1 min 4.2 sec armada-xp-openblocks-ax3-4 PASS: 0 min 22.9 sec imx6dl-wandboard,wand-solo PASS: 0 min 17.6 sec am335x-bone PASS: 0 min 23.4 sec imx6q-wandboard PASS: 0 min 16.8 sec omap3-tobi,3730storm PASS: 0 min 22.0 sec imx6dl-wandboard,wand-dual PASS: 0 min 16.9 sec omap3-tobi,3530overo PASS: 0 min 19.9 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 27.8 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.5 sec

11 years, 5 months

[PATCH V4] cpufreq: suspend governors on system suspend/hibernate

by Viresh Kumar

This patch adds cpufreq callbacks to dpm_{suspend|resume}_noirq() for handling suspend/resume of cpufreq governors. There are multiple problems that are fixed by this patch: - Nishanth Menon (TI) found an interesting problem on his platform, OMAP. His board wasn't working well with suspend/resume as calls for removing non-boot CPUs was turning out into a call to drivers ->target() which then tries to play with regulators. But regulators and their I2C bus were already suspended and this resulted in a failure. Many platforms have such problems, samsung, tegra, etc.. They solved it with driver specific PM notifiers where they used to disable their driver's ->target() routine. - Lan Tianyu (Intel) & Jinhyuk Choi (Broadcom) found another issue where tunables configuration for clusters/sockets with non-boot CPUs was getting lost after suspend/resume, as we were notifying governors with CPUFREQ_GOV_POLICY_EXIT on removal of the last cpu for that policy and so deallocating memory for tunables. This is also fixed with this patch as we don't allow any operation on Governors during suspend/resume now. Reported-and-tested-by: Lan Tianyu <tianyu.lan(a)intel.com> Reported-and-tested-by: Nishanth Menon <nm(a)ti.com> Reported-by: Jinhyuk Choi <jinchoi(a)broadcom.com> Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- This is almost same as 1/6 of V3 version of this patchset: https://lkml.org/lkml/2013/11/25/838 This is done to get some initial fixes for 3.13. These are already tested by both the reporters of initial problems. Tegra/exynos/s5p will keep running their PM notifiers until v3.14, as they are currently able to work with them.. drivers/base/power/main.c | 3 +++ drivers/cpufreq/cpufreq.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/cpufreq.h | 8 ++++++++ 3 files changed, 61 insertions(+) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 1b41fca..e3219df 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -29,6 +29,7 @@ #include <linux/async.h> #include <linux/suspend.h> #include <trace/events/power.h> +#include <linux/cpufreq.h> #include <linux/cpuidle.h> #include <linux/timer.h> @@ -540,6 +541,7 @@ static void dpm_resume_noirq(pm_message_t state) dpm_show_time(starttime, state, "noirq"); resume_device_irqs(); cpuidle_resume(); + cpufreq_resume(); } /** @@ -955,6 +957,7 @@ static int dpm_suspend_noirq(pm_message_t state) ktime_t starttime = ktime_get(); int error = 0; + cpufreq_suspend(); cpuidle_pause(); suspend_device_irqs(); mutex_lock(&dpm_list_mtx); diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 02d534d..b6c7821 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -26,6 +26,7 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/suspend.h> #include <linux/syscore_ops.h> #include <linux/tick.h> #include <trace/events/power.h> @@ -47,6 +48,9 @@ static LIST_HEAD(cpufreq_policy_list); static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor); #endif +/* Flag to suspend/resume CPUFreq governors */ +static bool cpufreq_suspended; + static inline bool has_target(void) { return cpufreq_driver->target_index || cpufreq_driver->target; @@ -1462,6 +1466,48 @@ static struct subsys_interface cpufreq_interface = { .remove_dev = cpufreq_remove_dev, }; +/* + * Callbacks for suspending/resuming governors as some platforms can't change + * frequency after this point in suspend cycle. Because some of the devices + * (like: i2c, regulators, etc) they use for changing frequency are suspended + * quickly after this point. + */ +void cpufreq_suspend(void) +{ + struct cpufreq_policy *policy; + + if (!has_target()) + return; + + pr_debug("%s: Suspending Governors\n", __func__); + + list_for_each_entry(policy, &cpufreq_policy_list, policy_list) + if (__cpufreq_governor(policy, CPUFREQ_GOV_STOP)) + pr_err("%s: Failed to stop governor for policy: %p\n", + __func__, policy); + + cpufreq_suspended = true; +} + +void cpufreq_resume(void) +{ + struct cpufreq_policy *policy; + + if (!has_target()) + return; + + pr_debug("%s: Resuming Governors\n", __func__); + + cpufreq_suspended = false; + + list_for_each_entry(policy, &cpufreq_policy_list, policy_list) + if (__cpufreq_governor(policy, CPUFREQ_GOV_START) || + __cpufreq_governor(policy, + CPUFREQ_GOV_LIMITS)) + pr_err("%s: Failed to start governor for policy: %p\n", + __func__, policy); +} + /** * cpufreq_bp_suspend - Prepare the boot CPU for system suspend. * @@ -1764,6 +1810,10 @@ static int __cpufreq_governor(struct cpufreq_policy *policy, struct cpufreq_governor *gov = NULL; #endif + /* Don't start any governor operations if we are entering suspend */ + if (cpufreq_suspended) + return 0; + if (policy->governor->max_transition_latency && policy->cpuinfo.transition_latency > policy->governor->max_transition_latency) { diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index dc196bb..ee5fe9d 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -280,6 +280,14 @@ cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy) policy->cpuinfo.max_freq); } +#ifdef CONFIG_CPU_FREQ +void cpufreq_suspend(void); +void cpufreq_resume(void); +#else +static inline void cpufreq_suspend(void) {} +static inline void cpufreq_resume(void) {} +#endif + /********************************************************************* * CPUFREQ NOTIFIER INTERFACE * *********************************************************************/ -- 1.7.12.rc2.18.g61b472e

11 years, 5 months

nohz_full left a periodic tick cpu issue

by Alex Shi

Hi Frederic, Sorry for idiot of nohz_full. When we using this feature on my mobile devices, we found this feature keep cpu0 in periodic tick mode. then the timer interrupt on cpu0 is very higher than normal nohz mode. that cause high power consuming cost. I found you have mention this on commit: a382bf934449 nohz: Assign timekeeping duty to a CPU outside the full dynticks range In fact, if all full dynticks cpu are in idle, cpu0 should be safe to get into idle too. Do you have some plan or idea to implement this? otherwise, power cost is too high to enable nohz_full in mobile platform. -- Thanks Alex

11 years, 5 months

arm-soc boot: 30 pass, 1 fail (v3.13-rc3-237-g72913fe)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: arm-soc Git describe: v3.13-rc3-237-g72913fe Failed boot tests (console logs at the end) =========================================== omap4-panda: FAIL: omap2plus_defconfig Full Report =========== omap2plus_defconfig ------------------- am335x-boneblack PASS: 0 min 27.8 sec omap3-beagle-xm PASS: 0 min 53.2 sec am335x-bone PASS: 0 min 26.6 sec omap4-panda FAIL: 2 min 57.1 sec omap4-panda-es PASS: 1 min 3.3 sec omap3-tobi,3730storm PASS: 0 min 21.0 sec omap3-tobi,3530overo PASS: 0 min 21.8 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 16.9 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 18.2 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.3 sec imx6q-wandboard PASS: 0 min 16.7 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 12.1 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 22.1 sec armada-370-mirabox PASS: 0 min 20.1 sec multi_v7_defconfig ------------------ ste-snowball PASS: 0 min 32.2 sec tegra30-beaver PASS: 0 min 16.5 sec am335x-boneblack PASS: 0 min 24.7 sec omap3-beagle-xm PASS: 0 min 50.5 sec sun7i-a20-cubieboard2 PASS: 0 min 13.0 sec armada-370-mirabox PASS: 0 min 20.7 sec omap4-panda PASS: 0 min 59.8 sec omap4-panda-es PASS: 1 min 2.8 sec armada-xp-openblocks-ax3-4 PASS: 0 min 22.8 sec imx6dl-wandboard,wand-solo PASS: 0 min 17.7 sec am335x-bone PASS: 0 min 23.4 sec imx6q-wandboard PASS: 0 min 16.8 sec omap3-tobi,3730storm PASS: 0 min 22.7 sec imx6dl-wandboard,wand-dual PASS: 0 min 17.8 sec omap3-tobi,3530overo PASS: 0 min 20.0 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 30.9 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.3 sec Console logs for failures ========================= omap2plus_defconfig ------------------- omap4-panda: FAIL: last 24 lines of boot log: --------------------------------------------- [ 2.380645] 4809c000.mmc supply vmmc_aux not found, using dummy regulator [ 2.390411] omap_hsmmc 4809c000.mmc: pins are not configured from the driver [ 2.450683] omap-dma-engine 4a056000.dma-controller: allocating channel for 60 [ 2.458435] omap-dma-engine 4a056000.dma-controller: allocating channel for 59 [ 2.466278] 480d5000.mmc supply vmmc_aux not found, using dummy regulator [ 2.548736] mmc0: host does not support reading read-only switch. assuming write-enable. [ 2.559631] mmc0: new high speed SD card at address f3c2 [ 2.566711] isa bounce pool size: 16 pages [ 2.572692] mmcblk0: mmc0:f3c2 SD02G 1.84 GiB [ 2.583648] mmcblk0: p1 p2 [ 2.683990] twl_rtc rtc.10: setting system clock to 2000-03-01 18:22:01 UTC (951934921) [ 18.105590] omap_uart 48020000.serial: no wakeirq for uart2 [ 19.404296] EXT4-fs (mmcblk0p2): recovery complete [ 19.417846] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [ 19.426422] VFS: Mounted root (ext4 filesystem) on device 179:2. [ 19.435058] devtmpfs: mounted [ 19.439147] Freeing unused kernel memory: 384K (c0780000 - c07e0000) [ 19.775482] random: init urandom read with 50 bits of entropy available [ 20.063049] init: ureadahead main process (811) terminated with status 5 [ 20.072723] omap_uart 48020000.serial: no wakeirq for uart2 ~$off # PYBOOT: Exception: userspace: ERROR: Never found root shell # PYBOOT: Time: 177.11 seconds. # PYBOOT: Result: FAIL

11 years, 5 months

[LSK PATCH] Revert "ARM: bL_switcher: Allow detachment of outstanding switch requests"

by Jon Medhurst (Tixy)

This reverts commit 4725d41daea7e0cc79b3fb92af012b8cb18fccff. This patch was dropped when the big.LITTLE switcher was submitted to the mainline kernel because it wasn't then being used and contained a logical flaw which meant it wouldn't have achieved what it was attempting to do anyway. It can also produce compilation warnings in certain configurations. --- arch/arm/common/bL_switcher.c | 32 -------------------------------- arch/arm/include/asm/bL_switcher.h | 6 ------ 2 files changed, 38 deletions(-) diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index 1883c5b..2193ae7 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c @@ -404,38 +404,6 @@ int bL_switch_request_cb(unsigned int cpu, unsigned int new_cluster_id, EXPORT_SYMBOL_GPL(bL_switch_request_cb); /* - * Detach an outstanding switch request. - * - * The switcher will continue with the switch request in the background, - * but the completer function will not be called. - * - * This may be necessary if the completer is in a kernel module which is - * about to be unloaded. - */ -void bL_switch_request_detach(unsigned int cpu, - bL_switch_completion_handler completer) -{ - struct bL_thread *t; - - if (cpu >= ARRAY_SIZE(bL_threads)) { - pr_err("%s: cpu %d out of bounds\n", __func__, cpu); - return; - } - - t = &bL_threads[cpu]; - - if (IS_ERR(t->task) || !t->task) - return; - - spin_lock(&t->lock); - if (t->completer == completer) - t->completer = NULL; - spin_unlock(&t->lock); -} - -EXPORT_SYMBOL_GPL(bL_switch_request_detach); - -/* * Activation and configuration code. */ diff --git a/arch/arm/include/asm/bL_switcher.h b/arch/arm/include/asm/bL_switcher.h index 482383b..87ebcbc 100644 --- a/arch/arm/include/asm/bL_switcher.h +++ b/arch/arm/include/asm/bL_switcher.h @@ -40,9 +40,6 @@ static inline int bL_switch_request(unsigned int cpu, unsigned int new_cluster_i #ifdef CONFIG_BL_SWITCHER -void bL_switch_request_detach(unsigned int cpu, - bL_switch_completion_handler completer); - int bL_switcher_register_notifier(struct notifier_block *nb); int bL_switcher_unregister_notifier(struct notifier_block *nb); @@ -61,9 +58,6 @@ int bL_switcher_trace_trigger(void); int bL_switcher_get_logical_index(u32 mpidr); #else -static void bL_switch_request_detach(unsigned int cpu, - bL_switch_completion_handler completer) { } - static inline int bL_switcher_register_notifier(struct notifier_block *nb) { return 0; -- 1.7.10.4

11 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel