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

Commit a1287476 authored by Russ Anderson's avatar Russ Anderson Committed by Tony Luck
Browse files

[IA64] Clean up CPE handler registration 



Use local_vector_to_irq() instead of looping through all NR_IRQS.
This avoids registering the CPE handler on multiple irqs.  Only
register if the irq is valid.  If no valid irq is found, print an
error message and set up polling.

Signed-off-by: default avatarRuss Anderson <rja@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0b0517a4

arch/ia64/kernel/mca.c

+19 −15
Original line number Diff line number Diff line
@@ -2018,24 +2018,28 @@ ia64_mca_late_init(void) 


		if (cpe_vector >= 0) {

			/* If platform supports CPEI, enable the irq. */

			irq = local_vector_to_irq(cpe_vector);

			if (irq > 0) {

				cpe_poll_enabled = 0;

			for (irq = 0; irq < NR_IRQS; ++irq)

				if (irq_to_vector(irq) == cpe_vector) {

				desc = irq_desc + irq;

				desc->status |= IRQ_PER_CPU;

				setup_irq(irq, &mca_cpe_irqaction);

				ia64_cpe_irq = irq;

				}

				ia64_mca_register_cpev(cpe_vector);

			IA64_MCA_DEBUG("%s: CPEI/P setup and enabled.\n", __FUNCTION__);

		} else {

				IA64_MCA_DEBUG("%s: CPEI/P setup and enabled.\n",

					__FUNCTION__);

				return 0;

			}

			printk(KERN_ERR "%s: Failed to find irq for CPE "

					"interrupt handler, vector %d\n",

					__FUNCTION__, cpe_vector);

		}

		/* If platform doesn't support CPEI, get the timer going. */

		if (cpe_poll_enabled) {

			ia64_mca_cpe_poll(0UL);

			IA64_MCA_DEBUG("%s: CPEP setup and enabled.\n", __FUNCTION__);

		}

	}

	}

#endif



	return 0;