Unverified Commit db0e7d4e authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Paul Burton
Browse files

MIPS: SGI-IP27: get rid of volatile and hubreg_t 



Replace hub register access with __raw_readq/__raw_writeq and get
rid of hubreg_t completely. Also remove no longer (probably never
used) used defines

Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent 72faa7a7

arch/mips/include/asm/sn/addrs.h

+9 −63
Original line number Original line Diff line number Diff line
@@ -27,16 +27,11 @@ 




#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





#define PS_UINT_CAST		(unsigned long)

#define UINT64_CAST		(unsigned long)

#define UINT64_CAST		(unsigned long)





#define HUBREG_CAST		(volatile hubreg_t *)



#else /* __ASSEMBLY__ */

#else /* __ASSEMBLY__ */





#define PS_UINT_CAST

#define UINT64_CAST

#define UINT64_CAST

#define HUBREG_CAST





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */
@@ -256,41 +251,22 @@ 
 *	Otherwise, the recommended approach is to use *_HUB_L() and *_HUB_S().

 *	Otherwise, the recommended approach is to use *_HUB_L() and *_HUB_S().

 *	They're always safe.

 *	They're always safe.

 */

 */

#define LOCAL_HUB_ADDR(_x)	(HUBREG_CAST (IALIAS_BASE + (_x)))

#define LOCAL_HUB_ADDR(_x)	(IALIAS_BASE + (_x))

#define REMOTE_HUB_ADDR(_n, _x) (HUBREG_CAST (NODE_SWIN_BASE(_n, 1) +	\

#define REMOTE_HUB_ADDR(_n, _x) ((NODE_SWIN_BASE(_n, 1) + 0x800000 + (_x)))

					      0x800000 + (_x)))

#ifdef CONFIG_SGI_IP27

#define REMOTE_HUB_PI_ADDR(_n, _sn, _x) (HUBREG_CAST (NODE_SWIN_BASE(_n, 1) +	\

					      0x800000 + (_x)))

#endif /* CONFIG_SGI_IP27 */





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





#define HUB_L(_a)			*(_a)

#define LOCAL_HUB_PTR(_x)	((u64 *)LOCAL_HUB_ADDR((_x)))

#define HUB_S(_a, _d)			*(_a) = (_d)

#define REMOTE_HUB_PTR(_n, _x)	((u64 *)REMOTE_HUB_ADDR((_n), (_x)))





#define LOCAL_HUB_L(_r)			HUB_L(LOCAL_HUB_ADDR(_r))

#define LOCAL_HUB_L(_r)			__raw_readq(LOCAL_HUB_PTR(_r))

#define LOCAL_HUB_S(_r, _d)		HUB_S(LOCAL_HUB_ADDR(_r), (_d))

#define LOCAL_HUB_S(_r, _d)		__raw_writeq((_d), LOCAL_HUB_PTR(_r))

#define REMOTE_HUB_L(_n, _r)		HUB_L(REMOTE_HUB_ADDR((_n), (_r)))

#define REMOTE_HUB_L(_n, _r)		__raw_readq(REMOTE_HUB_PTR((_n), (_r)))

#define REMOTE_HUB_S(_n, _r, _d)	HUB_S(REMOTE_HUB_ADDR((_n), (_r)), (_d))

#define REMOTE_HUB_S(_n, _r, _d)	__raw_writeq((_d),		\

#define REMOTE_HUB_PI_L(_n, _sn, _r)	HUB_L(REMOTE_HUB_PI_ADDR((_n), (_sn), (_r)))

						REMOTE_HUB_PTR((_n), (_r)))

#define REMOTE_HUB_PI_S(_n, _sn, _r, _d) HUB_S(REMOTE_HUB_PI_ADDR((_n), (_sn), (_r)), (_d))





#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLY__ */





/*

 * The following macros are used to get to a hub/bridge register, given

 * the base of the register space.

 */

#define HUB_REG_PTR(_base, _off)	\

	(HUBREG_CAST((__psunsigned_t)(_base) + (__psunsigned_t)(_off)))



#define HUB_REG_PTR_L(_base, _off)	\

	HUB_L(HUB_REG_PTR((_base), (_off)))



#define HUB_REG_PTR_S(_base, _off, _data)	\

	HUB_S(HUB_REG_PTR((_base), (_off)), (_data))



/*

/*

 * Software structure locations -- permanently fixed

 * Software structure locations -- permanently fixed

 *    See diagram in kldir.h

 *    See diagram in kldir.h
@@ -387,44 +363,14 @@ 




#define SYMMON_STK_END(nasid)	(SYMMON_STK_ADDR(nasid, 0) + KLD_SYMMON_STK(nasid)->size)

#define SYMMON_STK_END(nasid)	(SYMMON_STK_ADDR(nasid, 0) + KLD_SYMMON_STK(nasid)->size)





/* loading symmon 4k below UNIX. the arcs loader needs the topaddr for a

 * relocatable program

 */

#define UNIX_DEBUG_LOADADDR	0x300000

#define SYMMON_LOADADDR(nasid)						\

	TO_NODE(nasid, PHYS_TO_K0(UNIX_DEBUG_LOADADDR - 0x1000))



#define FREEMEM_OFFSET(nasid)	KLD_FREEMEM(nasid)->offset

#define FREEMEM_ADDR(nasid)	SYMMON_STK_END(nasid)

