UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/irq: Move check of cfg->move_in_progress into send_cleanup_vector() 

Move check of cfg->move_in_progress into send_cleanup_vector() to
prepare for simplifying struct irq_cfg.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Joerg Roedel <jroedel@suse.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: iommu@lists.linux-foundation.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Joerg Roedel <joro@8bytes.org>
Link: http://lkml.kernel.org/r/1428978610-28986-26-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jiang Liu 2015-04-14 10:30:02 +08:00 committed by Thomas Gleixner
parent 68f9f4404d
commit c6c2002b74
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/apic/vector.c
View File

@ -494,7 +494,7 @@ static struct irq_chip lapic_controller = {
}; };
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
void send_cleanup_vector(struct irq_cfg *cfg) static void __send_cleanup_vector(struct irq_cfg *cfg)
{ {
cpumask_var_t cleanup_mask; cpumask_var_t cleanup_mask;
@ -512,6 +512,12 @@ void send_cleanup_vector(struct irq_cfg *cfg)
cfg->move_in_progress = 0; cfg->move_in_progress = 0;
} }
void send_cleanup_vector(struct irq_cfg *cfg)
{
if (cfg->move_in_progress)
__send_cleanup_vector(cfg);
}
asmlinkage __visible void smp_irq_move_cleanup_interrupt(void) asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
{ {
unsigned vector, me; unsigned vector, me;
@ -582,7 +588,7 @@ static void __irq_complete_move(struct irq_cfg *cfg, unsigned vector)
me = smp_processor_id(); me = smp_processor_id();
if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain)) if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain))
send_cleanup_vector(cfg); __send_cleanup_vector(cfg);
} }
void irq_complete_move(struct irq_cfg *cfg) void irq_complete_move(struct irq_cfg *cfg)

1
arch/x86/platform/uv/uv_irq.c
View File

@ -63,7 +63,6 @@ uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
ret = parent->chip->irq_set_affinity(parent, mask, force); ret = parent->chip->irq_set_affinity(parent, mask, force);
if (ret >= 0) { if (ret >= 0) {
uv_program_mmr(cfg, data->chip_data); uv_program_mmr(cfg, data->chip_data);
if (cfg->move_in_progress)
send_cleanup_vector(cfg); send_cleanup_vector(cfg);
} }

1
drivers/iommu/amd_iommu.c
View File

@ -4327,7 +4327,6 @@ static int amd_ir_set_affinity(struct irq_data *data,
* at the new destination. So, time to cleanup the previous * at the new destination. So, time to cleanup the previous
* vector allocation. * vector allocation.
*/ */
if (cfg->move_in_progress)
send_cleanup_vector(cfg); send_cleanup_vector(cfg);
return IRQ_SET_MASK_OK_DONE; return IRQ_SET_MASK_OK_DONE;

1
drivers/iommu/intel_irq_remapping.c
View File

@ -1003,7 +1003,6 @@ intel_ir_set_affinity(struct irq_data *data, const struct cpumask *mask,
* at the new destination. So, time to cleanup the previous * at the new destination. So, time to cleanup the previous
* vector allocation. * vector allocation.
*/ */
if (cfg->move_in_progress)
send_cleanup_vector(cfg); send_cleanup_vector(cfg);
return IRQ_SET_MASK_OK_DONE; return IRQ_SET_MASK_OK_DONE;