linaro-kernel

linaro-kernel@lists.linaro.org

10094 discussions

Fwd: unhandled level 1 translation fault

by Aparna Mandke

Hi, I am using linaro 13.03 image with ARMv8 fast model. I am getting following "unhandled level 1 translation fault" exception while executing a test. Is it a known problem? Does anybody know its solution? Thanks, Aparna [[ 364.733273] jsc[834]: unhandled level 1 translation fault (11) at 0xffffffff874c0120, esr 0x92000005 [ 364.733356] pgd = ffffffc87d22b000 [ 364.733421] [ffffffff874c0120] *pgd=00000008ffeb9003, *pmd=00000008fe78f003, *pte=00a00008fbd74f53 [ 364.733573] [ 364.733631] Pid: 834, comm: jsc [ 364.733716] CPU: 0 Not tainted (3.9.0-1-linaro-vexpress64 #1ubuntu1~ci+130320041336) [ 364.733796] PC is at 0x4f69d4 [ 364.733860] LR is at 0x44cdec [ 364.733933] pc : [<00000000004f69d4>] lr : [<000000000044cdec>] pstate: 60000000 [ 364.734008] sp : 0000007ff1c891f0 [ 364.734070] x29: 0000007ff1c891f0 x28: 0000000000000000 [ 364.734188] x27: 0000007ff1c89db8 x26: 00000000005258a0 [ 364.734308] x25: 0000007f89342fa8 x24: 0000007f874c00c0 [ 364.734428] x23: 0000007ff1c89900 x22: 000000003f66ea48 [ 364.734548] x21: 0000007f89342e00 x20: 0000007f8933a4b0 [ 364.734669] x19: ffffffff874c0100 x18: 0000007ff1c899a0 [ 364.734789] x17: 0000007f8a2ac7d4 x16: 00000000005827b8 [ 364.734908] x15: 0000007f8a0ca590 x14: 0000000000000000 [ 364.735026] x13: 000000000000001f x12: 0000000000000000 [ 364.735144] x11: 0000000000000000 x10: 0000007f89345420 [ 364.735262] x9 : 000000000000000f x8 : 000000000000000f [ 364.735378] x7 : 000000000000000f x6 : 0000007f89353ca0 [ 364.735498] x5 : 0000007f893433e8 x4 : 0000007f89353cc0 [ 364.735618] x3 : 0000007f89353c40 x2 : 0000000000000003 [ 364.735735] x1 : 000000003f66ea48 x0 : 0000000000000000 [ 364.735845]

12 years

[PATCH V3] PM / devfreq: tie suspend/resume to runtime-pm

by Rajagopal Venkat

Devfreq core runtime suspend/resume of a device is explicitly handled by devfreq driver using devfreq_suspend_device() and devfreq_resume_device() apis typically called from runtime suspend/resume callbacks. This patch aims to take away this from devfreq drivers and handle it from runtime-pm core. So that devfreq core runtime suspend/resume of a device is automatically done with runtime pm suspend/resume. The devfreq drivers shouldn't be concerned on when to suspend/resume the devfreq. This patch is targeted to handle devfreq core load monitoring runtime suspend/resume only. Not the actual hardware itself. All the resources like clocks and regulators must still be handled by device driver using runtime-pm. The sequence of devfreq and device runtime suspend/resume is, pm_runtime_suspend(dev) will first suspend device devfreq (if available) before device is suspended to ensure devfreq load monitoring is stopped and no device resources like clocks are accessed while device suspend is in progress. pm_runtime_resume(dev) will resume device devfreq(if available) after device is resumed to ensure device resources like clocks are ready for use. As devfreq runtime suspend/resume is done automatically from runtime core, this patch removes the existing devfreq_suspend_device() and devfreq_resume_device() apis. Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> ---- Changes from V2: Updated change log to clarify patch deals with runtime suspend/resume Changes from v1: Improved change log and code comments Added NULL check for devfreq runtime-pm callbacks --- drivers/base/power/runtime.c | 21 ++++++++++++- drivers/devfreq/devfreq.c | 69 +++++++++++++++++++++++++++++++++++++++--- include/linux/devfreq.h | 18 +++-------- include/linux/pm.h | 2 ++ 4 files changed, 91 insertions(+), 19 deletions(-) diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 3148b10..2438abc 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -11,6 +11,7 @@ #include <linux/export.h> #include <linux/pm_runtime.h> #include <trace/events/rpm.h> +#include <linux/devfreq.h> #include "power.h" static int rpm_resume(struct device *dev, int rpmflags); @@ -406,6 +407,14 @@ static int rpm_suspend(struct device *dev, int rpmflags) __update_runtime_status(dev, RPM_SUSPENDING); + /* + * Try suspending devfreq before device is runtime suspended. + * It wouldn't make sense to continue devfreq load monitoring + * when device is runtime suspended. + */ + if (dev->power.devfreq && dev->power.devfreq->runtime_suspend) + dev->power.devfreq->runtime_suspend(dev); + if (dev->pm_domain) callback = dev->pm_domain->ops.runtime_suspend; else if (dev->type && dev->type->pm) @@ -421,8 +430,12 @@ static int rpm_suspend(struct device *dev, int rpmflags) callback = dev->driver->pm->runtime_suspend; retval = rpm_callback(callback, dev); - if (retval) + if (retval) { + /* Resume back devfreq on device suspend failure */ + if (dev->power.devfreq && dev->power.devfreq->runtime_resume) + dev->power.devfreq->runtime_resume(dev); goto fail; + } no_callback: __update_runtime_status(dev, RPM_SUSPENDED); @@ -661,6 +674,12 @@ static int rpm_resume(struct device *dev, int rpmflags) __update_runtime_status(dev, RPM_ACTIVE); if (parent) atomic_inc(&parent->power.child_count); + /* + * Resume devfreq after runtime resume sequence to ensure + * device resources are available for devfreq load monitoring. + */ + if (dev->power.devfreq && dev->power.devfreq->runtime_resume) + dev->power.devfreq->runtime_resume(dev); } wake_up_all(&dev->power.wait_queue); diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 44c4079..b8dab0d 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -25,6 +25,7 @@ #include <linux/list.h> #include <linux/printk.h> #include <linux/hrtimer.h> +#include <linux/pm_runtime.h> #include "governor.h" static struct class *devfreq_class; @@ -42,6 +43,9 @@ static LIST_HEAD(devfreq_governor_list); static LIST_HEAD(devfreq_list); static DEFINE_MUTEX(devfreq_list_lock); +static void devfreq_runtime_suspend(struct device *dev); +static void devfreq_runtime_resume(struct device *dev); + /** * find_device_devfreq() - find devfreq struct using device pointer * @dev: device pointer used to lookup device devfreq. @@ -387,6 +391,8 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type, */ static void _remove_devfreq(struct devfreq *devfreq, bool skip) { + unsigned long flags; + mutex_lock(&devfreq_list_lock); if (IS_ERR(find_device_devfreq(devfreq->dev.parent))) { mutex_unlock(&devfreq_list_lock); @@ -400,6 +406,10 @@ static void _remove_devfreq(struct devfreq *devfreq, bool skip) devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_STOP, NULL); + spin_lock_irqsave(&devfreq->dev.parent->power.lock, flags); + devfreq->dev.parent->power.devfreq = NULL; + spin_unlock_irqrestore(&devfreq->dev.parent->power.lock, flags); + if (devfreq->profile->exit) devfreq->profile->exit(devfreq->dev.parent); @@ -442,6 +452,7 @@ struct devfreq *devfreq_add_device(struct device *dev, { struct devfreq *devfreq; struct devfreq_governor *governor; + unsigned long flags; int err = 0; if (!dev || !profile || !governor_name) { @@ -476,6 +487,12 @@ struct devfreq *devfreq_add_device(struct device *dev, devfreq->previous_freq = profile->initial_freq; devfreq->data = data; devfreq->nb.notifier_call = devfreq_notifier_call; + devfreq->runtime_suspend = devfreq_runtime_suspend; + devfreq->runtime_resume = devfreq_runtime_resume; + spin_lock_irqsave(&dev->power.lock, flags); + dev->power.devfreq = devfreq; + spin_unlock_irqrestore(&dev->power.lock, flags); + devfreq->trans_table = devm_kzalloc(dev, sizeof(unsigned int) * devfreq->profile->max_state * @@ -549,7 +566,7 @@ EXPORT_SYMBOL(devfreq_remove_device); * (e.g., runtime_suspend, suspend) of the device driver that * holds the devfreq. */ -int devfreq_suspend_device(struct devfreq *devfreq) +static int devfreq_suspend_device(struct devfreq *devfreq) { if (!devfreq) return -EINVAL; @@ -560,7 +577,6 @@ int devfreq_suspend_device(struct devfreq *devfreq) return devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_SUSPEND, NULL); } -EXPORT_SYMBOL(devfreq_suspend_device); /** * devfreq_resume_device() - Resume devfreq of a device. @@ -570,7 +586,7 @@ EXPORT_SYMBOL(devfreq_suspend_device); * (e.g., runtime_resume, resume) of the device driver that * holds the devfreq. */ -int devfreq_resume_device(struct devfreq *devfreq) +static int devfreq_resume_device(struct devfreq *devfreq) { if (!devfreq) return -EINVAL; @@ -581,7 +597,52 @@ int devfreq_resume_device(struct devfreq *devfreq) return devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_RESUME, NULL); } -EXPORT_SYMBOL(devfreq_resume_device); + +/** + * devfreq_runtime_suspend() - Suspend devfreq of a device. + * @dev: the device associated with devfreq + * + * This function is intended to be called by the runtime-pm + * core when the device associated with devfreq is + * runtime suspended. + */ +static void devfreq_runtime_suspend(struct device *dev) +{ + struct devfreq *devfreq; + int err; + + mutex_lock(&devfreq_list_lock); + devfreq = find_device_devfreq(dev); + mutex_unlock(&devfreq_list_lock); + + err = devfreq_suspend_device(devfreq); + if (err) + dev_err(dev, "devfreq runtime suspend failed with (%d) error\n", + err); +} + +/** + * devfreq_runtime_resume() - Resume devfreq of a device. + * @dev: the device associated with devfreq + * + * This function is intended to be called by the runtime-pm + * core when the device associated with devfreq is + * runtime resumed. + */ +static void devfreq_runtime_resume(struct device *dev) +{ + struct devfreq *devfreq; + int err; + + mutex_lock(&devfreq_list_lock); + devfreq = find_device_devfreq(dev); + mutex_unlock(&devfreq_list_lock); + + err = devfreq_resume_device(devfreq); + if (err) + dev_err(dev, "devfreq runtime resume failed with (%d) error\n", + err); +} /** * devfreq_add_governor() - Add devfreq governor diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 5f1ab92..669368b 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -140,6 +140,8 @@ struct devfreq_governor { * @trans_table: Statistics of devfreq transitions * @time_in_state: Statistics of devfreq states * @last_stat_updated: The last time stat updated + * @runtime_suspend: func to runtime suspend devfreq from runtime core + * @runtime_resume: func to runtime resume devfreq from runtime core * * This structure stores the devfreq information for a give device. * @@ -173,6 +175,8 @@ struct devfreq { unsigned int *trans_table; unsigned long *time_in_state; unsigned long last_stat_updated; + void (*runtime_suspend)(struct device *dev); + void (*runtime_resume)(struct device *dev); }; #if defined(CONFIG_PM_DEVFREQ) @@ -182,10 +186,6 @@ extern struct devfreq *devfreq_add_device(struct device *dev, void *data); extern int devfreq_remove_device(struct devfreq *devfreq); -/* Supposed to be called by PM_SLEEP/PM_RUNTIME callbacks */ -extern int devfreq_suspend_device(struct devfreq *devfreq); -extern int devfreq_resume_device(struct devfreq *devfreq); - /* Helper functions for devfreq user device driver with OPP. */ extern struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, u32 flags); @@ -228,16 +228,6 @@ static inline int devfreq_remove_device(struct devfreq *devfreq) return 0; } -static inline int devfreq_suspend_device(struct devfreq *devfreq) -{ - return 0; -} - -static inline int devfreq_resume_device(struct devfreq *devfreq) -{ - return 0; -} - static inline struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, u32 flags) { diff --git a/include/linux/pm.h b/include/linux/pm.h index 03d7bb1..734449c 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -40,6 +40,7 @@ extern void (*pm_power_off_prepare)(void); */ struct device; +struct devfreq; #ifdef CONFIG_PM extern const char power_group_name[]; /* = "power" */ @@ -549,6 +550,7 @@ struct dev_pm_info { #endif struct pm_subsys_data *subsys_data; /* Owned by the subsystem. */ struct dev_pm_qos *qos; + struct devfreq *devfreq; /* device devfreq */ }; extern void update_pm_runtime_accounting(struct device *dev); -- 1.7.10.4

12 years

The Linaro IKS code now publicly available

by Nicolas Pitre

I'm delighted to announce that the Linaro Technical Steering Committee has approved the release of the big.LITTLE in-kernel switcher (IKS) code to the public. So here it is: Branch big.LITTLE-IKS-snapshot of git://git.linaro.org/landing-teams/working/arm/kernel.git Although this is a snapshot of our latest IKS code, it still needs some minor tidying before it is submitted upstream. So please consider the above as a temporary branch for people to look and play with, and not a branch that we'll keep stable and maintain. This code was also developed for and tested on the VExpress TC2 development platform. An MCPM backend and possibly a special cpufreq clock driver are required for this code to be usable on other platforms. The switcher concept is discussed here: http://lwn.net/Articles/481055/ Porting documentation is available here: https://wiki.linaro.org/projects/big.LITTLE.MP/Big.Little.Switcher/Docs/por… The switcher code description is available here (slightly out of date): https://wiki.linaro.org/projects/big.LITTLE.MP/Big.Little.Switcher/Docs/in-… And a review of the MCPM layer upon which IKS and HMP rely: http://lwn.net/Articles/539082/ The core MCPM patches are queued for inclusion into the v3.10 mainline kernel. The MCPM backend for TC2 and the IKS patches will tentatively be submitted for v3.11. Nicolas

12 years

[ACTIVITY] (Linus Walleij) 2013-04-29 - 2013-05-04

by Linus Walleij

== Linus Walleij linusw == === Highlights === * Sent a pull request to Torvalds for the v3.10 pinctrl bundle. Sent another request for two fixes on top of it. All pulled into mainline. * The GPIO tree exploded and will be held back for this merge window. Root-causing with Grant so as to make sure it won't happen again. (Cross-tree dependencies caused this. Partly my fault.) * Started to apply DMA40 patches from Lee on a specific DMA40 branch targeted for ARM SoC. Awaiting some ACKs and complaining as I go along. * Started to queue Ux500 device tree patches on another branch. * Iterated U300 DT patches and sent a multiplatform series on top of it. Will round it off with a series moving the clocks to the DT as a final step. === Plans === * On vacation until 9/5 i.e. I'm off this coming week. (Will be watching the merge window for any major disasters.) * Stack fixes for the -rc series. * Finalize U300 patch set. * Finalize Integrator PCI patch set, then start to delete board files and convert to multiplatform. * Convert Nomadik pinctrl driver to register GPIO ranges from the gpiochip side. * Test the PL08x patches on the Ericsson Research PB11MPCore and submit platform data for using pl08x DMA on that platform. * Get hands dirty with regmap. === Issues === * N/A Thanks, Linus Walleij

12 years

[ACTIVITY] (John Stultz) April 29-May 3

by John Stultz

=== Highlights === * Reworked a good chunk of the volatile range patch set, addressing issues from lsf-mm, and making required interface changes. Sent patches to Minchan for review. * Reviewed tglx's clocksource unregister patches * Pinged Keith Packard on his blog post related to userland sync w/ X to see if there was much overlap with Android sync. * Discussed Android/entropy security issue w/ Ted Tso * Reviewed Zoran's patchset prior to it going to lkml * Reviewed blueprints and sent out weekly mail summary * Helped with 13.05 Engineering Update * Worked on LPC Android minisummit planning * Synced with Mathieu on keyreset planning === Plans === * Address remapping issue in volatile ranges patchset * Unify volatile range purging logic in volatile ranges patchset * Send volatile ranges to lkml * More LPC minisummit planning * Hopefully a chance for ION research === Issues === * NA

12 years

[PATCH V2] cpufreq: cpu0: Free parent node for error cases

by Viresh Kumar

12 years

[PATCH 0/5] CPUFreq: ARM big LITTLE Fixes

by Viresh Kumar

Hi Rafael, I know I am late for this merge window and you have already closed the gates :) If you can still take them, its good, otherwise we will push this for v3.10-rc2. These are minor fixes for ARM big LITTLE cpufreq driver. It doesn't impact any other driver or cpufreq core and are fairly independent. Viresh Kumar (5): cpufreq: ARM big LITTLE: Select PM_OPP cpufreq: ARM big LITTLE DT: Return correct transition latency cpufreq: ARM big LITTLE DT: Return CPUFREQ_ETERNAL if clock-latency isn't found cpufreq: ARM big LITTLE: Move cpu_to_cluster() to arm_big_little.h cpufreq: ARM big LITTLE: Improve print message drivers/cpufreq/Kconfig.arm | 1 + drivers/cpufreq/arm_big_little.c | 7 +------ drivers/cpufreq/arm_big_little.h | 5 +++++ drivers/cpufreq/arm_big_little_dt.c | 9 +++++---- 4 files changed, 12 insertions(+), 10 deletions(-) -- 1.7.12.rc2.18.g61b472e

