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

Commit be539c73 authored by Colin Ngam's avatar Colin Ngam Committed by Tony Luck
Browse files

[IA64-SGI] Shub2 provides an addition of 2 External Interrupt events. 



Signed-off-by: default avatarColin Ngam <cngam@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent f1e2a1c8

arch/ia64/sn/kernel/irq.c

+2 −13
Original line number Diff line number Diff line
@@ -82,18 +82,7 @@ static void sn_ack_irq(unsigned int irq) 
	nasid = get_nasid();

	event_occurred =

	    HUB_L((uint64_t *) GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED));

	if (event_occurred & SH_EVENT_OCCURRED_UART_INT_MASK) {

		mask |= (1 << SH_EVENT_OCCURRED_UART_INT_SHFT);

	}

	if (event_occurred & SH_EVENT_OCCURRED_IPI_INT_MASK) {

		mask |= (1 << SH_EVENT_OCCURRED_IPI_INT_SHFT);

	}

	if (event_occurred & SH_EVENT_OCCURRED_II_INT0_MASK) {

		mask |= (1 << SH_EVENT_OCCURRED_II_INT0_SHFT);

	}

	if (event_occurred & SH_EVENT_OCCURRED_II_INT1_MASK) {

		mask |= (1 << SH_EVENT_OCCURRED_II_INT1_SHFT);

	}

	mask = event_occurred & SH_ALL_INT_MASK;

	HUB_S((uint64_t *) GLOBAL_MMR_ADDR(nasid, SH_EVENT_OCCURRED_ALIAS),

		 mask);

	__set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);

include/asm-ia64/sn/shub_mmr.h

+17 −0
Original line number Diff line number Diff line
@@ -129,6 +129,23 @@ 
#define SH_EVENT_OCCURRED_II_INT1_SHFT           30

#define SH_EVENT_OCCURRED_II_INT1_MASK           0x0000000040000000



/*   SH2_EVENT_OCCURRED_EXTIO_INT2                                      */

/*   Description:  Pending SHUB 2 EXT IO INT2                           */

#define SH2_EVENT_OCCURRED_EXTIO_INT2_SHFT       33

#define SH2_EVENT_OCCURRED_EXTIO_INT2_MASK       0x0000000200000000



/*   SH2_EVENT_OCCURRED_EXTIO_INT3                                      */

/*   Description:  Pending SHUB 2 EXT IO INT3                           */

#define SH2_EVENT_OCCURRED_EXTIO_INT3_SHFT       34

#define SH2_EVENT_OCCURRED_EXTIO_INT3_MASK       0x0000000400000000



#define SH_ALL_INT_MASK \

	(SH_EVENT_OCCURRED_UART_INT_MASK | SH_EVENT_OCCURRED_IPI_INT_MASK | \

	 SH_EVENT_OCCURRED_II_INT0_MASK | SH_EVENT_OCCURRED_II_INT1_MASK | \

	 SH_EVENT_OCCURRED_II_INT1_MASK | SH2_EVENT_OCCURRED_EXTIO_INT2_MASK | \

	 SH2_EVENT_OCCURRED_EXTIO_INT3_MASK)





/* ==================================================================== */

/*                         LEDS                                         */

/* ==================================================================== */