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

Commit 78608dd3 authored by Milton Miller's avatar Milton Miller Committed by Paul Mackerras
Browse files

powerpc/mpic: Use new smp_request_message_ipi 



MPIC has 4 ipis, so it can use the new smp_request_message_ipi to
reduce pathlength when receiving an ipi.

This has the side effect of using the common ipi names, and also
continuing to try request the remaining messages when one fails.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 25ddd738

arch/powerpc/sysdev/mpic.c

+4 −28
Original line number Diff line number Diff line
@@ -661,17 +661,6 @@ static inline void mpic_eoi(struct mpic *mpic) 
	(void)mpic_cpu_read(MPIC_INFO(CPU_WHOAMI));

}



#ifdef CONFIG_SMP

static irqreturn_t mpic_ipi_action(int irq, void *data)

{

	long ipi = (long)data;



	smp_message_recv(ipi);



	return IRQ_HANDLED;

}

#endif /* CONFIG_SMP */



/*

 * Linux descriptor level callbacks

 */
@@ -1543,13 +1532,7 @@ unsigned int mpic_get_mcirq(void) 
void mpic_request_ipis(void)

{

	struct mpic *mpic = mpic_primary;

	long i, err;

	static char *ipi_names[] = {

		"IPI0 (call function)",

		"IPI1 (reschedule)",

		"IPI2 (call function single)",

		"IPI3 (debugger break)",

	};

	int i;

	BUG_ON(mpic == NULL);



	printk(KERN_INFO "mpic: requesting IPIs ... \n");
@@ -1558,17 +1541,10 @@ void mpic_request_ipis(void) 
		unsigned int vipi = irq_create_mapping(mpic->irqhost,

						       mpic->ipi_vecs[0] + i);

		if (vipi == NO_IRQ) {

			printk(KERN_ERR "Failed to map IPI %ld\n", i);

			break;

		}

		err = request_irq(vipi, mpic_ipi_action,

				  IRQF_DISABLED|IRQF_PERCPU,

				  ipi_names[i], (void *)i);

		if (err) {

			printk(KERN_ERR "Request of irq %d for IPI %ld failed\n",

			       vipi, i);

			break;

			printk(KERN_ERR "Failed to map %s\n", smp_ipi_name[i]);

			continue;

		}

		smp_request_message_ipi(vipi, i);

	}

}