diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 15:41:30 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 15:41:30 +0200 |
commit | a6c761e44cfdeffc31785c698aa04d310e7cd686 (patch) | |
tree | f97b73d8f6cc57a3e900d2d868fe6d071fd72e48 /kernel | |
parent | 939ef66848ea2b069d938146332fe07e8b6c84af (diff) | |
parent | 0a4377de305684c883bf90ad21e3cbdeead70f5c (diff) | |
download | linux-stable-a6c761e44cfdeffc31785c698aa04d310e7cd686.tar.gz linux-stable-a6c761e44cfdeffc31785c698aa04d310e7cd686.tar.bz2 linux-stable-a6c761e44cfdeffc31785c698aa04d310e7cd686.zip |
Merge branch 'irq/for-x86' into irq/core
Pull in the branch which can be consumed by x86 to build their changes
on top.
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/chip.c | 14 | ||||
-rw-r--r-- | kernel/irq/manage.c | 31 |
2 files changed, 45 insertions, 0 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 2456fe89719c..330fc797e632 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -978,6 +978,20 @@ int irq_chip_retrigger_hierarchy(struct irq_data *data) } /** + * irq_chip_set_vcpu_affinity_parent - Set vcpu affinity on the parent interrupt + * @data: Pointer to interrupt specific data + * @dest: The vcpu affinity information + */ +int irq_chip_set_vcpu_affinity_parent(struct irq_data *data, void *vcpu_info) +{ + data = data->parent_data; + if (data->chip->irq_set_vcpu_affinity) + return data->chip->irq_set_vcpu_affinity(data, vcpu_info); + + return -ENOSYS; +} + +/** * irq_chip_set_wake_parent - Set/reset wake-up on the parent interrupt * @data: Pointer to interrupt specific data * @on: Whether to set or reset the wake-up capability of this irq diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index e68932bb308e..b1c7e8f46bfb 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -256,6 +256,37 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) } EXPORT_SYMBOL_GPL(irq_set_affinity_hint); +/** + * irq_set_vcpu_affinity - Set vcpu affinity for the interrupt + * @irq: interrupt number to set affinity + * @vcpu_info: vCPU specific data + * + * This function uses the vCPU specific data to set the vCPU + * affinity for an irq. The vCPU specific data is passed from + * outside, such as KVM. One example code path is as below: + * KVM -> IOMMU -> irq_set_vcpu_affinity(). + */ +int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info) +{ + unsigned long flags; + struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0); + struct irq_data *data; + struct irq_chip *chip; + int ret = -ENOSYS; + + if (!desc) + return -EINVAL; + + data = irq_desc_get_irq_data(desc); + chip = irq_data_get_irq_chip(data); + if (chip && chip->irq_set_vcpu_affinity) + ret = chip->irq_set_vcpu_affinity(data, vcpu_info); + irq_put_desc_unlock(desc, flags); + + return ret; +} +EXPORT_SYMBOL_GPL(irq_set_vcpu_affinity); + static void irq_affinity_notify(struct work_struct *work) { struct irq_affinity_notify *notify = |