12 years

[PATCH 0/2] CPUFreq core fixes for v3.10-rc2

by Viresh Kumar

I just saw your pull request and so these should go in rc2 now. These are fixes for cpufreq core and common governor part. They mostly impact systems which have set have_governor_per_policy to true. i.e. big LITTLE cpufreq driver. Viresh Kumar (2): cpufreq: governors: Fix CPUFREQ_GOV_POLICY_{INIT|EXIT} notifiers cpufreq: Issue CPUFREQ_GOV_POLICY_EXIT notifier before dropping policy refcount drivers/cpufreq/cpufreq.c | 6 +++--- drivers/cpufreq/cpufreq_governor.c | 11 +++++++---- drivers/cpufreq/cpufreq_governor.h | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) -- 1.7.12.rc2.18.g61b472e

12 years

[PATCH] cpufreq: cpu0: Free parent node for error cases

by Viresh Kumar

We are freeing parent node in success cases but not in failure cases. Lets do it. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- drivers/cpufreq/cpufreq-cpu0.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index 3ab8294..c025714 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c @@ -189,7 +189,8 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) if (!np) { pr_err("failed to find cpu0 node\n"); - return -ENOENT; + ret = -ENOENT; + goto out_put_parent; } cpu_dev = &pdev->dev; @@ -199,7 +200,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) if (IS_ERR(cpu_clk)) { ret = PTR_ERR(cpu_clk); pr_err("failed to get cpu0 clock: %d\n", ret); - goto out_put_node; + goto out_put_np; } cpu_reg = devm_regulator_get(cpu_dev, "cpu0"); @@ -211,13 +212,13 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) ret = of_init_opp_table(cpu_dev); if (ret) { pr_err("failed to init OPP table: %d\n", ret); - goto out_put_node; + goto out_put_np; } ret = opp_init_cpufreq_table(cpu_dev, &freq_table); if (ret) { pr_err("failed to init cpufreq table: %d\n", ret); - goto out_put_node; + goto out_put_np; } of_property_read_u32(np, "voltage-tolerance", &voltage_tolerance); @@ -262,8 +263,10 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) out_free_table: opp_free_cpufreq_table(cpu_dev, &freq_table); -out_put_node: +out_put_np: of_node_put(np); +out_put_parent: + of_node_put(parent); return ret; } -- 1.7.12.rc2.18.g61b472e

