x86/apic changes for v5.5
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus
# HEAD: 2579a4eefc04d1c23eef8f3f0db3309f955e5792 x86/ioapic: Rename misnamed functions
Two changes: a cleanup and a fix for an (old) race for oneshot threaded IRQ handlers.
Thanks,
Ingo
------------------>
Thomas Gleixner (2):
x86/ioapic: Prevent inconsistent state when moving an interrupt x86/ioapic: Rename misnamed functions
arch/x86/kernel/apic/io_apic.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
arch/x86/kernel/apic/io_apic.c +14 -11
@@ -1725,19 +1725,20 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)return false; } -static inline bool ioapic_irqd_mask (struct irq_data *data) +static inline bool ioapic_prepare_move (struct irq_data *data) { -/* If we are moving the irq we need to mask it */ +/* If we are moving the IRQ we need to mask it */ if (unlikely (irqd_is_setaffinity_pending (data))) { -mask_ioapic_irq (data); +if (!irqd_irq_masked (data)) +mask_ioapic_irq (data);return true; }return false; } -static inline void ioapic_irqd_unmask (struct irq_data *data,bool masked) +static inline void ioapic_finish_move (struct irq_data *data,bool moveit) { -if (unlikely (masked)) { +if (unlikely (moveit)) {/* Only migrate the irq if the ack has been received. * * On rare occasions the broadcast level triggered ack gets
@@ -1766,15 +1767,17 @@ static inline void ioapic_irqd_unmask(struct irq_data *data, bool masked)*/ if (!io_apic_level_ack_pending (data->chip_data))irq_move_masked_irq (data); - unmask_ioapic_irq(data); +/* If the IRQ is masked in the core, leave it: */ +if (!irqd_irq_masked (data)) + unmask_ioapic_irq(data); } }#else -static inline bool ioapic_irqd_mask (struct irq_data *data) +static inline bool ioapic_prepare_move (struct irq_data *data) {return false; } -static inline void ioapic_irqd_unmask (struct irq_data *data,bool masked) +static inline void ioapic_finish_move (struct irq_data *data,bool moveit) { }#endif
@@ -1783,11 +1786,11 @@ static void ioapic_ack_level(struct irq_data *irq_data) {struct irq_cfg *cfg =irqd_cfg (irq_data);unsigned long v; -bool masked; +bool moveit;int i;irq_complete_move (cfg); - masked =ioapic_irqd_mask (irq_data); + moveit =ioapic_prepare_move (irq_data);/* * It appears there is an erratum which affects at least version 0x11
@@ -1842,7 +1845,7 @@ static void ioapic_ack_level(struct irq_data *irq_data)eoi_ioapic_pin (cfg->vector, irq_data->chip_data); } -ioapic_irqd_unmask (irq_data, masked); +ioapic_finish_move (irq_data, moveit); }static void ioapic_ir_ack_level (struct irq_data *irq_data)
The pull request you sent on Mon, 25 Nov 2019 14:17:29 +0100:
The pull request you sent on Mon, 25 Nov 2019 14:17:29 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-apic-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fd2615908dfd0586ea40692a99c44e34b7e869bc
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker