Skip to content

Commit f8542a5

Browse files
KAGA-KOKOhansendc
authored andcommitted
x86/apic: Turn on static calls
Convert all the APIC callback inline wrappers from apic->foo() to static_call(apic_call_foo)(), except for the safe_wait_icr_idle() one which is only used during SMP bringup when sending INIT/SIPI. That really can do the conditional callback. The regular wait_icr_idle() matters as it is used in irq_work_raise(), so X2APIC machines spare the conditional. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest) Tested-by: Michael Kelley <mikelley@microsoft.com> Tested-by: Sohil Mehta <sohil.mehta@intel.com>
1 parent 3b7c27e commit f8542a5

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

arch/x86/include/asm/apic.h

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -394,68 +394,67 @@ DECLARE_APIC_CALL(write);
394394

395395
static __always_inline u32 apic_read(u32 reg)
396396
{
397-
return apic->read(reg);
397+
return static_call(apic_call_read)(reg);
398398
}
399399

400400
static __always_inline void apic_write(u32 reg, u32 val)
401401
{
402-
apic->write(reg, val);
402+
static_call(apic_call_write)(reg, val);
403403
}
404404

405405
static __always_inline void apic_eoi(void)
406406
{
407-
apic->eoi();
407+
static_call(apic_call_eoi)();
408408
}
409409

410410
static __always_inline void apic_native_eoi(void)
411411
{
412-
apic->native_eoi();
412+
static_call(apic_call_native_eoi)();
413413
}
414414

415415
static __always_inline u64 apic_icr_read(void)
416416
{
417-
return apic->icr_read();
417+
return static_call(apic_call_icr_read)();
418418
}
419419

420420
static __always_inline void apic_icr_write(u32 low, u32 high)
421421
{
422-
apic->icr_write(low, high);
422+
static_call(apic_call_icr_write)(low, high);
423423
}
424424

425425
static __always_inline void __apic_send_IPI(int cpu, int vector)
426426
{
427-
apic->send_IPI(cpu, vector);
427+
static_call(apic_call_send_IPI)(cpu, vector);
428428
}
429429

430430
static __always_inline void __apic_send_IPI_mask(const struct cpumask *mask, int vector)
431431
{
432-
apic->send_IPI_mask(mask, vector);
432+
static_call_mod(apic_call_send_IPI_mask)(mask, vector);
433433
}
434434

435435
static __always_inline void __apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector)
436436
{
437-
apic->send_IPI_mask_allbutself(mask, vector);
437+
static_call(apic_call_send_IPI_mask_allbutself)(mask, vector);
438438
}
439439

440440
static __always_inline void __apic_send_IPI_allbutself(int vector)
441441
{
442-
apic->send_IPI_allbutself(vector);
442+
static_call(apic_call_send_IPI_allbutself)(vector);
443443
}
444444

445445
static __always_inline void __apic_send_IPI_all(int vector)
446446
{
447-
apic->send_IPI_all(vector);
447+
static_call(apic_call_send_IPI_all)(vector);
448448
}
449449

450450
static __always_inline void __apic_send_IPI_self(int vector)
451451
{
452-
apic->send_IPI_self(vector);
452+
static_call_mod(apic_call_send_IPI_self)(vector);
453453
}
454454

455455
static __always_inline void apic_wait_icr_idle(void)
456456
{
457-
if (apic->wait_icr_idle)
458-
apic->wait_icr_idle();
457+
static_call_cond(apic_call_wait_icr_idle)();
459458
}
460459

461460
static __always_inline u32 safe_apic_wait_icr_idle(void)

0 commit comments

Comments
 (0)