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

Commit 4a3ad2dd authored by Dean Nelson's avatar Dean Nelson Committed by Tony Luck
Browse files

[IA64] run some drivers/misc/sgi-xp through scripts/Lindent



Ran patches through scripts/Lindent (part 1).

Signed-off-by: default avatarDean Nelson <dcn@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 45d9ca49
Loading
Loading
Loading
Loading
+29 −51
Original line number Diff line number Diff line
@@ -6,30 +6,25 @@
 * Copyright (C) 2004-2008 Silicon Graphics, Inc. All rights reserved.
 */


/*
 * External Cross Partition (XP) structures and defines.
 */


#ifndef _DRIVERS_MISC_SGIXP_XP_H
#define _DRIVERS_MISC_SGIXP_XP_H


#include <linux/cache.h>
#include <linux/hardirq.h>
#include <linux/mutex.h>
#include <asm/sn/types.h>
#include <asm/sn/bte.h>


#ifdef USE_DBUG_ON
#define DBUG_ON(condition)	BUG_ON(condition)
#else
#define DBUG_ON(condition)
#endif


/*
 * Define the maximum number of logically defined partitions the system
 * can support. It is constrained by the maximum number of hardware
@@ -43,7 +38,6 @@
 */
#define XP_MAX_PARTITIONS	64


/*
 * Define the number of u64s required to represent all the C-brick nasids
 * as a bitmap.  The cross-partition kernel modules deal only with
@@ -54,7 +48,6 @@
#define XP_NASID_MASK_BYTES	((XP_MAX_PHYSNODE_ID + 7) / 8)
#define XP_NASID_MASK_WORDS	((XP_MAX_PHYSNODE_ID + 63) / 64)


/*
 * Wrapper for bte_copy() that should it return a failure status will retry
 * the bte_copy() once in the hope that the failure was due to a temporary
@@ -74,7 +67,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
	bte_result_t ret;
	u64 pdst = ia64_tpa(vdst);


	/*
	 * Ensure that the physically mapped memory is contiguous.
	 *
@@ -96,7 +88,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
	return ret;
}


/*
 * XPC establishes channel connections between the local partition and any
 * other partition that is currently up. Over these channels, kernel-level
@@ -122,7 +113,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
#error	XPC_NCHANNELS exceeds MAXIMUM allowed.
#endif


/*
 * The format of an XPC message is as follows:
 *
@@ -160,12 +150,10 @@ struct xpc_msg {
	u64 payload;		/* user defined portion of message */
};


#define XPC_MSG_PAYLOAD_OFFSET	(u64) (&((struct xpc_msg *)0)->payload)
#define XPC_MSG_SIZE(_payload_size) \
		L1_CACHE_ALIGN(XPC_MSG_PAYLOAD_OFFSET + (_payload_size))


/*
 * Define the return values and values passed to user's callout functions.
 * (It is important to add new value codes at the end just preceding
@@ -270,7 +258,6 @@ enum xpc_retval {
	xpcUnknownReason	/* 116: unknown reason -- must be last in list */
};


/*
 * Define the callout function types used by XPC to update the user on
 * connection activity and state changes (via the user function registered by
@@ -381,7 +368,6 @@ typedef void (*xpc_channel_func)(enum xpc_retval reason, partid_t partid,
typedef void (*xpc_notify_func) (enum xpc_retval reason, partid_t partid,
				 int ch_number, void *key);


/*
 * The following is a registration entry. There is a global array of these,
 * one per channel. It is used to record the connection registration made
@@ -406,15 +392,12 @@ struct xpc_registration {
	u32 idle_limit;		/* limit on #of idle kthreads */
} ____cacheline_aligned;


#define XPC_CHANNEL_REGISTERED(_c)	(xpc_registrations[_c].func != NULL)


/* the following are valid xpc_allocate() flags */
#define XPC_WAIT	0	/* wait flag */
#define XPC_NOWAIT	1	/* no wait flag */


struct xpc_interface {
	void (*connect) (int);
	void (*disconnect) (int);
@@ -426,20 +409,18 @@ struct xpc_interface {
	enum xpc_retval (*partid_to_nasids) (partid_t, void *);
};


extern struct xpc_interface xpc_interface;

extern void xpc_set_interface(void (*)(int),
			      void (*)(int),
			      enum xpc_retval (*)(partid_t, int, u32, void **),
			      enum xpc_retval (*)(partid_t, int, void *),
		enum xpc_retval (*)(partid_t, int, void *, xpc_notify_func,
								void *),
			      enum xpc_retval (*)(partid_t, int, void *,
						  xpc_notify_func, void *),
			      void (*)(partid_t, int, void *),
			      enum xpc_retval (*)(partid_t, void *));
extern void xpc_clear_interface(void);


extern enum xpc_retval xpc_connect(int, xpc_channel_func, void *, u16,
				   u16, u32, u32);
extern void xpc_disconnect(int);
@@ -475,11 +456,8 @@ xpc_partid_to_nasids(partid_t partid, void *nasids)
	return xpc_interface.partid_to_nasids(partid, nasids);
}


