Merge tag 'irq-urgent-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (1d229a65) · Commits · 戴 / test

kernel/irq/manage.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -2731,8 +2731,10 @@ int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,

		do {
		chip = irq_data_get_irq_chip(data);
		if (WARN_ON_ONCE(!chip))
		return -ENODEV;
		if (WARN_ON_ONCE(!chip)) {
		err = -ENODEV;
		goto out_unlock;
		}
		if (chip->irq_set_irqchip_state)
		break;
		#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
		@@ -2745,6 +2747,7 @@ int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
		if (data)
		err = chip->irq_set_irqchip_state(data, which, val);

		out_unlock:
		irq_put_desc_busunlock(desc, flags);
		return err;
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -185,14 +185,18 @@ void rearm_wake_irq(unsigned int irq)
		unsigned long flags;
		struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);

		if (!desc \|\| !(desc->istate & IRQS_SUSPENDED) \|\|
		!irqd_is_wakeup_set(&desc->irq_data))
		if (!desc)
		return;

		if (!(desc->istate & IRQS_SUSPENDED) \|\|
		!irqd_is_wakeup_set(&desc->irq_data))
		goto unlock;

		desc->istate &= ~IRQS_SUSPENDED;
		irqd_set(&desc->irq_data, IRQD_WAKEUP_ARMED);
		__enable_irq(desc);

		unlock:
		irq_put_desc_busunlock(desc, flags);
		}