/*

 * XXX

 * Fix this. FREEMEM_ADDR should be aware of if symmon is loaded.

 * Also, it should take into account what prom thinks to be a safe

 * address

	PHYS_TO_K0(NODE_OFFSET(nasid) + FREEMEM_OFFSET(nasid))

 */

#define FREEMEM_SIZE(nasid)	KLD_FREEMEM(nasid)->size



#define PI_ERROR_OFFSET(nasid)	KLD_PI_ERROR(nasid)->offset

#define PI_ERROR_ADDR(nasid)						\

	TO_NODE_UNCAC((nasid), PI_ERROR_OFFSET(nasid))

#define PI_ERROR_SIZE(nasid)	KLD_PI_ERROR(nasid)->size



#define NODE_OFFSET_TO_K0(_nasid, _off)					\

#define NODE_OFFSET_TO_K0(_nasid, _off)					\

	PHYS_TO_K0((NODE_OFFSET(_nasid) + (_off)) | CAC_BASE)

	PHYS_TO_K0((NODE_OFFSET(_nasid) + (_off)) | CAC_BASE)

#define NODE_OFFSET_TO_K1(_nasid, _off)					\

#define NODE_OFFSET_TO_K1(_nasid, _off)					\

	TO_UNCAC((NODE_OFFSET(_nasid) + (_off)) | UNCAC_BASE)

	TO_UNCAC((NODE_OFFSET(_nasid) + (_off)) | UNCAC_BASE)

#define K0_TO_NODE_OFFSET(_k0addr)					\

	((__psunsigned_t)(_k0addr) & NODE_ADDRSPACE_MASK)





#define KERN_VARS_ADDR(nasid)	KLD_KERN_VARS(nasid)->pointer

#define KERN_VARS_ADDR(nasid)	KLD_KERN_VARS(nasid)->pointer

#define KERN_VARS_SIZE(nasid)	KLD_KERN_VARS(nasid)->size

#define KERN_VARS_SIZE(nasid)	KLD_KERN_VARS(nasid)->size





#define KERN_XP_ADDR(nasid)	KLD_KERN_XP(nasid)->pointer

#define KERN_XP_SIZE(nasid)	KLD_KERN_XP(nasid)->size



#define GPDA_ADDR(nasid)	TO_NODE_CAC(nasid, GPDA_OFFSET)



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLY__ */

arch/mips/include/asm/sn/arch.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,6 @@ 
#include <asm/sn/sn0/arch.h>

#include <asm/sn/sn0/arch.h>

#endif

#endif





typedef u64	hubreg_t;



#define cputonasid(cpu)		(sn_cpu_info[(cpu)].p_nasid)

#define cputonasid(cpu)		(sn_cpu_info[(cpu)].p_nasid)

#define cputoslice(cpu)		(sn_cpu_info[(cpu)].p_slice)

#define cputoslice(cpu)		(sn_cpu_info[(cpu)].p_slice)

#define makespnum(_nasid, _slice)					\

#define makespnum(_nasid, _slice)					\

arch/mips/include/asm/sn/io.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ 
	IIO_ITTE_PUT((nasid), HUB_PIO_MAP_TO_MEM, \

	IIO_ITTE_PUT((nasid), HUB_PIO_MAP_TO_MEM, \

		     (bigwin), IIO_ITTE_INVALID_WIDGET, 0)

		     (bigwin), IIO_ITTE_INVALID_WIDGET, 0)





#define IIO_ITTE_GET(nasid, bigwin) REMOTE_HUB_ADDR((nasid), IIO_ITTE(bigwin))

#define IIO_ITTE_GET(nasid, bigwin) REMOTE_HUB_PTR((nasid), IIO_ITTE(bigwin))





/*

/*

 * Macro which takes the widget number, and returns the

 * Macro which takes the widget number, and returns the

arch/mips/sgi-ip27/ip27-hubio.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ unsigned long hub_pio_map(cnodeid_t cnode, xwidgetnum_t widget, 
		 * after we write it.

		 * after we write it.

		 */

		 */

		IIO_ITTE_PUT(nasid, i, HUB_PIO_MAP_TO_MEM, widget, xtalk_addr);

		IIO_ITTE_PUT(nasid, i, HUB_PIO_MAP_TO_MEM, widget, xtalk_addr);

		(void) HUB_L(IIO_ITTE_GET(nasid, i));

		__raw_readq(IIO_ITTE_GET(nasid, i));





		return NODE_BWIN_BASE(nasid, widget) + (xtalk_addr % BWIN_SIZE);

		return NODE_BWIN_BASE(nasid, widget) + (xtalk_addr % BWIN_SIZE);

	}

	}
@@ -135,7 +135,7 @@ static void hub_setup_prb(nasid_t nasid, int prbnum, int credits) 
 **/

 **/

static void hub_set_piomode(nasid_t nasid)

static void hub_set_piomode(nasid_t nasid)

{

{

	hubreg_t ii_iowa;

	u64 ii_iowa;

	hubii_wcr_t ii_wcr;

	hubii_wcr_t ii_wcr;

	unsigned i;

	unsigned i;

arch/mips/sgi-ip27/ip27-init.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ extern void ip27_reboot_setup(void); 




void __init plat_mem_setup(void)

void __init plat_mem_setup(void)

{

{

	hubreg_t p, e, n_mode;

	u64 p, e, n_mode;

	nasid_t nid;

	nasid_t nid;





	ip27_reboot_setup();

	ip27_reboot_setup();

CRA Git | Maintained and supported by SUSTech CRA and CCSE