extern u64 xp_nofault_PIOR_target;
extern int xp_nofault_PIOR(void *);
extern int xp_error_PIOR(void);


#endif /* _DRIVERS_MISC_SGIXP_XP_H */
+44 −54
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@
 * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
 */


/*
 * Cross Partition (XP) base.
 *
@@ -15,7 +14,6 @@
 *
 */


#include <linux/kernel.h>
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -24,24 +22,25 @@
#include <asm/sn/sn_sal.h>
#include "xp.h"


/*
 * Target of nofault PIO read.
 */
u64 xp_nofault_PIOR_target;


/*
 * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level
 * users of XPC.
 */
struct xpc_registration xpc_registrations[XPC_NCHANNELS];


/*
 * Initialize the XPC interface to indicate that XPC isn't loaded.
 */
static enum xpc_retval xpc_notloaded(void) { return xpcNotLoaded; }
static enum xpc_retval
xpc_notloaded(void)
{
	return xpcNotLoaded;
}

struct xpc_interface xpc_interface = {
	(void (*)(int))xpc_notloaded,
@@ -54,7 +53,6 @@ struct xpc_interface xpc_interface = {
	(enum xpc_retval(*)(partid_t, void *))xpc_notloaded
};


/*
 * XPC calls this when it (the XPC module) has been loaded.
 */
@@ -77,7 +75,6 @@ xpc_set_interface(void (*connect)(int),
	xpc_interface.partid_to_nasids = partid_to_nasids;
}


/*
 * XPC calls this when it (the XPC module) is being unloaded.
 */
@@ -91,14 +88,14 @@ xpc_clear_interface(void)
	xpc_interface.send = (enum xpc_retval(*)(partid_t, int, void *))
	    xpc_notloaded;
	xpc_interface.send_notify = (enum xpc_retval(*)(partid_t, int, void *,
				    xpc_notify_func, void *)) xpc_notloaded;
							xpc_notify_func,
							void *))xpc_notloaded;
	xpc_interface.received = (void (*)(partid_t, int, void *))
	    xpc_notloaded;
	xpc_interface.partid_to_nasids = (enum xpc_retval(*)(partid_t, void *))
	    xpc_notloaded;
}


/*
 * Register for automatic establishment of a channel connection whenever
 * a partition comes up.
@@ -129,7 +126,6 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
{
	struct xpc_registration *registration;


	DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
	DBUG_ON(payload_size == 0 || nentries == 0);
	DBUG_ON(func == NULL);
@@ -162,7 +158,6 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
	return xpcSuccess;
}


/*
 * Remove the registration for automatic connection of the specified channel
 * when a partition comes up.
@@ -181,7 +176,6 @@ xpc_disconnect(int ch_number)
{
	struct xpc_registration *registration;


	DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);

	registration = &xpc_registrations[ch_number];
@@ -214,7 +208,6 @@ xpc_disconnect(int ch_number)
	return;
}


int __init
xp_init(void)
{
@@ -222,7 +215,6 @@ xp_init(void)
	u64 func_addr = *(u64 *)xp_nofault_PIOR;
	u64 err_func_addr = *(u64 *)xp_error_PIOR;


	if (!ia64_platform_is("sn2")) {
		return -ENODEV;
	}
@@ -258,8 +250,8 @@ xp_init(void)

	return 0;
}
module_init(xp_init);

module_init(xp_init);

void __exit
xp_exit(void)
@@ -267,13 +259,12 @@ xp_exit(void)
	u64 func_addr = *(u64 *)xp_nofault_PIOR;
	u64 err_func_addr = *(u64 *)xp_error_PIOR;


	/* unregister the PIO read nofault code region */
	(void)sn_register_nofault_code(func_addr, err_func_addr,
				       err_func_addr, 1, 0);
}
module_exit(xp_exit);

module_exit(xp_exit);

MODULE_AUTHOR("Silicon Graphics, Inc.");
MODULE_DESCRIPTION("Cross Partition (XP) base");
@@ -287,4 +278,3 @@ EXPORT_SYMBOL(xpc_clear_interface);
EXPORT_SYMBOL(xpc_set_interface);
EXPORT_SYMBOL(xpc_connect);
EXPORT_SYMBOL(xpc_disconnect);
+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@
 * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
 */


/*
 * The xp_nofault_PIOR function takes a pointer to a remote PIO register
 * and attempts to load and consume a value from it.  This function
+185 −257

File changed.

Preview size limit exceeded, changes collapsed.

+138 −190

File changed.

Preview size limit exceeded, changes collapsed.