Skip to content

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

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

Ran patches through scripts/Lindent (part 2).
Signed-off-by: default avatarDean Nelson <dcn@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 4a3ad2dd
Show whitespace changes
Inline Side-by-side
Showing with 322 additions and 506 deletions
drivers/misc/sgi-xp/xpc_channel.c
View file @ 35190506
...@@ -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) channel support. * Cross Partition Communication (XPC) channel support.
* *
...@@ -15,7 +14,6 @@ ...@@ -15,7 +14,6 @@
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -27,7 +25,6 @@ ...@@ -27,7 +25,6 @@
#include <asm/sn/sn_sal.h> #include <asm/sn/sn_sal.h>
#include "xpc.h" #include "xpc.h"
/* /*
* Guarantee that the kzalloc'd memory is cacheline aligned. * Guarantee that the kzalloc'd memory is cacheline aligned.
*/ */
...@@ -39,7 +36,7 @@ xpc_kzalloc_cacheline_aligned(size_t size, gfp_t flags, void **base) ...@@ -39,7 +36,7 @@ xpc_kzalloc_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);
...@@ -49,10 +46,9 @@ xpc_kzalloc_cacheline_aligned(size_t size, gfp_t flags, void **base) ...@@ -49,10 +46,9 @@ xpc_kzalloc_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);
} }
/* /*
* Set up the initial values for the XPartition Communication channels. * Set up the initial values for the XPartition Communication channels.
*/ */
...@@ -62,7 +58,6 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid) ...@@ -62,7 +58,6 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid)
int ch_number; int ch_number;
struct xpc_channel *ch; struct xpc_channel *ch;
for (ch_number = 0; ch_number < part->nchannels; ch_number++) { for (ch_number = 0; ch_number < part->nchannels; ch_number++) {
ch = &part->channels[ch_number]; ch = &part->channels[ch_number];
...@@ -91,7 +86,6 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid) ...@@ -91,7 +86,6 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid)
} }
} }
/* /*
* Setup the infrastructure necessary to support XPartition Communication * Setup the infrastructure necessary to support XPartition Communication
* between the specified remote partition and the local one. * between the specified remote partition and the local one.
...@@ -103,7 +97,6 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -103,7 +97,6 @@ xpc_setup_infrastructure(struct xpc_partition *part)
struct timer_list *timer; struct timer_list *timer;
partid_t partid = XPC_PARTID(part); partid_t partid = XPC_PARTID(part);
/* /*
* Zero out MOST of the entry for this partition. Only the fields * Zero out MOST of the entry for this partition. Only the fields
* starting with `nchannels' will be zeroed. The preceding fields must * starting with `nchannels' will be zeroed. The preceding fields must
...@@ -126,11 +119,11 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -126,11 +119,11 @@ xpc_setup_infrastructure(struct xpc_partition *part)
part->nchannels = XPC_NCHANNELS; part->nchannels = XPC_NCHANNELS;
/* allocate all the required GET/PUT values */ /* allocate all the required GET/PUT values */
part->local_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE, part->local_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE,
GFP_KERNEL, &part->local_GPs_base); GFP_KERNEL,
&part->local_GPs_base);
if (part->local_GPs == NULL) { if (part->local_GPs == NULL) {
kfree(part->channels); kfree(part->channels);
part->channels = NULL; part->channels = NULL;
...@@ -140,7 +133,9 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -140,7 +133,9 @@ xpc_setup_infrastructure(struct xpc_partition *part)
} }
part->remote_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE, part->remote_GPs = xpc_kzalloc_cacheline_aligned(XPC_GP_SIZE,
GFP_KERNEL, &part->remote_GPs_base); GFP_KERNEL,
&part->
remote_GPs_base);
if (part->remote_GPs == NULL) { if (part->remote_GPs == NULL) {
dev_err(xpc_chan, "can't get memory for remote get/put " dev_err(xpc_chan, "can't get memory for remote get/put "
"values\n"); "values\n");
...@@ -151,11 +146,10 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -151,11 +146,10 @@ xpc_setup_infrastructure(struct xpc_partition *part)
return xpcNoMemory; return xpcNoMemory;
} }
/* allocate all the required open and close args */ /* allocate all the required open and close args */
part->local_openclose_args = xpc_kzalloc_cacheline_aligned( part->local_openclose_args =
XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,
&part->local_openclose_args_base); &part->local_openclose_args_base);
if (part->local_openclose_args == NULL) { if (part->local_openclose_args == NULL) {
dev_err(xpc_chan, "can't get memory for local connect args\n"); dev_err(xpc_chan, "can't get memory for local connect args\n");
...@@ -168,8 +162,8 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -168,8 +162,8 @@ xpc_setup_infrastructure(struct xpc_partition *part)
return xpcNoMemory; return xpcNoMemory;
} }
part->remote_openclose_args = xpc_kzalloc_cacheline_aligned( part->remote_openclose_args =
XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL, xpc_kzalloc_cacheline_aligned(XPC_OPENCLOSE_ARGS_SIZE, GFP_KERNEL,
&part->remote_openclose_args_base); &part->remote_openclose_args_base);
if (part->remote_openclose_args == NULL) { if (part->remote_openclose_args == NULL) {
dev_err(xpc_chan, "can't get memory for remote connect args\n"); dev_err(xpc_chan, "can't get memory for remote connect args\n");
...@@ -184,13 +178,11 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -184,13 +178,11 @@ xpc_setup_infrastructure(struct xpc_partition *part)
return xpcNoMemory; return xpcNoMemory;
} }
xpc_initialize_channels(part, partid); xpc_initialize_channels(part, partid);
atomic_set(&part->nchannels_active, 0); atomic_set(&part->nchannels_active, 0);
atomic_set(&part->nchannels_engaged, 0); atomic_set(&part->nchannels_engaged, 0);
/* local_IPI_amo were set to 0 by an earlier memset() */ /* local_IPI_amo were set to 0 by an earlier memset() */
/* Initialize this partitions AMO_t structure */ /* Initialize this partitions AMO_t structure */
...@@ -203,7 +195,7 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -203,7 +195,7 @@ xpc_setup_infrastructure(struct xpc_partition *part)
sprintf(part->IPI_owner, "xpc%02d", partid); sprintf(part->IPI_owner, "xpc%02d", partid);
ret = request_irq(SGI_XPC_NOTIFY, xpc_notify_IRQ_handler, IRQF_SHARED, ret = request_irq(SGI_XPC_NOTIFY, xpc_notify_IRQ_handler, IRQF_SHARED,
part->IPI_owner, (void *) (u64) partid); part->IPI_owner, (void *)(u64)partid);
if (ret != 0) { if (ret != 0) {
dev_err(xpc_chan, "can't register NOTIFY IRQ handler, " dev_err(xpc_chan, "can't register NOTIFY IRQ handler, "
"errno=%d\n", -ret); "errno=%d\n", -ret);
...@@ -223,8 +215,8 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -223,8 +215,8 @@ xpc_setup_infrastructure(struct xpc_partition *part)
/* Setup a timer to check for dropped IPIs */ /* Setup a timer to check for dropped IPIs */
timer = &part->dropped_IPI_timer; timer = &part->dropped_IPI_timer;
init_timer(timer); init_timer(timer);
timer->function = (void (*)(unsigned long)) xpc_dropped_IPI_check; timer->function = (void (*)(unsigned long))xpc_dropped_IPI_check;
timer->data = (unsigned long) part; timer->data = (unsigned long)part;
timer->expires = jiffies + XPC_P_DROPPED_IPI_WAIT; timer->expires = jiffies + XPC_P_DROPPED_IPI_WAIT;
add_timer(timer); add_timer(timer);
...@@ -234,7 +226,6 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -234,7 +226,6 @@ xpc_setup_infrastructure(struct xpc_partition *part)
*/ */
part->setup_state = XPC_P_SETUP; part->setup_state = XPC_P_SETUP;
/* /*
* Setup the per partition specific variables required by the * Setup the per partition specific variables required by the
* remote partition to establish channel connections with us. * remote partition to establish channel connections with us.
...@@ -255,7 +246,6 @@ xpc_setup_infrastructure(struct xpc_partition *part) ...@@ -255,7 +246,6 @@ xpc_setup_infrastructure(struct xpc_partition *part)
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Create a wrapper that hides the underlying mechanism for pulling a cacheline * Create a wrapper that hides the underlying mechanism for pulling a cacheline
* (or multiple cachelines) from a remote partition. * (or multiple cachelines) from a remote partition.
...@@ -270,16 +260,15 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst, ...@@ -270,16 +260,15 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,
{ {
bte_result_t bte_ret; bte_result_t bte_ret;
DBUG_ON((u64)src != L1_CACHE_ALIGN((u64)src));
DBUG_ON((u64) src != L1_CACHE_ALIGN((u64) src)); DBUG_ON((u64)dst != L1_CACHE_ALIGN((u64)dst));
DBUG_ON((u64) dst != L1_CACHE_ALIGN((u64) dst));
DBUG_ON(cnt != L1_CACHE_ALIGN(cnt)); DBUG_ON(cnt != L1_CACHE_ALIGN(cnt));
if (part->act_state == XPC_P_DEACTIVATING) { if (part->act_state == XPC_P_DEACTIVATING) {
return part->reason; return part->reason;
} }
bte_ret = xp_bte_copy((u64) src, (u64) dst, (u64) cnt, bte_ret = xp_bte_copy((u64)src, (u64)dst, (u64)cnt,
(BTE_NORMAL | BTE_WACQUIRE), NULL); (BTE_NORMAL | BTE_WACQUIRE), NULL);
if (bte_ret == BTE_SUCCESS) { if (bte_ret == BTE_SUCCESS) {
return xpcSuccess; return xpcSuccess;
...@@ -291,7 +280,6 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst, ...@@ -291,7 +280,6 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst,
return xpc_map_bte_errors(bte_ret); return xpc_map_bte_errors(bte_ret);
} }
/* /*
* Pull the remote per partition specific variables from the specified * Pull the remote per partition specific variables from the specified
* partition. * partition.
...@@ -301,13 +289,12 @@ xpc_pull_remote_vars_part(struct xpc_partition *part) ...@@ -301,13 +289,12 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
{ {
u8 buffer[L1_CACHE_BYTES * 2]; u8 buffer[L1_CACHE_BYTES * 2];
struct xpc_vars_part *pulled_entry_cacheline = struct xpc_vars_part *pulled_entry_cacheline =
(struct xpc_vars_part *) L1_CACHE_ALIGN((u64) buffer); (struct xpc_vars_part *)L1_CACHE_ALIGN((u64)buffer);
struct xpc_vars_part *pulled_entry; struct xpc_vars_part *pulled_entry;
u64 remote_entry_cacheline_pa, remote_entry_pa; u64 remote_entry_cacheline_pa, remote_entry_pa;
partid_t partid = XPC_PARTID(part); partid_t partid = XPC_PARTID(part);
enum xpc_retval ret; enum xpc_retval ret;
/* pull the cacheline that contains the variables we're interested in */ /* pull the cacheline that contains the variables we're interested in */
DBUG_ON(part->remote_vars_part_pa != DBUG_ON(part->remote_vars_part_pa !=
...@@ -319,11 +306,12 @@ xpc_pull_remote_vars_part(struct xpc_partition *part) ...@@ -319,11 +306,12 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
remote_entry_cacheline_pa = (remote_entry_pa & ~(L1_CACHE_BYTES - 1)); remote_entry_cacheline_pa = (remote_entry_pa & ~(L1_CACHE_BYTES - 1));
pulled_entry = (struct xpc_vars_part *) ((u64) pulled_entry_cacheline + pulled_entry = (struct xpc_vars_part *)((u64)pulled_entry_cacheline +
(remote_entry_pa & (L1_CACHE_BYTES - 1))); (remote_entry_pa &
(L1_CACHE_BYTES - 1)));
ret = xpc_pull_remote_cachelines(part, pulled_entry_cacheline, ret = xpc_pull_remote_cachelines(part, pulled_entry_cacheline,
(void *) remote_entry_cacheline_pa, (void *)remote_entry_cacheline_pa,
L1_CACHE_BYTES); L1_CACHE_BYTES);
if (ret != xpcSuccess) { if (ret != xpcSuccess) {
dev_dbg(xpc_chan, "failed to pull XPC vars_part from " dev_dbg(xpc_chan, "failed to pull XPC vars_part from "
...@@ -331,7 +319,6 @@ xpc_pull_remote_vars_part(struct xpc_partition *part) ...@@ -331,7 +319,6 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
return ret; return ret;
} }
/* see if they've been set up yet */ /* see if they've been set up yet */
if (pulled_entry->magic != XPC_VP_MAGIC1 && if (pulled_entry->magic != XPC_VP_MAGIC1 &&
...@@ -368,7 +355,7 @@ xpc_pull_remote_vars_part(struct xpc_partition *part) ...@@ -368,7 +355,7 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
part->remote_openclose_args_pa = part->remote_openclose_args_pa =
pulled_entry->openclose_args_pa; pulled_entry->openclose_args_pa;
part->remote_IPI_amo_va = part->remote_IPI_amo_va =
(AMO_t *) __va(pulled_entry->IPI_amo_pa); (AMO_t *)__va(pulled_entry->IPI_amo_pa);
part->remote_IPI_nasid = pulled_entry->IPI_nasid; part->remote_IPI_nasid = pulled_entry->IPI_nasid;
part->remote_IPI_phys_cpuid = pulled_entry->IPI_phys_cpuid; part->remote_IPI_phys_cpuid = pulled_entry->IPI_phys_cpuid;
...@@ -388,7 +375,6 @@ xpc_pull_remote_vars_part(struct xpc_partition *part) ...@@ -388,7 +375,6 @@ xpc_pull_remote_vars_part(struct xpc_partition *part)
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Get the IPI flags and pull the openclose args and/or remote GPs as needed. * Get the IPI flags and pull the openclose args and/or remote GPs as needed.
*/ */
...@@ -399,7 +385,6 @@ xpc_get_IPI_flags(struct xpc_partition *part) ...@@ -399,7 +385,6 @@ xpc_get_IPI_flags(struct xpc_partition *part)
u64 IPI_amo; u64 IPI_amo;
enum xpc_retval ret; enum xpc_retval ret;
/* /*
* See if there are any IPI flags to be handled. * See if there are any IPI flags to be handled.
*/ */
...@@ -410,11 +395,11 @@ xpc_get_IPI_flags(struct xpc_partition *part) ...@@ -410,11 +395,11 @@ xpc_get_IPI_flags(struct xpc_partition *part)
} }
spin_unlock_irqrestore(&part->IPI_lock, irq_flags); spin_unlock_irqrestore(&part->IPI_lock, irq_flags);
if (XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(IPI_amo)) { if (XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(IPI_amo)) {
ret = xpc_pull_remote_cachelines(part, ret = xpc_pull_remote_cachelines(part,
part->remote_openclose_args, part->remote_openclose_args,
(void *) part->remote_openclose_args_pa, (void *)part->
remote_openclose_args_pa,
XPC_OPENCLOSE_ARGS_SIZE); XPC_OPENCLOSE_ARGS_SIZE);
if (ret != xpcSuccess) { if (ret != xpcSuccess) {
XPC_DEACTIVATE_PARTITION(part, ret); XPC_DEACTIVATE_PARTITION(part, ret);
...@@ -430,7 +415,7 @@ xpc_get_IPI_flags(struct xpc_partition *part) ...@@ -430,7 +415,7 @@ xpc_get_IPI_flags(struct xpc_partition *part)
if (XPC_ANY_MSG_IPI_FLAGS_SET(IPI_amo)) { if (XPC_ANY_MSG_IPI_FLAGS_SET(IPI_amo)) {
ret = xpc_pull_remote_cachelines(part, part->remote_GPs, ret = xpc_pull_remote_cachelines(part, part->remote_GPs,
(void *) part->remote_GPs_pa, (void *)part->remote_GPs_pa,
XPC_GP_SIZE); XPC_GP_SIZE);
if (ret != xpcSuccess) { if (ret != xpcSuccess) {
XPC_DEACTIVATE_PARTITION(part, ret); XPC_DEACTIVATE_PARTITION(part, ret);
...@@ -446,7 +431,6 @@ xpc_get_IPI_flags(struct xpc_partition *part) ...@@ -446,7 +431,6 @@ xpc_get_IPI_flags(struct xpc_partition *part)
return IPI_amo; return IPI_amo;
} }
/* /*
* Allocate the local message queue and the notify queue. * Allocate the local message queue and the notify queue.
*/ */
...@@ -457,7 +441,6 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch) ...@@ -457,7 +441,6 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch)
int nentries; int nentries;
size_t nbytes; size_t nbytes;
// >>> may want to check for ch->flags & XPC_C_DISCONNECTING between // >>> may want to check for ch->flags & XPC_C_DISCONNECTING between
// >>> iterations of the for-loop, bail if set? // >>> iterations of the for-loop, bail if set?
...@@ -467,7 +450,8 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch) ...@@ -467,7 +450,8 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch)
nbytes = nentries * ch->msg_size; nbytes = nentries * ch->msg_size;
ch->local_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes, ch->local_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes,
GFP_KERNEL, GFP_KERNEL,
&ch->local_msgqueue_base); &ch->
local_msgqueue_base);
if (ch->local_msgqueue == NULL) { if (ch->local_msgqueue == NULL) {
continue; continue;
} }
...@@ -497,7 +481,6 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch) ...@@ -497,7 +481,6 @@ xpc_allocate_local_msgqueue(struct xpc_channel *ch)
return xpcNoMemory; return xpcNoMemory;
} }
/* /*
* Allocate the cached remote message queue. * Allocate the cached remote message queue.
*/ */
...@@ -508,7 +491,6 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch) ...@@ -508,7 +491,6 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
int nentries; int nentries;
size_t nbytes; size_t nbytes;
DBUG_ON(ch->remote_nentries <= 0); DBUG_ON(ch->remote_nentries <= 0);
// >>> may want to check for ch->flags & XPC_C_DISCONNECTING between // >>> may want to check for ch->flags & XPC_C_DISCONNECTING between
...@@ -520,7 +502,8 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch) ...@@ -520,7 +502,8 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
nbytes = nentries * ch->msg_size; nbytes = nentries * ch->msg_size;
ch->remote_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes, ch->remote_msgqueue = xpc_kzalloc_cacheline_aligned(nbytes,
GFP_KERNEL, GFP_KERNEL,
&ch->remote_msgqueue_base); &ch->
remote_msgqueue_base);
if (ch->remote_msgqueue == NULL) { if (ch->remote_msgqueue == NULL) {
continue; continue;
} }
...@@ -542,7 +525,6 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch) ...@@ -542,7 +525,6 @@ xpc_allocate_remote_msgqueue(struct xpc_channel *ch)
return xpcNoMemory; return xpcNoMemory;
} }
/* /*
* Allocate message queues and other stuff associated with a channel. * Allocate message queues and other stuff associated with a channel.
* *
...@@ -554,7 +536,6 @@ xpc_allocate_msgqueues(struct xpc_channel *ch) ...@@ -554,7 +536,6 @@ xpc_allocate_msgqueues(struct xpc_channel *ch)
unsigned long irq_flags; unsigned long irq_flags;
enum xpc_retval ret; enum xpc_retval ret;
DBUG_ON(ch->flags & XPC_C_SETUP); DBUG_ON(ch->flags & XPC_C_SETUP);
if ((ret = xpc_allocate_local_msgqueue(ch)) != xpcSuccess) { if ((ret = xpc_allocate_local_msgqueue(ch)) != xpcSuccess) {
...@@ -576,7 +557,6 @@ xpc_allocate_msgqueues(struct xpc_channel *ch) ...@@ -576,7 +557,6 @@ xpc_allocate_msgqueues(struct xpc_channel *ch)
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Process a connect message from a remote partition. * Process a connect message from a remote partition.
* *
...@@ -588,7 +568,6 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags) ...@@ -588,7 +568,6 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
{ {
enum xpc_retval ret; enum xpc_retval ret;
DBUG_ON(!spin_is_locked(&ch->lock)); DBUG_ON(!spin_is_locked(&ch->lock));
if (!(ch->flags & XPC_C_OPENREQUEST) || if (!(ch->flags & XPC_C_OPENREQUEST) ||
...@@ -636,7 +615,6 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags) ...@@ -636,7 +615,6 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
spin_lock_irqsave(&ch->lock, *irq_flags); spin_lock_irqsave(&ch->lock, *irq_flags);
} }
/* /*
* Notify those who wanted to be notified upon delivery of their message. * Notify those who wanted to be notified upon delivery of their message.
*/ */
...@@ -647,7 +625,6 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put) ...@@ -647,7 +625,6 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put)
u8 notify_type; u8 notify_type;
s64 get = ch->w_remote_GP.get - 1; s64 get = ch->w_remote_GP.get - 1;
while (++get < put && atomic_read(&ch->n_to_notify) > 0) { while (++get < put && atomic_read(&ch->n_to_notify) > 0) {
notify = &ch->notify_queue[get % ch->local_nentries]; notify = &ch->notify_queue[get % ch->local_nentries];
...@@ -660,8 +637,7 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put) ...@@ -660,8 +637,7 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put)
*/ */
notify_type = notify->type; notify_type = notify->type;
if (notify_type == 0 || if (notify_type == 0 ||
cmpxchg(&notify->type, notify_type, 0) != cmpxchg(&notify->type, notify_type, 0) != notify_type) {
notify_type) {
continue; continue;
} }
...@@ -672,20 +648,19 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put) ...@@ -672,20 +648,19 @@ xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put)
if (notify->func != NULL) { if (notify->func != NULL) {
dev_dbg(xpc_chan, "notify->func() called, notify=0x%p, " dev_dbg(xpc_chan, "notify->func() called, notify=0x%p, "
"msg_number=%ld, partid=%d, channel=%d\n", "msg_number=%ld, partid=%d, channel=%d\n",
(void *) notify, get, ch->partid, ch->number); (void *)notify, get, ch->partid, ch->number);
notify->func(reason, ch->partid, ch->number, notify->func(reason, ch->partid, ch->number,
notify->key); notify->key);
dev_dbg(xpc_chan, "notify->func() returned, " dev_dbg(xpc_chan, "notify->func() returned, "
"notify=0x%p, msg_number=%ld, partid=%d, " "notify=0x%p, msg_number=%ld, partid=%d, "
"channel=%d\n", (void *) notify, get, "channel=%d\n", (void *)notify, get,
ch->partid, ch->number); ch->partid, ch->number);
} }
} }
} }
/* /*
* Free up message queues and other stuff that were allocated for the specified * Free up message queues and other stuff that were allocated for the specified
* channel. * channel.
...@@ -733,7 +708,6 @@ xpc_free_msgqueues(struct xpc_channel *ch) ...@@ -733,7 +708,6 @@ xpc_free_msgqueues(struct xpc_channel *ch)
} }
} }
/* /*
* spin_lock_irqsave() is expected to be held on entry. * spin_lock_irqsave() is expected to be held on entry.
*/ */
...@@ -743,7 +717,6 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags) ...@@ -743,7 +717,6 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
struct xpc_partition *part = &xpc_partitions[ch->partid]; struct xpc_partition *part = &xpc_partitions[ch->partid];
u32 channel_was_connected = (ch->flags & XPC_C_WASCONNECTED); u32 channel_was_connected = (ch->flags & XPC_C_WASCONNECTED);
DBUG_ON(!spin_is_locked(&ch->lock)); DBUG_ON(!spin_is_locked(&ch->lock));
if (!(ch->flags & XPC_C_DISCONNECTING)) { if (!(ch->flags & XPC_C_DISCONNECTING)) {
...@@ -827,7 +800,6 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags) ...@@ -827,7 +800,6 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
} }
} }
/* /*
* Process a change in the channel's remote connection state. * Process a change in the channel's remote connection state.
*/ */
...@@ -841,14 +813,11 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -841,14 +813,11 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
struct xpc_channel *ch = &part->channels[ch_number]; struct xpc_channel *ch = &part->channels[ch_number];
enum xpc_retval reason; enum xpc_retval reason;
spin_lock_irqsave(&ch->lock, irq_flags); spin_lock_irqsave(&ch->lock, irq_flags);
again: again:
if ((ch->flags & XPC_C_DISCONNECTED) && if ((ch->flags & XPC_C_DISCONNECTED) && (ch->flags & XPC_C_WDISCONNECT)) {
(ch->flags & XPC_C_WDISCONNECT)) {
/* /*
* Delay processing IPI flags until thread waiting disconnect * Delay processing IPI flags until thread waiting disconnect
* has had a chance to see that the channel is disconnected. * has had a chance to see that the channel is disconnected.
...@@ -858,7 +827,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -858,7 +827,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
return; return;
} }
if (IPI_flags & XPC_IPI_CLOSEREQUEST) { if (IPI_flags & XPC_IPI_CLOSEREQUEST) {
dev_dbg(xpc_chan, "XPC_IPI_CLOSEREQUEST (reason=%d) received " dev_dbg(xpc_chan, "XPC_IPI_CLOSEREQUEST (reason=%d) received "
...@@ -890,7 +858,8 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -890,7 +858,8 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
if (ch->flags & XPC_C_DISCONNECTED) { if (ch->flags & XPC_C_DISCONNECTED) {
if (!(IPI_flags & XPC_IPI_OPENREQUEST)) { if (!(IPI_flags & XPC_IPI_OPENREQUEST)) {
if ((XPC_GET_IPI_FLAGS(part->local_IPI_amo, if ((XPC_GET_IPI_FLAGS(part->local_IPI_amo,
ch_number) & XPC_IPI_OPENREQUEST)) { ch_number) &
XPC_IPI_OPENREQUEST)) {
DBUG_ON(ch->delayed_IPI_flags != 0); DBUG_ON(ch->delayed_IPI_flags != 0);
spin_lock(&part->IPI_lock); spin_lock(&part->IPI_lock);
...@@ -937,7 +906,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -937,7 +906,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
xpc_process_disconnect(ch, &irq_flags); xpc_process_disconnect(ch, &irq_flags);
} }
if (IPI_flags & XPC_IPI_CLOSEREPLY) { if (IPI_flags & XPC_IPI_CLOSEREPLY) {
dev_dbg(xpc_chan, "XPC_IPI_CLOSEREPLY received from partid=%d," dev_dbg(xpc_chan, "XPC_IPI_CLOSEREPLY received from partid=%d,"
...@@ -958,7 +926,8 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -958,7 +926,8 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
DBUG_ON(ch->delayed_IPI_flags != 0); DBUG_ON(ch->delayed_IPI_flags != 0);
spin_lock(&part->IPI_lock); spin_lock(&part->IPI_lock);
XPC_SET_IPI_FLAGS(part->local_IPI_amo, XPC_SET_IPI_FLAGS(part->local_IPI_amo,
ch_number, XPC_IPI_CLOSEREPLY); ch_number,
XPC_IPI_CLOSEREPLY);
spin_unlock(&part->IPI_lock); spin_unlock(&part->IPI_lock);
} }
spin_unlock_irqrestore(&ch->lock, irq_flags); spin_unlock_irqrestore(&ch->lock, irq_flags);
...@@ -973,7 +942,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -973,7 +942,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
} }
} }
if (IPI_flags & XPC_IPI_OPENREQUEST) { if (IPI_flags & XPC_IPI_OPENREQUEST) {
dev_dbg(xpc_chan, "XPC_IPI_OPENREQUEST (msg_size=%d, " dev_dbg(xpc_chan, "XPC_IPI_OPENREQUEST (msg_size=%d, "
...@@ -1011,7 +979,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -1011,7 +979,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
ch->flags |= (XPC_C_ROPENREQUEST | XPC_C_CONNECTING); ch->flags |= (XPC_C_ROPENREQUEST | XPC_C_CONNECTING);
ch->remote_nentries = args->local_nentries; ch->remote_nentries = args->local_nentries;
if (ch->flags & XPC_C_OPENREQUEST) { if (ch->flags & XPC_C_OPENREQUEST) {
if (args->msg_size != ch->msg_size) { if (args->msg_size != ch->msg_size) {
XPC_DISCONNECT_CHANNEL(ch, xpcUnequalMsgSizes, XPC_DISCONNECT_CHANNEL(ch, xpcUnequalMsgSizes,
...@@ -1031,7 +998,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -1031,7 +998,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
xpc_process_connect(ch, &irq_flags); xpc_process_connect(ch, &irq_flags);
} }
if (IPI_flags & XPC_IPI_OPENREPLY) { if (IPI_flags & XPC_IPI_OPENREPLY) {
dev_dbg(xpc_chan, "XPC_IPI_OPENREPLY (local_msgqueue_pa=0x%lx, " dev_dbg(xpc_chan, "XPC_IPI_OPENREPLY (local_msgqueue_pa=0x%lx, "
...@@ -1093,7 +1059,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, ...@@ -1093,7 +1059,6 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number,
spin_unlock_irqrestore(&ch->lock, irq_flags); spin_unlock_irqrestore(&ch->lock, irq_flags);
} }
/* /*
* Attempt to establish a channel connection to a remote partition. * Attempt to establish a channel connection to a remote partition.
*/ */
...@@ -1103,7 +1068,6 @@ xpc_connect_channel(struct xpc_channel *ch) ...@@ -1103,7 +1068,6 @@ xpc_connect_channel(struct xpc_channel *ch)
unsigned long irq_flags; unsigned long irq_flags;
struct xpc_registration *registration = &xpc_registrations[ch->number]; struct xpc_registration *registration = &xpc_registrations[ch->number];
if (mutex_trylock(&registration->mutex) == 0) { if (mutex_trylock(&registration->mutex) == 0) {
return xpcRetry; return xpcRetry;
} }
...@@ -1124,7 +1088,6 @@ xpc_connect_channel(struct xpc_channel *ch) ...@@ -1124,7 +1088,6 @@ xpc_connect_channel(struct xpc_channel *ch)
return ch->reason; return ch->reason;
} }
/* add info from the channel connect registration to the channel */ /* add info from the channel connect registration to the channel */
ch->kthreads_assigned_limit = registration->assigned_limit; ch->kthreads_assigned_limit = registration->assigned_limit;
...@@ -1169,7 +1132,6 @@ xpc_connect_channel(struct xpc_channel *ch) ...@@ -1169,7 +1132,6 @@ xpc_connect_channel(struct xpc_channel *ch)
mutex_unlock(&registration->mutex); mutex_unlock(&registration->mutex);
/* initiate the connection */ /* initiate the connection */
ch->flags |= (XPC_C_OPENREQUEST | XPC_C_CONNECTING); ch->flags |= (XPC_C_OPENREQUEST | XPC_C_CONNECTING);
...@@ -1182,7 +1144,6 @@ xpc_connect_channel(struct xpc_channel *ch) ...@@ -1182,7 +1144,6 @@ xpc_connect_channel(struct xpc_channel *ch)
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Clear some of the msg flags in the local message queue. * Clear some of the msg flags in the local message queue.
*/ */
...@@ -1192,16 +1153,15 @@ xpc_clear_local_msgqueue_flags(struct xpc_channel *ch) ...@@ -1192,16 +1153,15 @@ xpc_clear_local_msgqueue_flags(struct xpc_channel *ch)
struct xpc_msg *msg; struct xpc_msg *msg;
s64 get; s64 get;
get = ch->w_remote_GP.get; get = ch->w_remote_GP.get;
do { do {
msg = (struct xpc_msg *) ((u64) ch->local_msgqueue + msg = (struct xpc_msg *)((u64)ch->local_msgqueue +
(get % ch->local_nentries) * ch->msg_size); (get % ch->local_nentries) *
ch->msg_size);
msg->flags = 0; msg->flags = 0;
} while (++get < (volatile s64) ch->remote_GP.get); } while (++get < (volatile s64)ch->remote_GP.get);
} }
/* /*
* Clear some of the msg flags in the remote message queue. * Clear some of the msg flags in the remote message queue.
*/ */
...@@ -1211,26 +1171,23 @@ xpc_clear_remote_msgqueue_flags(struct xpc_channel *ch) ...@@ -1211,26 +1171,23 @@ xpc_clear_remote_msgqueue_flags(struct xpc_channel *ch)
struct xpc_msg *msg; struct xpc_msg *msg;
s64 put; s64 put;
put = ch->w_remote_GP.put; put = ch->w_remote_GP.put;
do { do {
msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue + msg = (struct xpc_msg *)((u64)ch->remote_msgqueue +
(put % ch->remote_nentries) * ch->msg_size); (put % ch->remote_nentries) *
ch->msg_size);
msg->flags = 0; msg->flags = 0;
} while (++put < (volatile s64) ch->remote_GP.put); } while (++put < (volatile s64)ch->remote_GP.put);
} }
static void static void
xpc_process_msg_IPI(struct xpc_partition *part, int ch_number) xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
{ {
struct xpc_channel *ch = &part->channels[ch_number]; struct xpc_channel *ch = &part->channels[ch_number];
int nmsgs_sent; int nmsgs_sent;
ch->remote_GP = part->remote_GPs[ch_number]; ch->remote_GP = part->remote_GPs[ch_number];
/* See what, if anything, has changed for each connected channel */ /* See what, if anything, has changed for each connected channel */
xpc_msgqueue_ref(ch); xpc_msgqueue_ref(ch);
...@@ -1242,12 +1199,11 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number) ...@@ -1242,12 +1199,11 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
return; return;
} }
if (!(ch->flags & XPC_C_CONNECTED)){ if (!(ch->flags & XPC_C_CONNECTED)) {
xpc_msgqueue_deref(ch); xpc_msgqueue_deref(ch);
return; return;
} }
/* /*
* First check to see if messages recently sent by us have been * First check to see if messages recently sent by us have been
* received by the other side. (The remote GET value will have * received by the other side. (The remote GET value will have
...@@ -1293,7 +1249,6 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number) ...@@ -1293,7 +1249,6 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
} }
} }
/* /*
* Now check for newly sent messages by the other side. (The remote * Now check for newly sent messages by the other side. (The remote
* PUT value will have changed since we last looked at it.) * PUT value will have changed since we last looked at it.)
...@@ -1327,7 +1282,6 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number) ...@@ -1327,7 +1282,6 @@ xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
xpc_msgqueue_deref(ch); xpc_msgqueue_deref(ch);
} }
void void
xpc_process_channel_activity(struct xpc_partition *part) xpc_process_channel_activity(struct xpc_partition *part)
{ {
...@@ -1337,7 +1291,6 @@ xpc_process_channel_activity(struct xpc_partition *part) ...@@ -1337,7 +1291,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
int ch_number; int ch_number;
u32 ch_flags; u32 ch_flags;
IPI_amo = xpc_get_IPI_flags(part); IPI_amo = xpc_get_IPI_flags(part);
/* /*
...@@ -1350,7 +1303,6 @@ xpc_process_channel_activity(struct xpc_partition *part) ...@@ -1350,7 +1303,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
for (ch_number = 0; ch_number < part->nchannels; ch_number++) { for (ch_number = 0; ch_number < part->nchannels; ch_number++) {
ch = &part->channels[ch_number]; ch = &part->channels[ch_number];
/* /*
* Process any open or close related IPI flags, and then deal * Process any open or close related IPI flags, and then deal
* with connecting or disconnecting the channel as required. * with connecting or disconnecting the channel as required.
...@@ -1378,7 +1330,7 @@ xpc_process_channel_activity(struct xpc_partition *part) ...@@ -1378,7 +1330,7 @@ xpc_process_channel_activity(struct xpc_partition *part)
if (!(ch_flags & XPC_C_CONNECTED)) { if (!(ch_flags & XPC_C_CONNECTED)) {
if (!(ch_flags & XPC_C_OPENREQUEST)) { if (!(ch_flags & XPC_C_OPENREQUEST)) {
DBUG_ON(ch_flags & XPC_C_SETUP); DBUG_ON(ch_flags & XPC_C_SETUP);
(void) xpc_connect_channel(ch); (void)xpc_connect_channel(ch);
} else { } else {
spin_lock_irqsave(&ch->lock, irq_flags); spin_lock_irqsave(&ch->lock, irq_flags);
xpc_process_connect(ch, &irq_flags); xpc_process_connect(ch, &irq_flags);
...@@ -1387,7 +1339,6 @@ xpc_process_channel_activity(struct xpc_partition *part) ...@@ -1387,7 +1339,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
continue; continue;
} }
/* /*
* Process any message related IPI flags, this may involve the * Process any message related IPI flags, this may involve the
* activation of kthreads to deliver any pending messages sent * activation of kthreads to deliver any pending messages sent
...@@ -1400,7 +1351,6 @@ xpc_process_channel_activity(struct xpc_partition *part) ...@@ -1400,7 +1351,6 @@ xpc_process_channel_activity(struct xpc_partition *part)
} }
} }
/* /*
* XPC's heartbeat code calls this function to inform XPC that a partition is * XPC's heartbeat code calls this function to inform XPC that a partition is
* going down. XPC responds by tearing down the XPartition Communication * going down. XPC responds by tearing down the XPartition Communication
...@@ -1417,7 +1367,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason) ...@@ -1417,7 +1367,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
int ch_number; int ch_number;
struct xpc_channel *ch; struct xpc_channel *ch;
dev_dbg(xpc_chan, "deactivating partition %d, reason=%d\n", dev_dbg(xpc_chan, "deactivating partition %d, reason=%d\n",
XPC_PARTID(part), reason); XPC_PARTID(part), reason);
...@@ -1426,7 +1375,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason) ...@@ -1426,7 +1375,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
return; return;
} }
/* disconnect channels associated with the partition going down */ /* disconnect channels associated with the partition going down */
for (ch_number = 0; ch_number < part->nchannels; ch_number++) { for (ch_number = 0; ch_number < part->nchannels; ch_number++) {
...@@ -1446,7 +1394,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason) ...@@ -1446,7 +1394,6 @@ xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason)
xpc_part_deref(part); xpc_part_deref(part);
} }
/* /*
* Teardown the infrastructure necessary to support XPartition Communication * Teardown the infrastructure necessary to support XPartition Communication
* between the specified remote partition and the local one. * between the specified remote partition and the local one.
...@@ -1456,7 +1403,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part) ...@@ -1456,7 +1403,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
{ {
partid_t partid = XPC_PARTID(part); partid_t partid = XPC_PARTID(part);
/* /*
* We start off by making this partition inaccessible to local * We start off by making this partition inaccessible to local
* processes by marking it as no longer setup. Then we make it * processes by marking it as no longer setup. Then we make it
...@@ -1473,9 +1419,7 @@ xpc_teardown_infrastructure(struct xpc_partition *part) ...@@ -1473,9 +1419,7 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
xpc_vars_part[partid].magic = 0; xpc_vars_part[partid].magic = 0;
free_irq(SGI_XPC_NOTIFY, (void *)(u64)partid);
free_irq(SGI_XPC_NOTIFY, (void *) (u64) partid);
/* /*
* Before proceeding with the teardown we have to wait until all * Before proceeding with the teardown we have to wait until all
...@@ -1483,7 +1427,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part) ...@@ -1483,7 +1427,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
*/ */
wait_event(part->teardown_wq, (atomic_read(&part->references) == 0)); wait_event(part->teardown_wq, (atomic_read(&part->references) == 0));
/* now we can begin tearing down the infrastructure */ /* now we can begin tearing down the infrastructure */
part->setup_state = XPC_P_TORNDOWN; part->setup_state = XPC_P_TORNDOWN;
...@@ -1504,7 +1447,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part) ...@@ -1504,7 +1447,6 @@ xpc_teardown_infrastructure(struct xpc_partition *part)
part->local_IPI_amo_va = NULL; part->local_IPI_amo_va = NULL;
} }
/* /*
* Called by XP at the time of channel connection registration to cause * Called by XP at the time of channel connection registration to cause
* XPC to establish connections to all currently active partitions. * XPC to establish connections to all currently active partitions.
...@@ -1516,7 +1458,6 @@ xpc_initiate_connect(int ch_number) ...@@ -1516,7 +1458,6 @@ xpc_initiate_connect(int ch_number)
struct xpc_partition *part; struct xpc_partition *part;
struct xpc_channel *ch; struct xpc_channel *ch;
DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS); DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) {
...@@ -1535,7 +1476,6 @@ xpc_initiate_connect(int ch_number) ...@@ -1535,7 +1476,6 @@ xpc_initiate_connect(int ch_number)
} }
} }
void void
xpc_connected_callout(struct xpc_channel *ch) xpc_connected_callout(struct xpc_channel *ch)
{ {
...@@ -1546,14 +1486,13 @@ xpc_connected_callout(struct xpc_channel *ch) ...@@ -1546,14 +1486,13 @@ xpc_connected_callout(struct xpc_channel *ch)
"partid=%d, channel=%d\n", ch->partid, ch->number); "partid=%d, channel=%d\n", ch->partid, ch->number);
ch->func(xpcConnected, ch->partid, ch->number, ch->func(xpcConnected, ch->partid, ch->number,
(void *) (u64) ch->local_nentries, ch->key); (void *)(u64)ch->local_nentries, ch->key);
dev_dbg(xpc_chan, "ch->func() returned, reason=xpcConnected, " dev_dbg(xpc_chan, "ch->func() returned, reason=xpcConnected, "
"partid=%d, channel=%d\n", ch->partid, ch->number); "partid=%d, channel=%d\n", ch->partid, ch->number);
} }
} }
/* /*
* Called by XP at the time of channel connection unregistration to cause * Called by XP at the time of channel connection unregistration to cause
* XPC to teardown all current connections for the specified channel. * XPC to teardown all current connections for the specified channel.
...@@ -1575,7 +1514,6 @@ xpc_initiate_disconnect(int ch_number) ...@@ -1575,7 +1514,6 @@ xpc_initiate_disconnect(int ch_number)
struct xpc_partition *part; struct xpc_partition *part;
struct xpc_channel *ch; struct xpc_channel *ch;
DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS); DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
/* initiate the channel disconnect for every active partition */ /* initiate the channel disconnect for every active partition */
...@@ -1605,7 +1543,6 @@ xpc_initiate_disconnect(int ch_number) ...@@ -1605,7 +1543,6 @@ xpc_initiate_disconnect(int ch_number)
xpc_disconnect_wait(ch_number); xpc_disconnect_wait(ch_number);
} }
/* /*
* To disconnect a channel, and reflect it back to all who may be waiting. * To disconnect a channel, and reflect it back to all who may be waiting.
* *
...@@ -1621,7 +1558,6 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch, ...@@ -1621,7 +1558,6 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
{ {
u32 channel_was_connected = (ch->flags & XPC_C_CONNECTED); u32 channel_was_connected = (ch->flags & XPC_C_CONNECTED);
DBUG_ON(!spin_is_locked(&ch->lock)); DBUG_ON(!spin_is_locked(&ch->lock));
if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED)) { if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED)) {
...@@ -1666,7 +1602,6 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch, ...@@ -1666,7 +1602,6 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
spin_lock_irqsave(&ch->lock, *irq_flags); spin_lock_irqsave(&ch->lock, *irq_flags);
} }
void void
xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason) xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason)
{ {
...@@ -1687,7 +1622,6 @@ xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason) ...@@ -1687,7 +1622,6 @@ xpc_disconnect_callout(struct xpc_channel *ch, enum xpc_retval reason)
} }
} }
/* /*
* Wait for a message entry to become available for the specified channel, * Wait for a message entry to become available for the specified channel,
* but don't wait any longer than 1 jiffy. * but don't wait any longer than 1 jiffy.
...@@ -1697,7 +1631,6 @@ xpc_allocate_msg_wait(struct xpc_channel *ch) ...@@ -1697,7 +1631,6 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)
{ {
enum xpc_retval ret; enum xpc_retval ret;
if (ch->flags & XPC_C_DISCONNECTING) { if (ch->flags & XPC_C_DISCONNECTING) {
DBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true? DBUG_ON(ch->reason == xpcInterrupted); // >>> Is this true?
return ch->reason; return ch->reason;
...@@ -1719,7 +1652,6 @@ xpc_allocate_msg_wait(struct xpc_channel *ch) ...@@ -1719,7 +1652,6 @@ xpc_allocate_msg_wait(struct xpc_channel *ch)
return ret; return ret;
} }
/* /*
* Allocate an entry for a message from the message queue associated with the * Allocate an entry for a message from the message queue associated with the
* specified channel. * specified channel.
...@@ -1732,7 +1664,6 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags, ...@@ -1732,7 +1664,6 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
enum xpc_retval ret; enum xpc_retval ret;
s64 put; s64 put;
/* this reference will be dropped in xpc_send_msg() */ /* this reference will be dropped in xpc_send_msg() */
xpc_msgqueue_ref(ch); xpc_msgqueue_ref(ch);
...@@ -1745,7 +1676,6 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags, ...@@ -1745,7 +1676,6 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
return xpcNotConnected; return xpcNotConnected;
} }
/* /*
* Get the next available message entry from the local message queue. * Get the next available message entry from the local message queue.
* If none are available, we'll make sure that we grab the latest * If none are available, we'll make sure that we grab the latest
...@@ -1755,8 +1685,8 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags, ...@@ -1755,8 +1685,8 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
while (1) { while (1) {
put = (volatile s64) ch->w_local_GP.put; put = (volatile s64)ch->w_local_GP.put;
if (put - (volatile s64) ch->w_remote_GP.get < if (put - (volatile s64)ch->w_remote_GP.get <
ch->local_nentries) { ch->local_nentries) {
/* There are available message entries. We need to try /* There are available message entries. We need to try
...@@ -1765,15 +1695,13 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags, ...@@ -1765,15 +1695,13 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
* doesn't beat us to it. If they do, we'll have to * doesn't beat us to it. If they do, we'll have to
* try again. * try again.
*/ */
if (cmpxchg(&ch->w_local_GP.put, put, put + 1) == if (cmpxchg(&ch->w_local_GP.put, put, put + 1) == put) {
put) {
/* we got the entry referenced by put */ /* we got the entry referenced by put */
break; break;
} }
continue; /* try again */ continue; /* try again */
} }
/* /*
* There aren't any available msg entries at this time. * There aren't any available msg entries at this time.
* *
...@@ -1799,25 +1727,22 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags, ...@@ -1799,25 +1727,22 @@ xpc_allocate_msg(struct xpc_channel *ch, u32 flags,
} }
} }
/* get the message's address and initialize it */ /* get the message's address and initialize it */
msg = (struct xpc_msg *) ((u64) ch->local_msgqueue + msg = (struct xpc_msg *)((u64)ch->local_msgqueue +
(put % ch->local_nentries) * ch->msg_size); (put % ch->local_nentries) * ch->msg_size);
DBUG_ON(msg->flags != 0); DBUG_ON(msg->flags != 0);
msg->number = put; msg->number = put;
dev_dbg(xpc_chan, "w_local_GP.put changed to %ld; msg=0x%p, " dev_dbg(xpc_chan, "w_local_GP.put changed to %ld; msg=0x%p, "
"msg_number=%ld, partid=%d, channel=%d\n", put + 1, "msg_number=%ld, partid=%d, channel=%d\n", put + 1,
(void *) msg, msg->number, ch->partid, ch->number); (void *)msg, msg->number, ch->partid, ch->number);
*address_of_msg = msg; *address_of_msg = msg;
return xpcSuccess; return xpcSuccess;
} }
/* /*
* Allocate an entry for a message from the message queue associated with the * Allocate an entry for a message from the message queue associated with the
* specified channel. NOTE that this routine can sleep waiting for a message * specified channel. NOTE that this routine can sleep waiting for a message
...@@ -1838,7 +1763,6 @@ xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload) ...@@ -1838,7 +1763,6 @@ xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload)
enum xpc_retval ret = xpcUnknownReason; enum xpc_retval ret = xpcUnknownReason;
struct xpc_msg *msg = NULL; struct xpc_msg *msg = NULL;
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
DBUG_ON(ch_number < 0 || ch_number >= part->nchannels); DBUG_ON(ch_number < 0 || ch_number >= part->nchannels);
...@@ -1856,7 +1780,6 @@ xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload) ...@@ -1856,7 +1780,6 @@ xpc_initiate_allocate(partid_t partid, int ch_number, u32 flags, void **payload)
return ret; return ret;
} }
/* /*
* Now we actually send the messages that are ready to be sent by advancing * Now we actually send the messages that are ready to be sent by advancing
* the local message queue's Put value and then send an IPI to the recipient * the local message queue's Put value and then send an IPI to the recipient
...@@ -1869,16 +1792,16 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put) ...@@ -1869,16 +1792,16 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
s64 put = initial_put + 1; s64 put = initial_put + 1;
int send_IPI = 0; int send_IPI = 0;
while (1) { while (1) {
while (1) { while (1) {
if (put == (volatile s64) ch->w_local_GP.put) { if (put == (volatile s64)ch->w_local_GP.put) {
break; break;
} }
msg = (struct xpc_msg *) ((u64) ch->local_msgqueue + msg = (struct xpc_msg *)((u64)ch->local_msgqueue +
(put % ch->local_nentries) * ch->msg_size); (put % ch->local_nentries) *
ch->msg_size);
if (!(msg->flags & XPC_M_READY)) { if (!(msg->flags & XPC_M_READY)) {
break; break;
...@@ -1895,7 +1818,7 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put) ...@@ -1895,7 +1818,7 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
if (cmpxchg_rel(&ch->local_GP->put, initial_put, put) != if (cmpxchg_rel(&ch->local_GP->put, initial_put, put) !=
initial_put) { initial_put) {
/* someone else beat us to it */ /* someone else beat us to it */
DBUG_ON((volatile s64) ch->local_GP->put < initial_put); DBUG_ON((volatile s64)ch->local_GP->put < initial_put);
break; break;
} }
...@@ -1919,7 +1842,6 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put) ...@@ -1919,7 +1842,6 @@ xpc_send_msgs(struct xpc_channel *ch, s64 initial_put)
} }
} }
/* /*
* Common code that does the actual sending of the message by advancing the * Common code that does the actual sending of the message by advancing the
* local message queue's Put value and sends an IPI to the partition the * local message queue's Put value and sends an IPI to the partition the
...@@ -1933,9 +1855,8 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type, ...@@ -1933,9 +1855,8 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,
struct xpc_notify *notify = notify; struct xpc_notify *notify = notify;
s64 put, msg_number = msg->number; s64 put, msg_number = msg->number;
DBUG_ON(notify_type == XPC_N_CALL && func == NULL); DBUG_ON(notify_type == XPC_N_CALL && func == NULL);
DBUG_ON((((u64) msg - (u64) ch->local_msgqueue) / ch->msg_size) != DBUG_ON((((u64)msg - (u64)ch->local_msgqueue) / ch->msg_size) !=
msg_number % ch->local_nentries); msg_number % ch->local_nentries);
DBUG_ON(msg->flags & XPC_M_READY); DBUG_ON(msg->flags & XPC_M_READY);
...@@ -2001,7 +1922,6 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type, ...@@ -2001,7 +1922,6 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type,
return ret; return ret;
} }
/* /*
* Send a message previously allocated using xpc_initiate_allocate() on the * Send a message previously allocated using xpc_initiate_allocate() on the
* specified channel connected to the specified partition. * specified channel connected to the specified partition.
...@@ -2029,8 +1949,7 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload) ...@@ -2029,8 +1949,7 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload)
struct xpc_msg *msg = XPC_MSG_ADDRESS(payload); struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
enum xpc_retval ret; enum xpc_retval ret;
dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,
dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *) msg,
partid, ch_number); partid, ch_number);
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
...@@ -2042,7 +1961,6 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload) ...@@ -2042,7 +1961,6 @@ xpc_initiate_send(partid_t partid, int ch_number, void *payload)
return ret; return ret;
} }
/* /*
* Send a message previously allocated using xpc_initiate_allocate on the * Send a message previously allocated using xpc_initiate_allocate on the
* specified channel connected to the specified partition. * specified channel connected to the specified partition.
...@@ -2081,8 +1999,7 @@ xpc_initiate_send_notify(partid_t partid, int ch_number, void *payload, ...@@ -2081,8 +1999,7 @@ xpc_initiate_send_notify(partid_t partid, int ch_number, void *payload,
struct xpc_msg *msg = XPC_MSG_ADDRESS(payload); struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
enum xpc_retval ret; enum xpc_retval ret;
dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *)msg,
dev_dbg(xpc_chan, "msg=0x%p, partid=%d, channel=%d\n", (void *) msg,
partid, ch_number); partid, ch_number);
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
...@@ -2095,7 +2012,6 @@ xpc_initiate_send_notify(partid_t partid, int ch_number, void *payload, ...@@ -2095,7 +2012,6 @@ xpc_initiate_send_notify(partid_t partid, int ch_number, void *payload,
return ret; return ret;
} }
static struct xpc_msg * static struct xpc_msg *
xpc_pull_remote_msg(struct xpc_channel *ch, s64 get) xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
{ {
...@@ -2105,7 +2021,6 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get) ...@@ -2105,7 +2021,6 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
u64 msg_offset; u64 msg_offset;
enum xpc_retval ret; enum xpc_retval ret;
if (mutex_lock_interruptible(&ch->msg_to_pull_mutex) != 0) { if (mutex_lock_interruptible(&ch->msg_to_pull_mutex) != 0) {
/* we were interrupted by a signal */ /* we were interrupted by a signal */
return NULL; return NULL;
...@@ -2118,8 +2033,8 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get) ...@@ -2118,8 +2033,8 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
msg_index = ch->next_msg_to_pull % ch->remote_nentries; msg_index = ch->next_msg_to_pull % ch->remote_nentries;
DBUG_ON(ch->next_msg_to_pull >= DBUG_ON(ch->next_msg_to_pull >=
(volatile s64) ch->w_remote_GP.put); (volatile s64)ch->w_remote_GP.put);
nmsgs = (volatile s64) ch->w_remote_GP.put - nmsgs = (volatile s64)ch->w_remote_GP.put -
ch->next_msg_to_pull; ch->next_msg_to_pull;
if (msg_index + nmsgs > ch->remote_nentries) { if (msg_index + nmsgs > ch->remote_nentries) {
/* ignore the ones that wrap the msg queue for now */ /* ignore the ones that wrap the msg queue for now */
...@@ -2127,13 +2042,13 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get) ...@@ -2127,13 +2042,13 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
} }
msg_offset = msg_index * ch->msg_size; msg_offset = msg_index * ch->msg_size;
msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue + msg = (struct xpc_msg *)((u64)ch->remote_msgqueue + msg_offset);
msg_offset); remote_msg = (struct xpc_msg *)(ch->remote_msgqueue_pa +
remote_msg = (struct xpc_msg *) (ch->remote_msgqueue_pa +
msg_offset); msg_offset);
if ((ret = xpc_pull_remote_cachelines(part, msg, remote_msg, if ((ret = xpc_pull_remote_cachelines(part, msg, remote_msg,
nmsgs * ch->msg_size)) != xpcSuccess) { nmsgs * ch->msg_size)) !=
xpcSuccess) {
dev_dbg(xpc_chan, "failed to pull %d msgs starting with" dev_dbg(xpc_chan, "failed to pull %d msgs starting with"
" msg %ld from partition %d, channel=%d, " " msg %ld from partition %d, channel=%d, "
...@@ -2155,12 +2070,11 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get) ...@@ -2155,12 +2070,11 @@ xpc_pull_remote_msg(struct xpc_channel *ch, s64 get)
/* return the message we were looking for */ /* return the message we were looking for */
msg_offset = (get % ch->remote_nentries) * ch->msg_size; msg_offset = (get % ch->remote_nentries) * ch->msg_size;
msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue + msg_offset); msg = (struct xpc_msg *)((u64)ch->remote_msgqueue + msg_offset);
return msg; return msg;
} }
/* /*
* Get a message to be delivered. * Get a message to be delivered.
*/ */
...@@ -2170,14 +2084,13 @@ xpc_get_deliverable_msg(struct xpc_channel *ch) ...@@ -2170,14 +2084,13 @@ xpc_get_deliverable_msg(struct xpc_channel *ch)
struct xpc_msg *msg = NULL; struct xpc_msg *msg = NULL;
s64 get; s64 get;
do { do {
if ((volatile u32) ch->flags & XPC_C_DISCONNECTING) { if ((volatile u32)ch->flags & XPC_C_DISCONNECTING) {
break; break;
} }
get = (volatile s64) ch->w_local_GP.get; get = (volatile s64)ch->w_local_GP.get;
if (get == (volatile s64) ch->w_remote_GP.put) { if (get == (volatile s64)ch->w_remote_GP.put) {
break; break;
} }
...@@ -2211,7 +2124,6 @@ xpc_get_deliverable_msg(struct xpc_channel *ch) ...@@ -2211,7 +2124,6 @@ xpc_get_deliverable_msg(struct xpc_channel *ch)
return msg; return msg;
} }
/* /*
* Deliver a message to its intended recipient. * Deliver a message to its intended recipient.
*/ */
...@@ -2220,7 +2132,6 @@ xpc_deliver_msg(struct xpc_channel *ch) ...@@ -2220,7 +2132,6 @@ xpc_deliver_msg(struct xpc_channel *ch)
{ {
struct xpc_msg *msg; struct xpc_msg *msg;
if ((msg = xpc_get_deliverable_msg(ch)) != NULL) { if ((msg = xpc_get_deliverable_msg(ch)) != NULL) {
/* /*
...@@ -2235,7 +2146,7 @@ xpc_deliver_msg(struct xpc_channel *ch) ...@@ -2235,7 +2146,7 @@ xpc_deliver_msg(struct xpc_channel *ch)
if (ch->func != NULL) { if (ch->func != NULL) {
dev_dbg(xpc_chan, "ch->func() called, msg=0x%p, " dev_dbg(xpc_chan, "ch->func() called, msg=0x%p, "
"msg_number=%ld, partid=%d, channel=%d\n", "msg_number=%ld, partid=%d, channel=%d\n",
(void *) msg, msg->number, ch->partid, (void *)msg, msg->number, ch->partid,
ch->number); ch->number);
/* deliver the message to its intended recipient */ /* deliver the message to its intended recipient */
...@@ -2244,7 +2155,7 @@ xpc_deliver_msg(struct xpc_channel *ch) ...@@ -2244,7 +2155,7 @@ xpc_deliver_msg(struct xpc_channel *ch)
dev_dbg(xpc_chan, "ch->func() returned, msg=0x%p, " dev_dbg(xpc_chan, "ch->func() returned, msg=0x%p, "
"msg_number=%ld, partid=%d, channel=%d\n", "msg_number=%ld, partid=%d, channel=%d\n",
(void *) msg, msg->number, ch->partid, (void *)msg, msg->number, ch->partid,
ch->number); ch->number);
} }
...@@ -2252,7 +2163,6 @@ xpc_deliver_msg(struct xpc_channel *ch) ...@@ -2252,7 +2163,6 @@ xpc_deliver_msg(struct xpc_channel *ch)
} }
} }
/* /*
* Now we actually acknowledge the messages that have been delivered and ack'd * Now we actually acknowledge the messages that have been delivered and ack'd
* by advancing the cached remote message queue's Get value and if requested * by advancing the cached remote message queue's Get value and if requested
...@@ -2265,16 +2175,16 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags) ...@@ -2265,16 +2175,16 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)
s64 get = initial_get + 1; s64 get = initial_get + 1;
int send_IPI = 0; int send_IPI = 0;
while (1) { while (1) {
while (1) { while (1) {
if (get == (volatile s64) ch->w_local_GP.get) { if (get == (volatile s64)ch->w_local_GP.get) {
break; break;
} }
msg = (struct xpc_msg *) ((u64) ch->remote_msgqueue + msg = (struct xpc_msg *)((u64)ch->remote_msgqueue +
(get % ch->remote_nentries) * ch->msg_size); (get % ch->remote_nentries) *
ch->msg_size);
if (!(msg->flags & XPC_M_DONE)) { if (!(msg->flags & XPC_M_DONE)) {
break; break;
...@@ -2292,8 +2202,7 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags) ...@@ -2292,8 +2202,7 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)
if (cmpxchg_rel(&ch->local_GP->get, initial_get, get) != if (cmpxchg_rel(&ch->local_GP->get, initial_get, get) !=
initial_get) { initial_get) {
/* someone else beat us to it */ /* someone else beat us to it */
DBUG_ON((volatile s64) ch->local_GP->get <= DBUG_ON((volatile s64)ch->local_GP->get <= initial_get);
initial_get);
break; break;
} }
...@@ -2317,7 +2226,6 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags) ...@@ -2317,7 +2226,6 @@ xpc_acknowledge_msgs(struct xpc_channel *ch, s64 initial_get, u8 msg_flags)
} }
} }
/* /*
* Acknowledge receipt of a delivered message. * Acknowledge receipt of a delivered message.
* *
...@@ -2343,16 +2251,15 @@ xpc_initiate_received(partid_t partid, int ch_number, void *payload) ...@@ -2343,16 +2251,15 @@ xpc_initiate_received(partid_t partid, int ch_number, void *payload)
struct xpc_msg *msg = XPC_MSG_ADDRESS(payload); struct xpc_msg *msg = XPC_MSG_ADDRESS(payload);
s64 get, msg_number = msg->number; s64 get, msg_number = msg->number;
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
DBUG_ON(ch_number < 0 || ch_number >= part->nchannels); DBUG_ON(ch_number < 0 || ch_number >= part->nchannels);
ch = &part->channels[ch_number]; ch = &part->channels[ch_number];
dev_dbg(xpc_chan, "msg=0x%p, msg_number=%ld, partid=%d, channel=%d\n", dev_dbg(xpc_chan, "msg=0x%p, msg_number=%ld, partid=%d, channel=%d\n",
(void *) msg, msg_number, ch->partid, ch->number); (void *)msg, msg_number, ch->partid, ch->number);
DBUG_ON((((u64) msg - (u64) ch->remote_msgqueue) / ch->msg_size) != DBUG_ON((((u64)msg - (u64)ch->remote_msgqueue) / ch->msg_size) !=
msg_number % ch->remote_nentries); msg_number % ch->remote_nentries);
DBUG_ON(msg->flags & XPC_M_DONE); DBUG_ON(msg->flags & XPC_M_DONE);
...@@ -2376,4 +2283,3 @@ xpc_initiate_received(partid_t partid, int ch_number, void *payload) ...@@ -2376,4 +2283,3 @@ xpc_initiate_received(partid_t partid, int ch_number, void *payload)
/* the call to xpc_msgqueue_ref() was done by xpc_deliver_msg() */ /* the call to xpc_msgqueue_ref() was done by xpc_deliver_msg() */
xpc_msgqueue_deref(ch); xpc_msgqueue_deref(ch);
} }
drivers/misc/sgi-xp/xpc_main.c
View file @ 35190506
...@@ -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) support - standard version. * Cross Partition Communication (XPC) support - standard version.
* *
...@@ -44,7 +43,6 @@ ...@@ -44,7 +43,6 @@
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -61,7 +59,6 @@ ...@@ -61,7 +59,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "xpc.h" #include "xpc.h"
/* define two XPC debug device structures to be used with dev_dbg() et al */ /* define two XPC debug device structures to be used with dev_dbg() et al */
struct device_driver xpc_dbg_name = { struct device_driver xpc_dbg_name = {
...@@ -81,10 +78,8 @@ struct device xpc_chan_dbg_subname = { ...@@ -81,10 +78,8 @@ struct device xpc_chan_dbg_subname = {
struct device *xpc_part = &xpc_part_dbg_subname; struct device *xpc_part = &xpc_part_dbg_subname;
struct device *xpc_chan = &xpc_chan_dbg_subname; struct device *xpc_chan = &xpc_chan_dbg_subname;
static int xpc_kdebug_ignore; static int xpc_kdebug_ignore;
/* systune related variables for /proc/sys directories */ /* systune related variables for /proc/sys directories */
static int xpc_hb_interval = XPC_HB_DEFAULT_INTERVAL; static int xpc_hb_interval = XPC_HB_DEFAULT_INTERVAL;
...@@ -109,8 +104,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = { ...@@ -109,8 +104,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
.proc_handler = &proc_dointvec_minmax, .proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec, .strategy = &sysctl_intvec,
.extra1 = &xpc_hb_min_interval, .extra1 = &xpc_hb_min_interval,
.extra2 = &xpc_hb_max_interval .extra2 = &xpc_hb_max_interval},
},
{ {
.ctl_name = CTL_UNNUMBERED, .ctl_name = CTL_UNNUMBERED,
.procname = "hb_check_interval", .procname = "hb_check_interval",
...@@ -120,8 +114,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = { ...@@ -120,8 +114,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
.proc_handler = &proc_dointvec_minmax, .proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec, .strategy = &sysctl_intvec,
.extra1 = &xpc_hb_check_min_interval, .extra1 = &xpc_hb_check_min_interval,
.extra2 = &xpc_hb_check_max_interval .extra2 = &xpc_hb_check_max_interval},
},
{} {}
}; };
static ctl_table xpc_sys_xpc_dir[] = { static ctl_table xpc_sys_xpc_dir[] = {
...@@ -129,8 +122,7 @@ static ctl_table xpc_sys_xpc_dir[] = { ...@@ -129,8 +122,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
.ctl_name = CTL_UNNUMBERED, .ctl_name = CTL_UNNUMBERED,
.procname = "hb", .procname = "hb",
.mode = 0555, .mode = 0555,
.child = xpc_sys_xpc_hb_dir .child = xpc_sys_xpc_hb_dir},
},
{ {
.ctl_name = CTL_UNNUMBERED, .ctl_name = CTL_UNNUMBERED,
.procname = "disengage_request_timelimit", .procname = "disengage_request_timelimit",
...@@ -140,8 +132,7 @@ static ctl_table xpc_sys_xpc_dir[] = { ...@@ -140,8 +132,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
.proc_handler = &proc_dointvec_minmax, .proc_handler = &proc_dointvec_minmax,
.strategy = &sysctl_intvec, .strategy = &sysctl_intvec,
.extra1 = &xpc_disengage_request_min_timelimit, .extra1 = &xpc_disengage_request_min_timelimit,
.extra2 = &xpc_disengage_request_max_timelimit .extra2 = &xpc_disengage_request_max_timelimit},
},
{} {}
}; };
static ctl_table xpc_sys_dir[] = { static ctl_table xpc_sys_dir[] = {
...@@ -149,8 +140,7 @@ static ctl_table xpc_sys_dir[] = { ...@@ -149,8 +140,7 @@ static ctl_table xpc_sys_dir[] = {
.ctl_name = CTL_UNNUMBERED, .ctl_name = CTL_UNNUMBERED,
.procname = "xpc", .procname = "xpc",
.mode = 0555, .mode = 0555,
.child = xpc_sys_xpc_dir .child = xpc_sys_xpc_dir},
},
{} {}
}; };
static struct ctl_table_header *xpc_sysctl; static struct ctl_table_header *xpc_sysctl;
...@@ -172,13 +162,10 @@ static DECLARE_COMPLETION(xpc_hb_checker_exited); ...@@ -172,13 +162,10 @@ static DECLARE_COMPLETION(xpc_hb_checker_exited);
/* notification that the xpc_discovery thread has exited */ /* notification that the xpc_discovery thread has exited */
static DECLARE_COMPLETION(xpc_discovery_exited); static DECLARE_COMPLETION(xpc_discovery_exited);
static struct timer_list xpc_hb_timer; static struct timer_list xpc_hb_timer;
static void xpc_kthread_waitmsgs(struct xpc_partition *, struct xpc_channel *); static void xpc_kthread_waitmsgs(struct xpc_partition *, struct xpc_channel *);
static int xpc_system_reboot(struct notifier_block *, unsigned long, void *); static int xpc_system_reboot(struct notifier_block *, unsigned long, void *);
static struct notifier_block xpc_reboot_notifier = { static struct notifier_block xpc_reboot_notifier = {
.notifier_call = xpc_system_reboot, .notifier_call = xpc_system_reboot,
...@@ -189,25 +176,22 @@ static struct notifier_block xpc_die_notifier = { ...@@ -189,25 +176,22 @@ static struct notifier_block xpc_die_notifier = {
.notifier_call = xpc_system_die, .notifier_call = xpc_system_die,
}; };
/* /*
* Timer function to enforce the timelimit on the partition disengage request. * Timer function to enforce the timelimit on the partition disengage request.
*/ */
static void static void
xpc_timeout_partition_disengage_request(unsigned long data) xpc_timeout_partition_disengage_request(unsigned long data)
{ {
struct xpc_partition *part = (struct xpc_partition *) data; struct xpc_partition *part = (struct xpc_partition *)data;
DBUG_ON(time_before(jiffies, part->disengage_request_timeout)); DBUG_ON(time_before(jiffies, part->disengage_request_timeout));
(void) xpc_partition_disengaged(part); (void)xpc_partition_disengaged(part);
DBUG_ON(part->disengage_request_timeout != 0); DBUG_ON(part->disengage_request_timeout != 0);
DBUG_ON(xpc_partition_engaged(1UL << XPC_PARTID(part)) != 0); DBUG_ON(xpc_partition_engaged(1UL << XPC_PARTID(part)) != 0);
} }
/* /*
* Notify the heartbeat check thread that an IRQ has been received. * Notify the heartbeat check thread that an IRQ has been received.
*/ */
...@@ -219,7 +203,6 @@ xpc_act_IRQ_handler(int irq, void *dev_id) ...@@ -219,7 +203,6 @@ xpc_act_IRQ_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* /*
* Timer to produce the heartbeat. The timer structures function is * Timer to produce the heartbeat. The timer structures function is
* already set when this is initially called. A tunable is used to * already set when this is initially called. A tunable is used to
...@@ -238,7 +221,6 @@ xpc_hb_beater(unsigned long dummy) ...@@ -238,7 +221,6 @@ xpc_hb_beater(unsigned long dummy)
add_timer(&xpc_hb_timer); add_timer(&xpc_hb_timer);
} }
/* /*
* This thread is responsible for nearly all of the partition * This thread is responsible for nearly all of the partition
* activation/deactivation. * activation/deactivation.
...@@ -248,8 +230,7 @@ xpc_hb_checker(void *ignore) ...@@ -248,8 +230,7 @@ xpc_hb_checker(void *ignore)
{ {
int last_IRQ_count = 0; int last_IRQ_count = 0;
int new_IRQ_count; int new_IRQ_count;
int force_IRQ=0; int force_IRQ = 0;
/* this thread was marked active by xpc_hb_init() */ /* this thread was marked active by xpc_hb_init() */
...@@ -261,14 +242,13 @@ xpc_hb_checker(void *ignore) ...@@ -261,14 +242,13 @@ xpc_hb_checker(void *ignore)
xpc_hb_check_timeout = jiffies + (xpc_hb_check_interval * HZ); xpc_hb_check_timeout = jiffies + (xpc_hb_check_interval * HZ);
xpc_hb_beater(0); xpc_hb_beater(0);
while (!(volatile int) xpc_exiting) { while (!(volatile int)xpc_exiting) {
dev_dbg(xpc_part, "woke up with %d ticks rem; %d IRQs have " dev_dbg(xpc_part, "woke up with %d ticks rem; %d IRQs have "
"been received\n", "been received\n",
(int) (xpc_hb_check_timeout - jiffies), (int)(xpc_hb_check_timeout - jiffies),
atomic_read(&xpc_act_IRQ_rcvd) - last_IRQ_count); atomic_read(&xpc_act_IRQ_rcvd) - last_IRQ_count);
/* checking of remote heartbeats is skewed by IRQ handling */ /* checking of remote heartbeats is skewed by IRQ handling */
if (time_after_eq(jiffies, xpc_hb_check_timeout)) { if (time_after_eq(jiffies, xpc_hb_check_timeout)) {
dev_dbg(xpc_part, "checking remote heartbeats\n"); dev_dbg(xpc_part, "checking remote heartbeats\n");
...@@ -282,7 +262,6 @@ xpc_hb_checker(void *ignore) ...@@ -282,7 +262,6 @@ xpc_hb_checker(void *ignore)
force_IRQ = 1; force_IRQ = 1;
} }
/* check for outstanding IRQs */ /* check for outstanding IRQs */
new_IRQ_count = atomic_read(&xpc_act_IRQ_rcvd); new_IRQ_count = atomic_read(&xpc_act_IRQ_rcvd);
if (last_IRQ_count < new_IRQ_count || force_IRQ != 0) { if (last_IRQ_count < new_IRQ_count || force_IRQ != 0) {
...@@ -294,7 +273,7 @@ xpc_hb_checker(void *ignore) ...@@ -294,7 +273,7 @@ xpc_hb_checker(void *ignore)
last_IRQ_count += xpc_identify_act_IRQ_sender(); last_IRQ_count += xpc_identify_act_IRQ_sender();
if (last_IRQ_count < new_IRQ_count) { if (last_IRQ_count < new_IRQ_count) {
/* retry once to help avoid missing AMO */ /* retry once to help avoid missing AMO */
(void) xpc_identify_act_IRQ_sender(); (void)xpc_identify_act_IRQ_sender();
} }
last_IRQ_count = new_IRQ_count; last_IRQ_count = new_IRQ_count;
...@@ -303,21 +282,21 @@ xpc_hb_checker(void *ignore) ...@@ -303,21 +282,21 @@ xpc_hb_checker(void *ignore)
} }
/* wait for IRQ or timeout */ /* wait for IRQ or timeout */
(void) wait_event_interruptible(xpc_act_IRQ_wq, (void)wait_event_interruptible(xpc_act_IRQ_wq,
(last_IRQ_count < atomic_read(&xpc_act_IRQ_rcvd) || (last_IRQ_count <
time_after_eq(jiffies, xpc_hb_check_timeout) || atomic_read(&xpc_act_IRQ_rcvd)
(volatile int) xpc_exiting)); || time_after_eq(jiffies,
xpc_hb_check_timeout) ||
(volatile int)xpc_exiting));
} }
dev_dbg(xpc_part, "heartbeat checker is exiting\n"); dev_dbg(xpc_part, "heartbeat checker is exiting\n");
/* mark this thread as having exited */ /* mark this thread as having exited */
complete(&xpc_hb_checker_exited); complete(&xpc_hb_checker_exited);
return 0; return 0;
} }
/* /*
* This thread will attempt to discover other partitions to activate * This thread will attempt to discover other partitions to activate
* based on info provided by SAL. This new thread is short lived and * based on info provided by SAL. This new thread is short lived and
...@@ -337,7 +316,6 @@ xpc_initiate_discovery(void *ignore) ...@@ -337,7 +316,6 @@ xpc_initiate_discovery(void *ignore)
return 0; return 0;
} }
/* /*
* Establish first contact with the remote partititon. This involves pulling * Establish first contact with the remote partititon. This involves pulling
* the XPC per partition variables from the remote partition and waiting for * the XPC per partition variables from the remote partition and waiting for
...@@ -348,7 +326,6 @@ xpc_make_first_contact(struct xpc_partition *part) ...@@ -348,7 +326,6 @@ xpc_make_first_contact(struct xpc_partition *part)
{ {
enum xpc_retval ret; enum xpc_retval ret;
while ((ret = xpc_pull_remote_vars_part(part)) != xpcSuccess) { while ((ret = xpc_pull_remote_vars_part(part)) != xpcSuccess) {
if (ret != xpcRetry) { if (ret != xpcRetry) {
XPC_DEACTIVATE_PARTITION(part, ret); XPC_DEACTIVATE_PARTITION(part, ret);
...@@ -359,7 +336,7 @@ xpc_make_first_contact(struct xpc_partition *part) ...@@ -359,7 +336,7 @@ xpc_make_first_contact(struct xpc_partition *part)
"partition %d\n", XPC_PARTID(part)); "partition %d\n", XPC_PARTID(part));
/* wait a 1/4 of a second or so */ /* wait a 1/4 of a second or so */
(void) msleep_interruptible(250); (void)msleep_interruptible(250);
if (part->act_state == XPC_P_DEACTIVATING) { if (part->act_state == XPC_P_DEACTIVATING) {
return part->reason; return part->reason;
...@@ -369,7 +346,6 @@ xpc_make_first_contact(struct xpc_partition *part) ...@@ -369,7 +346,6 @@ xpc_make_first_contact(struct xpc_partition *part)
return xpc_mark_partition_active(part); return xpc_mark_partition_active(part);
} }
/* /*
* The first kthread assigned to a newly activated partition is the one * The first kthread assigned to a newly activated partition is the one
* created by XPC HB with which it calls xpc_partition_up(). XPC hangs on to * created by XPC HB with which it calls xpc_partition_up(). XPC hangs on to
...@@ -391,7 +367,6 @@ xpc_channel_mgr(struct xpc_partition *part) ...@@ -391,7 +367,6 @@ xpc_channel_mgr(struct xpc_partition *part)
xpc_process_channel_activity(part); xpc_process_channel_activity(part);
/* /*
* Wait until we've been requested to activate kthreads or * Wait until we've been requested to activate kthreads or
* all of the channel's message queues have been torn down or * all of the channel's message queues have been torn down or
...@@ -406,13 +381,19 @@ xpc_channel_mgr(struct xpc_partition *part) ...@@ -406,13 +381,19 @@ xpc_channel_mgr(struct xpc_partition *part)
* wake him up. * wake him up.
*/ */
atomic_dec(&part->channel_mgr_requests); atomic_dec(&part->channel_mgr_requests);
(void) wait_event_interruptible(part->channel_mgr_wq, (void)wait_event_interruptible(part->channel_mgr_wq,
(atomic_read(&part->channel_mgr_requests) > 0 || (atomic_read
(volatile u64) part->local_IPI_amo != 0 || (&part->channel_mgr_requests) >
((volatile u8) part->act_state == 0 ||
(volatile u64)part->
local_IPI_amo != 0 ||
((volatile u8)part->act_state ==
XPC_P_DEACTIVATING && XPC_P_DEACTIVATING &&
atomic_read(&part->nchannels_active) == 0 && atomic_read(&part->
xpc_partition_disengaged(part)))); nchannels_active)
== 0 &&
xpc_partition_disengaged
(part))));
atomic_set(&part->channel_mgr_requests, 1); atomic_set(&part->channel_mgr_requests, 1);
// >>> Does it need to wakeup periodically as well? In case we // >>> Does it need to wakeup periodically as well? In case we
...@@ -420,7 +401,6 @@ xpc_channel_mgr(struct xpc_partition *part) ...@@ -420,7 +401,6 @@ xpc_channel_mgr(struct xpc_partition *part)
} }
} }
/* /*
* When XPC HB determines that a partition has come up, it will create a new * When XPC HB determines that a partition has come up, it will create a new
* kthread and that kthread will call this function to attempt to set up the * kthread and that kthread will call this function to attempt to set up the
...@@ -454,7 +434,7 @@ xpc_partition_up(struct xpc_partition *part) ...@@ -454,7 +434,7 @@ xpc_partition_up(struct xpc_partition *part)
* has been dismantled. * has been dismantled.
*/ */
(void) xpc_part_ref(part); /* this will always succeed */ (void)xpc_part_ref(part); /* this will always succeed */
if (xpc_make_first_contact(part) == xpcSuccess) { if (xpc_make_first_contact(part) == xpcSuccess) {
xpc_channel_mgr(part); xpc_channel_mgr(part);
...@@ -465,17 +445,15 @@ xpc_partition_up(struct xpc_partition *part) ...@@ -465,17 +445,15 @@ xpc_partition_up(struct xpc_partition *part)
xpc_teardown_infrastructure(part); xpc_teardown_infrastructure(part);
} }
static int static int
xpc_activating(void *__partid) xpc_activating(void *__partid)
{ {
partid_t partid = (u64) __partid; partid_t partid = (u64)__partid;
struct xpc_partition *part = &xpc_partitions[partid]; struct xpc_partition *part = &xpc_partitions[partid];
unsigned long irq_flags; unsigned long irq_flags;
struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 }; struct sched_param param = {.sched_priority = MAX_RT_PRIO - 1 };
int ret; int ret;
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
spin_lock_irqsave(&part->act_lock, irq_flags); spin_lock_irqsave(&part->act_lock, irq_flags);
...@@ -537,12 +515,11 @@ xpc_activating(void *__partid) ...@@ -537,12 +515,11 @@ xpc_activating(void *__partid)
xpc_allow_hb(partid, xpc_vars); xpc_allow_hb(partid, xpc_vars);
xpc_IPI_send_activated(part); xpc_IPI_send_activated(part);
/* /*
* xpc_partition_up() holds this thread and marks this partition as * xpc_partition_up() holds this thread and marks this partition as
* XPC_P_ACTIVE by calling xpc_hb_mark_active(). * XPC_P_ACTIVE by calling xpc_hb_mark_active().
*/ */
(void) xpc_partition_up(part); (void)xpc_partition_up(part);
xpc_disallow_hb(partid, xpc_vars); xpc_disallow_hb(partid, xpc_vars);
xpc_mark_partition_inactive(part); xpc_mark_partition_inactive(part);
...@@ -555,7 +532,6 @@ xpc_activating(void *__partid) ...@@ -555,7 +532,6 @@ xpc_activating(void *__partid)
return 0; return 0;
} }
void void
xpc_activate_partition(struct xpc_partition *part) xpc_activate_partition(struct xpc_partition *part)
{ {
...@@ -563,7 +539,6 @@ xpc_activate_partition(struct xpc_partition *part) ...@@ -563,7 +539,6 @@ xpc_activate_partition(struct xpc_partition *part)
unsigned long irq_flags; unsigned long irq_flags;
pid_t pid; pid_t pid;
spin_lock_irqsave(&part->act_lock, irq_flags); spin_lock_irqsave(&part->act_lock, irq_flags);
DBUG_ON(part->act_state != XPC_P_INACTIVE); DBUG_ON(part->act_state != XPC_P_INACTIVE);
...@@ -573,7 +548,7 @@ xpc_activate_partition(struct xpc_partition *part) ...@@ -573,7 +548,7 @@ xpc_activate_partition(struct xpc_partition *part)
spin_unlock_irqrestore(&part->act_lock, irq_flags); spin_unlock_irqrestore(&part->act_lock, irq_flags);
pid = kernel_thread(xpc_activating, (void *) ((u64) partid), 0); pid = kernel_thread(xpc_activating, (void *)((u64)partid), 0);
if (unlikely(pid <= 0)) { if (unlikely(pid <= 0)) {
spin_lock_irqsave(&part->act_lock, irq_flags); spin_lock_irqsave(&part->act_lock, irq_flags);
...@@ -583,7 +558,6 @@ xpc_activate_partition(struct xpc_partition *part) ...@@ -583,7 +558,6 @@ xpc_activate_partition(struct xpc_partition *part)
} }
} }
/* /*
* Handle the receipt of a SGI_XPC_NOTIFY IRQ by seeing whether the specified * Handle the receipt of a SGI_XPC_NOTIFY IRQ by seeing whether the specified
* partition actually sent it. Since SGI_XPC_NOTIFY IRQs may be shared by more * partition actually sent it. Since SGI_XPC_NOTIFY IRQs may be shared by more
...@@ -603,10 +577,9 @@ xpc_activate_partition(struct xpc_partition *part) ...@@ -603,10 +577,9 @@ xpc_activate_partition(struct xpc_partition *part)
irqreturn_t irqreturn_t
xpc_notify_IRQ_handler(int irq, void *dev_id) xpc_notify_IRQ_handler(int irq, void *dev_id)
{ {
partid_t partid = (partid_t) (u64) dev_id; partid_t partid = (partid_t) (u64)dev_id;
struct xpc_partition *part = &xpc_partitions[partid]; struct xpc_partition *part = &xpc_partitions[partid];
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
if (xpc_part_ref(part)) { if (xpc_part_ref(part)) {
...@@ -617,7 +590,6 @@ xpc_notify_IRQ_handler(int irq, void *dev_id) ...@@ -617,7 +590,6 @@ xpc_notify_IRQ_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* /*
* Check to see if xpc_notify_IRQ_handler() dropped any IPIs on the floor * Check to see if xpc_notify_IRQ_handler() dropped any IPIs on the floor
* because the write to their associated IPI amo completed after the IRQ/IPI * because the write to their associated IPI amo completed after the IRQ/IPI
...@@ -636,7 +608,6 @@ xpc_dropped_IPI_check(struct xpc_partition *part) ...@@ -636,7 +608,6 @@ xpc_dropped_IPI_check(struct xpc_partition *part)
} }
} }
void void
xpc_activate_kthreads(struct xpc_channel *ch, int needed) xpc_activate_kthreads(struct xpc_channel *ch, int needed)
{ {
...@@ -644,7 +615,6 @@ xpc_activate_kthreads(struct xpc_channel *ch, int needed) ...@@ -644,7 +615,6 @@ xpc_activate_kthreads(struct xpc_channel *ch, int needed)
int assigned = atomic_read(&ch->kthreads_assigned); int assigned = atomic_read(&ch->kthreads_assigned);
int wakeup; int wakeup;
DBUG_ON(needed <= 0); DBUG_ON(needed <= 0);
if (idle > 0) { if (idle > 0) {
...@@ -676,7 +646,6 @@ xpc_activate_kthreads(struct xpc_channel *ch, int needed) ...@@ -676,7 +646,6 @@ xpc_activate_kthreads(struct xpc_channel *ch, int needed)
xpc_create_kthreads(ch, needed, 0); xpc_create_kthreads(ch, needed, 0);
} }
/* /*
* This function is where XPC's kthreads wait for messages to deliver. * This function is where XPC's kthreads wait for messages to deliver.
*/ */
...@@ -686,10 +655,9 @@ xpc_kthread_waitmsgs(struct xpc_partition *part, struct xpc_channel *ch) ...@@ -686,10 +655,9 @@ xpc_kthread_waitmsgs(struct xpc_partition *part, struct xpc_channel *ch)
do { do {
/* deliver messages to their intended recipients */ /* deliver messages to their intended recipients */
while ((volatile s64) ch->w_local_GP.get < while ((volatile s64)ch->w_local_GP.get <
(volatile s64) ch->w_remote_GP.put && (volatile s64)ch->w_remote_GP.put &&
!((volatile u32) ch->flags & !((volatile u32)ch->flags & XPC_C_DISCONNECTING)) {
XPC_C_DISCONNECTING)) {
xpc_deliver_msg(ch); xpc_deliver_msg(ch);
} }
...@@ -703,18 +671,20 @@ xpc_kthread_waitmsgs(struct xpc_partition *part, struct xpc_channel *ch) ...@@ -703,18 +671,20 @@ xpc_kthread_waitmsgs(struct xpc_partition *part, struct xpc_channel *ch)
dev_dbg(xpc_chan, "idle kthread calling " dev_dbg(xpc_chan, "idle kthread calling "
"wait_event_interruptible_exclusive()\n"); "wait_event_interruptible_exclusive()\n");
(void) wait_event_interruptible_exclusive(ch->idle_wq, (void)wait_event_interruptible_exclusive(ch->idle_wq,
((volatile s64) ch->w_local_GP.get < ((volatile s64)ch->
(volatile s64) ch->w_remote_GP.put || w_local_GP.get <
((volatile u32) ch->flags & (volatile s64)ch->
w_remote_GP.put ||
((volatile u32)ch->
flags &
XPC_C_DISCONNECTING))); XPC_C_DISCONNECTING)));
atomic_dec(&ch->kthreads_idle); atomic_dec(&ch->kthreads_idle);
} while (!((volatile u32) ch->flags & XPC_C_DISCONNECTING)); } while (!((volatile u32)ch->flags & XPC_C_DISCONNECTING));
} }
static int static int
xpc_daemonize_kthread(void *args) xpc_daemonize_kthread(void *args)
{ {
...@@ -725,7 +695,6 @@ xpc_daemonize_kthread(void *args) ...@@ -725,7 +695,6 @@ xpc_daemonize_kthread(void *args)
int n_needed; int n_needed;
unsigned long irq_flags; unsigned long irq_flags;
daemonize("xpc%02dc%d", partid, ch_number); daemonize("xpc%02dc%d", partid, ch_number);
dev_dbg(xpc_chan, "kthread starting, partid=%d, channel=%d\n", dev_dbg(xpc_chan, "kthread starting, partid=%d, channel=%d\n",
...@@ -756,8 +725,7 @@ xpc_daemonize_kthread(void *args) ...@@ -756,8 +725,7 @@ xpc_daemonize_kthread(void *args)
* need one less than total #of messages to deliver. * need one less than total #of messages to deliver.
*/ */
n_needed = ch->w_remote_GP.put - ch->w_local_GP.get - 1; n_needed = ch->w_remote_GP.put - ch->w_local_GP.get - 1;
if (n_needed > 0 && if (n_needed > 0 && !(ch->flags & XPC_C_DISCONNECTING)) {
!(ch->flags & XPC_C_DISCONNECTING)) {
xpc_activate_kthreads(ch, n_needed); xpc_activate_kthreads(ch, n_needed);
} }
} else { } else {
...@@ -798,7 +766,6 @@ xpc_daemonize_kthread(void *args) ...@@ -798,7 +766,6 @@ xpc_daemonize_kthread(void *args)
return 0; return 0;
} }
/* /*
* For each partition that XPC has established communications with, there is * For each partition that XPC has established communications with, there is
* a minimum of one kernel thread assigned to perform any operation that * a minimum of one kernel thread assigned to perform any operation that
...@@ -820,7 +787,6 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed, ...@@ -820,7 +787,6 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,
u64 args = XPC_PACK_ARGS(ch->partid, ch->number); u64 args = XPC_PACK_ARGS(ch->partid, ch->number);
struct xpc_partition *part = &xpc_partitions[ch->partid]; struct xpc_partition *part = &xpc_partitions[ch->partid];
while (needed-- > 0) { while (needed-- > 0) {
/* /*
...@@ -843,10 +809,10 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed, ...@@ -843,10 +809,10 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,
if (atomic_inc_return(&part->nchannels_engaged) == 1) if (atomic_inc_return(&part->nchannels_engaged) == 1)
xpc_mark_partition_engaged(part); xpc_mark_partition_engaged(part);
} }
(void) xpc_part_ref(part); (void)xpc_part_ref(part);
xpc_msgqueue_ref(ch); xpc_msgqueue_ref(ch);
pid = kernel_thread(xpc_daemonize_kthread, (void *) args, 0); pid = kernel_thread(xpc_daemonize_kthread, (void *)args, 0);
if (pid < 0) { if (pid < 0) {
/* the fork failed */ /* the fork failed */
...@@ -887,7 +853,6 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed, ...@@ -887,7 +853,6 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,
} }
} }
void void
xpc_disconnect_wait(int ch_number) xpc_disconnect_wait(int ch_number)
{ {
...@@ -897,7 +862,6 @@ xpc_disconnect_wait(int ch_number) ...@@ -897,7 +862,6 @@ xpc_disconnect_wait(int ch_number)
struct xpc_channel *ch; struct xpc_channel *ch;
int wakeup_channel_mgr; int wakeup_channel_mgr;
/* now wait for all callouts to the caller's function to cease */ /* now wait for all callouts to the caller's function to cease */
for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) {
part = &xpc_partitions[partid]; part = &xpc_partitions[partid];
...@@ -923,7 +887,8 @@ xpc_disconnect_wait(int ch_number) ...@@ -923,7 +887,8 @@ xpc_disconnect_wait(int ch_number)
if (part->act_state != XPC_P_DEACTIVATING) { if (part->act_state != XPC_P_DEACTIVATING) {
spin_lock(&part->IPI_lock); spin_lock(&part->IPI_lock);
XPC_SET_IPI_FLAGS(part->local_IPI_amo, XPC_SET_IPI_FLAGS(part->local_IPI_amo,
ch->number, ch->delayed_IPI_flags); ch->number,
ch->delayed_IPI_flags);
spin_unlock(&part->IPI_lock); spin_unlock(&part->IPI_lock);
wakeup_channel_mgr = 1; wakeup_channel_mgr = 1;
} }
...@@ -941,7 +906,6 @@ xpc_disconnect_wait(int ch_number) ...@@ -941,7 +906,6 @@ xpc_disconnect_wait(int ch_number)
} }
} }
static void static void
xpc_do_exit(enum xpc_retval reason) xpc_do_exit(enum xpc_retval reason)
{ {
...@@ -950,7 +914,6 @@ xpc_do_exit(enum xpc_retval reason) ...@@ -950,7 +914,6 @@ xpc_do_exit(enum xpc_retval reason)
struct xpc_partition *part; struct xpc_partition *part;
unsigned long printmsg_time, disengage_request_timeout = 0; unsigned long printmsg_time, disengage_request_timeout = 0;
/* a 'rmmod XPC' and a 'reboot' cannot both end up here together */ /* a 'rmmod XPC' and a 'reboot' cannot both end up here together */
DBUG_ON(xpc_exiting == 1); DBUG_ON(xpc_exiting == 1);
...@@ -971,10 +934,8 @@ xpc_do_exit(enum xpc_retval reason) ...@@ -971,10 +934,8 @@ xpc_do_exit(enum xpc_retval reason)
/* wait for the heartbeat checker thread to exit */ /* wait for the heartbeat checker thread to exit */
wait_for_completion(&xpc_hb_checker_exited); wait_for_completion(&xpc_hb_checker_exited);
/* sleep for a 1/3 of a second or so */ /* sleep for a 1/3 of a second or so */
(void) msleep_interruptible(300); (void)msleep_interruptible(300);
/* wait for all partitions to become inactive */ /* wait for all partitions to become inactive */
...@@ -1031,13 +992,12 @@ xpc_do_exit(enum xpc_retval reason) ...@@ -1031,13 +992,12 @@ xpc_do_exit(enum xpc_retval reason)
} }
/* sleep for a 1/3 of a second or so */ /* sleep for a 1/3 of a second or so */
(void) msleep_interruptible(300); (void)msleep_interruptible(300);
} while (1); } while (1);
DBUG_ON(xpc_partition_engaged(-1UL)); DBUG_ON(xpc_partition_engaged(-1UL));
/* indicate to others that our reserved page is uninitialized */ /* indicate to others that our reserved page is uninitialized */
xpc_rsvd_page->vars_pa = 0; xpc_rsvd_page->vars_pa = 0;
...@@ -1047,16 +1007,15 @@ xpc_do_exit(enum xpc_retval reason) ...@@ -1047,16 +1007,15 @@ xpc_do_exit(enum xpc_retval reason)
if (reason == xpcUnloading) { if (reason == xpcUnloading) {
/* take ourselves off of the reboot_notifier_list */ /* take ourselves off of the reboot_notifier_list */
(void) unregister_reboot_notifier(&xpc_reboot_notifier); (void)unregister_reboot_notifier(&xpc_reboot_notifier);
/* take ourselves off of the die_notifier list */ /* take ourselves off of the die_notifier list */
(void) unregister_die_notifier(&xpc_die_notifier); (void)unregister_die_notifier(&xpc_die_notifier);
} }
/* close down protections for IPI operations */ /* close down protections for IPI operations */
xpc_restrict_IPI_ops(); xpc_restrict_IPI_ops();
/* clear the interface to XPC's functions */ /* clear the interface to XPC's functions */
xpc_clear_interface(); xpc_clear_interface();
...@@ -1067,7 +1026,6 @@ xpc_do_exit(enum xpc_retval reason) ...@@ -1067,7 +1026,6 @@ xpc_do_exit(enum xpc_retval reason)
kfree(xpc_remote_copy_buffer_base); kfree(xpc_remote_copy_buffer_base);
} }
/* /*
* This function is called when the system is being rebooted. * This function is called when the system is being rebooted.
*/ */
...@@ -1076,7 +1034,6 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused) ...@@ -1076,7 +1034,6 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
{ {
enum xpc_retval reason; enum xpc_retval reason;
switch (event) { switch (event) {
case SYS_RESTART: case SYS_RESTART:
reason = xpcSystemReboot; reason = xpcSystemReboot;
...@@ -1095,7 +1052,6 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused) ...@@ -1095,7 +1052,6 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
return NOTIFY_DONE; return NOTIFY_DONE;
} }
/* /*
* Notify other partitions to disengage from all references to our memory. * Notify other partitions to disengage from all references to our memory.
*/ */
...@@ -1107,7 +1063,6 @@ xpc_die_disengage(void) ...@@ -1107,7 +1063,6 @@ xpc_die_disengage(void)
unsigned long engaged; unsigned long engaged;
long time, printmsg_time, disengage_request_timeout; long time, printmsg_time, disengage_request_timeout;
/* keep xpc_hb_checker thread from doing anything (just in case) */ /* keep xpc_hb_checker thread from doing anything (just in case) */
xpc_exiting = 1; xpc_exiting = 1;
...@@ -1116,8 +1071,7 @@ xpc_die_disengage(void) ...@@ -1116,8 +1071,7 @@ xpc_die_disengage(void)
for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) {
part = &xpc_partitions[partid]; part = &xpc_partitions[partid];
if (!XPC_SUPPORTS_DISENGAGE_REQUEST(part-> if (!XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version)) {
remote_vars_version)) {
/* just in case it was left set by an earlier XPC */ /* just in case it was left set by an earlier XPC */
xpc_clear_partition_engaged(1UL << partid); xpc_clear_partition_engaged(1UL << partid);
...@@ -1171,7 +1125,6 @@ xpc_die_disengage(void) ...@@ -1171,7 +1125,6 @@ xpc_die_disengage(void)
} }
} }
/* /*
* This function is called when the system is being restarted or halted due * This function is called when the system is being restarted or halted due
* to some sort of system failure. If this is the case we need to notify the * to some sort of system failure. If this is the case we need to notify the
...@@ -1217,7 +1170,6 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused) ...@@ -1217,7 +1170,6 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
return NOTIFY_DONE; return NOTIFY_DONE;
} }
int __init int __init
xpc_init(void) xpc_init(void)
{ {
...@@ -1227,16 +1179,15 @@ xpc_init(void) ...@@ -1227,16 +1179,15 @@ xpc_init(void)
pid_t pid; pid_t pid;
size_t buf_size; size_t buf_size;
if (!ia64_platform_is("sn2")) { if (!ia64_platform_is("sn2")) {
return -ENODEV; return -ENODEV;
} }
buf_size = max(XPC_RP_VARS_SIZE, buf_size = max(XPC_RP_VARS_SIZE,
XPC_RP_HEADER_SIZE + XP_NASID_MASK_BYTES); XPC_RP_HEADER_SIZE + XP_NASID_MASK_BYTES);
xpc_remote_copy_buffer = xpc_kmalloc_cacheline_aligned(buf_size, xpc_remote_copy_buffer = xpc_kmalloc_cacheline_aligned(buf_size,
GFP_KERNEL, &xpc_remote_copy_buffer_base); GFP_KERNEL,
&xpc_remote_copy_buffer_base);
if (xpc_remote_copy_buffer == NULL) if (xpc_remote_copy_buffer == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -1256,7 +1207,7 @@ xpc_init(void) ...@@ -1256,7 +1207,7 @@ xpc_init(void)
for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) {
part = &xpc_partitions[partid]; part = &xpc_partitions[partid];
DBUG_ON((u64) part != L1_CACHE_ALIGN((u64) part)); DBUG_ON((u64)part != L1_CACHE_ALIGN((u64)part));
part->act_IRQ_rcvd = 0; part->act_IRQ_rcvd = 0;
spin_lock_init(&part->act_lock); spin_lock_init(&part->act_lock);
...@@ -1266,7 +1217,7 @@ xpc_init(void) ...@@ -1266,7 +1217,7 @@ xpc_init(void)
init_timer(&part->disengage_request_timer); init_timer(&part->disengage_request_timer);
part->disengage_request_timer.function = part->disengage_request_timer.function =
xpc_timeout_partition_disengage_request; xpc_timeout_partition_disengage_request;
part->disengage_request_timer.data = (unsigned long) part; part->disengage_request_timer.data = (unsigned long)part;
part->setup_state = XPC_P_UNSET; part->setup_state = XPC_P_UNSET;
init_waitqueue_head(&part->teardown_wq); init_waitqueue_head(&part->teardown_wq);
...@@ -1327,7 +1278,6 @@ xpc_init(void) ...@@ -1327,7 +1278,6 @@ xpc_init(void)
return -EBUSY; return -EBUSY;
} }
/* add ourselves to the reboot_notifier_list */ /* add ourselves to the reboot_notifier_list */
ret = register_reboot_notifier(&xpc_reboot_notifier); ret = register_reboot_notifier(&xpc_reboot_notifier);
if (ret != 0) { if (ret != 0) {
...@@ -1355,10 +1305,10 @@ xpc_init(void) ...@@ -1355,10 +1305,10 @@ xpc_init(void)
xpc_rsvd_page->vars_pa = 0; xpc_rsvd_page->vars_pa = 0;
/* take ourselves off of the reboot_notifier_list */ /* take ourselves off of the reboot_notifier_list */
(void) unregister_reboot_notifier(&xpc_reboot_notifier); (void)unregister_reboot_notifier(&xpc_reboot_notifier);
/* take ourselves off of the die_notifier list */ /* take ourselves off of the die_notifier list */
(void) unregister_die_notifier(&xpc_die_notifier); (void)unregister_die_notifier(&xpc_die_notifier);
del_timer_sync(&xpc_hb_timer); del_timer_sync(&xpc_hb_timer);
free_irq(SGI_XPC_ACTIVATE, NULL); free_irq(SGI_XPC_ACTIVATE, NULL);
...@@ -1372,7 +1322,6 @@ xpc_init(void) ...@@ -1372,7 +1322,6 @@ xpc_init(void)
return -EBUSY; return -EBUSY;
} }
/* /*
* Startup a thread that will attempt to discover other partitions to * Startup a thread that will attempt to discover other partitions to
* activate based on info provided by SAL. This new thread is short * activate based on info provided by SAL. This new thread is short
...@@ -1389,7 +1338,6 @@ xpc_init(void) ...@@ -1389,7 +1338,6 @@ xpc_init(void)
return -EBUSY; return -EBUSY;
} }
/* set the interface to point at XPC's functions */ /* set the interface to point at XPC's functions */
xpc_set_interface(xpc_initiate_connect, xpc_initiate_disconnect, xpc_set_interface(xpc_initiate_connect, xpc_initiate_disconnect,
xpc_initiate_allocate, xpc_initiate_send, xpc_initiate_allocate, xpc_initiate_send,
...@@ -1398,16 +1346,16 @@ xpc_init(void) ...@@ -1398,16 +1346,16 @@ xpc_init(void)
return 0; return 0;
} }
module_init(xpc_init);
module_init(xpc_init);
void __exit void __exit
xpc_exit(void) xpc_exit(void)
{ {
xpc_do_exit(xpcUnloading); xpc_do_exit(xpcUnloading);
} }
module_exit(xpc_exit);
module_exit(xpc_exit);
MODULE_AUTHOR("Silicon Graphics, Inc."); MODULE_AUTHOR("Silicon Graphics, Inc.");
MODULE_DESCRIPTION("Cross Partition Communication (XPC) support"); MODULE_DESCRIPTION("Cross Partition Communication (XPC) support");
...@@ -1428,4 +1376,3 @@ MODULE_PARM_DESC(xpc_disengage_request_timelimit, "Number of seconds to wait " ...@@ -1428,4 +1376,3 @@ MODULE_PARM_DESC(xpc_disengage_request_timelimit, "Number of seconds to wait "
module_param(xpc_kdebug_ignore, int, 0); module_param(xpc_kdebug_ignore, int, 0);
MODULE_PARM_DESC(xpc_kdebug_ignore, "Should lack of heartbeat be ignored by " MODULE_PARM_DESC(xpc_kdebug_ignore, "Should lack of heartbeat be ignored by "
"other partitions when dropping into kdebug."); "other partitions when dropping into kdebug.");
drivers/misc/sgi-xp/xpnet.c
View file @ 35190506
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.
*/ */
/* /*
* Cross Partition Network Interface (XPNET) support * Cross Partition Network Interface (XPNET) support
* *
...@@ -21,7 +20,6 @@ ...@@ -21,7 +20,6 @@
* *
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -40,7 +38,6 @@ ...@@ -40,7 +38,6 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include "xp.h" #include "xp.h"
/* /*
* The message payload transferred by XPC. * The message payload transferred by XPC.
* *
...@@ -79,7 +76,6 @@ struct xpnet_message { ...@@ -79,7 +76,6 @@ struct xpnet_message {
#define XPNET_MSG_ALIGNED_SIZE (L1_CACHE_ALIGN(XPNET_MSG_SIZE)) #define XPNET_MSG_ALIGNED_SIZE (L1_CACHE_ALIGN(XPNET_MSG_SIZE))
#define XPNET_MSG_NENTRIES (PAGE_SIZE / XPNET_MSG_ALIGNED_SIZE) #define XPNET_MSG_NENTRIES (PAGE_SIZE / XPNET_MSG_ALIGNED_SIZE)
#define XPNET_MAX_KTHREADS (XPNET_MSG_NENTRIES + 1) #define XPNET_MAX_KTHREADS (XPNET_MSG_NENTRIES + 1)
#define XPNET_MAX_IDLE_KTHREADS (XPNET_MSG_NENTRIES + 1) #define XPNET_MAX_IDLE_KTHREADS (XPNET_MSG_NENTRIES + 1)
...@@ -101,7 +97,6 @@ struct xpnet_message { ...@@ -101,7 +97,6 @@ struct xpnet_message {
#define XPNET_DEVICE_NAME "xp0" #define XPNET_DEVICE_NAME "xp0"
/* /*
* When messages are queued with xpc_send_notify, a kmalloc'd buffer * When messages are queued with xpc_send_notify, a kmalloc'd buffer
* of the following type is passed as a notification cookie. When the * of the following type is passed as a notification cookie. When the
...@@ -145,7 +140,6 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock); ...@@ -145,7 +140,6 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock);
/* 32KB has been determined to be the ideal */ /* 32KB has been determined to be the ideal */
#define XPNET_DEF_MTU (0x8000UL) #define XPNET_DEF_MTU (0x8000UL)
/* /*
* The partition id is encapsulated in the MAC address. The following * The partition id is encapsulated in the MAC address. The following
* define locates the octet the partid is in. * define locates the octet the partid is in.
...@@ -153,7 +147,6 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock); ...@@ -153,7 +147,6 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock);
#define XPNET_PARTID_OCTET 1 #define XPNET_PARTID_OCTET 1
#define XPNET_LICENSE_OCTET 2 #define XPNET_LICENSE_OCTET 2
/* /*
* Define the XPNET debug device structure that is to be used with dev_dbg(), * Define the XPNET debug device structure that is to be used with dev_dbg(),
* dev_err(), dev_warn(), and dev_info(). * dev_err(), dev_warn(), and dev_info().
...@@ -178,14 +171,13 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) ...@@ -178,14 +171,13 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
struct sk_buff *skb; struct sk_buff *skb;
bte_result_t bret; bte_result_t bret;
struct xpnet_dev_private *priv = struct xpnet_dev_private *priv =
(struct xpnet_dev_private *) xpnet_device->priv; (struct xpnet_dev_private *)xpnet_device->priv;
if (!XPNET_VALID_MSG(msg)) { if (!XPNET_VALID_MSG(msg)) {
/* /*
* Packet with a different XPC version. Ignore. * Packet with a different XPC version. Ignore.
*/ */
xpc_received(partid, channel, (void *) msg); xpc_received(partid, channel, (void *)msg);
priv->stats.rx_errors++; priv->stats.rx_errors++;
...@@ -194,14 +186,13 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) ...@@ -194,14 +186,13 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
dev_dbg(xpnet, "received 0x%lx, %d, %d, %d\n", msg->buf_pa, msg->size, dev_dbg(xpnet, "received 0x%lx, %d, %d, %d\n", msg->buf_pa, msg->size,
msg->leadin_ignore, msg->tailout_ignore); msg->leadin_ignore, msg->tailout_ignore);
/* reserve an extra cache line */ /* reserve an extra cache line */
skb = dev_alloc_skb(msg->size + L1_CACHE_BYTES); skb = dev_alloc_skb(msg->size + L1_CACHE_BYTES);
if (!skb) { if (!skb) {
dev_err(xpnet, "failed on dev_alloc_skb(%d)\n", dev_err(xpnet, "failed on dev_alloc_skb(%d)\n",
msg->size + L1_CACHE_BYTES); msg->size + L1_CACHE_BYTES);
xpc_received(partid, channel, (void *) msg); xpc_received(partid, channel, (void *)msg);
priv->stats.rx_errors++; priv->stats.rx_errors++;
...@@ -230,9 +221,10 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) ...@@ -230,9 +221,10 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
(msg->embedded_bytes != 0)) { (msg->embedded_bytes != 0)) {
dev_dbg(xpnet, "copying embedded message. memcpy(0x%p, 0x%p, " dev_dbg(xpnet, "copying embedded message. memcpy(0x%p, 0x%p, "
"%lu)\n", skb->data, &msg->data, "%lu)\n", skb->data, &msg->data,
(size_t) msg->embedded_bytes); (size_t)msg->embedded_bytes);
skb_copy_to_linear_data(skb, &msg->data, (size_t)msg->embedded_bytes); skb_copy_to_linear_data(skb, &msg->data,
(size_t)msg->embedded_bytes);
} else { } else {
dev_dbg(xpnet, "transferring buffer to the skb->data area;\n\t" dev_dbg(xpnet, "transferring buffer to the skb->data area;\n\t"
"bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg->buf_pa, "bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg->buf_pa,
...@@ -253,7 +245,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) ...@@ -253,7 +245,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
~(L1_CACHE_BYTES - 1)), ~(L1_CACHE_BYTES - 1)),
msg->size, bret); msg->size, bret);
xpc_received(partid, channel, (void *) msg); xpc_received(partid, channel, (void *)msg);
priv->stats.rx_errors++; priv->stats.rx_errors++;
...@@ -262,7 +254,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) ...@@ -262,7 +254,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
} }
dev_dbg(xpnet, "<skb->head=0x%p skb->data=0x%p skb->tail=0x%p " dev_dbg(xpnet, "<skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
"skb->end=0x%p skb->len=%d\n", (void *) skb->head, "skb->end=0x%p skb->len=%d\n", (void *)skb->head,
(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb), (void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
skb->len); skb->len);
...@@ -275,16 +267,14 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) ...@@ -275,16 +267,14 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb), (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
skb_end_pointer(skb), skb->len); skb_end_pointer(skb), skb->len);
xpnet_device->last_rx = jiffies; xpnet_device->last_rx = jiffies;
priv->stats.rx_packets++; priv->stats.rx_packets++;
priv->stats.rx_bytes += skb->len + ETH_HLEN; priv->stats.rx_bytes += skb->len + ETH_HLEN;
netif_rx_ni(skb); netif_rx_ni(skb);
xpc_received(partid, channel, (void *) msg); xpc_received(partid, channel, (void *)msg);
} }
/* /*
* This is the handler which XPC calls during any sort of change in * This is the handler which XPC calls during any sort of change in
* state or message reception on a connection. * state or message reception on a connection.
...@@ -295,20 +285,19 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel, ...@@ -295,20 +285,19 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
{ {
long bp; long bp;
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS); DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
DBUG_ON(channel != XPC_NET_CHANNEL); DBUG_ON(channel != XPC_NET_CHANNEL);
switch(reason) { switch (reason) {
case xpcMsgReceived: /* message received */ case xpcMsgReceived: /* message received */
DBUG_ON(data == NULL); DBUG_ON(data == NULL);
xpnet_receive(partid, channel, (struct xpnet_message *) data); xpnet_receive(partid, channel, (struct xpnet_message *)data);
break; break;
case xpcConnected: /* connection completed to a partition */ case xpcConnected: /* connection completed to a partition */
spin_lock_bh(&xpnet_broadcast_lock); spin_lock_bh(&xpnet_broadcast_lock);
xpnet_broadcast_partitions |= 1UL << (partid -1 ); xpnet_broadcast_partitions |= 1UL << (partid - 1);
bp = xpnet_broadcast_partitions; bp = xpnet_broadcast_partitions;
spin_unlock_bh(&xpnet_broadcast_lock); spin_unlock_bh(&xpnet_broadcast_lock);
...@@ -321,7 +310,7 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel, ...@@ -321,7 +310,7 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
default: default:
spin_lock_bh(&xpnet_broadcast_lock); spin_lock_bh(&xpnet_broadcast_lock);
xpnet_broadcast_partitions &= ~(1UL << (partid -1 )); xpnet_broadcast_partitions &= ~(1UL << (partid - 1));
bp = xpnet_broadcast_partitions; bp = xpnet_broadcast_partitions;
spin_unlock_bh(&xpnet_broadcast_lock); spin_unlock_bh(&xpnet_broadcast_lock);
...@@ -337,13 +326,11 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel, ...@@ -337,13 +326,11 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
} }
} }
static int static int
xpnet_dev_open(struct net_device *dev) xpnet_dev_open(struct net_device *dev)
{ {
enum xpc_retval ret; enum xpc_retval ret;
dev_dbg(xpnet, "calling xpc_connect(%d, 0x%p, NULL, %ld, %ld, %ld, " dev_dbg(xpnet, "calling xpc_connect(%d, 0x%p, NULL, %ld, %ld, %ld, "
"%ld)\n", XPC_NET_CHANNEL, xpnet_connection_activity, "%ld)\n", XPC_NET_CHANNEL, xpnet_connection_activity,
XPNET_MSG_SIZE, XPNET_MSG_NENTRIES, XPNET_MAX_KTHREADS, XPNET_MSG_SIZE, XPNET_MSG_NENTRIES, XPNET_MAX_KTHREADS,
...@@ -364,7 +351,6 @@ xpnet_dev_open(struct net_device *dev) ...@@ -364,7 +351,6 @@ xpnet_dev_open(struct net_device *dev)
return 0; return 0;
} }
static int static int
xpnet_dev_stop(struct net_device *dev) xpnet_dev_stop(struct net_device *dev)
{ {
...@@ -375,7 +361,6 @@ xpnet_dev_stop(struct net_device *dev) ...@@ -375,7 +361,6 @@ xpnet_dev_stop(struct net_device *dev)
return 0; return 0;
} }
static int static int
xpnet_dev_change_mtu(struct net_device *dev, int new_mtu) xpnet_dev_change_mtu(struct net_device *dev, int new_mtu)
{ {
...@@ -392,7 +377,6 @@ xpnet_dev_change_mtu(struct net_device *dev, int new_mtu) ...@@ -392,7 +377,6 @@ xpnet_dev_change_mtu(struct net_device *dev, int new_mtu)
return 0; return 0;
} }
/* /*
* Required for the net_device structure. * Required for the net_device structure.
*/ */
...@@ -402,7 +386,6 @@ xpnet_dev_set_config(struct net_device *dev, struct ifmap *new_map) ...@@ -402,7 +386,6 @@ xpnet_dev_set_config(struct net_device *dev, struct ifmap *new_map)
return 0; return 0;
} }
/* /*
* Return statistics to the caller. * Return statistics to the caller.
*/ */
...@@ -411,13 +394,11 @@ xpnet_dev_get_stats(struct net_device *dev) ...@@ -411,13 +394,11 @@ xpnet_dev_get_stats(struct net_device *dev)
{ {
struct xpnet_dev_private *priv; struct xpnet_dev_private *priv;
priv = (struct xpnet_dev_private *)dev->priv;
priv = (struct xpnet_dev_private *) dev->priv;
return &priv->stats; return &priv->stats;
} }
/* /*
* Notification that the other end has received the message and * Notification that the other end has received the message and
* DMA'd the skb information. At this point, they are done with * DMA'd the skb information. At this point, they are done with
...@@ -428,9 +409,7 @@ static void ...@@ -428,9 +409,7 @@ static void
xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel, xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel,
void *__qm) void *__qm)
{ {
struct xpnet_pending_msg *queued_msg = struct xpnet_pending_msg *queued_msg = (struct xpnet_pending_msg *)__qm;
(struct xpnet_pending_msg *) __qm;
DBUG_ON(queued_msg == NULL); DBUG_ON(queued_msg == NULL);
...@@ -439,14 +418,13 @@ xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel, ...@@ -439,14 +418,13 @@ xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel,
if (atomic_dec_return(&queued_msg->use_count) == 0) { if (atomic_dec_return(&queued_msg->use_count) == 0) {
dev_dbg(xpnet, "all acks for skb->head=-x%p\n", dev_dbg(xpnet, "all acks for skb->head=-x%p\n",
(void *) queued_msg->skb->head); (void *)queued_msg->skb->head);
dev_kfree_skb_any(queued_msg->skb); dev_kfree_skb_any(queued_msg->skb);
kfree(queued_msg); kfree(queued_msg);
} }
} }
/* /*
* Network layer has formatted a packet (skb) and is ready to place it * Network layer has formatted a packet (skb) and is ready to place it
* "on the wire". Prepare and send an xpnet_message to all partitions * "on the wire". Prepare and send an xpnet_message to all partitions
...@@ -469,16 +447,13 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -469,16 +447,13 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct xpnet_dev_private *priv; struct xpnet_dev_private *priv;
u16 embedded_bytes; u16 embedded_bytes;
priv = (struct xpnet_dev_private *)dev->priv;
priv = (struct xpnet_dev_private *) dev->priv;
dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p " dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
"skb->end=0x%p skb->len=%d\n", (void *) skb->head, "skb->end=0x%p skb->len=%d\n", (void *)skb->head,
(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb), (void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
skb->len); skb->len);
/* /*
* The xpnet_pending_msg tracks how many outstanding * The xpnet_pending_msg tracks how many outstanding
* xpc_send_notifies are relying on this skb. When none * xpc_send_notifies are relying on this skb. When none
...@@ -494,9 +469,8 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -494,9 +469,8 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
return -ENOMEM; return -ENOMEM;
} }
/* get the beginning of the first cacheline and end of last */ /* get the beginning of the first cacheline and end of last */
start_addr = ((u64) skb->data & ~(L1_CACHE_BYTES - 1)); start_addr = ((u64)skb->data & ~(L1_CACHE_BYTES - 1));
end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb)); end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb));
/* calculate how many bytes to embed in the XPC message */ /* calculate how many bytes to embed in the XPC message */
...@@ -506,7 +480,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -506,7 +480,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
embedded_bytes = skb->len; embedded_bytes = skb->len;
} }
/* /*
* Since the send occurs asynchronously, we set the count to one * Since the send occurs asynchronously, we set the count to one
* and begin sending. Any sends that happen to complete before * and begin sending. Any sends that happen to complete before
...@@ -517,7 +490,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -517,7 +490,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
atomic_set(&queued_msg->use_count, 1); atomic_set(&queued_msg->use_count, 1);
queued_msg->skb = skb; queued_msg->skb = skb;
second_mac_octet = skb->data[XPNET_PARTID_OCTET]; second_mac_octet = skb->data[XPNET_PARTID_OCTET];
if (second_mac_octet == 0xff) { if (second_mac_octet == 0xff) {
/* we are being asked to broadcast to all partitions */ /* we are being asked to broadcast to all partitions */
...@@ -543,7 +515,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -543,7 +515,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
for (dest_partid = 1; dp && dest_partid < XP_MAX_PARTITIONS; for (dest_partid = 1; dp && dest_partid < XP_MAX_PARTITIONS;
dest_partid++) { dest_partid++) {
if (!(dp & (1UL << (dest_partid - 1)))) { if (!(dp & (1UL << (dest_partid - 1)))) {
/* not destined for this partition */ /* not destined for this partition */
continue; continue;
...@@ -552,7 +523,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -552,7 +523,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* remove this partition from the destinations mask */ /* remove this partition from the destinations mask */
dp &= ~(1UL << (dest_partid - 1)); dp &= ~(1UL << (dest_partid - 1));
/* found a partition to send to */ /* found a partition to send to */
ret = xpc_allocate(dest_partid, XPC_NET_CHANNEL, ret = xpc_allocate(dest_partid, XPC_NET_CHANNEL,
...@@ -565,7 +535,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -565,7 +535,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(embedded_bytes != 0)) { if (unlikely(embedded_bytes != 0)) {
msg->version = XPNET_VERSION_EMBED; msg->version = XPNET_VERSION_EMBED;
dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n", dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n",
&msg->data, skb->data, (size_t) embedded_bytes); &msg->data, skb->data, (size_t)embedded_bytes);
skb_copy_from_linear_data(skb, &msg->data, skb_copy_from_linear_data(skb, &msg->data,
(size_t)embedded_bytes); (size_t)embedded_bytes);
} else { } else {
...@@ -573,7 +543,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -573,7 +543,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
} }
msg->magic = XPNET_MAGIC; msg->magic = XPNET_MAGIC;
msg->size = end_addr - start_addr; msg->size = end_addr - start_addr;
msg->leadin_ignore = (u64) skb->data - start_addr; msg->leadin_ignore = (u64)skb->data - start_addr;
msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb); msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
msg->buf_pa = __pa(start_addr); msg->buf_pa = __pa(start_addr);
...@@ -583,7 +553,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -583,7 +553,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size, dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
msg->leadin_ignore, msg->tailout_ignore); msg->leadin_ignore, msg->tailout_ignore);
atomic_inc(&queued_msg->use_count); atomic_inc(&queued_msg->use_count);
ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, msg, ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, msg,
...@@ -599,7 +568,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -599,7 +568,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev_dbg(xpnet, "no partitions to receive packet destined for " dev_dbg(xpnet, "no partitions to receive packet destined for "
"%d\n", dest_partid); "%d\n", dest_partid);
dev_kfree_skb(skb); dev_kfree_skb(skb);
kfree(queued_msg); kfree(queued_msg);
} }
...@@ -610,23 +578,20 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -610,23 +578,20 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
return 0; return 0;
} }
/* /*
* Deal with transmit timeouts coming from the network layer. * Deal with transmit timeouts coming from the network layer.
*/ */
static void static void
xpnet_dev_tx_timeout (struct net_device *dev) xpnet_dev_tx_timeout(struct net_device *dev)
{ {
struct xpnet_dev_private *priv; struct xpnet_dev_private *priv;
priv = (struct xpnet_dev_private *)dev->priv;
priv = (struct xpnet_dev_private *) dev->priv;
priv->stats.tx_errors++; priv->stats.tx_errors++;
return; return;
} }
static int __init static int __init
xpnet_init(void) xpnet_init(void)
{ {
...@@ -634,7 +599,6 @@ xpnet_init(void) ...@@ -634,7 +599,6 @@ xpnet_init(void)
u32 license_num; u32 license_num;
int result = -ENOMEM; int result = -ENOMEM;
if (!ia64_platform_is("sn2")) { if (!ia64_platform_is("sn2")) {
return -ENODEV; return -ENODEV;
} }
...@@ -696,8 +660,8 @@ xpnet_init(void) ...@@ -696,8 +660,8 @@ xpnet_init(void)
return result; return result;
} }
module_init(xpnet_init);
module_init(xpnet_init);
static void __exit static void __exit
xpnet_exit(void) xpnet_exit(void)
...@@ -709,10 +673,9 @@ xpnet_exit(void) ...@@ -709,10 +673,9 @@ xpnet_exit(void)
free_netdev(xpnet_device); free_netdev(xpnet_device);
} }
module_exit(xpnet_exit);
module_exit(xpnet_exit);
MODULE_AUTHOR("Silicon Graphics, Inc."); MODULE_AUTHOR("Silicon Graphics, Inc.");
MODULE_DESCRIPTION("Cross Partition Network adapter (XPNET)"); MODULE_DESCRIPTION("Cross Partition Network adapter (XPNET)");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
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