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

Commit 0aa2c72e authored by Jack Steiner's avatar Jack Steiner Committed by Tony Luck
Browse files

[IA64-SGI] - New SN hardware support - use_alias_space 



Use local SHUB alias space when referencing MMRs that are known
to be node local. There is a slight performance benefit & code 
simplification.

Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 3d14487b

arch/ia64/sn/kernel/irq.c

+7 −12
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.

 * Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.

 */



#include <linux/irq.h>
@@ -76,15 +76,13 @@ static void sn_enable_irq(unsigned int irq) 


static void sn_ack_irq(unsigned int irq)

{

	uint64_t event_occurred, mask = 0;

	int nasid;

	u64 event_occurred, mask = 0;



	irq = irq & 0xff;

	nasid = get_nasid();

	event_occurred =

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

	    HUB_L((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED));

	mask = event_occurred & SH_ALL_INT_MASK;

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

	HUB_S((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED_ALIAS),

	      mask);

	__set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);
@@ -93,15 +91,12 @@ static void sn_ack_irq(unsigned int irq) 


static void sn_end_irq(unsigned int irq)

{

	int nasid;

	int ivec;

	uint64_t event_occurred;

	u64 event_occurred;



	ivec = irq & 0xff;

	if (ivec == SGI_UART_VECTOR) {

		nasid = get_nasid();

		event_occurred = HUB_L((uint64_t *) GLOBAL_MMR_ADDR

				       (nasid, SH_EVENT_OCCURRED));

		event_occurred = HUB_L((u64*)LOCAL_MMR_ADDR (SH_EVENT_OCCURRED));

		/* If the UART bit is set here, we may have received an

		 * interrupt from the UART that the driver missed.  To

		 * make sure, we IPI ourselves to force us to look again.

arch/ia64/sn/pci/pcibr/pcibr_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ void sn_dma_flush(uint64_t addr) 
		 * If CE ever needs the sn_dma_flush mechanism, we will have

		 * to account for that here and in tioce_bus_fixup().

	 	 */

		uint32_t tio_id = REMOTE_HUB_L(nasid, TIO_NODE_ID);

		uint32_t tio_id = HUB_L(TIO_IOSPACE_ADDR(nasid, TIO_NODE_ID));

		uint32_t revnum = XWIDGET_PART_REV_NUM(tio_id);



		/* TIOCP BRINGUP WAR (PV907516): Don't write buffer flush reg */