Skip to content

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

[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
Show whitespace changes
Inline Side-by-side
Showing with 396 additions and 553 deletions
drivers/misc/sgi-xp/xp.h
View file @ 4a3ad2dd
...@@ -6,30 +6,25 @@ ...@@ -6,30 +6,25 @@
* Copyright (C) 2004-2008 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 2004-2008 Silicon Graphics, Inc. All rights reserved.
*/ */
/* /*
* External Cross Partition (XP) structures and defines. * External Cross Partition (XP) structures and defines.
*/ */
#ifndef _DRIVERS_MISC_SGIXP_XP_H #ifndef _DRIVERS_MISC_SGIXP_XP_H
#define _DRIVERS_MISC_SGIXP_XP_H #define _DRIVERS_MISC_SGIXP_XP_H
#include <linux/cache.h> #include <linux/cache.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/sn/types.h> #include <asm/sn/types.h>
#include <asm/sn/bte.h> #include <asm/sn/bte.h>
#ifdef USE_DBUG_ON #ifdef USE_DBUG_ON
#define DBUG_ON(condition) BUG_ON(condition) #define DBUG_ON(condition) BUG_ON(condition)
#else #else
#define DBUG_ON(condition) #define DBUG_ON(condition)
#endif #endif
/* /*
* Define the maximum number of logically defined partitions the system * Define the maximum number of logically defined partitions the system
* can support. It is constrained by the maximum number of hardware * can support. It is constrained by the maximum number of hardware
...@@ -43,7 +38,6 @@ ...@@ -43,7 +38,6 @@
*/ */
#define XP_MAX_PARTITIONS 64 #define XP_MAX_PARTITIONS 64
/* /*
* Define the number of u64s required to represent all the C-brick nasids * Define the number of u64s required to represent all the C-brick nasids
* as a bitmap. The cross-partition kernel modules deal only with * as a bitmap. The cross-partition kernel modules deal only with
...@@ -54,7 +48,6 @@ ...@@ -54,7 +48,6 @@
#define XP_NASID_MASK_BYTES ((XP_MAX_PHYSNODE_ID + 7) / 8) #define XP_NASID_MASK_BYTES ((XP_MAX_PHYSNODE_ID + 7) / 8)
#define XP_NASID_MASK_WORDS ((XP_MAX_PHYSNODE_ID + 63) / 64) #define XP_NASID_MASK_WORDS ((XP_MAX_PHYSNODE_ID + 63) / 64)
/* /*
* Wrapper for bte_copy() that should it return a failure status will retry * 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 * 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) ...@@ -74,7 +67,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
bte_result_t ret; bte_result_t ret;
u64 pdst = ia64_tpa(vdst); u64 pdst = ia64_tpa(vdst);
/* /*
* Ensure that the physically mapped memory is contiguous. * 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) ...@@ -96,7 +88,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
return ret; return ret;
} }
/* /*
* XPC establishes channel connections between the local partition and any * XPC establishes channel connections between the local partition and any
* other partition that is currently up. Over these channels, kernel-level * 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) ...@@ -122,7 +113,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
#error XPC_NCHANNELS exceeds MAXIMUM allowed. #error XPC_NCHANNELS exceeds MAXIMUM allowed.
#endif #endif
/* /*
* The format of an XPC message is as follows: * The format of an XPC message is as follows:
* *
...@@ -160,12 +150,10 @@ struct xpc_msg { ...@@ -160,12 +150,10 @@ struct xpc_msg {
u64 payload; /* user defined portion of message */ u64 payload; /* user defined portion of message */
}; };
#define XPC_MSG_PAYLOAD_OFFSET (u64) (&((struct xpc_msg *)0)->payload) #define XPC_MSG_PAYLOAD_OFFSET (u64) (&((struct xpc_msg *)0)->payload)
#define XPC_MSG_SIZE(_payload_size) \ #define XPC_MSG_SIZE(_payload_size) \
L1_CACHE_ALIGN(XPC_MSG_PAYLOAD_OFFSET + (_payload_size)) L1_CACHE_ALIGN(XPC_MSG_PAYLOAD_OFFSET + (_payload_size))
/* /*
* Define the return values and values passed to user's callout functions. * 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 * (It is important to add new value codes at the end just preceding
...@@ -270,7 +258,6 @@ enum xpc_retval { ...@@ -270,7 +258,6 @@ enum xpc_retval {
xpcUnknownReason /* 116: unknown reason -- must be last in list */ xpcUnknownReason /* 116: unknown reason -- must be last in list */
}; };
/* /*
* Define the callout function types used by XPC to update the user on * Define the callout function types used by XPC to update the user on
* connection activity and state changes (via the user function registered by * connection activity and state changes (via the user function registered by
...@@ -375,13 +362,12 @@ enum xpc_retval { ...@@ -375,13 +362,12 @@ enum xpc_retval {
* =====================+================================+===================== * =====================+================================+=====================
*/ */
typedef void (*xpc_channel_func)(enum xpc_retval reason, partid_t partid, typedef void (*xpc_channel_func) (enum xpc_retval reason, partid_t partid,
int ch_number, void *data, void *key); int ch_number, void *data, void *key);
typedef void (*xpc_notify_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); int ch_number, void *key);
/* /*
* The following is a registration entry. There is a global array of these, * 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 * one per channel. It is used to record the connection registration made
...@@ -406,40 +392,35 @@ struct xpc_registration { ...@@ -406,40 +392,35 @@ struct xpc_registration {
u32 idle_limit; /* limit on #of idle kthreads */ u32 idle_limit; /* limit on #of idle kthreads */
} ____cacheline_aligned; } ____cacheline_aligned;
#define XPC_CHANNEL_REGISTERED(_c) (xpc_registrations[_c].func != NULL) #define XPC_CHANNEL_REGISTERED(_c) (xpc_registrations[_c].func != NULL)
/* the following are valid xpc_allocate() flags */ /* the following are valid xpc_allocate() flags */
#define XPC_WAIT 0 /* wait flag */ #define XPC_WAIT 0 /* wait flag */
#define XPC_NOWAIT 1 /* no wait flag */ #define XPC_NOWAIT 1 /* no wait flag */
struct xpc_interface { struct xpc_interface {
void (*connect)(int); void (*connect) (int);
void (*disconnect)(int); void (*disconnect) (int);
enum xpc_retval (*allocate)(partid_t, int, u32, void **); enum xpc_retval (*allocate) (partid_t, int, u32, void **);
enum xpc_retval (*send)(partid_t, int, void *); enum xpc_retval (*send) (partid_t, int, void *);
enum xpc_retval (*send_notify)(partid_t, int, void *, enum xpc_retval (*send_notify) (partid_t, int, void *,
xpc_notify_func, void *); xpc_notify_func, void *);
void (*received)(partid_t, int, void *); void (*received) (partid_t, int, void *);
enum xpc_retval (*partid_to_nasids)(partid_t, void *); enum xpc_retval (*partid_to_nasids) (partid_t, void *);
}; };
extern struct xpc_interface xpc_interface; extern struct xpc_interface xpc_interface;
extern void xpc_set_interface(void (*)(int), extern void xpc_set_interface(void (*)(int),
void (*)(int), void (*)(int),
enum xpc_retval (*)(partid_t, int, u32, void **), enum xpc_retval (*)(partid_t, int, u32, void **),
enum xpc_retval (*)(partid_t, int, void *), enum xpc_retval (*)(partid_t, int, void *),
enum xpc_retval (*)(partid_t, int, void *, xpc_notify_func, enum xpc_retval (*)(partid_t, int, void *,
void *), xpc_notify_func, void *),
void (*)(partid_t, int, void *), void (*)(partid_t, int, void *),
enum xpc_retval (*)(partid_t, void *)); enum xpc_retval (*)(partid_t, void *));
extern void xpc_clear_interface(void); extern void xpc_clear_interface(void);
extern enum xpc_retval xpc_connect(int, xpc_channel_func, void *, u16, extern enum xpc_retval xpc_connect(int, xpc_channel_func, void *, u16,
u16, u32, u32); u16, u32, u32);
extern void xpc_disconnect(int); extern void xpc_disconnect(int);
...@@ -475,11 +456,8 @@ xpc_partid_to_nasids(partid_t partid, void *nasids) ...@@ -475,11 +456,8 @@ xpc_partid_to_nasids(partid_t partid, void *nasids)
return xpc_interface.partid_to_nasids(partid, nasids); return xpc_interface.partid_to_nasids(partid, nasids);
} }
extern u64 xp_nofault_PIOR_target; extern u64 xp_nofault_PIOR_target;
extern int xp_nofault_PIOR(void *); extern int xp_nofault_PIOR(void *);
extern int xp_error_PIOR(void); extern int xp_error_PIOR(void);
#endif /* _DRIVERS_MISC_SGIXP_XP_H */ #endif /* _DRIVERS_MISC_SGIXP_XP_H */
drivers/misc/sgi-xp/xp_main.c
View file @ 4a3ad2dd
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.
*/ */
/* /*
* Cross Partition (XP) base. * Cross Partition (XP) base.
* *
...@@ -15,7 +14,6 @@ ...@@ -15,7 +14,6 @@
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -24,49 +22,49 @@ ...@@ -24,49 +22,49 @@
#include <asm/sn/sn_sal.h> #include <asm/sn/sn_sal.h>
#include "xp.h" #include "xp.h"
/* /*
* Target of nofault PIO read. * Target of nofault PIO read.
*/ */
u64 xp_nofault_PIOR_target; u64 xp_nofault_PIOR_target;
/* /*
* xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level * xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level
* users of XPC. * users of XPC.
*/ */
struct xpc_registration xpc_registrations[XPC_NCHANNELS]; struct xpc_registration xpc_registrations[XPC_NCHANNELS];
/* /*
* Initialize the XPC interface to indicate that XPC isn't loaded. * 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 = { struct xpc_interface xpc_interface = {
(void (*)(int)) xpc_notloaded, (void (*)(int))xpc_notloaded,
(void (*)(int)) xpc_notloaded, (void (*)(int))xpc_notloaded,
(enum xpc_retval (*)(partid_t, int, u32, void **)) xpc_notloaded, (enum xpc_retval(*)(partid_t, int, u32, void **))xpc_notloaded,
(enum xpc_retval (*)(partid_t, int, void *)) xpc_notloaded, (enum xpc_retval(*)(partid_t, int, void *))xpc_notloaded,
(enum xpc_retval (*)(partid_t, int, void *, xpc_notify_func, void *)) (enum xpc_retval(*)(partid_t, int, void *, xpc_notify_func, void *))
xpc_notloaded, xpc_notloaded,
(void (*)(partid_t, int, void *)) xpc_notloaded, (void (*)(partid_t, int, void *))xpc_notloaded,
(enum xpc_retval (*)(partid_t, void *)) xpc_notloaded (enum xpc_retval(*)(partid_t, void *))xpc_notloaded
}; };
/* /*
* XPC calls this when it (the XPC module) has been loaded. * XPC calls this when it (the XPC module) has been loaded.
*/ */
void void
xpc_set_interface(void (*connect)(int), xpc_set_interface(void (*connect) (int),
void (*disconnect)(int), void (*disconnect) (int),
enum xpc_retval (*allocate)(partid_t, int, u32, void **), enum xpc_retval (*allocate) (partid_t, int, u32, void **),
enum xpc_retval (*send)(partid_t, int, void *), enum xpc_retval (*send) (partid_t, int, void *),
enum xpc_retval (*send_notify)(partid_t, int, void *, enum xpc_retval (*send_notify) (partid_t, int, void *,
xpc_notify_func, void *), xpc_notify_func, void *),
void (*received)(partid_t, int, void *), void (*received) (partid_t, int, void *),
enum xpc_retval (*partid_to_nasids)(partid_t, void *)) enum xpc_retval (*partid_to_nasids) (partid_t, void *))
{ {
xpc_interface.connect = connect; xpc_interface.connect = connect;
xpc_interface.disconnect = disconnect; xpc_interface.disconnect = disconnect;
...@@ -77,28 +75,27 @@ xpc_set_interface(void (*connect)(int), ...@@ -77,28 +75,27 @@ xpc_set_interface(void (*connect)(int),
xpc_interface.partid_to_nasids = partid_to_nasids; xpc_interface.partid_to_nasids = partid_to_nasids;
} }
/* /*
* XPC calls this when it (the XPC module) is being unloaded. * XPC calls this when it (the XPC module) is being unloaded.
*/ */
void void
xpc_clear_interface(void) xpc_clear_interface(void)
{ {
xpc_interface.connect = (void (*)(int)) xpc_notloaded; xpc_interface.connect = (void (*)(int))xpc_notloaded;
xpc_interface.disconnect = (void (*)(int)) xpc_notloaded; xpc_interface.disconnect = (void (*)(int))xpc_notloaded;
xpc_interface.allocate = (enum xpc_retval (*)(partid_t, int, u32, xpc_interface.allocate = (enum xpc_retval(*)(partid_t, int, u32,
void **)) xpc_notloaded; void **))xpc_notloaded;
xpc_interface.send = (enum xpc_retval (*)(partid_t, int, void *)) xpc_interface.send = (enum xpc_retval(*)(partid_t, int, void *))
xpc_notloaded; xpc_notloaded;
xpc_interface.send_notify = (enum xpc_retval (*)(partid_t, int, void *, 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_interface.received = (void (*)(partid_t, int, void *))
xpc_notloaded; xpc_notloaded;
xpc_interface.partid_to_nasids = (enum xpc_retval (*)(partid_t, void *)) xpc_interface.partid_to_nasids = (enum xpc_retval(*)(partid_t, void *))
xpc_notloaded; xpc_notloaded;
} }
/* /*
* Register for automatic establishment of a channel connection whenever * Register for automatic establishment of a channel connection whenever
* a partition comes up. * a partition comes up.
...@@ -129,7 +126,6 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size, ...@@ -129,7 +126,6 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
{ {
struct xpc_registration *registration; struct xpc_registration *registration;
DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS); DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
DBUG_ON(payload_size == 0 || nentries == 0); DBUG_ON(payload_size == 0 || nentries == 0);
DBUG_ON(func == NULL); DBUG_ON(func == NULL);
...@@ -162,7 +158,6 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size, ...@@ -162,7 +158,6 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Remove the registration for automatic connection of the specified channel * Remove the registration for automatic connection of the specified channel
* when a partition comes up. * when a partition comes up.
...@@ -181,7 +176,6 @@ xpc_disconnect(int ch_number) ...@@ -181,7 +176,6 @@ xpc_disconnect(int ch_number)
{ {
struct xpc_registration *registration; struct xpc_registration *registration;
DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS); DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
registration = &xpc_registrations[ch_number]; registration = &xpc_registrations[ch_number];
...@@ -214,14 +208,12 @@ xpc_disconnect(int ch_number) ...@@ -214,14 +208,12 @@ xpc_disconnect(int ch_number)
return; return;
} }
int __init int __init
xp_init(void) xp_init(void)
{ {
int ret, ch_number; int ret, ch_number;
u64 func_addr = *(u64 *) xp_nofault_PIOR; u64 func_addr = *(u64 *)xp_nofault_PIOR;
u64 err_func_addr = *(u64 *) xp_error_PIOR; u64 err_func_addr = *(u64 *)xp_error_PIOR;
if (!ia64_platform_is("sn2")) { if (!ia64_platform_is("sn2")) {
return -ENODEV; return -ENODEV;
...@@ -258,22 +250,21 @@ xp_init(void) ...@@ -258,22 +250,21 @@ xp_init(void)
return 0; return 0;
} }
module_init(xp_init);
module_init(xp_init);
void __exit void __exit
xp_exit(void) xp_exit(void)
{ {
u64 func_addr = *(u64 *) xp_nofault_PIOR; u64 func_addr = *(u64 *)xp_nofault_PIOR;
u64 err_func_addr = *(u64 *) xp_error_PIOR; u64 err_func_addr = *(u64 *)xp_error_PIOR;
/* unregister the PIO read nofault code region */ /* unregister the PIO read nofault code region */
(void) sn_register_nofault_code(func_addr, err_func_addr, (void)sn_register_nofault_code(func_addr, err_func_addr,
err_func_addr, 1, 0); err_func_addr, 1, 0);
} }
module_exit(xp_exit);
module_exit(xp_exit);
MODULE_AUTHOR("Silicon Graphics, Inc."); MODULE_AUTHOR("Silicon Graphics, Inc.");
MODULE_DESCRIPTION("Cross Partition (XP) base"); MODULE_DESCRIPTION("Cross Partition (XP) base");
...@@ -287,4 +278,3 @@ EXPORT_SYMBOL(xpc_clear_interface); ...@@ -287,4 +278,3 @@ EXPORT_SYMBOL(xpc_clear_interface);
EXPORT_SYMBOL(xpc_set_interface); EXPORT_SYMBOL(xpc_set_interface);
EXPORT_SYMBOL(xpc_connect); EXPORT_SYMBOL(xpc_connect);
EXPORT_SYMBOL(xpc_disconnect); EXPORT_SYMBOL(xpc_disconnect);
drivers/misc/sgi-xp/xp_nofault.S
View file @ 4a3ad2dd
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.
*/ */
/* /*
* The xp_nofault_PIOR function takes a pointer to a remote PIO register * 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 * and attempts to load and consume a value from it. This function
......
drivers/misc/sgi-xp/xpc.h
View file @ 4a3ad2dd
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.
*/ */
/* /*
* Cross Partition Communication (XPC) structures and macros. * Cross Partition Communication (XPC) structures and macros.
*/ */
...@@ -14,7 +13,6 @@ ...@@ -14,7 +13,6 @@
#ifndef _DRIVERS_MISC_SGIXP_XPC_H #ifndef _DRIVERS_MISC_SGIXP_XPC_H
#define _DRIVERS_MISC_SGIXP_XPC_H #define _DRIVERS_MISC_SGIXP_XPC_H
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/device.h> #include <linux/device.h>
...@@ -29,7 +27,6 @@ ...@@ -29,7 +27,6 @@
#include <asm/sn/shub_mmr.h> #include <asm/sn/shub_mmr.h>
#include "xp.h" #include "xp.h"
/* /*
* XPC Version numbers consist of a major and minor number. XPC can always * XPC Version numbers consist of a major and minor number. XPC can always
* talk to versions with same major #, and never talk to versions with a * talk to versions with same major #, and never talk to versions with a
...@@ -39,7 +36,6 @@ ...@@ -39,7 +36,6 @@
#define XPC_VERSION_MAJOR(_v) ((_v) >> 4) #define XPC_VERSION_MAJOR(_v) ((_v) >> 4)
#define XPC_VERSION_MINOR(_v) ((_v) & 0xf) #define XPC_VERSION_MINOR(_v) ((_v) & 0xf)
/* /*
* The next macros define word or bit representations for given * The next macros define word or bit representations for given
* C-brick nasid in either the SAL provided bit array representing * C-brick nasid in either the SAL provided bit array representing
...@@ -67,7 +63,6 @@ ...@@ -67,7 +63,6 @@
/* define the process name of the discovery thread */ /* define the process name of the discovery thread */
#define XPC_DISCOVERY_THREAD_NAME "xpc_discovery" #define XPC_DISCOVERY_THREAD_NAME "xpc_discovery"
/* /*
* the reserved page * the reserved page
* *
...@@ -138,14 +133,12 @@ xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2) ...@@ -138,14 +133,12 @@ xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2)
{ {
int ret; int ret;
if ((ret = stamp1->tv_sec - stamp2->tv_sec) == 0) { if ((ret = stamp1->tv_sec - stamp2->tv_sec) == 0) {
ret = stamp1->tv_nsec - stamp2->tv_nsec; ret = stamp1->tv_nsec - stamp2->tv_nsec;
} }
return ret; return ret;
} }
/* /*
* Define the structures by which XPC variables can be exported to other * Define the structures by which XPC variables can be exported to other
* partitions. (There are two: struct xpc_vars and struct xpc_vars_part) * partitions. (There are two: struct xpc_vars and struct xpc_vars_part)
...@@ -177,7 +170,6 @@ struct xpc_vars { ...@@ -177,7 +170,6 @@ struct xpc_vars {
#define XPC_SUPPORTS_DISENGAGE_REQUEST(_version) \ #define XPC_SUPPORTS_DISENGAGE_REQUEST(_version) \
(_version >= _XPC_VERSION(3,1)) (_version >= _XPC_VERSION(3,1))
static inline int static inline int
xpc_hb_allowed(partid_t partid, struct xpc_vars *vars) xpc_hb_allowed(partid_t partid, struct xpc_vars *vars)
{ {
...@@ -208,7 +200,6 @@ xpc_disallow_hb(partid_t partid, struct xpc_vars *vars) ...@@ -208,7 +200,6 @@ xpc_disallow_hb(partid_t partid, struct xpc_vars *vars)
old_mask); old_mask);
} }
/* /*
* The AMOs page consists of a number of AMO variables which are divided into * The AMOs page consists of a number of AMO variables which are divided into
* four groups, The first two groups are used to identify an IRQ's sender. * four groups, The first two groups are used to identify an IRQ's sender.
...@@ -222,7 +213,6 @@ xpc_disallow_hb(partid_t partid, struct xpc_vars *vars) ...@@ -222,7 +213,6 @@ xpc_disallow_hb(partid_t partid, struct xpc_vars *vars)
#define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS) #define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS)
#define XPC_DISENGAGE_REQUEST_AMO (XPC_ENGAGED_PARTITIONS_AMO + 1) #define XPC_DISENGAGE_REQUEST_AMO (XPC_ENGAGED_PARTITIONS_AMO + 1)
/* /*
* The following structure describes the per partition specific variables. * The following structure describes the per partition specific variables.
* *
...@@ -260,7 +250,6 @@ struct xpc_vars_part { ...@@ -260,7 +250,6 @@ struct xpc_vars_part {
#define XPC_VP_MAGIC1 0x0053524156435058L /* 'XPCVARS\0'L (little endian) */ #define XPC_VP_MAGIC1 0x0053524156435058L /* 'XPCVARS\0'L (little endian) */
#define XPC_VP_MAGIC2 0x0073726176435058L /* 'XPCvars\0'L (little endian) */ #define XPC_VP_MAGIC2 0x0073726176435058L /* 'XPCvars\0'L (little endian) */
/* the reserved page sizes and offsets */ /* the reserved page sizes and offsets */
#define XPC_RP_HEADER_SIZE L1_CACHE_ALIGN(sizeof(struct xpc_rsvd_page)) #define XPC_RP_HEADER_SIZE L1_CACHE_ALIGN(sizeof(struct xpc_rsvd_page))
...@@ -271,7 +260,6 @@ struct xpc_vars_part { ...@@ -271,7 +260,6 @@ struct xpc_vars_part {
#define XPC_RP_VARS(_rp) ((struct xpc_vars *) XPC_RP_MACH_NASIDS(_rp) + xp_nasid_mask_words) #define XPC_RP_VARS(_rp) ((struct xpc_vars *) XPC_RP_MACH_NASIDS(_rp) + xp_nasid_mask_words)
#define XPC_RP_VARS_PART(_rp) (struct xpc_vars_part *) ((u8 *) XPC_RP_VARS(rp) + XPC_RP_VARS_SIZE) #define XPC_RP_VARS_PART(_rp) (struct xpc_vars_part *) ((u8 *) XPC_RP_VARS(rp) + XPC_RP_VARS_SIZE)
/* /*
* Functions registered by add_timer() or called by kernel_thread() only * Functions registered by add_timer() or called by kernel_thread() only
* allow for a single 64-bit argument. The following macros can be used to * allow for a single 64-bit argument. The following macros can be used to
...@@ -285,8 +273,6 @@ struct xpc_vars_part { ...@@ -285,8 +273,6 @@ struct xpc_vars_part {
#define XPC_UNPACK_ARG1(_args) (((u64) _args) & 0xffffffff) #define XPC_UNPACK_ARG1(_args) (((u64) _args) & 0xffffffff)
#define XPC_UNPACK_ARG2(_args) ((((u64) _args) >> 32) & 0xffffffff) #define XPC_UNPACK_ARG2(_args) ((((u64) _args) >> 32) & 0xffffffff)
/* /*
* Define a Get/Put value pair (pointers) used with a message queue. * Define a Get/Put value pair (pointers) used with a message queue.
*/ */
...@@ -298,8 +284,6 @@ struct xpc_gp { ...@@ -298,8 +284,6 @@ struct xpc_gp {
#define XPC_GP_SIZE \ #define XPC_GP_SIZE \
L1_CACHE_ALIGN(sizeof(struct xpc_gp) * XPC_NCHANNELS) L1_CACHE_ALIGN(sizeof(struct xpc_gp) * XPC_NCHANNELS)
/* /*
* Define a structure that contains arguments associated with opening and * Define a structure that contains arguments associated with opening and
* closing a channel. * closing a channel.
...@@ -315,20 +299,15 @@ struct xpc_openclose_args { ...@@ -315,20 +299,15 @@ struct xpc_openclose_args {
#define XPC_OPENCLOSE_ARGS_SIZE \ #define XPC_OPENCLOSE_ARGS_SIZE \
L1_CACHE_ALIGN(sizeof(struct xpc_openclose_args) * XPC_NCHANNELS) L1_CACHE_ALIGN(sizeof(struct xpc_openclose_args) * XPC_NCHANNELS)
/* struct xpc_msg flags */ /* struct xpc_msg flags */
#define XPC_M_DONE 0x01 /* msg has been received/consumed */ #define XPC_M_DONE 0x01 /* msg has been received/consumed */
#define XPC_M_READY 0x02 /* msg is ready to be sent */ #define XPC_M_READY 0x02 /* msg is ready to be sent */
#define XPC_M_INTERRUPT 0x04 /* send interrupt when msg consumed */ #define XPC_M_INTERRUPT 0x04 /* send interrupt when msg consumed */
#define XPC_MSG_ADDRESS(_payload) \ #define XPC_MSG_ADDRESS(_payload) \
((struct xpc_msg *)((u8 *)(_payload) - XPC_MSG_PAYLOAD_OFFSET)) ((struct xpc_msg *)((u8 *)(_payload) - XPC_MSG_PAYLOAD_OFFSET))
/* /*
* Defines notify entry. * Defines notify entry.
* *
...@@ -347,8 +326,6 @@ struct xpc_notify { ...@@ -347,8 +326,6 @@ struct xpc_notify {
#define XPC_N_CALL 0x01 /* notify function provided by user */ #define XPC_N_CALL 0x01 /* notify function provided by user */
/* /*
* Define the structure that manages all the stuff required by a channel. In * Define the structure that manages all the stuff required by a channel. In
* particular, they are used to manage the messages sent across the channel. * particular, they are used to manage the messages sent across the channel.
...@@ -439,12 +416,12 @@ struct xpc_channel { ...@@ -439,12 +416,12 @@ struct xpc_channel {
u16 msg_size; /* sizeof each msg entry */ u16 msg_size; /* sizeof each msg entry */
u16 local_nentries; /* #of msg entries in local msg queue */ u16 local_nentries; /* #of msg entries in local msg queue */
u16 remote_nentries; /* #of msg entries in remote msg queue*/ u16 remote_nentries; /* #of msg entries in remote msg queue */
void *local_msgqueue_base; /* base address of kmalloc'd space */ void *local_msgqueue_base; /* base address of kmalloc'd space */
struct xpc_msg *local_msgqueue; /* local message queue */ struct xpc_msg *local_msgqueue; /* local message queue */
void *remote_msgqueue_base; /* base address of kmalloc'd space */ void *remote_msgqueue_base; /* base address of kmalloc'd space */
struct xpc_msg *remote_msgqueue;/* cached copy of remote partition's */ struct xpc_msg *remote_msgqueue; /* cached copy of remote partition's */
/* local message queue */ /* local message queue */
u64 remote_msgqueue_pa; /* phys addr of remote partition's */ u64 remote_msgqueue_pa; /* phys addr of remote partition's */
/* local message queue */ /* local message queue */
...@@ -460,7 +437,7 @@ struct xpc_channel { ...@@ -460,7 +437,7 @@ struct xpc_channel {
/* queue of msg senders who want to be notified when msg received */ /* queue of msg senders who want to be notified when msg received */
atomic_t n_to_notify; /* #of msg senders to notify */ atomic_t n_to_notify; /* #of msg senders to notify */
struct xpc_notify *notify_queue;/* notify queue for messages sent */ struct xpc_notify *notify_queue; /* notify queue for messages sent */
xpc_channel_func func; /* user's channel function */ xpc_channel_func func; /* user's channel function */
void *key; /* pointer to user's key */ void *key; /* pointer to user's key */
...@@ -496,7 +473,6 @@ struct xpc_channel { ...@@ -496,7 +473,6 @@ struct xpc_channel {
} ____cacheline_aligned; } ____cacheline_aligned;
/* struct xpc_channel flags */ /* struct xpc_channel flags */
#define XPC_C_WASCONNECTED 0x00000001 /* channel was connected */ #define XPC_C_WASCONNECTED 0x00000001 /* channel was connected */
...@@ -526,8 +502,6 @@ struct xpc_channel { ...@@ -526,8 +502,6 @@ struct xpc_channel {
0x00020000 /* disconnecting callout completed */ 0x00020000 /* disconnecting callout completed */
#define XPC_C_WDISCONNECT 0x00040000 /* waiting for channel disconnect */ #define XPC_C_WDISCONNECT 0x00040000 /* waiting for channel disconnect */
/* /*
* Manages channels on a partition basis. There is one of these structures * Manages channels on a partition basis. There is one of these structures
* for each partition (a partition will never utilize the structure that * for each partition (a partition will never utilize the structure that
...@@ -538,7 +512,7 @@ struct xpc_partition { ...@@ -538,7 +512,7 @@ struct xpc_partition {
/* XPC HB infrastructure */ /* XPC HB infrastructure */
u8 remote_rp_version; /* version# of partition's rsvd pg */ u8 remote_rp_version; /* version# of partition's rsvd pg */
struct timespec remote_rp_stamp;/* time when rsvd pg was initialized */ struct timespec remote_rp_stamp; /* time when rsvd pg was initialized */
u64 remote_rp_pa; /* phys addr of partition's rsvd pg */ u64 remote_rp_pa; /* phys addr of partition's rsvd pg */
u64 remote_vars_pa; /* phys addr of partition's vars */ u64 remote_vars_pa; /* phys addr of partition's vars */
u64 remote_vars_part_pa; /* phys addr of partition's vars part */ u64 remote_vars_part_pa; /* phys addr of partition's vars part */
...@@ -557,14 +531,12 @@ struct xpc_partition { ...@@ -557,14 +531,12 @@ struct xpc_partition {
unsigned long disengage_request_timeout; /* timeout in jiffies */ unsigned long disengage_request_timeout; /* timeout in jiffies */
struct timer_list disengage_request_timer; struct timer_list disengage_request_timer;
/* XPC infrastructure referencing and teardown control */ /* XPC infrastructure referencing and teardown control */
volatile u8 setup_state; /* infrastructure setup state */ volatile u8 setup_state; /* infrastructure setup state */
wait_queue_head_t teardown_wq; /* kthread waiting to teardown infra */ wait_queue_head_t teardown_wq; /* kthread waiting to teardown infra */
atomic_t references; /* #of references to infrastructure */ atomic_t references; /* #of references to infrastructure */
/* /*
* NONE OF THE PRECEDING FIELDS OF THIS STRUCTURE WILL BE CLEARED WHEN * NONE OF THE PRECEDING FIELDS OF THIS STRUCTURE WILL BE CLEARED WHEN
* XPC SETS UP THE NECESSARY INFRASTRUCTURE TO SUPPORT CROSS PARTITION * XPC SETS UP THE NECESSARY INFRASTRUCTURE TO SUPPORT CROSS PARTITION
...@@ -572,21 +544,19 @@ struct xpc_partition { ...@@ -572,21 +544,19 @@ struct xpc_partition {
* 'nchannels' FIELD MUST BE THE FIRST OF THE FIELDS TO BE CLEARED.) * 'nchannels' FIELD MUST BE THE FIRST OF THE FIELDS TO BE CLEARED.)
*/ */
u8 nchannels; /* #of defined channels supported */ u8 nchannels; /* #of defined channels supported */
atomic_t nchannels_active; /* #of channels that are not DISCONNECTED */ atomic_t nchannels_active; /* #of channels that are not DISCONNECTED */
atomic_t nchannels_engaged;/* #of channels engaged with remote part */ atomic_t nchannels_engaged; /* #of channels engaged with remote part */
struct xpc_channel *channels;/* array of channel structures */ struct xpc_channel *channels; /* array of channel structures */
void *local_GPs_base; /* base address of kmalloc'd space */ void *local_GPs_base; /* base address of kmalloc'd space */
struct xpc_gp *local_GPs; /* local Get/Put values */ struct xpc_gp *local_GPs; /* local Get/Put values */
void *remote_GPs_base; /* base address of kmalloc'd space */ void *remote_GPs_base; /* base address of kmalloc'd space */
struct xpc_gp *remote_GPs;/* copy of remote partition's local Get/Put */ struct xpc_gp *remote_GPs; /* copy of remote partition's local Get/Put */
/* values */ /* values */
u64 remote_GPs_pa; /* phys address of remote partition's local */ u64 remote_GPs_pa; /* phys address of remote partition's local */
/* Get/Put values */ /* Get/Put values */
/* fields used to pass args when opening or closing a channel */ /* fields used to pass args when opening or closing a channel */
void *local_openclose_args_base; /* base address of kmalloc'd space */ void *local_openclose_args_base; /* base address of kmalloc'd space */
...@@ -596,7 +566,6 @@ struct xpc_partition { ...@@ -596,7 +566,6 @@ struct xpc_partition {
/* args */ /* args */
u64 remote_openclose_args_pa; /* phys addr of remote's args */ u64 remote_openclose_args_pa; /* phys addr of remote's args */
/* IPI sending, receiving and handling related fields */ /* IPI sending, receiving and handling related fields */
int remote_IPI_nasid; /* nasid of where to send IPIs */ int remote_IPI_nasid; /* nasid of where to send IPIs */
...@@ -610,7 +579,6 @@ struct xpc_partition { ...@@ -610,7 +579,6 @@ struct xpc_partition {
spinlock_t IPI_lock; /* IPI handler lock */ spinlock_t IPI_lock; /* IPI handler lock */
/* channel manager related fields */ /* channel manager related fields */
atomic_t channel_mgr_requests; /* #of requests to activate chan mgr */ atomic_t channel_mgr_requests; /* #of requests to activate chan mgr */
...@@ -618,7 +586,6 @@ struct xpc_partition { ...@@ -618,7 +586,6 @@ struct xpc_partition {
} ____cacheline_aligned; } ____cacheline_aligned;
/* struct xpc_partition act_state values (for XPC HB) */ /* struct xpc_partition act_state values (for XPC HB) */
#define XPC_P_INACTIVE 0x00 /* partition is not active */ #define XPC_P_INACTIVE 0x00 /* partition is not active */
...@@ -627,11 +594,9 @@ struct xpc_partition { ...@@ -627,11 +594,9 @@ struct xpc_partition {
#define XPC_P_ACTIVE 0x03 /* xpc_partition_up() was called */ #define XPC_P_ACTIVE 0x03 /* xpc_partition_up() was called */
#define XPC_P_DEACTIVATING 0x04 /* partition deactivation initiated */ #define XPC_P_DEACTIVATING 0x04 /* partition deactivation initiated */
#define XPC_DEACTIVATE_PARTITION(_p, _reason) \ #define XPC_DEACTIVATE_PARTITION(_p, _reason) \
xpc_deactivate_partition(__LINE__, (_p), (_reason)) xpc_deactivate_partition(__LINE__, (_p), (_reason))
/* struct xpc_partition setup_state values */ /* struct xpc_partition setup_state values */
#define XPC_P_UNSET 0x00 /* infrastructure was never setup */ #define XPC_P_UNSET 0x00 /* infrastructure was never setup */
...@@ -639,8 +604,6 @@ struct xpc_partition { ...@@ -639,8 +604,6 @@ struct xpc_partition {
#define XPC_P_WTEARDOWN 0x02 /* waiting to teardown infrastructure */ #define XPC_P_WTEARDOWN 0x02 /* waiting to teardown infrastructure */
#define XPC_P_TORNDOWN 0x03 /* infrastructure is torndown */ #define XPC_P_TORNDOWN 0x03 /* infrastructure is torndown */
/* /*
* struct xpc_partition IPI_timer #of seconds to wait before checking for * struct xpc_partition IPI_timer #of seconds to wait before checking for
* dropped IPIs. These occur whenever an IPI amo write doesn't complete until * dropped IPIs. These occur whenever an IPI amo write doesn't complete until
...@@ -648,22 +611,17 @@ struct xpc_partition { ...@@ -648,22 +611,17 @@ struct xpc_partition {
*/ */
#define XPC_P_DROPPED_IPI_WAIT (0.25 * HZ) #define XPC_P_DROPPED_IPI_WAIT (0.25 * HZ)
/* number of seconds to wait for other partitions to disengage */ /* number of seconds to wait for other partitions to disengage */
#define XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT 90 #define XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT 90
/* interval in seconds to print 'waiting disengagement' messages */ /* interval in seconds to print 'waiting disengagement' messages */
#define XPC_DISENGAGE_PRINTMSG_INTERVAL 10 #define XPC_DISENGAGE_PRINTMSG_INTERVAL 10
#define XPC_PARTID(_p) ((partid_t) ((_p) - &xpc_partitions[0])) #define XPC_PARTID(_p) ((partid_t) ((_p) - &xpc_partitions[0]))
/* found in xp_main.c */ /* found in xp_main.c */
extern struct xpc_registration xpc_registrations[]; extern struct xpc_registration xpc_registrations[];
/* found in xpc_main.c */ /* found in xpc_main.c */
extern struct device *xpc_part; extern struct device *xpc_part;
extern struct device *xpc_chan; extern struct device *xpc_chan;
...@@ -676,7 +634,6 @@ extern void xpc_activate_kthreads(struct xpc_channel *, int); ...@@ -676,7 +634,6 @@ extern void xpc_activate_kthreads(struct xpc_channel *, int);
extern void xpc_create_kthreads(struct xpc_channel *, int, int); extern void xpc_create_kthreads(struct xpc_channel *, int, int);
extern void xpc_disconnect_wait(int); extern void xpc_disconnect_wait(int);
/* found in xpc_partition.c */ /* found in xpc_partition.c */
extern int xpc_exiting; extern int xpc_exiting;
extern struct xpc_vars *xpc_vars; extern struct xpc_vars *xpc_vars;
...@@ -699,7 +656,6 @@ extern void xpc_deactivate_partition(const int, struct xpc_partition *, ...@@ -699,7 +656,6 @@ extern void xpc_deactivate_partition(const int, struct xpc_partition *,
enum xpc_retval); enum xpc_retval);
extern enum xpc_retval xpc_initiate_partid_to_nasids(partid_t, void *); extern enum xpc_retval xpc_initiate_partid_to_nasids(partid_t, void *);
/* found in xpc_channel.c */ /* found in xpc_channel.c */
extern void xpc_initiate_connect(int); extern void xpc_initiate_connect(int);
extern void xpc_initiate_disconnect(int); extern void xpc_initiate_disconnect(int);
...@@ -719,8 +675,6 @@ extern void xpc_disconnect_callout(struct xpc_channel *, enum xpc_retval); ...@@ -719,8 +675,6 @@ extern void xpc_disconnect_callout(struct xpc_channel *, enum xpc_retval);
extern void xpc_partition_going_down(struct xpc_partition *, enum xpc_retval); extern void xpc_partition_going_down(struct xpc_partition *, enum xpc_retval);
extern void xpc_teardown_infrastructure(struct xpc_partition *); extern void xpc_teardown_infrastructure(struct xpc_partition *);
static inline void static inline void
xpc_wakeup_channel_mgr(struct xpc_partition *part) xpc_wakeup_channel_mgr(struct xpc_partition *part)
{ {
...@@ -729,8 +683,6 @@ xpc_wakeup_channel_mgr(struct xpc_partition *part) ...@@ -729,8 +683,6 @@ xpc_wakeup_channel_mgr(struct xpc_partition *part)
} }
} }
/* /*
* These next two inlines are used to keep us from tearing down a channel's * These next two inlines are used to keep us from tearing down a channel's
* msg queues while a thread may be referencing them. * msg queues while a thread may be referencing them.
...@@ -752,12 +704,9 @@ xpc_msgqueue_deref(struct xpc_channel *ch) ...@@ -752,12 +704,9 @@ xpc_msgqueue_deref(struct xpc_channel *ch)
} }
} }
#define XPC_DISCONNECT_CHANNEL(_ch, _reason, _irqflgs) \ #define XPC_DISCONNECT_CHANNEL(_ch, _reason, _irqflgs) \
xpc_disconnect_channel(__LINE__, _ch, _reason, _irqflgs) xpc_disconnect_channel(__LINE__, _ch, _reason, _irqflgs)
/* /*
* These two inlines are used to keep us from tearing down a partition's * These two inlines are used to keep us from tearing down a partition's
* setup infrastructure while a thread may be referencing it. * setup infrastructure while a thread may be referencing it.
...@@ -767,7 +716,6 @@ xpc_part_deref(struct xpc_partition *part) ...@@ -767,7 +716,6 @@ xpc_part_deref(struct xpc_partition *part)
{ {
s32 refs = atomic_dec_return(&part->references); s32 refs = atomic_dec_return(&part->references);
DBUG_ON(refs < 0); DBUG_ON(refs < 0);
if (refs == 0 && part->setup_state == XPC_P_WTEARDOWN) { if (refs == 0 && part->setup_state == XPC_P_WTEARDOWN) {
wake_up(&part->teardown_wq); wake_up(&part->teardown_wq);
...@@ -779,7 +727,6 @@ xpc_part_ref(struct xpc_partition *part) ...@@ -779,7 +727,6 @@ xpc_part_ref(struct xpc_partition *part)
{ {
int setup; int setup;
atomic_inc(&part->references); atomic_inc(&part->references);
setup = (part->setup_state == XPC_P_SETUP); setup = (part->setup_state == XPC_P_SETUP);
if (!setup) { if (!setup) {
...@@ -788,8 +735,6 @@ xpc_part_ref(struct xpc_partition *part) ...@@ -788,8 +735,6 @@ xpc_part_ref(struct xpc_partition *part)
return setup; return setup;
} }
/* /*
* The following macro is to be used for the setting of the reason and * The following macro is to be used for the setting of the reason and
* reason_line fields in both the struct xpc_channel and struct xpc_partition * reason_line fields in both the struct xpc_channel and struct xpc_partition
...@@ -801,8 +746,6 @@ xpc_part_ref(struct xpc_partition *part) ...@@ -801,8 +746,6 @@ xpc_part_ref(struct xpc_partition *part)
(_p)->reason_line = _line; \ (_p)->reason_line = _line; \
} }
/* /*
* This next set of inlines are used to keep track of when a partition is * This next set of inlines are used to keep track of when a partition is
* potentially engaged in accessing memory belonging to another partition. * potentially engaged in accessing memory belonging to another partition.
...@@ -812,14 +755,14 @@ static inline void ...@@ -812,14 +755,14 @@ static inline void
xpc_mark_partition_engaged(struct xpc_partition *part) xpc_mark_partition_engaged(struct xpc_partition *part)
{ {
unsigned long irq_flags; unsigned long irq_flags;
AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
(XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t))); (XPC_ENGAGED_PARTITIONS_AMO *
sizeof(AMO_t)));
local_irq_save(irq_flags); local_irq_save(irq_flags);
/* set bit corresponding to our partid in remote partition's AMO */ /* set bit corresponding to our partid in remote partition's AMO */
FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR, FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_OR,
(1UL << sn_partition_id)); (1UL << sn_partition_id));
/* /*
* We must always use the nofault function regardless of whether we * We must always use the nofault function regardless of whether we
...@@ -827,8 +770,9 @@ xpc_mark_partition_engaged(struct xpc_partition *part) ...@@ -827,8 +770,9 @@ xpc_mark_partition_engaged(struct xpc_partition *part)
* didn't, we'd never know that the other partition is down and would * didn't, we'd never know that the other partition is down and would
* keep sending IPIs and AMOs to it until the heartbeat times out. * keep sending IPIs and AMOs to it until the heartbeat times out.
*/ */
(void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
variable), xp_nofault_PIOR_target)); variable),
xp_nofault_PIOR_target));
local_irq_restore(irq_flags); local_irq_restore(irq_flags);
} }
...@@ -837,14 +781,14 @@ static inline void ...@@ -837,14 +781,14 @@ static inline void
xpc_mark_partition_disengaged(struct xpc_partition *part) xpc_mark_partition_disengaged(struct xpc_partition *part)
{ {
unsigned long irq_flags; unsigned long irq_flags;
AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
(XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t))); (XPC_ENGAGED_PARTITIONS_AMO *
sizeof(AMO_t)));
local_irq_save(irq_flags); local_irq_save(irq_flags);
/* clear bit corresponding to our partid in remote partition's AMO */ /* clear bit corresponding to our partid in remote partition's AMO */
FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
~(1UL << sn_partition_id)); ~(1UL << sn_partition_id));
/* /*
* We must always use the nofault function regardless of whether we * We must always use the nofault function regardless of whether we
...@@ -852,8 +796,9 @@ xpc_mark_partition_disengaged(struct xpc_partition *part) ...@@ -852,8 +796,9 @@ xpc_mark_partition_disengaged(struct xpc_partition *part)
* didn't, we'd never know that the other partition is down and would * didn't, we'd never know that the other partition is down and would
* keep sending IPIs and AMOs to it until the heartbeat times out. * keep sending IPIs and AMOs to it until the heartbeat times out.
*/ */
(void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
variable), xp_nofault_PIOR_target)); variable),
xp_nofault_PIOR_target));
local_irq_restore(irq_flags); local_irq_restore(irq_flags);
} }
...@@ -862,14 +807,13 @@ static inline void ...@@ -862,14 +807,13 @@ static inline void
xpc_request_partition_disengage(struct xpc_partition *part) xpc_request_partition_disengage(struct xpc_partition *part)
{ {
unsigned long irq_flags; unsigned long irq_flags;
AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
(XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t))); (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
local_irq_save(irq_flags); local_irq_save(irq_flags);
/* set bit corresponding to our partid in remote partition's AMO */ /* set bit corresponding to our partid in remote partition's AMO */
FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR, FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_OR,
(1UL << sn_partition_id)); (1UL << sn_partition_id));
/* /*
* We must always use the nofault function regardless of whether we * We must always use the nofault function regardless of whether we
...@@ -877,8 +821,9 @@ xpc_request_partition_disengage(struct xpc_partition *part) ...@@ -877,8 +821,9 @@ xpc_request_partition_disengage(struct xpc_partition *part)
* didn't, we'd never know that the other partition is down and would * didn't, we'd never know that the other partition is down and would
* keep sending IPIs and AMOs to it until the heartbeat times out. * keep sending IPIs and AMOs to it until the heartbeat times out.
*/ */
(void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
variable), xp_nofault_PIOR_target)); variable),
xp_nofault_PIOR_target));
local_irq_restore(irq_flags); local_irq_restore(irq_flags);
} }
...@@ -887,14 +832,13 @@ static inline void ...@@ -887,14 +832,13 @@ static inline void
xpc_cancel_partition_disengage_request(struct xpc_partition *part) xpc_cancel_partition_disengage_request(struct xpc_partition *part)
{ {
unsigned long irq_flags; unsigned long irq_flags;
AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + AMO_t *amo = (AMO_t *)__va(part->remote_amos_page_pa +
(XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t))); (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t)));
local_irq_save(irq_flags); local_irq_save(irq_flags);
/* clear bit corresponding to our partid in remote partition's AMO */ /* clear bit corresponding to our partid in remote partition's AMO */
FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
~(1UL << sn_partition_id)); ~(1UL << sn_partition_id));
/* /*
* We must always use the nofault function regardless of whether we * We must always use the nofault function regardless of whether we
...@@ -902,8 +846,9 @@ xpc_cancel_partition_disengage_request(struct xpc_partition *part) ...@@ -902,8 +846,9 @@ xpc_cancel_partition_disengage_request(struct xpc_partition *part)
* didn't, we'd never know that the other partition is down and would * didn't, we'd never know that the other partition is down and would
* keep sending IPIs and AMOs to it until the heartbeat times out. * keep sending IPIs and AMOs to it until the heartbeat times out.
*/ */
(void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> (void)xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->
variable), xp_nofault_PIOR_target)); variable),
xp_nofault_PIOR_target));
local_irq_restore(irq_flags); local_irq_restore(irq_flags);
} }
...@@ -913,9 +858,8 @@ xpc_partition_engaged(u64 partid_mask) ...@@ -913,9 +858,8 @@ xpc_partition_engaged(u64 partid_mask)
{ {
AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO; AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO;
/* return our partition's AMO variable ANDed with partid_mask */ /* return our partition's AMO variable ANDed with partid_mask */
return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) & return (FETCHOP_LOAD_OP(TO_AMO((u64)&amo->variable), FETCHOP_LOAD) &
partid_mask); partid_mask);
} }
...@@ -924,9 +868,8 @@ xpc_partition_disengage_requested(u64 partid_mask) ...@@ -924,9 +868,8 @@ xpc_partition_disengage_requested(u64 partid_mask)
{ {
AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO; AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO;
/* return our partition's AMO variable ANDed with partid_mask */ /* return our partition's AMO variable ANDed with partid_mask */
return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) & return (FETCHOP_LOAD_OP(TO_AMO((u64)&amo->variable), FETCHOP_LOAD) &
partid_mask); partid_mask);
} }
...@@ -935,9 +878,8 @@ xpc_clear_partition_engaged(u64 partid_mask) ...@@ -935,9 +878,8 @@ xpc_clear_partition_engaged(u64 partid_mask)
{ {
AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO; AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO;
/* clear bit(s) based on partid_mask in our partition's AMO */ /* clear bit(s) based on partid_mask in our partition's AMO */
FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
~partid_mask); ~partid_mask);
} }
...@@ -946,14 +888,11 @@ xpc_clear_partition_disengage_request(u64 partid_mask) ...@@ -946,14 +888,11 @@ xpc_clear_partition_disengage_request(u64 partid_mask)
{ {
AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO; AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO;
/* clear bit(s) based on partid_mask in our partition's AMO */ /* clear bit(s) based on partid_mask in our partition's AMO */
FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_AND,
~partid_mask); ~partid_mask);
} }
/* /*
* The following set of macros and inlines are used for the sending and * The following set of macros and inlines are used for the sending and
* receiving of IPIs (also known as IRQs). There are two flavors of IPIs, * receiving of IPIs (also known as IRQs). There are two flavors of IPIs,
...@@ -964,20 +903,18 @@ xpc_clear_partition_disengage_request(u64 partid_mask) ...@@ -964,20 +903,18 @@ xpc_clear_partition_disengage_request(u64 partid_mask)
static inline u64 static inline u64
xpc_IPI_receive(AMO_t *amo) xpc_IPI_receive(AMO_t *amo)
{ {
return FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_CLEAR); return FETCHOP_LOAD_OP(TO_AMO((u64)&amo->variable), FETCHOP_CLEAR);
} }
static inline enum xpc_retval static inline enum xpc_retval
xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector) xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
{ {
int ret = 0; int ret = 0;
unsigned long irq_flags; unsigned long irq_flags;
local_irq_save(irq_flags); local_irq_save(irq_flags);
FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR, flag); FETCHOP_STORE_OP(TO_AMO((u64)&amo->variable), FETCHOP_OR, flag);
sn_send_IPI_phys(nasid, phys_cpuid, vector, 0); sn_send_IPI_phys(nasid, phys_cpuid, vector, 0);
/* /*
...@@ -986,7 +923,7 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector) ...@@ -986,7 +923,7 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
* didn't, we'd never know that the other partition is down and would * didn't, we'd never know that the other partition is down and would
* keep sending IPIs and AMOs to it until the heartbeat times out. * keep sending IPIs and AMOs to it until the heartbeat times out.
*/ */
ret = xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo->variable), ret = xp_nofault_PIOR((u64 *)GLOBAL_MMR_ADDR(NASID_GET(&amo->variable),
xp_nofault_PIOR_target)); xp_nofault_PIOR_target));
local_irq_restore(irq_flags); local_irq_restore(irq_flags);
...@@ -994,7 +931,6 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector) ...@@ -994,7 +931,6 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector)
return ((ret == 0) ? xpcSuccess : xpcPioReadError); return ((ret == 0) ? xpcSuccess : xpcPioReadError);
} }
/* /*
* IPIs associated with SGI_XPC_ACTIVATE IRQ. * IPIs associated with SGI_XPC_ACTIVATE IRQ.
*/ */
...@@ -1008,11 +944,10 @@ xpc_activate_IRQ_send(u64 amos_page_pa, int from_nasid, int to_nasid, ...@@ -1008,11 +944,10 @@ xpc_activate_IRQ_send(u64 amos_page_pa, int from_nasid, int to_nasid,
{ {
int w_index = XPC_NASID_W_INDEX(from_nasid); int w_index = XPC_NASID_W_INDEX(from_nasid);
int b_index = XPC_NASID_B_INDEX(from_nasid); int b_index = XPC_NASID_B_INDEX(from_nasid);
AMO_t *amos = (AMO_t *) __va(amos_page_pa + AMO_t *amos = (AMO_t *)__va(amos_page_pa +
(XPC_ACTIVATE_IRQ_AMOS * sizeof(AMO_t))); (XPC_ACTIVATE_IRQ_AMOS * sizeof(AMO_t)));
(void)xpc_IPI_send(&amos[w_index], (1UL << b_index), to_nasid,
(void) xpc_IPI_send(&amos[w_index], (1UL << b_index), to_nasid,
to_phys_cpuid, SGI_XPC_ACTIVATE); to_phys_cpuid, SGI_XPC_ACTIVATE);
} }
...@@ -1027,7 +962,8 @@ static inline void ...@@ -1027,7 +962,8 @@ static inline void
xpc_IPI_send_activated(struct xpc_partition *part) xpc_IPI_send_activated(struct xpc_partition *part)
{ {
xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0), xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0),
part->remote_act_nasid, part->remote_act_phys_cpuid); part->remote_act_nasid,
part->remote_act_phys_cpuid);
} }
static inline void static inline void
...@@ -1041,10 +977,10 @@ static inline void ...@@ -1041,10 +977,10 @@ static inline void
xpc_IPI_send_disengage(struct xpc_partition *part) xpc_IPI_send_disengage(struct xpc_partition *part)
{ {
xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0), xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0),
part->remote_act_nasid, part->remote_act_phys_cpuid); part->remote_act_nasid,
part->remote_act_phys_cpuid);
} }
/* /*
* IPIs associated with SGI_XPC_NOTIFY IRQ. * IPIs associated with SGI_XPC_NOTIFY IRQ.
*/ */
...@@ -1063,13 +999,11 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string, ...@@ -1063,13 +999,11 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
struct xpc_partition *part = &xpc_partitions[ch->partid]; struct xpc_partition *part = &xpc_partitions[ch->partid];
enum xpc_retval ret; enum xpc_retval ret;
if (likely(part->act_state != XPC_P_DEACTIVATING)) { if (likely(part->act_state != XPC_P_DEACTIVATING)) {
ret = xpc_IPI_send(part->remote_IPI_amo_va, ret = xpc_IPI_send(part->remote_IPI_amo_va,
(u64) ipi_flag << (ch->number * 8), (u64)ipi_flag << (ch->number * 8),
part->remote_IPI_nasid, part->remote_IPI_nasid,
part->remote_IPI_phys_cpuid, part->remote_IPI_phys_cpuid, SGI_XPC_NOTIFY);
SGI_XPC_NOTIFY);
dev_dbg(xpc_chan, "%s sent to partid=%d, channel=%d, ret=%d\n", dev_dbg(xpc_chan, "%s sent to partid=%d, channel=%d, ret=%d\n",
ipi_flag_string, ch->partid, ch->number, ret); ipi_flag_string, ch->partid, ch->number, ret);
if (unlikely(ret != xpcSuccess)) { if (unlikely(ret != xpcSuccess)) {
...@@ -1084,7 +1018,6 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string, ...@@ -1084,7 +1018,6 @@ xpc_notify_IRQ_send(struct xpc_channel *ch, u8 ipi_flag, char *ipi_flag_string,
} }
} }
/* /*
* Make it look like the remote partition, which is associated with the * Make it look like the remote partition, which is associated with the
* specified channel, sent us an IPI. This faked IPI will be handled * specified channel, sent us an IPI. This faked IPI will be handled
...@@ -1099,14 +1032,12 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag, ...@@ -1099,14 +1032,12 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
{ {
struct xpc_partition *part = &xpc_partitions[ch->partid]; struct xpc_partition *part = &xpc_partitions[ch->partid];
FETCHOP_STORE_OP(TO_AMO((u64)&part->local_IPI_amo_va->variable),
FETCHOP_STORE_OP(TO_AMO((u64) &part->local_IPI_amo_va->variable), FETCHOP_OR, ((u64)ipi_flag << (ch->number * 8)));
FETCHOP_OR, ((u64) ipi_flag << (ch->number * 8)));
dev_dbg(xpc_chan, "%s sent local from partid=%d, channel=%d\n", dev_dbg(xpc_chan, "%s sent local from partid=%d, channel=%d\n",
ipi_flag_string, ch->partid, ch->number); ipi_flag_string, ch->partid, ch->number);
} }
/* /*
* The sending and receiving of IPIs includes the setting of an AMO variable * The sending and receiving of IPIs includes the setting of an AMO variable
* to indicate the reason the IPI was sent. The 64-bit variable is divided * to indicate the reason the IPI was sent. The 64-bit variable is divided
...@@ -1121,7 +1052,6 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag, ...@@ -1121,7 +1052,6 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
#define XPC_IPI_OPENREPLY 0x08 #define XPC_IPI_OPENREPLY 0x08
#define XPC_IPI_MSGREQUEST 0x10 #define XPC_IPI_MSGREQUEST 0x10
/* given an AMO variable and a channel#, get its associated IPI flags */ /* given an AMO variable and a channel#, get its associated IPI flags */
#define XPC_GET_IPI_FLAGS(_amo, _c) ((u8) (((_amo) >> ((_c) * 8)) & 0xff)) #define XPC_GET_IPI_FLAGS(_amo, _c) ((u8) (((_amo) >> ((_c) * 8)) & 0xff))
#define XPC_SET_IPI_FLAGS(_amo, _c, _f) (_amo) |= ((u64) (_f) << ((_c) * 8)) #define XPC_SET_IPI_FLAGS(_amo, _c, _f) (_amo) |= ((u64) (_f) << ((_c) * 8))
...@@ -1129,13 +1059,11 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag, ...@@ -1129,13 +1059,11 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag,
#define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & __IA64_UL_CONST(0x0f0f0f0f0f0f0f0f)) #define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & __IA64_UL_CONST(0x0f0f0f0f0f0f0f0f))
#define XPC_ANY_MSG_IPI_FLAGS_SET(_amo) ((_amo) & __IA64_UL_CONST(0x1010101010101010)) #define XPC_ANY_MSG_IPI_FLAGS_SET(_amo) ((_amo) & __IA64_UL_CONST(0x1010101010101010))
static inline void static inline void
xpc_IPI_send_closerequest(struct xpc_channel *ch, unsigned long *irq_flags) xpc_IPI_send_closerequest(struct xpc_channel *ch, unsigned long *irq_flags)
{ {
struct xpc_openclose_args *args = ch->local_openclose_args; struct xpc_openclose_args *args = ch->local_openclose_args;
args->reason = ch->reason; args->reason = ch->reason;
XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_CLOSEREQUEST, irq_flags); XPC_NOTIFY_IRQ_SEND(ch, XPC_IPI_CLOSEREQUEST, irq_flags);
...@@ -1152,7 +1080,6 @@ xpc_IPI_send_openrequest(struct xpc_channel *ch, unsigned long *irq_flags) ...@@ -1152,7 +1080,6 @@ xpc_IPI_send_openrequest(struct xpc_channel *ch, unsigned long *irq_flags)
{ {
struct xpc_openclose_args *args = ch->local_openclose_args; struct xpc_openclose_args *args = ch->local_openclose_args;
args->msg_size = ch->msg_size; args->msg_size = ch->msg_size;
args->local_nentries = ch->local_nentries; args->local_nentries = ch->local_nentries;
...@@ -1164,7 +1091,6 @@ xpc_IPI_send_openreply(struct xpc_channel *ch, unsigned long *irq_flags) ...@@ -1164,7 +1091,6 @@ xpc_IPI_send_openreply(struct xpc_channel *ch, unsigned long *irq_flags)
{ {
struct xpc_openclose_args *args = ch->local_openclose_args; struct xpc_openclose_args *args = ch->local_openclose_args;
args->remote_nentries = ch->remote_nentries; args->remote_nentries = ch->remote_nentries;
args->local_nentries = ch->local_nentries; args->local_nentries = ch->local_nentries;
args->local_msgqueue_pa = __pa(ch->local_msgqueue); args->local_msgqueue_pa = __pa(ch->local_msgqueue);
...@@ -1184,7 +1110,6 @@ xpc_IPI_send_local_msgrequest(struct xpc_channel *ch) ...@@ -1184,7 +1110,6 @@ xpc_IPI_send_local_msgrequest(struct xpc_channel *ch)
XPC_NOTIFY_IRQ_SEND_LOCAL(ch, XPC_IPI_MSGREQUEST); XPC_NOTIFY_IRQ_SEND_LOCAL(ch, XPC_IPI_MSGREQUEST);
} }
/* /*
* Memory for XPC's AMO variables is allocated by the MSPEC driver. These * Memory for XPC's AMO variables is allocated by the MSPEC driver. These
* pages are located in the lowest granule. The lowest granule uses 4k pages * pages are located in the lowest granule. The lowest granule uses 4k pages
...@@ -1201,13 +1126,10 @@ xpc_IPI_init(int index) ...@@ -1201,13 +1126,10 @@ xpc_IPI_init(int index)
{ {
AMO_t *amo = xpc_vars->amos_page + index; AMO_t *amo = xpc_vars->amos_page + index;
(void)xpc_IPI_receive(amo); /* clear AMO variable */
(void) xpc_IPI_receive(amo); /* clear AMO variable */
return amo; return amo;
} }
static inline enum xpc_retval static inline enum xpc_retval
xpc_map_bte_errors(bte_result_t error) xpc_map_bte_errors(bte_result_t error)
{ {
...@@ -1220,22 +1142,31 @@ xpc_map_bte_errors(bte_result_t error) ...@@ -1220,22 +1142,31 @@ xpc_map_bte_errors(bte_result_t error)
return xpcBteUnmappedError; return xpcBteUnmappedError;
} }
switch (error) { switch (error) {
case BTE_SUCCESS: return xpcSuccess; case BTE_SUCCESS:
case BTEFAIL_DIR: return xpcBteDirectoryError; return xpcSuccess;
case BTEFAIL_POISON: return xpcBtePoisonError; case BTEFAIL_DIR:
case BTEFAIL_WERR: return xpcBteWriteError; return xpcBteDirectoryError;
case BTEFAIL_ACCESS: return xpcBteAccessError; case BTEFAIL_POISON:
case BTEFAIL_PWERR: return xpcBtePWriteError; return xpcBtePoisonError;
case BTEFAIL_PRERR: return xpcBtePReadError; case BTEFAIL_WERR:
case BTEFAIL_TOUT: return xpcBteTimeOutError; return xpcBteWriteError;
case BTEFAIL_XTERR: return xpcBteXtalkError; case BTEFAIL_ACCESS:
case BTEFAIL_NOTAVAIL: return xpcBteNotAvailable; return xpcBteAccessError;
default: return xpcBteUnmappedError; case BTEFAIL_PWERR:
return xpcBtePWriteError;
case BTEFAIL_PRERR:
return xpcBtePReadError;
case BTEFAIL_TOUT:
return xpcBteTimeOutError;
case BTEFAIL_XTERR:
return xpcBteXtalkError;
case BTEFAIL_NOTAVAIL:
return xpcBteNotAvailable;
default:
return xpcBteUnmappedError;
} }
} }
/* /*
* Check to see if there is any channel activity to/from the specified * Check to see if there is any channel activity to/from the specified
* partition. * partition.
...@@ -1246,7 +1177,6 @@ xpc_check_for_channel_activity(struct xpc_partition *part) ...@@ -1246,7 +1177,6 @@ xpc_check_for_channel_activity(struct xpc_partition *part)
u64 IPI_amo; u64 IPI_amo;
unsigned long irq_flags; unsigned long irq_flags;
IPI_amo = xpc_IPI_receive(part->local_IPI_amo_va); IPI_amo = xpc_IPI_receive(part->local_IPI_amo_va);
if (IPI_amo == 0) { if (IPI_amo == 0) {
return; return;
...@@ -1262,6 +1192,4 @@ xpc_check_for_channel_activity(struct xpc_partition *part) ...@@ -1262,6 +1192,4 @@ xpc_check_for_channel_activity(struct xpc_partition *part)
xpc_wakeup_channel_mgr(part); xpc_wakeup_channel_mgr(part);
} }
#endif /* _DRIVERS_MISC_SGIXP_XPC_H */ #endif /* _DRIVERS_MISC_SGIXP_XPC_H */
drivers/misc/sgi-xp/xpc_partition.c
View file @ 4a3ad2dd
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.
*/ */
/* /*
* Cross Partition Communication (XPC) partition support. * Cross Partition Communication (XPC) partition support.
* *
...@@ -16,7 +15,6 @@ ...@@ -16,7 +15,6 @@
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/cache.h> #include <linux/cache.h>
...@@ -30,11 +28,9 @@ ...@@ -30,11 +28,9 @@
#include <asm/sn/addrs.h> #include <asm/sn/addrs.h>
#include "xpc.h" #include "xpc.h"
/* XPC is exiting flag */ /* XPC is exiting flag */
int xpc_exiting; int xpc_exiting;
/* SH_IPI_ACCESS shub register value on startup */ /* SH_IPI_ACCESS shub register value on startup */
static u64 xpc_sh1_IPI_access; static u64 xpc_sh1_IPI_access;
static u64 xpc_sh2_IPI_access0; static u64 xpc_sh2_IPI_access0;
...@@ -42,11 +38,9 @@ static u64 xpc_sh2_IPI_access1; ...@@ -42,11 +38,9 @@ static u64 xpc_sh2_IPI_access1;
static u64 xpc_sh2_IPI_access2; static u64 xpc_sh2_IPI_access2;
static u64 xpc_sh2_IPI_access3; static u64 xpc_sh2_IPI_access3;
/* original protection values for each node */ /* original protection values for each node */
u64 xpc_prot_vec[MAX_NUMNODES]; u64 xpc_prot_vec[MAX_NUMNODES];
/* this partition's reserved page pointers */ /* this partition's reserved page pointers */
struct xpc_rsvd_page *xpc_rsvd_page; struct xpc_rsvd_page *xpc_rsvd_page;
static u64 *xpc_part_nasids; static u64 *xpc_part_nasids;
...@@ -57,7 +51,6 @@ struct xpc_vars_part *xpc_vars_part; ...@@ -57,7 +51,6 @@ struct xpc_vars_part *xpc_vars_part;
static int xp_nasid_mask_bytes; /* actual size in bytes of nasid mask */ static int xp_nasid_mask_bytes; /* actual size in bytes of nasid mask */
static int xp_nasid_mask_words; /* actual size in words of nasid mask */ static int xp_nasid_mask_words; /* actual size in words of nasid mask */
/* /*
* For performance reasons, each entry of xpc_partitions[] is cacheline * For performance reasons, each entry of xpc_partitions[] is cacheline
* aligned. And xpc_partitions[] is padded with an additional entry at the * aligned. And xpc_partitions[] is padded with an additional entry at the
...@@ -66,7 +59,6 @@ static int xp_nasid_mask_words; /* actual size in words of nasid mask */ ...@@ -66,7 +59,6 @@ static int xp_nasid_mask_words; /* actual size in words of nasid mask */
*/ */
struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1]; struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1];
/* /*
* Generic buffer used to store a local copy of portions of a remote * Generic buffer used to store a local copy of portions of a remote
* partition's reserved page (either its header and part_nasids mask, * partition's reserved page (either its header and part_nasids mask,
...@@ -75,7 +67,6 @@ struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1]; ...@@ -75,7 +67,6 @@ struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1];
char *xpc_remote_copy_buffer; char *xpc_remote_copy_buffer;
void *xpc_remote_copy_buffer_base; void *xpc_remote_copy_buffer_base;
/* /*
* Guarantee that the kmalloc'd memory is cacheline aligned. * Guarantee that the kmalloc'd memory is cacheline aligned.
*/ */
...@@ -87,7 +78,7 @@ xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base) ...@@ -87,7 +78,7 @@ xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)
if (*base == NULL) { if (*base == NULL) {
return NULL; return NULL;
} }
if ((u64) *base == L1_CACHE_ALIGN((u64) *base)) { if ((u64)*base == L1_CACHE_ALIGN((u64)*base)) {
return *base; return *base;
} }
kfree(*base); kfree(*base);
...@@ -97,10 +88,9 @@ xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base) ...@@ -97,10 +88,9 @@ xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)
if (*base == NULL) { if (*base == NULL) {
return NULL; return NULL;
} }
return (void *) L1_CACHE_ALIGN((u64) *base); return (void *)L1_CACHE_ALIGN((u64)*base);
} }
/* /*
* Given a nasid, get the physical address of the partition's reserved page * Given a nasid, get the physical address of the partition's reserved page
* for that nasid. This function returns 0 on any error. * for that nasid. This function returns 0 on any error.
...@@ -117,7 +107,6 @@ xpc_get_rsvd_page_pa(int nasid) ...@@ -117,7 +107,6 @@ xpc_get_rsvd_page_pa(int nasid)
u64 buf_len = 0; u64 buf_len = 0;
void *buf_base = NULL; void *buf_base = NULL;
while (1) { while (1) {
status = sn_partition_reserved_page_pa(buf, &cookie, &rp_pa, status = sn_partition_reserved_page_pa(buf, &cookie, &rp_pa,
...@@ -134,8 +123,9 @@ xpc_get_rsvd_page_pa(int nasid) ...@@ -134,8 +123,9 @@ xpc_get_rsvd_page_pa(int nasid)
if (L1_CACHE_ALIGN(len) > buf_len) { if (L1_CACHE_ALIGN(len) > buf_len) {
kfree(buf_base); kfree(buf_base);
buf_len = L1_CACHE_ALIGN(len); buf_len = L1_CACHE_ALIGN(len);
buf = (u64) xpc_kmalloc_cacheline_aligned(buf_len, buf = (u64)xpc_kmalloc_cacheline_aligned(buf_len,
GFP_KERNEL, &buf_base); GFP_KERNEL,
&buf_base);
if (buf_base == NULL) { if (buf_base == NULL) {
dev_err(xpc_part, "unable to kmalloc " dev_err(xpc_part, "unable to kmalloc "
"len=0x%016lx\n", buf_len); "len=0x%016lx\n", buf_len);
...@@ -162,7 +152,6 @@ xpc_get_rsvd_page_pa(int nasid) ...@@ -162,7 +152,6 @@ xpc_get_rsvd_page_pa(int nasid)
return rp_pa; return rp_pa;
} }
/* /*
* Fill the partition reserved page with the information needed by * Fill the partition reserved page with the information needed by
* other partitions to discover we are alive and establish initial * other partitions to discover we are alive and establish initial
...@@ -176,7 +165,6 @@ xpc_rsvd_page_init(void) ...@@ -176,7 +165,6 @@ xpc_rsvd_page_init(void)
u64 rp_pa, nasid_array = 0; u64 rp_pa, nasid_array = 0;
int i, ret; int i, ret;
/* get the local reserved page's address */ /* get the local reserved page's address */
preempt_disable(); preempt_disable();
...@@ -186,7 +174,7 @@ xpc_rsvd_page_init(void) ...@@ -186,7 +174,7 @@ xpc_rsvd_page_init(void)
dev_err(xpc_part, "SAL failed to locate the reserved page\n"); dev_err(xpc_part, "SAL failed to locate the reserved page\n");
return NULL; return NULL;
} }
rp = (struct xpc_rsvd_page *) __va(rp_pa); rp = (struct xpc_rsvd_page *)__va(rp_pa);
if (rp->partid != sn_partition_id) { if (rp->partid != sn_partition_id) {
dev_err(xpc_part, "the reserved page's partid of %d should be " dev_err(xpc_part, "the reserved page's partid of %d should be "
...@@ -223,7 +211,7 @@ xpc_rsvd_page_init(void) ...@@ -223,7 +211,7 @@ xpc_rsvd_page_init(void)
* memory protections are never restricted. * memory protections are never restricted.
*/ */
if ((amos_page = xpc_vars->amos_page) == NULL) { if ((amos_page = xpc_vars->amos_page) == NULL) {
amos_page = (AMO_t *) TO_AMO(uncached_alloc_page(0)); amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0));
if (amos_page == NULL) { if (amos_page == NULL) {
dev_err(xpc_part, "can't allocate page of AMOs\n"); dev_err(xpc_part, "can't allocate page of AMOs\n");
return NULL; return NULL;
...@@ -234,30 +222,31 @@ xpc_rsvd_page_init(void) ...@@ -234,30 +222,31 @@ xpc_rsvd_page_init(void)
* when xpc_allow_IPI_ops() is called via xpc_hb_init(). * when xpc_allow_IPI_ops() is called via xpc_hb_init().
*/ */
if (!enable_shub_wars_1_1()) { if (!enable_shub_wars_1_1()) {
ret = sn_change_memprotect(ia64_tpa((u64) amos_page), ret = sn_change_memprotect(ia64_tpa((u64)amos_page),
PAGE_SIZE, SN_MEMPROT_ACCESS_CLASS_1, PAGE_SIZE,
SN_MEMPROT_ACCESS_CLASS_1,
&nasid_array); &nasid_array);
if (ret != 0) { if (ret != 0) {
dev_err(xpc_part, "can't change memory " dev_err(xpc_part, "can't change memory "
"protections\n"); "protections\n");
uncached_free_page(__IA64_UNCACHED_OFFSET | uncached_free_page(__IA64_UNCACHED_OFFSET |
TO_PHYS((u64) amos_page)); TO_PHYS((u64)amos_page));
return NULL; return NULL;
} }
} }
} else if (!IS_AMO_ADDRESS((u64) amos_page)) { } else if (!IS_AMO_ADDRESS((u64)amos_page)) {
/* /*
* EFI's XPBOOT can also set amos_page in the reserved page, * EFI's XPBOOT can also set amos_page in the reserved page,
* but it happens to leave it as an uncached physical address * but it happens to leave it as an uncached physical address
* and we need it to be an uncached virtual, so we'll have to * and we need it to be an uncached virtual, so we'll have to
* convert it. * convert it.
*/ */
if (!IS_AMO_PHYS_ADDRESS((u64) amos_page)) { if (!IS_AMO_PHYS_ADDRESS((u64)amos_page)) {
dev_err(xpc_part, "previously used amos_page address " dev_err(xpc_part, "previously used amos_page address "
"is bad = 0x%p\n", (void *) amos_page); "is bad = 0x%p\n", (void *)amos_page);
return NULL; return NULL;
} }
amos_page = (AMO_t *) TO_AMO((u64) amos_page); amos_page = (AMO_t *)TO_AMO((u64)amos_page);
} }
/* clear xpc_vars */ /* clear xpc_vars */
...@@ -267,22 +256,21 @@ xpc_rsvd_page_init(void) ...@@ -267,22 +256,21 @@ xpc_rsvd_page_init(void)
xpc_vars->act_nasid = cpuid_to_nasid(0); xpc_vars->act_nasid = cpuid_to_nasid(0);
xpc_vars->act_phys_cpuid = cpu_physical_id(0); xpc_vars->act_phys_cpuid = cpu_physical_id(0);
xpc_vars->vars_part_pa = __pa(xpc_vars_part); xpc_vars->vars_part_pa = __pa(xpc_vars_part);
xpc_vars->amos_page_pa = ia64_tpa((u64) amos_page); xpc_vars->amos_page_pa = ia64_tpa((u64)amos_page);
xpc_vars->amos_page = amos_page; /* save for next load of XPC */ xpc_vars->amos_page = amos_page; /* save for next load of XPC */
/* clear xpc_vars_part */ /* clear xpc_vars_part */
memset((u64 *) xpc_vars_part, 0, sizeof(struct xpc_vars_part) * memset((u64 *)xpc_vars_part, 0, sizeof(struct xpc_vars_part) *
XP_MAX_PARTITIONS); XP_MAX_PARTITIONS);
/* initialize the activate IRQ related AMO variables */ /* initialize the activate IRQ related AMO variables */
for (i = 0; i < xp_nasid_mask_words; i++) { for (i = 0; i < xp_nasid_mask_words; i++) {
(void) xpc_IPI_init(XPC_ACTIVATE_IRQ_AMOS + i); (void)xpc_IPI_init(XPC_ACTIVATE_IRQ_AMOS + i);
} }
/* initialize the engaged remote partitions related AMO variables */ /* initialize the engaged remote partitions related AMO variables */
(void) xpc_IPI_init(XPC_ENGAGED_PARTITIONS_AMO); (void)xpc_IPI_init(XPC_ENGAGED_PARTITIONS_AMO);
(void) xpc_IPI_init(XPC_DISENGAGE_REQUEST_AMO); (void)xpc_IPI_init(XPC_DISENGAGE_REQUEST_AMO);
/* timestamp of when reserved page was setup by XPC */ /* timestamp of when reserved page was setup by XPC */
rp->stamp = CURRENT_TIME; rp->stamp = CURRENT_TIME;
...@@ -296,7 +284,6 @@ xpc_rsvd_page_init(void) ...@@ -296,7 +284,6 @@ xpc_rsvd_page_init(void)
return rp; return rp;
} }
/* /*
* Change protections to allow IPI operations (and AMO operations on * Change protections to allow IPI operations (and AMO operations on
* Shub 1.1 systems). * Shub 1.1 systems).
...@@ -307,38 +294,37 @@ xpc_allow_IPI_ops(void) ...@@ -307,38 +294,37 @@ xpc_allow_IPI_ops(void)
int node; int node;
int nasid; int nasid;
// >>> Change SH_IPI_ACCESS code to use SAL call once it is available. // >>> Change SH_IPI_ACCESS code to use SAL call once it is available.
if (is_shub2()) { if (is_shub2()) {
xpc_sh2_IPI_access0 = xpc_sh2_IPI_access0 =
(u64) HUB_L((u64 *) LOCAL_MMR_ADDR(SH2_IPI_ACCESS0)); (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS0));
xpc_sh2_IPI_access1 = xpc_sh2_IPI_access1 =
(u64) HUB_L((u64 *) LOCAL_MMR_ADDR(SH2_IPI_ACCESS1)); (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS1));
xpc_sh2_IPI_access2 = xpc_sh2_IPI_access2 =
(u64) HUB_L((u64 *) LOCAL_MMR_ADDR(SH2_IPI_ACCESS2)); (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS2));
xpc_sh2_IPI_access3 = xpc_sh2_IPI_access3 =
(u64) HUB_L((u64 *) LOCAL_MMR_ADDR(SH2_IPI_ACCESS3)); (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH2_IPI_ACCESS3));
for_each_online_node(node) { for_each_online_node(node) {
nasid = cnodeid_to_nasid(node); nasid = cnodeid_to_nasid(node);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0),
-1UL); -1UL);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1),
-1UL); -1UL);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2),
-1UL); -1UL);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3),
-1UL); -1UL);
} }
} else { } else {
xpc_sh1_IPI_access = xpc_sh1_IPI_access =
(u64) HUB_L((u64 *) LOCAL_MMR_ADDR(SH1_IPI_ACCESS)); (u64)HUB_L((u64 *)LOCAL_MMR_ADDR(SH1_IPI_ACCESS));
for_each_online_node(node) { for_each_online_node(node) {
nasid = cnodeid_to_nasid(node); nasid = cnodeid_to_nasid(node);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS),
-1UL); -1UL);
/* /*
...@@ -347,13 +333,16 @@ xpc_allow_IPI_ops(void) ...@@ -347,13 +333,16 @@ xpc_allow_IPI_ops(void)
*/ */
if (enable_shub_wars_1_1()) { if (enable_shub_wars_1_1()) {
/* open up everything */ /* open up everything */
xpc_prot_vec[node] = (u64) HUB_L((u64 *) xpc_prot_vec[node] = (u64)HUB_L((u64 *)
GLOBAL_MMR_ADDR(nasid, GLOBAL_MMR_ADDR
(nasid,
SH1_MD_DQLP_MMR_DIR_PRIVEC0)); SH1_MD_DQLP_MMR_DIR_PRIVEC0));
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, HUB_S((u64 *)
GLOBAL_MMR_ADDR(nasid,
SH1_MD_DQLP_MMR_DIR_PRIVEC0), SH1_MD_DQLP_MMR_DIR_PRIVEC0),
-1UL); -1UL);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, HUB_S((u64 *)
GLOBAL_MMR_ADDR(nasid,
SH1_MD_DQRP_MMR_DIR_PRIVEC0), SH1_MD_DQRP_MMR_DIR_PRIVEC0),
-1UL); -1UL);
} }
...@@ -361,7 +350,6 @@ xpc_allow_IPI_ops(void) ...@@ -361,7 +350,6 @@ xpc_allow_IPI_ops(void)
} }
} }
/* /*
* Restrict protections to disallow IPI operations (and AMO operations on * Restrict protections to disallow IPI operations (and AMO operations on
* Shub 1.1 systems). * Shub 1.1 systems).
...@@ -372,20 +360,19 @@ xpc_restrict_IPI_ops(void) ...@@ -372,20 +360,19 @@ xpc_restrict_IPI_ops(void)
int node; int node;
int nasid; int nasid;
// >>> Change SH_IPI_ACCESS code to use SAL call once it is available. // >>> Change SH_IPI_ACCESS code to use SAL call once it is available.
if (is_shub2()) { if (is_shub2()) {
for_each_online_node(node) { for_each_online_node(node) {
nasid = cnodeid_to_nasid(node); nasid = cnodeid_to_nasid(node);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS0),
xpc_sh2_IPI_access0); xpc_sh2_IPI_access0);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS1),
xpc_sh2_IPI_access1); xpc_sh2_IPI_access1);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS2),
xpc_sh2_IPI_access2); xpc_sh2_IPI_access2);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH2_IPI_ACCESS3),
xpc_sh2_IPI_access3); xpc_sh2_IPI_access3);
} }
...@@ -393,14 +380,14 @@ xpc_restrict_IPI_ops(void) ...@@ -393,14 +380,14 @@ xpc_restrict_IPI_ops(void)
for_each_online_node(node) { for_each_online_node(node) {
nasid = cnodeid_to_nasid(node); nasid = cnodeid_to_nasid(node);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS), HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid, SH1_IPI_ACCESS),
xpc_sh1_IPI_access); xpc_sh1_IPI_access);
if (enable_shub_wars_1_1()) { if (enable_shub_wars_1_1()) {
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid,
SH1_MD_DQLP_MMR_DIR_PRIVEC0), SH1_MD_DQLP_MMR_DIR_PRIVEC0),
xpc_prot_vec[node]); xpc_prot_vec[node]);
HUB_S((u64 *) GLOBAL_MMR_ADDR(nasid, HUB_S((u64 *)GLOBAL_MMR_ADDR(nasid,
SH1_MD_DQRP_MMR_DIR_PRIVEC0), SH1_MD_DQRP_MMR_DIR_PRIVEC0),
xpc_prot_vec[node]); xpc_prot_vec[node]);
} }
...@@ -408,7 +395,6 @@ xpc_restrict_IPI_ops(void) ...@@ -408,7 +395,6 @@ xpc_restrict_IPI_ops(void)
} }
} }
/* /*
* At periodic intervals, scan through all active partitions and ensure * At periodic intervals, scan through all active partitions and ensure
* their heartbeat is still active. If not, the partition is deactivated. * their heartbeat is still active. If not, the partition is deactivated.
...@@ -421,8 +407,7 @@ xpc_check_remote_hb(void) ...@@ -421,8 +407,7 @@ xpc_check_remote_hb(void)
partid_t partid; partid_t partid;
bte_result_t bres; bte_result_t bres;
remote_vars = (struct xpc_vars *)xpc_remote_copy_buffer;
remote_vars = (struct xpc_vars *) xpc_remote_copy_buffer;
for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) {
...@@ -443,7 +428,7 @@ xpc_check_remote_hb(void) ...@@ -443,7 +428,7 @@ xpc_check_remote_hb(void)
/* pull the remote_hb cache line */ /* pull the remote_hb cache line */
bres = xp_bte_copy(part->remote_vars_pa, bres = xp_bte_copy(part->remote_vars_pa,
(u64) remote_vars, (u64)remote_vars,
XPC_RP_VARS_SIZE, XPC_RP_VARS_SIZE,
(BTE_NOTIFY | BTE_WACQUIRE), NULL); (BTE_NOTIFY | BTE_WACQUIRE), NULL);
if (bres != BTE_SUCCESS) { if (bres != BTE_SUCCESS) {
...@@ -470,7 +455,6 @@ xpc_check_remote_hb(void) ...@@ -470,7 +455,6 @@ xpc_check_remote_hb(void)
} }
} }
/* /*
* Get a copy of a portion of the remote partition's rsvd page. * Get a copy of a portion of the remote partition's rsvd page.
* *
...@@ -484,7 +468,6 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids, ...@@ -484,7 +468,6 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
{ {
int bres, i; int bres, i;
/* get the reserved page's physical address */ /* get the reserved page's physical address */
*remote_rp_pa = xpc_get_rsvd_page_pa(nasid); *remote_rp_pa = xpc_get_rsvd_page_pa(nasid);
...@@ -492,26 +475,22 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids, ...@@ -492,26 +475,22 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
return xpcNoRsvdPageAddr; return xpcNoRsvdPageAddr;
} }
/* pull over the reserved page header and part_nasids mask */ /* pull over the reserved page header and part_nasids mask */
bres = xp_bte_copy(*remote_rp_pa, (u64) remote_rp, bres = xp_bte_copy(*remote_rp_pa, (u64)remote_rp,
XPC_RP_HEADER_SIZE + xp_nasid_mask_bytes, XPC_RP_HEADER_SIZE + xp_nasid_mask_bytes,
(BTE_NOTIFY | BTE_WACQUIRE), NULL); (BTE_NOTIFY | BTE_WACQUIRE), NULL);
if (bres != BTE_SUCCESS) { if (bres != BTE_SUCCESS) {
return xpc_map_bte_errors(bres); return xpc_map_bte_errors(bres);
} }
if (discovered_nasids != NULL) { if (discovered_nasids != NULL) {
u64 *remote_part_nasids = XPC_RP_PART_NASIDS(remote_rp); u64 *remote_part_nasids = XPC_RP_PART_NASIDS(remote_rp);
for (i = 0; i < xp_nasid_mask_words; i++) { for (i = 0; i < xp_nasid_mask_words; i++) {
discovered_nasids[i] |= remote_part_nasids[i]; discovered_nasids[i] |= remote_part_nasids[i];
} }
} }
/* check that the partid is for another partition */ /* check that the partid is for another partition */
if (remote_rp->partid < 1 || if (remote_rp->partid < 1 ||
...@@ -523,7 +502,6 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids, ...@@ -523,7 +502,6 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
return xpcLocalPartid; return xpcLocalPartid;
} }
if (XPC_VERSION_MAJOR(remote_rp->version) != if (XPC_VERSION_MAJOR(remote_rp->version) !=
XPC_VERSION_MAJOR(XPC_RP_VERSION)) { XPC_VERSION_MAJOR(XPC_RP_VERSION)) {
return xpcBadVersion; return xpcBadVersion;
...@@ -532,7 +510,6 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids, ...@@ -532,7 +510,6 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Get a copy of the remote partition's XPC variables from the reserved page. * Get a copy of the remote partition's XPC variables from the reserved page.
* *
...@@ -544,13 +521,12 @@ xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars) ...@@ -544,13 +521,12 @@ xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars)
{ {
int bres; int bres;
if (remote_vars_pa == 0) { if (remote_vars_pa == 0) {
return xpcVarsNotSet; return xpcVarsNotSet;
} }
/* pull over the cross partition variables */ /* pull over the cross partition variables */
bres = xp_bte_copy(remote_vars_pa, (u64) remote_vars, XPC_RP_VARS_SIZE, bres = xp_bte_copy(remote_vars_pa, (u64)remote_vars, XPC_RP_VARS_SIZE,
(BTE_NOTIFY | BTE_WACQUIRE), NULL); (BTE_NOTIFY | BTE_WACQUIRE), NULL);
if (bres != BTE_SUCCESS) { if (bres != BTE_SUCCESS) {
return xpc_map_bte_errors(bres); return xpc_map_bte_errors(bres);
...@@ -564,7 +540,6 @@ xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars) ...@@ -564,7 +540,6 @@ xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars)
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Update the remote partition's info. * Update the remote partition's info.
*/ */
...@@ -613,7 +588,6 @@ xpc_update_partition_info(struct xpc_partition *part, u8 remote_rp_version, ...@@ -613,7 +588,6 @@ xpc_update_partition_info(struct xpc_partition *part, u8 remote_rp_version,
part->remote_vars_version); part->remote_vars_version);
} }
/* /*
* Prior code has determined the nasid which generated an IPI. Inspect * Prior code has determined the nasid which generated an IPI. Inspect
* that nasid to determine if its partition needs to be activated or * that nasid to determine if its partition needs to be activated or
...@@ -643,10 +617,9 @@ xpc_identify_act_IRQ_req(int nasid) ...@@ -643,10 +617,9 @@ xpc_identify_act_IRQ_req(int nasid)
struct xpc_partition *part; struct xpc_partition *part;
enum xpc_retval ret; enum xpc_retval ret;
/* pull over the reserved page structure */ /* pull over the reserved page structure */
remote_rp = (struct xpc_rsvd_page *) xpc_remote_copy_buffer; remote_rp = (struct xpc_rsvd_page *)xpc_remote_copy_buffer;
ret = xpc_get_remote_rp(nasid, NULL, remote_rp, &remote_rp_pa); ret = xpc_get_remote_rp(nasid, NULL, remote_rp, &remote_rp_pa);
if (ret != xpcSuccess) { if (ret != xpcSuccess) {
...@@ -663,10 +636,9 @@ xpc_identify_act_IRQ_req(int nasid) ...@@ -663,10 +636,9 @@ xpc_identify_act_IRQ_req(int nasid)
partid = remote_rp->partid; partid = remote_rp->partid;
part = &xpc_partitions[partid]; part = &xpc_partitions[partid];
/* pull over the cross partition variables */ /* pull over the cross partition variables */
remote_vars = (struct xpc_vars *) xpc_remote_copy_buffer; remote_vars = (struct xpc_vars *)xpc_remote_copy_buffer;
ret = xpc_get_remote_vars(remote_vars_pa, remote_vars); ret = xpc_get_remote_vars(remote_vars_pa, remote_vars);
if (ret != xpcSuccess) { if (ret != xpcSuccess) {
...@@ -678,15 +650,13 @@ xpc_identify_act_IRQ_req(int nasid) ...@@ -678,15 +650,13 @@ xpc_identify_act_IRQ_req(int nasid)
return; return;
} }
part->act_IRQ_rcvd++; part->act_IRQ_rcvd++;
dev_dbg(xpc_part, "partid for nasid %d is %d; IRQs = %d; HB = " dev_dbg(xpc_part, "partid for nasid %d is %d; IRQs = %d; HB = "
"%ld:0x%lx\n", (int) nasid, (int) partid, part->act_IRQ_rcvd, "%ld:0x%lx\n", (int)nasid, (int)partid, part->act_IRQ_rcvd,
remote_vars->heartbeat, remote_vars->heartbeating_to_mask); remote_vars->heartbeat, remote_vars->heartbeating_to_mask);
if (xpc_partition_disengaged(part) && if (xpc_partition_disengaged(part) && part->act_state == XPC_P_INACTIVE) {
part->act_state == XPC_P_INACTIVE) {
xpc_update_partition_info(part, remote_rp_version, xpc_update_partition_info(part, remote_rp_version,
&remote_rp_stamp, remote_rp_pa, &remote_rp_stamp, remote_rp_pa,
...@@ -722,8 +692,7 @@ xpc_identify_act_IRQ_req(int nasid) ...@@ -722,8 +692,7 @@ xpc_identify_act_IRQ_req(int nasid)
/* see if the other side rebooted */ /* see if the other side rebooted */
if (part->remote_amos_page_pa == if (part->remote_amos_page_pa ==
remote_vars->amos_page_pa && remote_vars->amos_page_pa &&
xpc_hb_allowed(sn_partition_id, xpc_hb_allowed(sn_partition_id, remote_vars)) {
remote_vars)) {
/* doesn't look that way, so ignore the IPI */ /* doesn't look that way, so ignore the IPI */
return; return;
} }
...@@ -778,8 +747,9 @@ xpc_identify_act_IRQ_req(int nasid) ...@@ -778,8 +747,9 @@ xpc_identify_act_IRQ_req(int nasid)
partid)); partid));
xpc_update_partition_info(part, remote_rp_version, xpc_update_partition_info(part, remote_rp_version,
&remote_rp_stamp, remote_rp_pa, &remote_rp_stamp,
remote_vars_pa, remote_vars); remote_rp_pa, remote_vars_pa,
remote_vars);
reactivate = 1; reactivate = 1;
} }
} }
...@@ -800,7 +770,6 @@ xpc_identify_act_IRQ_req(int nasid) ...@@ -800,7 +770,6 @@ xpc_identify_act_IRQ_req(int nasid)
} }
} }
/* /*
* Loop through the activation AMO variables and process any bits * Loop through the activation AMO variables and process any bits
* which are set. Each bit indicates a nasid sending a partition * which are set. Each bit indicates a nasid sending a partition
...@@ -817,10 +786,8 @@ xpc_identify_act_IRQ_sender(void) ...@@ -817,10 +786,8 @@ xpc_identify_act_IRQ_sender(void)
int n_IRQs_detected = 0; int n_IRQs_detected = 0;
AMO_t *act_amos; AMO_t *act_amos;
act_amos = xpc_vars->amos_page + XPC_ACTIVATE_IRQ_AMOS; act_amos = xpc_vars->amos_page + XPC_ACTIVATE_IRQ_AMOS;
/* scan through act AMO variable looking for non-zero entries */ /* scan through act AMO variable looking for non-zero entries */
for (word = 0; word < xp_nasid_mask_words; word++) { for (word = 0; word < xp_nasid_mask_words; word++) {
...@@ -837,7 +804,6 @@ xpc_identify_act_IRQ_sender(void) ...@@ -837,7 +804,6 @@ xpc_identify_act_IRQ_sender(void)
dev_dbg(xpc_part, "AMO[%d] gave back 0x%lx\n", word, dev_dbg(xpc_part, "AMO[%d] gave back 0x%lx\n", word,
nasid_mask); nasid_mask);
/* /*
* If this nasid has been added to the machine since * If this nasid has been added to the machine since
* our partition was reset, this will retain the * our partition was reset, this will retain the
...@@ -846,7 +812,6 @@ xpc_identify_act_IRQ_sender(void) ...@@ -846,7 +812,6 @@ xpc_identify_act_IRQ_sender(void)
*/ */
xpc_mach_nasids[word] |= nasid_mask; xpc_mach_nasids[word] |= nasid_mask;
/* locate the nasid(s) which sent interrupts */ /* locate the nasid(s) which sent interrupts */
for (bit = 0; bit < (8 * sizeof(u64)); bit++) { for (bit = 0; bit < (8 * sizeof(u64)); bit++) {
...@@ -862,7 +827,6 @@ xpc_identify_act_IRQ_sender(void) ...@@ -862,7 +827,6 @@ xpc_identify_act_IRQ_sender(void)
return n_IRQs_detected; return n_IRQs_detected;
} }
/* /*
* See if the other side has responded to a partition disengage request * See if the other side has responded to a partition disengage request
* from us. * from us.
...@@ -873,7 +837,6 @@ xpc_partition_disengaged(struct xpc_partition *part) ...@@ -873,7 +837,6 @@ xpc_partition_disengaged(struct xpc_partition *part)
partid_t partid = XPC_PARTID(part); partid_t partid = XPC_PARTID(part);
int disengaged; int disengaged;
disengaged = (xpc_partition_engaged(1UL << partid) == 0); disengaged = (xpc_partition_engaged(1UL << partid) == 0);
if (part->disengage_request_timeout) { if (part->disengage_request_timeout) {
if (!disengaged) { if (!disengaged) {
...@@ -914,7 +877,6 @@ xpc_partition_disengaged(struct xpc_partition *part) ...@@ -914,7 +877,6 @@ xpc_partition_disengaged(struct xpc_partition *part)
return disengaged; return disengaged;
} }
/* /*
* Mark specified partition as active. * Mark specified partition as active.
*/ */
...@@ -924,7 +886,6 @@ xpc_mark_partition_active(struct xpc_partition *part) ...@@ -924,7 +886,6 @@ xpc_mark_partition_active(struct xpc_partition *part)
unsigned long irq_flags; unsigned long irq_flags;
enum xpc_retval ret; enum xpc_retval ret;
dev_dbg(xpc_part, "setting partition %d to ACTIVE\n", XPC_PARTID(part)); dev_dbg(xpc_part, "setting partition %d to ACTIVE\n", XPC_PARTID(part));
spin_lock_irqsave(&part->act_lock, irq_flags); spin_lock_irqsave(&part->act_lock, irq_flags);
...@@ -940,7 +901,6 @@ xpc_mark_partition_active(struct xpc_partition *part) ...@@ -940,7 +901,6 @@ xpc_mark_partition_active(struct xpc_partition *part)
return ret; return ret;
} }
/* /*
* Notify XPC that the partition is down. * Notify XPC that the partition is down.
*/ */
...@@ -950,7 +910,6 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part, ...@@ -950,7 +910,6 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
{ {
unsigned long irq_flags; unsigned long irq_flags;
spin_lock_irqsave(&part->act_lock, irq_flags); spin_lock_irqsave(&part->act_lock, irq_flags);
if (part->act_state == XPC_P_INACTIVE) { if (part->act_state == XPC_P_INACTIVE) {
...@@ -994,7 +953,6 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part, ...@@ -994,7 +953,6 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
xpc_partition_going_down(part, reason); xpc_partition_going_down(part, reason);
} }
/* /*
* Mark specified partition as inactive. * Mark specified partition as inactive.
*/ */
...@@ -1003,7 +961,6 @@ xpc_mark_partition_inactive(struct xpc_partition *part) ...@@ -1003,7 +961,6 @@ xpc_mark_partition_inactive(struct xpc_partition *part)
{ {
unsigned long irq_flags; unsigned long irq_flags;
dev_dbg(xpc_part, "setting partition %d to INACTIVE\n", dev_dbg(xpc_part, "setting partition %d to INACTIVE\n",
XPC_PARTID(part)); XPC_PARTID(part));
...@@ -1013,7 +970,6 @@ xpc_mark_partition_inactive(struct xpc_partition *part) ...@@ -1013,7 +970,6 @@ xpc_mark_partition_inactive(struct xpc_partition *part)
part->remote_rp_pa = 0; part->remote_rp_pa = 0;
} }
/* /*
* SAL has provided a partition and machine mask. The partition mask * SAL has provided a partition and machine mask. The partition mask
* contains a bit for each even nasid in our partition. The machine * contains a bit for each even nasid in our partition. The machine
...@@ -1041,15 +997,13 @@ xpc_discovery(void) ...@@ -1041,15 +997,13 @@ xpc_discovery(void)
u64 *discovered_nasids; u64 *discovered_nasids;
enum xpc_retval ret; enum xpc_retval ret;
remote_rp = xpc_kmalloc_cacheline_aligned(XPC_RP_HEADER_SIZE + remote_rp = xpc_kmalloc_cacheline_aligned(XPC_RP_HEADER_SIZE +
xp_nasid_mask_bytes, xp_nasid_mask_bytes,
GFP_KERNEL, &remote_rp_base); GFP_KERNEL, &remote_rp_base);
if (remote_rp == NULL) { if (remote_rp == NULL) {
return; return;
} }
remote_vars = (struct xpc_vars *) remote_rp; remote_vars = (struct xpc_vars *)remote_rp;
discovered_nasids = kzalloc(sizeof(u64) * xp_nasid_mask_words, discovered_nasids = kzalloc(sizeof(u64) * xp_nasid_mask_words,
GFP_KERNEL); GFP_KERNEL);
...@@ -1058,7 +1012,7 @@ xpc_discovery(void) ...@@ -1058,7 +1012,7 @@ xpc_discovery(void)
return; return;
} }
rp = (struct xpc_rsvd_page *) xpc_rsvd_page; rp = (struct xpc_rsvd_page *)xpc_rsvd_page;
/* /*
* The term 'region' in this context refers to the minimum number of * The term 'region' in this context refers to the minimum number of
...@@ -1081,23 +1035,21 @@ xpc_discovery(void) ...@@ -1081,23 +1035,21 @@ xpc_discovery(void)
for (region = 0; region < max_regions; region++) { for (region = 0; region < max_regions; region++) {
if ((volatile int) xpc_exiting) { if ((volatile int)xpc_exiting) {
break; break;
} }
dev_dbg(xpc_part, "searching region %d\n", region); dev_dbg(xpc_part, "searching region %d\n", region);
for (nasid = (region * region_size * 2); for (nasid = (region * region_size * 2);
nasid < ((region + 1) * region_size * 2); nasid < ((region + 1) * region_size * 2); nasid += 2) {
nasid += 2) {
if ((volatile int) xpc_exiting) { if ((volatile int)xpc_exiting) {
break; break;
} }
dev_dbg(xpc_part, "checking nasid %d\n", nasid); dev_dbg(xpc_part, "checking nasid %d\n", nasid);
if (XPC_NASID_IN_ARRAY(nasid, xpc_part_nasids)) { if (XPC_NASID_IN_ARRAY(nasid, xpc_part_nasids)) {
dev_dbg(xpc_part, "PROM indicates Nasid %d is " dev_dbg(xpc_part, "PROM indicates Nasid %d is "
"part of the local partition; skipping " "part of the local partition; skipping "
...@@ -1119,7 +1071,6 @@ xpc_discovery(void) ...@@ -1119,7 +1071,6 @@ xpc_discovery(void)
continue; continue;
} }
/* pull over the reserved page structure */ /* pull over the reserved page structure */
ret = xpc_get_remote_rp(nasid, discovered_nasids, ret = xpc_get_remote_rp(nasid, discovered_nasids,
...@@ -1140,7 +1091,6 @@ xpc_discovery(void) ...@@ -1140,7 +1091,6 @@ xpc_discovery(void)
partid = remote_rp->partid; partid = remote_rp->partid;
part = &xpc_partitions[partid]; part = &xpc_partitions[partid];
/* pull over the cross partition variables */ /* pull over the cross partition variables */
ret = xpc_get_remote_vars(remote_vars_pa, remote_vars); ret = xpc_get_remote_vars(remote_vars_pa, remote_vars);
...@@ -1171,10 +1121,10 @@ xpc_discovery(void) ...@@ -1171,10 +1121,10 @@ xpc_discovery(void)
* get the same page for remote_act_amos_pa after * get the same page for remote_act_amos_pa after
* module reloads and system reboots. * module reloads and system reboots.
*/ */
if (sn_register_xp_addr_region( if (sn_register_xp_addr_region
remote_vars->amos_page_pa, (remote_vars->amos_page_pa, PAGE_SIZE, 1) < 0) {
PAGE_SIZE, 1) < 0) { dev_dbg(xpc_part,
dev_dbg(xpc_part, "partition %d failed to " "partition %d failed to "
"register xp_addr region 0x%016lx\n", "register xp_addr region 0x%016lx\n",
partid, remote_vars->amos_page_pa); partid, remote_vars->amos_page_pa);
...@@ -1209,7 +1159,6 @@ xpc_discovery(void) ...@@ -1209,7 +1159,6 @@ xpc_discovery(void)
kfree(remote_rp_base); kfree(remote_rp_base);
} }
/* /*
* Given a partid, get the nasids owned by that partition from the * Given a partid, get the nasids owned by that partition from the
* remote partition's reserved page. * remote partition's reserved page.
...@@ -1221,7 +1170,6 @@ xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask) ...@@ -1221,7 +1170,6 @@ xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask)
u64 part_nasid_pa; u64 part_nasid_pa;
int bte_res; int bte_res;
part = &xpc_partitions[partid]; part = &xpc_partitions[partid];
if (part->remote_rp_pa == 0) { if (part->remote_rp_pa == 0) {
return xpcPartitionDown; return xpcPartitionDown;
...@@ -1229,11 +1177,11 @@ xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask) ...@@ -1229,11 +1177,11 @@ xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask)
memset(nasid_mask, 0, XP_NASID_MASK_BYTES); memset(nasid_mask, 0, XP_NASID_MASK_BYTES);
part_nasid_pa = (u64) XPC_RP_PART_NASIDS(part->remote_rp_pa); part_nasid_pa = (u64)XPC_RP_PART_NASIDS(part->remote_rp_pa);
bte_res = xp_bte_copy(part_nasid_pa, (u64) nasid_mask, bte_res = xp_bte_copy(part_nasid_pa, (u64)nasid_mask,
xp_nasid_mask_bytes, (BTE_NOTIFY | BTE_WACQUIRE), NULL); xp_nasid_mask_bytes, (BTE_NOTIFY | BTE_WACQUIRE),
NULL);
return xpc_map_bte_errors(bte_res); return xpc_map_bte_errors(bte_res);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7