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

Commit 8f2f360d authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] IP27: Nuke leftovers of _STANDALONE 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent edc123d1

include/asm-mips/sn/addrs.h

+0 −22
Original line number Diff line number Diff line
@@ -248,14 +248,6 @@ 
 * for _x.

 */



#ifdef _STANDALONE



/* DO NOT USE THESE DIRECTLY IN THE KERNEL. SEE BELOW. */

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

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

					      0x800000 + (_x)))

#endif /* _STANDALONE */



/*

 * WARNING:

 *	When certain Hub chip workaround are defined, it's not sufficient
@@ -322,20 +314,6 @@ 
	PHYS_TO_K0(NODE_OFFSET(nasid) | ARCS_SPB_OFFSET)

#define ARCS_SPB_SIZE		0x0400



#ifdef _STANDALONE



#define ARCS_TVECTOR_OFFSET	0x2800

#define ARCS_PVECTOR_OFFSET	0x2c00



/*

 * These addresses are used by the master CPU to install the transfer

 * and private vectors.  All others use the SPB to find them.

 */

#define TVADDR	(NODE_CAC_BASE(get_nasid()) + ARCS_TVECTOR_OFFSET)

#define PVADDR	(NODE_CAC_BASE(get_nasid()) + ARCS_PVECTOR_OFFSET)



#endif /* _STANDALONE */



#define KLDIR_OFFSET		0x2000

#define KLDIR_ADDR(nasid)						\

	TO_NODE_UNCAC((nasid), KLDIR_OFFSET)

include/asm-mips/sn/sn0/addrs.h

+3 −73
Original line number Diff line number Diff line
@@ -85,15 +85,15 @@ 
#define NASID_GET(_pa)		(int) ((UINT64_CAST (_pa) >>		\

					NASID_SHFT) & NASID_BITMASK)



#if !defined(__ASSEMBLY__) && !defined(_STANDALONE)

#if !defined(__ASSEMBLY__)



#define NODE_SWIN_BASE(nasid, widget)					\

	((widget == 0) ? NODE_BWIN_BASE((nasid), SWIN0_BIGWIN)		\

	: RAW_NODE_SWIN_BASE(nasid, widget))

#else /* __ASSEMBLY__ || _STANDALONE */

#else /* __ASSEMBLY__ */

#define NODE_SWIN_BASE(nasid, widget) \

     (NODE_IO_BASE(nasid) + (UINT64_CAST (widget) << SWIN_SIZE_BITS))

#endif /* __ASSEMBLY__ || _STANDALONE */

#endif /* __ASSEMBLY__ */



/*

 * The following definitions pertain to the IO special address
@@ -276,76 +276,6 @@ 


#define _ARCSPROM



#ifdef _STANDALONE



/*

 * The PROM needs to pass the device base address and the

 * device pci cfg space address to the device drivers during

 * install. The COMPONENT->Key field is used for this purpose.

 * Macros needed by SN0 device drivers to convert the

 * COMPONENT->Key field to the respective base address.

 * Key field looks as follows:

 *

 *  +----------------------------------------------------+

 *  |devnasid | widget  |pciid |hubwidid|hstnasid | adap |

 *  |   2     |   1     |  1   |   1    |    2    |   1  |

 *  +----------------------------------------------------+

 *  |         |         |      |        |         |      |

 *  64        48        40     32       24        8      0

 *

 * These are used by standalone drivers till the io infrastructure

 * is in place.

 */



#ifndef __ASSEMBLY__



#define uchar unsigned char



#define KEY_DEVNASID_SHFT  48

#define KEY_WIDID_SHFT	   40

#define KEY_PCIID_SHFT	   32

#define KEY_HUBWID_SHFT	   24

#define KEY_HSTNASID_SHFT  8



#define MK_SN0_KEY(nasid, widid, pciid) \

			((((__psunsigned_t)nasid)<< KEY_DEVNASID_SHFT |\

				((__psunsigned_t)widid) << KEY_WIDID_SHFT) |\

				((__psunsigned_t)pciid) << KEY_PCIID_SHFT)



#define ADD_HUBWID_KEY(key,hubwid)\

			(key|=((__psunsigned_t)hubwid << KEY_HUBWID_SHFT))



#define ADD_HSTNASID_KEY(key,hstnasid)\

			(key|=((__psunsigned_t)hstnasid << KEY_HSTNASID_SHFT))



#define GET_DEVNASID_FROM_KEY(key)	((short)(key >> KEY_DEVNASID_SHFT))

#define GET_WIDID_FROM_KEY(key)		((uchar)(key >> KEY_WIDID_SHFT))

#define GET_PCIID_FROM_KEY(key)		((uchar)(key >> KEY_PCIID_SHFT))

#define GET_HUBWID_FROM_KEY(key)	((uchar)(key >> KEY_HUBWID_SHFT))

#define GET_HSTNASID_FROM_KEY(key)	((short)(key >> KEY_HSTNASID_SHFT))



#define PCI_64_TARGID_SHFT		60



#define GET_PCIBASE_FROM_KEY(key)  (NODE_SWIN_BASE(GET_DEVNASID_FROM_KEY(key),\

					GET_WIDID_FROM_KEY(key))\

					| BRIDGE_DEVIO(GET_PCIID_FROM_KEY(key)))



#define GET_PCICFGBASE_FROM_KEY(key) \

			(NODE_SWIN_BASE(GET_DEVNASID_FROM_KEY(key),\

			      GET_WIDID_FROM_KEY(key))\

			| BRIDGE_TYPE0_CFG_DEV(GET_PCIID_FROM_KEY(key)))



#define GET_WIDBASE_FROM_KEY(key) \

                        (NODE_SWIN_BASE(GET_DEVNASID_FROM_KEY(key),\

                              GET_WIDID_FROM_KEY(key)))



#define PUT_INSTALL_STATUS(c,s)		c->Revision = s

#define GET_INSTALL_STATUS(c)		c->Revision



#endif /* !__ASSEMBLY__ */



#endif /* _STANDALONE */



#if defined (HUB_ERR_STS_WAR)



#define ERR_STS_WAR_REGISTER	IIO_IIBUSERR