Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c96b3b3c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Provide compat handling for chip->set_affinity() 



Wrap the old chip function set_affinity() until the migration is
complete and the old chip functions are removed.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20100927121842.732894108@linutronix.de>
Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent 37e12df7

kernel/irq/chip.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -370,6 +370,12 @@ static unsigned int compat_irq_startup(struct irq_data *data) 
	return data->chip->startup(data->irq);

	return data->chip->startup(data->irq);

}

}





static int compat_irq_set_affinity(struct irq_data *data,

				   const struct cpumask *dest, bool force)

{

	return data->chip->set_affinity(data->irq, dest);

}



static void compat_bus_lock(struct irq_data *data)

static void compat_bus_lock(struct irq_data *data)

{

{

	data->chip->bus_lock(data->irq);

	data->chip->bus_lock(data->irq);
@@ -436,6 +442,8 @@ void irq_chip_set_defaults(struct irq_chip *chip) 
		chip->irq_mask_ack = compat_irq_mask_ack;

		chip->irq_mask_ack = compat_irq_mask_ack;

	if (chip->eoi)

	if (chip->eoi)

		chip->irq_eoi = compat_irq_eoi;

		chip->irq_eoi = compat_irq_eoi;

	if (chip->set_affinity)

		chip->irq_set_affinity = compat_irq_set_affinity;

}

}





static inline void mask_ack_irq(struct irq_desc *desc)

static inline void mask_ack_irq(struct irq_desc *desc)

kernel/irq/manage.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ int irq_can_set_affinity(unsigned int irq) 
	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_desc *desc = irq_to_desc(irq);





	if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip ||

	if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip ||

	    !desc->irq_data.chip->set_affinity)

	    !desc->irq_data.chip->irq_set_affinity)

		return 0;

		return 0;





	return 1;

	return 1;
@@ -109,16 +109,17 @@ void irq_set_thread_affinity(struct irq_desc *desc) 
int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)

int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)

{

{

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_chip *chip = desc->irq_data.chip;

	unsigned long flags;

	unsigned long flags;





	if (!desc->irq_data.chip->set_affinity)

	if (!chip->irq_set_affinity)

		return -EINVAL;

		return -EINVAL;





	raw_spin_lock_irqsave(&desc->lock, flags);

	raw_spin_lock_irqsave(&desc->lock, flags);





#ifdef CONFIG_GENERIC_PENDING_IRQ

#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (desc->status & IRQ_MOVE_PCNTXT) {

	if (desc->status & IRQ_MOVE_PCNTXT) {

		if (!desc->irq_data.chip->set_affinity(irq, cpumask)) {

		if (!chip->irq_set_affinity(&desc->irq_data, cpumask, false)) {

			cpumask_copy(desc->irq_data.affinity, cpumask);

			cpumask_copy(desc->irq_data.affinity, cpumask);

			irq_set_thread_affinity(desc);

			irq_set_thread_affinity(desc);

		}

		}
@@ -128,7 +129,7 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask) 
		cpumask_copy(desc->pending_mask, cpumask);

		cpumask_copy(desc->pending_mask, cpumask);

	}

	}

#else

#else

	if (!desc->irq_data.chip->set_affinity(irq, cpumask)) {

	if (!chip->irq_set_affinity(&desc->irq_data, cpumask, false)) {

		cpumask_copy(desc->irq_data.affinity, cpumask);

		cpumask_copy(desc->irq_data.affinity, cpumask);

		irq_set_thread_affinity(desc);

		irq_set_thread_affinity(desc);

	}

	}
@@ -177,7 +178,7 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc) 




	cpumask_and(desc->irq_data.affinity, cpu_online_mask, irq_default_affinity);

	cpumask_and(desc->irq_data.affinity, cpu_online_mask, irq_default_affinity);

set_affinity:

set_affinity:

	desc->irq_data.chip->set_affinity(irq, desc->irq_data.affinity);

	desc->irq_data.chip->irq_set_affinity(&desc->irq_data, desc->irq_data.affinity, false);





	return 0;

	return 0;

}

}

kernel/irq/migration.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
void move_masked_irq(int irq)

void move_masked_irq(int irq)

{

{

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_chip *chip = desc->irq_data.chip;





	if (likely(!(desc->status & IRQ_MOVE_PENDING)))

	if (likely(!(desc->status & IRQ_MOVE_PENDING)))

		return;

		return;
@@ -24,7 +25,7 @@ void move_masked_irq(int irq) 
	if (unlikely(cpumask_empty(desc->pending_mask)))

	if (unlikely(cpumask_empty(desc->pending_mask)))

		return;

		return;





	if (!desc->irq_data.chip->set_affinity)

	if (!chip->irq_set_affinity)

		return;

		return;





	assert_raw_spin_locked(&desc->lock);

	assert_raw_spin_locked(&desc->lock);
@@ -43,7 +44,8 @@ void move_masked_irq(int irq) 
	 */

	 */

	if (likely(cpumask_any_and(desc->pending_mask, cpu_online_mask)

	if (likely(cpumask_any_and(desc->pending_mask, cpu_online_mask)

		   < nr_cpu_ids))

		   < nr_cpu_ids))

		if (!desc->irq_data.chip->set_affinity(irq, desc->pending_mask)) {

		if (!chip->irq_set_affinity(&desc->irq_data,

					    desc->pending_mask, false)) {

			cpumask_copy(desc->irq_data.affinity, desc->pending_mask);

			cpumask_copy(desc->irq_data.affinity, desc->pending_mask);

			irq_set_thread_affinity(desc);

			irq_set_thread_affinity(desc);

		}

		}

kernel/irq/proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ static ssize_t irq_affinity_proc_write(struct file *file, 
	cpumask_var_t new_value;

	cpumask_var_t new_value;

	int err;

	int err;





	if (!irq_to_desc(irq)->irq_data.chip->set_affinity || no_irq_affinity ||

	if (!irq_to_desc(irq)->irq_data.chip->irq_set_affinity || no_irq_affinity ||

	    irq_balancing_disabled(irq))

	    irq_balancing_disabled(irq))

		return -EIO;

		return -EIO;