linaro-kernel March 2014

linaro-kernel@lists.linaro.org

86 participants
221 discussions

[RFC 0/6] rework sched_domain topology description

by Vincent Guittot

This patchset was previously part of the larger tasks packing patchset [1]. I have splitted the latter in 3 different patchsets (at least) to make the thing easier. -configuration of sched_domain topology (this patchset) -update and consolidation of cpu_power -tasks packing algorithm Based on Peter Z's proposal [2][3], this patchset modifies the way to configure the sched_domain level in order to let architectures to add specific level like the current BOOK level or the proposed power gating level for ARM architecture. [1] https://lkml.org/lkml/2013/10/18/121 [2] https://lkml.org/lkml/2013/11/5/239 [3] https://lkml.org/lkml/2013/11/5/449 Vincent Guittot (6): sched: remove unused SCHED_INIT_NODE sched: rework of sched_domain topology definition sched: s390: create a dedicated topology table sched: powerpc: create a dedicated topology table sched: add a new SD_SHARE_POWERDOMAIN for sched_domain sched: ARM: create a dedicated scheduler topology table arch/arm/kernel/topology.c | 26 ++++ arch/ia64/include/asm/topology.h | 24 ---- arch/metag/include/asm/topology.h | 27 ----- arch/powerpc/kernel/smp.c | 35 ++++-- arch/s390/include/asm/topology.h | 13 +- arch/s390/kernel/topology.c | 25 ++++ arch/tile/include/asm/topology.h | 33 ------ include/linux/sched.h | 30 +++++ include/linux/topology.h | 128 ++------------------ kernel/sched/core.c | 235 ++++++++++++++++++------------------- 10 files changed, 237 insertions(+), 339 deletions(-) -- 1.7.9.5

10 years, 3 months

[PATCH 0/5] aarch64 BE kvm support

by Victor Kamensky

Hi Guys, Here is series that enable KVM in V8 BE image. It is addition on top of previously posted V7 BE KVM support [1]. It was tested on aarch64 fastmodels and APM mustang board. It was tested only with kvmtool at this point. In case of V8 BE KVM host was tested that V8 BE guest runs fine and V8 LE guest runs too. Also V8 LE KVM regression was tested on both V8 LE guest and V8 BE guest. Note for mixed mode Marc's kvmtool was used and guest image had minor change that treats all virtio in LE form. Note first two patches are similar to V7 BE KVM patches. Last three are new specific for V8 image. Thanks, Victor [1] https://lists.cs.columbia.edu/pipermail/kvmarm/2014-February/009446.html Victor Kamensky (5): ARM64: KVM: MMIO support BE host running LE code ARM64: KVM: set and get of sys registers in BE case ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word ARM64: KVM: vgic_elrsr and vgic_eisr need to by byteswapped in BE case ARM64: KVM: fix vgic_bitmap_get_reg function for BE 64bit case arch/arm64/include/asm/kvm_emulate.h | 22 ++++++++++++++++++++ arch/arm64/kvm/hyp.S | 9 ++++++++- arch/arm64/kvm/sys_regs.c | 39 ++++++++++++++++++++++++++++++------ virt/kvm/arm/vgic.c | 27 +++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 9 deletions(-) -- 1.8.1.4 Thanks, Victor

10 years, 3 months

mainline boot: 48 pass, 0 fail (v3.14-rc7-33-g8878439)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: mainline Git describe: v3.14-rc7-33-g8878439 Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 15.7 sec legacy,da850evm PASS: 0 min 14.7 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 57.6 sec am335x-boneblack PASS: 0 min 26.4 sec omap3-beagle-xm PASS: 1 min 5.7 sec legacy,3530beagle PASS: 0 min 46.5 sec omap4-panda PASS: 1 min 5.2 sec omap3-overo-tobi PASS: 0 min 23.3 sec am335x-bone PASS: 0 min 27.8 sec omap3-overo-storm-tobi PASS: 0 min 25.4 sec omap5-uevm PASS: 0 min 59.4 sec omap4-panda-es PASS: 1 min 7.6 sec legacy,3730storm PASS: 0 min 23.9 sec legacy,3530overo PASS: 0 min 24.5 sec multi_lpae_defconfig -------------------- omap5-uevm PASS: 1 min 52.6 sec sun7i-a20-cubieboard2 PASS: 0 min 14.7 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 17.1 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 19.0 sec imx6dl-wandboard,wand-solo PASS: 0 min 19.1 sec imx6q-wandboard PASS: 0 min 17.5 sec msm_defconfig ------------- qcom-apq8074-dragonboard PASS: 1 min 4.2 sec bcm_defconfig ------------- bcm28155-ap PASS: 0 min 58.7 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 16.7 sec sun4i-a10-cubieboard PASS: 0 min 13.3 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 30.0 sec multi_v7_defconfig ------------------ ste-snowball PASS: 1 min 18.3 sec tegra30-beaver PASS: 0 min 20.0 sec am335x-boneblack PASS: 0 min 23.9 sec omap3-beagle-xm PASS: 0 min 57.8 sec sun7i-a20-cubieboard2 PASS: 0 min 14.7 sec armada-370-mirabox PASS: 0 min 22.1 sec omap4-panda PASS: 0 min 54.1 sec armada-xp-openblocks-ax3-4 PASS: 0 min 24.9 sec sun4i-a10-cubieboard PASS: 0 min 14.5 sec bcm28155-ap PASS: 1 min 9.4 sec omap3-overo-tobi PASS: 0 min 21.7 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.4 sec am335x-bone PASS: 0 min 26.4 sec omap3-overo-storm-tobi PASS: 0 min 21.3 sec omap5-uevm PASS: 1 min 55.5 sec imx6q-wandboard PASS: 0 min 17.6 sec omap4-panda-es PASS: 0 min 54.2 sec imx6dl-wandboard,wand-dual PASS: 0 min 19.0 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 32.4 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.1 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 17.3 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 21.9 sec armada-370-mirabox PASS: 0 min 20.2 sec

10 years, 3 months

[PATCH 1/2] timer: check failure of timer_cpu_notify() before calling init_timer_stats()

by Viresh Kumar

timer_cpu_notify() should return NOTIFY_OK and nothing else. Anything else would trigger a BUG_ON(). Return value of this routine is already checked correctly but is done after issuing a call to init_timer_stats(). The right order would be to check the error case first and then call init_timer_stats(). Lets do it. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- kernel/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/timer.c b/kernel/timer.c index f64a98c..e8e7839 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1674,9 +1674,9 @@ void __init init_timers(void) err = timer_cpu_notify(&timers_nb, (unsigned long)CPU_UP_PREPARE, (void *)(long)smp_processor_id()); - init_timer_stats(); - BUG_ON(err != NOTIFY_OK); + + init_timer_stats(); register_cpu_notifier(&timers_nb); open_softirq(TIMER_SOFTIRQ, run_timer_softirq); } -- 1.7.12.rc2.18.g61b472e

10 years, 3 months

mainline boot: 48 pass, 0 fail (v3.14-rc7-28-gea1cd65)

by Kevin's boot bot

Automated DT boot report for various ARM defconfigs. Tree/Branch: mainline Git describe: v3.14-rc7-28-gea1cd65 Full Report =========== da8xx_omapl_defconfig --------------------- da850-evm PASS: 0 min 15.7 sec legacy,da850evm PASS: 0 min 14.7 sec omap2plus_defconfig ------------------- legacy,3730xm PASS: 0 min 48.3 sec am335x-boneblack PASS: 0 min 26.0 sec omap3-beagle-xm PASS: 0 min 57.4 sec legacy,3530beagle PASS: 0 min 36.3 sec omap4-panda PASS: 1 min 10.7 sec omap3-overo-tobi PASS: 0 min 23.8 sec am335x-bone PASS: 0 min 27.9 sec omap3-overo-storm-tobi PASS: 0 min 25.1 sec omap5-uevm PASS: 1 min 4.7 sec omap4-panda-es PASS: 1 min 4.8 sec legacy,3730storm PASS: 0 min 21.2 sec legacy,3530overo PASS: 0 min 21.7 sec multi_lpae_defconfig -------------------- omap5-uevm PASS: 1 min 48.8 sec sun7i-a20-cubieboard2 PASS: 0 min 14.6 sec tegra_defconfig --------------- tegra30-beaver PASS: 0 min 20.8 sec imx_v6_v7_defconfig ------------------- imx6dl-wandboard,wand-dual PASS: 0 min 19.1 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.9 sec imx6q-wandboard PASS: 0 min 17.4 sec msm_defconfig ------------- qcom-apq8074-dragonboard PASS: 1 min 4.1 sec bcm_defconfig ------------- bcm28155-ap PASS: 1 min 14.5 sec sunxi_defconfig --------------- sun7i-a20-cubieboard2 PASS: 0 min 13.3 sec sun4i-a10-cubieboard PASS: 0 min 16.2 sec exynos_defconfig ---------------- exynos5250-arndale PASS: 0 min 30.3 sec multi_v7_defconfig ------------------ ste-snowball PASS: 1 min 17.6 sec tegra30-beaver PASS: 0 min 19.7 sec am335x-boneblack PASS: 0 min 23.9 sec omap3-beagle-xm PASS: 0 min 51.5 sec sun7i-a20-cubieboard2 PASS: 0 min 14.4 sec armada-370-mirabox PASS: 0 min 22.0 sec omap4-panda PASS: 0 min 58.1 sec armada-xp-openblocks-ax3-4 PASS: 0 min 24.9 sec sun4i-a10-cubieboard PASS: 0 min 14.3 sec bcm28155-ap PASS: 1 min 9.2 sec omap3-overo-tobi PASS: 0 min 21.9 sec imx6dl-wandboard,wand-solo PASS: 0 min 18.8 sec am335x-bone PASS: 0 min 26.5 sec omap3-overo-storm-tobi PASS: 0 min 24.8 sec omap5-uevm PASS: 1 min 47.8 sec imx6q-wandboard PASS: 0 min 17.6 sec omap4-panda-es PASS: 0 min 57.6 sec imx6dl-wandboard,wand-dual PASS: 0 min 18.7 sec u8500_defconfig --------------- ste-snowball PASS: 0 min 34.6 sec sama5_defconfig --------------- sama5d35ek PASS: 0 min 17.1 sec davinci_all_defconfig --------------------- legacy,dm365evm PASS: 0 min 17.1 sec mvebu_defconfig --------------- armada-xp-openblocks-ax3-4 PASS: 0 min 22.2 sec armada-370-mirabox PASS: 0 min 20.1 sec

10 years, 3 months

[PATCH 1/3] arm64: topology: Add support for topology DT bindings

by Mark Brown

From: Mark Brown <broonie(a)linaro.org> Add support for parsing the explicit topology bindings to discover the topology of the system. Since it is not currently clear how to map multi-level clusters for the scheduler all leaf clusters are presented to the scheduler at the same level. This should be enough to provide good support for current systems. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- This revision of the patch changes the parsing code to error out on any failures it detects and discard any information already obtained, reverting to the default flat topology. arch/arm64/kernel/topology.c | 172 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 167 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 3e06b0b..8e0f29a 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -17,10 +17,161 @@ #include <linux/percpu.h> #include <linux/node.h> #include <linux/nodemask.h> +#include <linux/of.h> #include <linux/sched.h> #include <asm/topology.h> +#ifdef CONFIG_OF +static int __init get_cpu_for_node(struct device_node *node) +{ + struct device_node *cpu_node; + int cpu; + + cpu_node = of_parse_phandle(node, "cpu", 0); + if (!cpu_node) + return -1; + + for_each_possible_cpu(cpu) { + if (of_get_cpu_node(cpu, NULL) == cpu_node) + return cpu; + } + + pr_crit("Unable to find CPU node for %s\n", cpu_node->full_name); + return -1; +} + +static int __init parse_core(struct device_node *core, int cluster_id, + int core_id) +{ + char name[10]; + bool leaf = true; + int i = 0; + int cpu; + struct device_node *t; + + do { + snprintf(name, sizeof(name), "thread%d", i); + t = of_get_child_by_name(core, name); + if (t) { + leaf = false; + cpu = get_cpu_for_node(t); + if (cpu >= 0) { + cpu_topology[cpu].cluster_id = cluster_id; + cpu_topology[cpu].core_id = core_id; + cpu_topology[cpu].thread_id = i; + } else { + pr_err("%s: Can't get CPU for thread\n", + t->full_name); + return -EINVAL; + } + } + i++; + } while (t); + + cpu = get_cpu_for_node(core); + if (cpu >= 0) { + if (!leaf) { + pr_err("%s: Core has both threads and CPU\n", + core->full_name); + return -EINVAL; + } + + cpu_topology[cpu].cluster_id = cluster_id; + cpu_topology[cpu].core_id = core_id; + } else if (leaf) { + pr_err("%s: Can't get CPU for leaf core\n", core->full_name); + return -EINVAL; + } + + return 0; +} + +static int __init parse_cluster(struct device_node *cluster, int depth) +{ + char name[10]; + bool leaf = true; + bool has_cores = false; + struct device_node *c; + static int __initdata cluster_id; + int core_id = 0; + int i, ret; + + /* + * First check for child clusters; we currently ignore any + * information about the nesting of clusters and present the + * scheduler with a flat list of them. + */ + i = 0; + do { + snprintf(name, sizeof(name), "cluster%d", i); + c = of_get_child_by_name(cluster, name); + if (c) { + parse_cluster(c, depth + 1); + leaf = false; + } + i++; + } while (c); + + /* Now check for cores */ + i = 0; + do { + snprintf(name, sizeof(name), "core%d", i); + c = of_get_child_by_name(cluster, name); + if (c) { + has_cores = true; + + if (depth == 0) + pr_err("%s: cpu-map children should be clusters\n", + c->full_name); + + if (leaf) { + ret = parse_core(c, cluster_id, core_id++); + if (ret != 0) { + return ret; + } + } else { + pr_err("%s: Non-leaf cluster with core %s\n", + cluster->full_name, name); + return -EINVAL; + } + } + i++; + } while (c); + + if (leaf && !has_cores) + pr_warn("%s: empty cluster\n", cluster->full_name); + + if (leaf) + cluster_id++; + + return 0; +} + +static int __init parse_dt_topology(void) +{ + struct device_node *cn; + + cn = of_find_node_by_path("/cpus"); + if (!cn) { + pr_err("No CPU information found in DT\n"); + return 0; + } + + /* + * When topology is provided cpu-map is essentially a root + * cluster with restricted subnodes. + */ + cn = of_get_child_by_name(cn, "cpu-map"); + if (!cn) + return 0; + return parse_cluster(cn, 0); +} + +#else +static inline int parse_dt_topology(void) { return 0; } +#endif + /* * cpu topology table */ @@ -74,11 +225,7 @@ void store_cpu_topology(unsigned int cpuid) update_siblings_masks(cpuid); } -/* - * 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) +static void __init reset_cpu_topology(void) { unsigned int cpu; @@ -93,3 +240,18 @@ void __init init_cpu_topology(void) cpumask_clear(&cpu_topo->thread_sibling); } } + +/* + * 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) +{ + int ret; + + reset_cpu_topology(); + + ret = parse_dt_topology(); + if (ret != 0) + reset_cpu_topology(); +} -- 1.9.0

10 years, 3 months

[PATCH v2 0/7] rework sched_domain topology description

by Vincent Guittot

This patchset was previously part of the larger tasks packing patchset [1]. I have splitted the latter in 3 different patchsets (at least) to make the thing easier. -configuration of sched_domain topology (this patchset) -update and consolidation of cpu_power -tasks packing algorithm Based on Peter Z's proposal [2][3], this patchset modifies the way to configure the sched_domain level in order to let architectures to add specific level like the current BOOK level or the proposed power gating level for ARM architecture. [1] https://lkml.org/lkml/2013/10/18/121 [2] https://lkml.org/lkml/2013/11/5/239 [3] https://lkml.org/lkml/2013/11/5/449 Change since v1: - move sched_domains_curr_level back under #ifdef CONFIG_NUMA - use function pointer to set flag instead of a plain value. - add list of tunable flags in the commit message of patch 2 - add SD_SHARE_POWER_DOMAIN flag for powerpc's SMT level Vincent Guittot (7): sched: remove unused SCHED_INIT_NODE sched: rework of sched_domain topology definition sched: s390: create a dedicated topology table sched: powerpc: create a dedicated topology table sched: add a new SD_SHARE_POWERDOMAIN for sched_domain sched: ARM: create a dedicated scheduler topology table sched: powerpc: Add SD_SHARE_POWERDOMAIN for SMT level arch/arm/kernel/topology.c | 26 ++++ arch/ia64/include/asm/topology.h | 24 ---- arch/metag/include/asm/topology.h | 27 ----- arch/powerpc/kernel/smp.c | 31 +++-- arch/s390/include/asm/topology.h | 13 +- arch/s390/kernel/topology.c | 20 ++++ arch/tile/include/asm/topology.h | 33 ------ include/linux/sched.h | 49 +++++++- include/linux/topology.h | 128 ++------------------ kernel/sched/core.c | 243 +++++++++++++++++++------------------- 10 files changed, 254 insertions(+), 340 deletions(-) -- 1.9.0

10 years, 3 months

[PATCH] cpufreq: remove unused notifier: CPUFREQ_{SUSPENDCHANGE|RESUMECHANGE}

by Viresh Kumar

Two cpufreq notifiers CPUFREQ_RESUMECHANGE and CPUFREQ_SUSPENDCHANGE were unused since sometime. And so better remove them to clean code a bit. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- Documentation/cpu-freq/core.txt | 4 ---- arch/arm/kernel/smp.c | 3 +-- arch/arm/kernel/smp_twd.c | 2 +- arch/arm/mach-pxa/viper.c | 3 --- arch/powerpc/oprofile/op_model_cell.c | 3 +-- arch/sparc/kernel/time_64.c | 3 +-- arch/x86/kernel/tsc.c | 3 +-- drivers/cpufreq/cpufreq.c | 3 +-- drivers/pcmcia/sa11xx_base.c | 3 --- drivers/tty/serial/sh-sci.c | 3 +-- include/linux/cpufreq.h | 2 -- 11 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Documentation/cpu-freq/core.txt b/Documentation/cpu-freq/core.txt index ce0666e..0060d76 100644 --- a/Documentation/cpu-freq/core.txt +++ b/Documentation/cpu-freq/core.txt @@ -92,7 +92,3 @@ values: cpu - number of the affected CPU old - old frequency new - new frequency - -If the cpufreq core detects the frequency has changed while the system -was suspended, these notifiers are called with CPUFREQ_RESUMECHANGE as -second argument. diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index b7b4c86..7c4fada 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -674,8 +674,7 @@ static int cpufreq_callback(struct notifier_block *nb, } if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || - (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || - (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) { + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { loops_per_jiffy = cpufreq_scale(global_l_p_j_ref, global_l_p_j_ref_freq, freq->new); diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 6591e26..dfc3213 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -166,7 +166,7 @@ static int twd_cpufreq_transition(struct notifier_block *nb, * frequency. The timer is local to a cpu, so cross-call to the * changing cpu. */ - if (state == CPUFREQ_POSTCHANGE || state == CPUFREQ_RESUMECHANGE) + if (state == CPUFREQ_POSTCHANGE) smp_call_function_single(freqs->cpu, twd_update_frequency, NULL, 1); diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 29905b1..41f27f6 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c @@ -885,9 +885,6 @@ static int viper_cpufreq_notifier(struct notifier_block *nb, viper_set_core_cpu_voltage(freq->new, 0); } break; - case CPUFREQ_RESUMECHANGE: - viper_set_core_cpu_voltage(freq->new, 0); - break; default: /* ignore */ break; diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index 1f0ebde..863d893 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c @@ -1121,8 +1121,7 @@ oprof_cpufreq_notify(struct notifier_block *nb, unsigned long val, void *data) int ret = 0; struct cpufreq_freqs *frq = data; if ((val == CPUFREQ_PRECHANGE && frq->old < frq->new) || - (val == CPUFREQ_POSTCHANGE && frq->old > frq->new) || - (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) + (val == CPUFREQ_POSTCHANGE && frq->old > frq->new)) set_spu_profiling_frequency(frq->new, spu_cycle_reset); return ret; } diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index c3d82b5..b397e05 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c @@ -659,8 +659,7 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val ft->clock_tick_ref = cpu_data(cpu).clock_tick; } if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || - (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || - (val == CPUFREQ_RESUMECHANGE)) { + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { cpu_data(cpu).clock_tick = cpufreq_scale(ft->clock_tick_ref, ft->ref_freq, diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index cfbe99f..7a9296a 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -914,8 +914,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, tsc_khz_ref = tsc_khz; } if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || - (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || - (val == CPUFREQ_RESUMECHANGE)) { + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { *lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new); tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq->new); diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index bf7f9c2..d0f0b7b 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -264,8 +264,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) pr_debug("saving %lu as reference value for loops_per_jiffy; freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq); } - if ((val == CPUFREQ_POSTCHANGE && ci->old != ci->new) || - (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) { + if (val == CPUFREQ_POSTCHANGE && ci->old != ci->new) { loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq, ci->new); pr_debug("scaling loops_per_jiffy to %lu for frequency %u kHz\n", diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 6eecd7c..54d3089 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c @@ -125,9 +125,6 @@ sa1100_pcmcia_frequency_change(struct soc_pcmcia_socket *skt, if (freqs->new < freqs->old) sa1100_pcmcia_set_mecr(skt, freqs->new); break; - case CPUFREQ_RESUMECHANGE: - sa1100_pcmcia_set_mecr(skt, freqs->new); - break; } return 0; diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index be33d2b..7e0b626 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1041,8 +1041,7 @@ static int sci_notifier(struct notifier_block *self, sci_port = container_of(self, struct sci_port, freq_transition); - if ((phase == CPUFREQ_POSTCHANGE) || - (phase == CPUFREQ_RESUMECHANGE)) { + if (phase == CPUFREQ_POSTCHANGE) { struct uart_port *port = &sci_port->port; spin_lock_irqsave(&port->lock, flags); diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index e5cebce..4c3bcdc 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -320,8 +320,6 @@ static inline void cpufreq_resume(void) {} /* Transition notifiers */ #define CPUFREQ_PRECHANGE (0) #define CPUFREQ_POSTCHANGE (1) -#define CPUFREQ_RESUMECHANGE (8) -#define CPUFREQ_SUSPENDCHANGE (9) /* Policy Notifiers */ #define CPUFREQ_ADJUST (0) -- 1.7.12.rc2.18.g61b472e

10 years, 3 months

[PATCH v4 00/10] In-kernel PSCI v0.2 emulation for KVM ARM/ARM64

by Anup Patel

Currently, KVM ARM/ARM64 only provides in-kernel emulation of Power State and Coordination Interface (PSCI) v0.1. This patchset aims at providing newer PSCI v0.2 for KVM ARM/ARM64 VCPUs such that it does not break current KVM ARM/ARM64 ABI. Also, the patchset provides emulation of only few PSCI v0.2 functions such as PSCI_VERSION, CPU_ON, and CPU_OFF. Emulation of other PSCI v0.2 functions will be added later. The user space tools (i.e. QEMU or KVMTOOL) will have to explicitly enable KVM_ARM_VCPU_PSCI_0_2 feature using KVM_ARM_VCPU_INIT ioctl for providing PSCI v0.2 to VCPUs. Changlog: V4: - Implement all mandatory functions required by PSCI v0.2 V3: - Make KVM_ARM_VCPU_PSCI_0_2 feature experiementatl for now so that it fails for user space till all mandatory PSCI v0.2 functions are emulated by KVM ARM/ARM64 - Have separate patch for making KVM_ARM_VCPU_PSCI_0_2 feature available to user space. This patch can be defferred for now V2: - Don't rename PSCI return values KVM_PSCI_RET_NI and KVM_PSCI_RET_INVAL - Added kvm_psci_version() to get PSCI version available to VCPU - Fixed grammer in Documentation/virtual/kvm/api.txt V1: - Initial RFC PATCH Anup Patel (10): KVM: Add capability to advertise PSCI v0.2 support ARM/ARM64: KVM: Add base for PSCI v0.2 emulation KVM: Documentation: Add info regarding KVM_ARM_VCPU_PSCI_0_2 feature ARM/ARM64: KVM: Make kvm_psci_call() return convention more flexible KVM: Add KVM_EXIT_SYSTEM_EVENT to user space API header ARM/ARM64: KVM: Emulate PSCI v0.2 SYSTEM_OFF and SYSTEM_RESET ARM/ARM64: KVM: Emulate PSCI v0.2 AFFINITY_INFO ARM/ARM64: KVM: Emulate PSCI v0.2 MIGRATE_INFO_TYPE and related functions ARM/ARM64: KVM: Fix CPU_ON emulation for PSCI v0.2 ARM/ARM64: KVM: Emulate PSCI v0.2 CPU_SUSPEND Documentation/virtual/kvm/api.txt | 17 +++ arch/arm/include/asm/kvm_host.h | 7 +- arch/arm/include/asm/kvm_psci.h | 7 +- arch/arm/include/uapi/asm/kvm.h | 35 ++++- arch/arm/kvm/arm.c | 1 + arch/arm/kvm/handle_exit.c | 10 +- arch/arm/kvm/psci.c | 270 ++++++++++++++++++++++++++++++++++--- arch/arm/kvm/reset.c | 4 + arch/arm64/include/asm/kvm_host.h | 7 +- arch/arm64/include/asm/kvm_psci.h | 7 +- arch/arm64/include/uapi/asm/kvm.h | 35 ++++- arch/arm64/kvm/handle_exit.c | 10 +- arch/arm64/kvm/reset.c | 4 + include/uapi/linux/kvm.h | 9 ++ 14 files changed, 395 insertions(+), 28 deletions(-) -- 1.7.9.5

10 years, 3 months

[PATCH] hrtimer: rearrange comments in the order struct members are declared

by Viresh Kumar

Rearrange kernel doc comments in the order members of struct hrtimer are declared. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- include/linux/hrtimer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index d19a5c2..e7a8d3f 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -96,12 +96,12 @@ enum hrtimer_restart { * @function: timer expiry callback function * @base: pointer to the timer base (per cpu and per clock) * @state: state information (See bit values above) + * @start_pid: timer statistics field to store the pid of the task which + * started the timer * @start_site: timer statistics field to store the site where the timer * was started * @start_comm: timer statistics field to store the name of the process which * started the timer - * @start_pid: timer statistics field to store the pid of the task which - * started the timer * * The hrtimer structure must be initialized by hrtimer_init() */ -- 1.7.12.rc2.18.g61b472e

10 years, 3 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel March 2014