12 years

[PATCH V3] ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq

by Anup Patel

The arch_timer irq numbers (or PPI numbers) are implementation dependent, so the host virtual timer irq number can be different from guest virtual timer irq number. This patch ensures that host virtual timer irq number is read from DTB and guest virtual timer irq is determined based on vcpu target type. Signed-off-by: Anup Patel <anup.patel(a)linaro.org> Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar(a)linaro.org> --- arch/arm/include/asm/kvm_arch_timer.h | 4 ++++ arch/arm/kvm/arch_timer.c | 29 ++++++++++++++++++++--------- arch/arm/kvm/reset.c | 11 +++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/kvm_arch_timer.h b/arch/arm/include/asm/kvm_arch_timer.h index 68cb9e1..eeb2a3f 100644 --- a/arch/arm/include/asm/kvm_arch_timer.h +++ b/arch/arm/include/asm/kvm_arch_timer.h @@ -61,6 +61,8 @@ struct arch_timer_cpu { #ifdef CONFIG_KVM_ARM_TIMER int kvm_timer_hyp_init(void); int kvm_timer_init(struct kvm *kvm); +void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, + const struct kvm_irq_level *irq); void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu); void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu); void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu); @@ -76,6 +78,8 @@ static inline int kvm_timer_init(struct kvm *kvm) return 0; } +static inline void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, + const struct kvm_irq_level *irq) {} static inline void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) {} static inline void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) {} static inline void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) {} diff --git a/arch/arm/kvm/arch_timer.c b/arch/arm/kvm/arch_timer.c index 49a7516..5826437 100644 --- a/arch/arm/kvm/arch_timer.c +++ b/arch/arm/kvm/arch_timer.c @@ -30,9 +30,7 @@ static struct timecounter *timecounter; static struct workqueue_struct *wqueue; -static struct kvm_irq_level timer_irq = { - .level = 1, -}; +static unsigned int host_vtimer_irq; static cycle_t kvm_phys_timer_read(void) { @@ -67,8 +65,8 @@ static void kvm_timer_inject_irq(struct kvm_vcpu *vcpu) timer->cntv_ctl |= ARCH_TIMER_CTRL_IT_MASK; kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id, - vcpu->arch.timer_cpu.irq->irq, - vcpu->arch.timer_cpu.irq->level); + timer->irq->irq, + timer->irq->level); } static irqreturn_t kvm_arch_timer_handler(int irq, void *dev_id) @@ -156,6 +154,20 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) timer_arm(timer, ns); } +void kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, + const struct kvm_irq_level *irq) +{ + struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; + + /* + * The vcpu timer irq number cannot be determined in + * kvm_timer_vcpu_init() because it is called much before + * kvm_vcpu_set_target(). To handle this, we determine + * vcpu timer irq number when the vcpu is reset. + */ + timer->irq = irq; +} + void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) { struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; @@ -163,12 +175,11 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) INIT_WORK(&timer->expired, kvm_timer_inject_irq_work); hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); timer->timer.function = kvm_timer_expire; - timer->irq = &timer_irq; } static void kvm_timer_init_interrupt(void *info) { - enable_percpu_irq(timer_irq.irq, 0); + enable_percpu_irq(host_vtimer_irq, 0); } @@ -182,7 +193,7 @@ static int kvm_timer_cpu_notify(struct notifier_block *self, break; case CPU_DYING: case CPU_DYING_FROZEN: - disable_percpu_irq(timer_irq.irq); + disable_percpu_irq(host_vtimer_irq); break; } @@ -230,7 +241,7 @@ int kvm_timer_hyp_init(void) goto out; } - timer_irq.irq = ppi; + host_vtimer_irq = ppi; err = register_cpu_notifier(&kvm_timer_cpu_nb); if (err) { diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c index b80256b..0b49ad7 100644 --- a/arch/arm/kvm/reset.c +++ b/arch/arm/kvm/reset.c @@ -26,6 +26,7 @@ #include <asm/cputype.h> #include <asm/kvm_arm.h> #include <asm/kvm_coproc.h> +#include <asm/kvm_arch_timer.h> /****************************************************************************** * Cortex-A15 Reset Values @@ -37,6 +38,11 @@ static struct kvm_regs a15_regs_reset = { .usr_regs.ARM_cpsr = SVC_MODE | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT, }; +static const struct kvm_irq_level a15_vtimer_irq = { + .irq = 27, + .level = 1, +}; + /******************************************************************************* * Exported reset function @@ -52,6 +58,7 @@ static struct kvm_regs a15_regs_reset = { int kvm_reset_vcpu(struct kvm_vcpu *vcpu) { struct kvm_regs *cpu_reset; + const struct kvm_irq_level *cpu_vtimer_irq; switch (vcpu->arch.target) { case KVM_ARM_TARGET_CORTEX_A15: @@ -59,6 +66,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) return -EINVAL; cpu_reset = &a15_regs_reset; vcpu->arch.midr = read_cpuid_id(); + cpu_vtimer_irq = &a15_vtimer_irq; break; default: return -ENODEV; @@ -70,5 +78,8 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) /* Reset CP15 registers */ kvm_reset_coprocs(vcpu); + /* Reset arch_timer context */ + kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq); + return 0; } -- 1.7.9.5

12 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel