aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/io_apic.c
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2014-10-27 04:11:57 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-12-16 08:08:16 -0500
commitcb39288cd6c6dfd0e87c6e161d9da1ec6974f4b8 (patch)
treed4c0972b2e81c849249a753cd5187e86df609653 /arch/x86/kernel/apic/io_apic.c
parent26011eee04f7144a4bcb150386b43e6e881f8fa1 (diff)
x86, irq: Rename local APIC related functions in io_apic.c as apic_xxx()
Rename local APIC related functions in io_apic.c as apic_xxx() instead of ioapic_xxx(), later they will be moved into separate file. Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Grant Likely <grant.likely@linaro.org> Link: http://lkml.kernel.org/r/1414397531-28254-7-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r--arch/x86/kernel/apic/io_apic.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 11978401d0cb..4d871339ba4f 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2252,7 +2252,7 @@ static unsigned int startup_ioapic_irq(struct irq_data *data)
2252 return was_pending; 2252 return was_pending;
2253} 2253}
2254 2254
2255static int ioapic_retrigger_irq(struct irq_data *data) 2255static int apic_retrigger_irq(struct irq_data *data)
2256{ 2256{
2257 struct irq_cfg *cfg = data->chip_data; 2257 struct irq_cfg *cfg = data->chip_data;
2258 unsigned long flags; 2258 unsigned long flags;
@@ -2407,8 +2407,8 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, struct irq
2407 * ->cpu_mask_to_apicid of that in dest_id, or returns -1 and 2407 * ->cpu_mask_to_apicid of that in dest_id, or returns -1 and
2408 * leaves data->affinity untouched. 2408 * leaves data->affinity untouched.
2409 */ 2409 */
2410int __ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask, 2410int apic_set_affinity(struct irq_data *data, const struct cpumask *mask,
2411 unsigned int *dest_id) 2411 unsigned int *dest_id)
2412{ 2412{
2413 struct irq_cfg *cfg = data->chip_data; 2413 struct irq_cfg *cfg = data->chip_data;
2414 unsigned int irq = data->irq; 2414 unsigned int irq = data->irq;
@@ -2449,7 +2449,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
2449 return -EPERM; 2449 return -EPERM;
2450 2450
2451 raw_spin_lock_irqsave(&ioapic_lock, flags); 2451 raw_spin_lock_irqsave(&ioapic_lock, flags);
2452 ret = __ioapic_set_affinity(data, mask, &dest); 2452 ret = apic_set_affinity(data, mask, &dest);
2453 if (!ret) { 2453 if (!ret) {
2454 /* Only the high 8 bits are valid. */ 2454 /* Only the high 8 bits are valid. */
2455 dest = SET_APIC_LOGICAL_ID(dest); 2455 dest = SET_APIC_LOGICAL_ID(dest);
@@ -2460,7 +2460,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
2460 return ret; 2460 return ret;
2461} 2461}
2462 2462
2463static void ack_apic_edge(struct irq_data *data) 2463static void apic_ack_edge(struct irq_data *data)
2464{ 2464{
2465 irq_complete_move(data->chip_data); 2465 irq_complete_move(data->chip_data);
2466 irq_move_irq(data); 2466 irq_move_irq(data);
@@ -2549,7 +2549,7 @@ static inline void ioapic_irqd_unmask(struct irq_data *data,
2549} 2549}
2550#endif 2550#endif
2551 2551
2552static void ack_apic_level(struct irq_data *data) 2552static void ack_ioapic_level(struct irq_data *data)
2553{ 2553{
2554 struct irq_cfg *cfg = data->chip_data; 2554 struct irq_cfg *cfg = data->chip_data;
2555 int i, irq = data->irq; 2555 int i, irq = data->irq;
@@ -2621,10 +2621,10 @@ static struct irq_chip ioapic_chip __read_mostly = {
2621 .irq_startup = startup_ioapic_irq, 2621 .irq_startup = startup_ioapic_irq,
2622 .irq_mask = mask_ioapic_irq, 2622 .irq_mask = mask_ioapic_irq,
2623 .irq_unmask = unmask_ioapic_irq, 2623 .irq_unmask = unmask_ioapic_irq,
2624 .irq_ack = ack_apic_edge, 2624 .irq_ack = apic_ack_edge,
2625 .irq_eoi = ack_apic_level, 2625 .irq_eoi = ack_ioapic_level,
2626 .irq_set_affinity = native_ioapic_set_affinity, 2626 .irq_set_affinity = native_ioapic_set_affinity,
2627 .irq_retrigger = ioapic_retrigger_irq, 2627 .irq_retrigger = apic_retrigger_irq,
2628 .flags = IRQCHIP_SKIP_SET_WAKE, 2628 .flags = IRQCHIP_SKIP_SET_WAKE,
2629}; 2629};
2630 2630
@@ -3159,7 +3159,7 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
3159 unsigned int dest; 3159 unsigned int dest;
3160 int ret; 3160 int ret;
3161 3161
3162 ret = __ioapic_set_affinity(data, mask, &dest); 3162 ret = apic_set_affinity(data, mask, &dest);
3163 if (ret) 3163 if (ret)
3164 return ret; 3164 return ret;
3165 3165
@@ -3183,9 +3183,9 @@ static struct irq_chip msi_chip = {
3183 .name = "PCI-MSI", 3183 .name = "PCI-MSI",
3184 .irq_unmask = pci_msi_unmask_irq, 3184 .irq_unmask = pci_msi_unmask_irq,
3185 .irq_mask = pci_msi_mask_irq, 3185 .irq_mask = pci_msi_mask_irq,
3186 .irq_ack = ack_apic_edge, 3186 .irq_ack = apic_ack_edge,
3187 .irq_set_affinity = msi_set_affinity, 3187 .irq_set_affinity = msi_set_affinity,
3188 .irq_retrigger = ioapic_retrigger_irq, 3188 .irq_retrigger = apic_retrigger_irq,
3189 .flags = IRQCHIP_SKIP_SET_WAKE, 3189 .flags = IRQCHIP_SKIP_SET_WAKE,
3190}; 3190};
3191 3191
@@ -3261,7 +3261,7 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,
3261 struct msi_msg msg; 3261 struct msi_msg msg;
3262 int ret; 3262 int ret;
3263 3263
3264 ret = __ioapic_set_affinity(data, mask, &dest); 3264 ret = apic_set_affinity(data, mask, &dest);
3265 if (ret) 3265 if (ret)
3266 return ret; 3266 return ret;
3267 3267
@@ -3282,9 +3282,9 @@ static struct irq_chip dmar_msi_type = {
3282 .name = "DMAR_MSI", 3282 .name = "DMAR_MSI",
3283 .irq_unmask = dmar_msi_unmask, 3283 .irq_unmask = dmar_msi_unmask,
3284 .irq_mask = dmar_msi_mask, 3284 .irq_mask = dmar_msi_mask,
3285 .irq_ack = ack_apic_edge, 3285 .irq_ack = apic_ack_edge,
3286 .irq_set_affinity = dmar_msi_set_affinity, 3286 .irq_set_affinity = dmar_msi_set_affinity,
3287 .irq_retrigger = ioapic_retrigger_irq, 3287 .irq_retrigger = apic_retrigger_irq,
3288 .flags = IRQCHIP_SKIP_SET_WAKE, 3288 .flags = IRQCHIP_SKIP_SET_WAKE,
3289}; 3289};
3290 3290
@@ -3313,7 +3313,7 @@ static int hpet_msi_set_affinity(struct irq_data *data,
3313 unsigned int dest; 3313 unsigned int dest;
3314 int ret; 3314 int ret;
3315 3315
3316 ret = __ioapic_set_affinity(data, mask, &dest); 3316 ret = apic_set_affinity(data, mask, &dest);
3317 if (ret) 3317 if (ret)
3318 return ret; 3318 return ret;
3319 3319
@@ -3333,9 +3333,9 @@ static struct irq_chip hpet_msi_type = {
3333 .name = "HPET_MSI", 3333 .name = "HPET_MSI",
3334 .irq_unmask = hpet_msi_unmask, 3334 .irq_unmask = hpet_msi_unmask,
3335 .irq_mask = hpet_msi_mask, 3335 .irq_mask = hpet_msi_mask,
3336 .irq_ack = ack_apic_edge, 3336 .irq_ack = apic_ack_edge,
3337 .irq_set_affinity = hpet_msi_set_affinity, 3337 .irq_set_affinity = hpet_msi_set_affinity,
3338 .irq_retrigger = ioapic_retrigger_irq, 3338 .irq_retrigger = apic_retrigger_irq,
3339 .flags = IRQCHIP_SKIP_SET_WAKE, 3339 .flags = IRQCHIP_SKIP_SET_WAKE,
3340}; 3340};
3341 3341
@@ -3385,7 +3385,7 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
3385 unsigned int dest; 3385 unsigned int dest;
3386 int ret; 3386 int ret;
3387 3387
3388 ret = __ioapic_set_affinity(data, mask, &dest); 3388 ret = apic_set_affinity(data, mask, &dest);
3389 if (ret) 3389 if (ret)
3390 return ret; 3390 return ret;
3391 3391
@@ -3397,9 +3397,9 @@ static struct irq_chip ht_irq_chip = {
3397 .name = "PCI-HT", 3397 .name = "PCI-HT",
3398 .irq_mask = mask_ht_irq, 3398 .irq_mask = mask_ht_irq,
3399 .irq_unmask = unmask_ht_irq, 3399 .irq_unmask = unmask_ht_irq,
3400 .irq_ack = ack_apic_edge, 3400 .irq_ack = apic_ack_edge,
3401 .irq_set_affinity = ht_set_affinity, 3401 .irq_set_affinity = ht_set_affinity,
3402 .irq_retrigger = ioapic_retrigger_irq, 3402 .irq_retrigger = apic_retrigger_irq,
3403 .flags = IRQCHIP_SKIP_SET_WAKE, 3403 .flags = IRQCHIP_SKIP_SET_WAKE,
3404}; 3404};
3405 3405