Commit f74a127f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "Two small changes:

   - a fix for a interrupt regression caused by the vector management
     changes in 4.15 affecting museum pieces which rely on interrupt
     probing for legacy (e.g. parallel port) devices.

     One of the startup calls in the autoprobe code was not changed to
     the new activate_and_startup() function resulting in a warning and
     as a consequence failing to discover the device interrupt.

   - a trivial update to the copyright/license header of the STM32 irq
     chip driver"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Make legacy autoprobing work again
  irqchip/stm32: Fix copyright
parents 64b28683 1beaeacd

drivers/irqchip/irq-stm32-exti.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) Maxime Coquelin 2015

 * Copyright (C) STMicroelectronics 2017

 * Author:  Maxime Coquelin <mcoquelin.stm32@gmail.com>

 * License terms:  GNU General Public License (GPL), version 2

 */



#include <linux/bitops.h>

kernel/irq/autoprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ unsigned long probe_irq_on(void) 
		raw_spin_lock_irq(&desc->lock);

		if (!desc->action && irq_settings_can_probe(desc)) {

			desc->istate |= IRQS_AUTODETECT | IRQS_WAITING;

			if (irq_startup(desc, IRQ_NORESEND, IRQ_START_FORCE))

			if (irq_activate_and_startup(desc, IRQ_NORESEND))

				desc->istate |= IRQS_PENDING;

		}

		raw_spin_unlock_irq(&desc->lock);

kernel/irq/chip.c

+3 −3
Original line number Diff line number Diff line
@@ -294,11 +294,11 @@ int irq_activate(struct irq_desc *desc) 
	return 0;

}



void irq_activate_and_startup(struct irq_desc *desc, bool resend)

int irq_activate_and_startup(struct irq_desc *desc, bool resend)

{

	if (WARN_ON(irq_activate(desc)))

		return;

	irq_startup(desc, resend, IRQ_START_FORCE);

		return 0;

	return irq_startup(desc, resend, IRQ_START_FORCE);

}



static void __irq_disable(struct irq_desc *desc, bool mask);

kernel/irq/internals.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ extern void __enable_irq(struct irq_desc *desc); 
#define IRQ_START_COND	false



extern int irq_activate(struct irq_desc *desc);

extern void irq_activate_and_startup(struct irq_desc *desc, bool resend);

extern int irq_activate_and_startup(struct irq_desc *desc, bool resend);

extern int irq_startup(struct irq_desc *desc, bool resend, bool force);



extern void irq_shutdown(struct irq_desc *desc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE