sgi-xp: isolate additional sn2 specific code (a47d5dac) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/misc/sgi-xp/xpc.h

+97 −76

Original line number	Original line	Diff line number	Diff line
	@@ -122,9 +122,6 @@ struct xpc_rsvd_page {

	#define XPC_RP_VERSION _XPC_VERSION(2, 0) /* version 2.0 of the reserved page */		#define XPC_RP_VERSION _XPC_VERSION(2, 0) /* version 2.0 of the reserved page */

	#define XPC_SUPPORTS_RP_STAMP(_version) \
	(_version >= _XPC_VERSION(1, 1))

	/*		/*
	* Define the structures by which XPC variables can be exported to other		* Define the structures by which XPC variables can be exported to other
	* partitions. (There are two: struct xpc_vars and struct xpc_vars_part)		* partitions. (There are two: struct xpc_vars and struct xpc_vars_part)
	@@ -144,8 +141,8 @@ struct xpc_vars_sn2 {
	u64 heartbeat;		u64 heartbeat;
	DECLARE_BITMAP(heartbeating_to_mask, XP_MAX_NPARTITIONS_SN2);		DECLARE_BITMAP(heartbeating_to_mask, XP_MAX_NPARTITIONS_SN2);
	u64 heartbeat_offline; /* if 0, heartbeat should be changing */		u64 heartbeat_offline; /* if 0, heartbeat should be changing */
	int act_nasid;		int activate_IRQ_nasid;
	int act_phys_cpuid;		int activate_IRQ_phys_cpuid;
	u64 vars_part_pa;		u64 vars_part_pa;
	u64 amos_page_pa; /* paddr of page of AMOs from MSPEC driver */		u64 amos_page_pa; /* paddr of page of AMOs from MSPEC driver */
	AMO_t amos_page; / vaddr of page of AMOs from MSPEC driver */		AMO_t amos_page; / vaddr of page of AMOs from MSPEC driver */
	@@ -153,9 +150,6 @@ struct xpc_vars_sn2 {

	#define XPC_V_VERSION _XPC_VERSION(3, 1) /* version 3.1 of the cross vars */		#define XPC_V_VERSION _XPC_VERSION(3, 1) /* version 3.1 of the cross vars */

	#define XPC_SUPPORTS_DISENGAGE_REQUEST(_version) \
	(_version >= _XPC_VERSION(3, 1))

	/*		/*
	* The following pertains to ia64-sn2 only.		* The following pertains to ia64-sn2 only.
	*		*
	@@ -167,14 +161,14 @@ struct xpc_vars_sn2 {
	* a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64		* a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64
	* AMO variables (based on XP_MAX_NPARTITIONS_SN2) to identify the senders of		* AMO variables (based on XP_MAX_NPARTITIONS_SN2) to identify the senders of
	* NOTIFY IRQs, 128 AMO variables (based on XP_NASID_MASK_WORDS) to identify		* NOTIFY IRQs, 128 AMO variables (based on XP_NASID_MASK_WORDS) to identify
	* the senders of ACTIVATE IRQs, and 2 AMO variables to identify which remote		* the senders of ACTIVATE IRQs, 1 AMO variable to identify which remote
	* partitions (i.e., XPCs) consider themselves currently engaged with the		* partitions (i.e., XPCs) consider themselves currently engaged with the
	* local XPC.		* local XPC and 1 AMO variable to request partition deactivation.
	*/		*/
	#define XPC_NOTIFY_IRQ_AMOS 0		#define XPC_NOTIFY_IRQ_AMOS 0
	#define XPC_ACTIVATE_IRQ_AMOS (XPC_NOTIFY_IRQ_AMOS + XP_MAX_NPARTITIONS_SN2)		#define XPC_ACTIVATE_IRQ_AMOS (XPC_NOTIFY_IRQ_AMOS + XP_MAX_NPARTITIONS_SN2)
	#define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS)		#define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS)
	#define XPC_DISENGAGE_REQUEST_AMO (XPC_ENGAGED_PARTITIONS_AMO + 1)		#define XPC_DEACTIVATE_REQUEST_AMO (XPC_ENGAGED_PARTITIONS_AMO + 1)

	/*		/*
	* The following structure describes the per partition specific variables.		* The following structure describes the per partition specific variables.
	@@ -369,6 +363,23 @@ struct xpc_notify {
	* new messages, by the clearing of the message flags of the acknowledged		* new messages, by the clearing of the message flags of the acknowledged
	* messages.		* messages.
	*/		*/
			struct xpc_channel_sn2 {

			/* various flavors of local and remote Get/Put values */

			struct xpc_gp local_GP; / local Get/Put values */
			struct xpc_gp remote_GP; /* remote Get/Put values */
			struct xpc_gp w_local_GP; /* working local Get/Put values */
			struct xpc_gp w_remote_GP; /* working remote Get/Put values */
			s64 next_msg_to_pull; /* Put value of next msg to pull */

			struct mutex msg_to_pull_mutex; /* next msg to pull serialization */
			};

			struct xpc_channel_uv {
			/* >>> code is coming */
			};

	struct xpc_channel {		struct xpc_channel {
	short partid; /* ID of remote partition connected */		short partid; /* ID of remote partition connected */
	spinlock_t lock; /* lock for updating this structure */		spinlock_t lock; /* lock for updating this structure */
	@@ -407,20 +418,11 @@ struct xpc_channel {
	xpc_channel_func func; /* user's channel function */		xpc_channel_func func; /* user's channel function */
	void key; / pointer to user's key */		void key; / pointer to user's key */

	struct mutex msg_to_pull_mutex; /* next msg to pull serialization */
	struct completion wdisconnect_wait; /* wait for channel disconnect */		struct completion wdisconnect_wait; /* wait for channel disconnect */

	struct xpc_openclose_args local_openclose_args; / args passed on */		struct xpc_openclose_args local_openclose_args; / args passed on */
	/* opening or closing of channel */		/* opening or closing of channel */

	/* various flavors of local and remote Get/Put values */

	struct xpc_gp local_GP; / local Get/Put values */
	struct xpc_gp remote_GP; /* remote Get/Put values */
	struct xpc_gp w_local_GP; /* working local Get/Put values */
	struct xpc_gp w_remote_GP; /* working remote Get/Put values */
	s64 next_msg_to_pull; /* Put value of next msg to pull */

	/* kthread management related fields */		/* kthread management related fields */

	atomic_t kthreads_assigned; /* #of kthreads assigned to channel */		atomic_t kthreads_assigned; /* #of kthreads assigned to channel */
	@@ -431,6 +433,11 @@ struct xpc_channel {

	wait_queue_head_t idle_wq; /* idle kthread wait queue */		wait_queue_head_t idle_wq; /* idle kthread wait queue */

			union {
			struct xpc_channel_sn2 sn2;
			struct xpc_channel_uv uv;
			} sn;

	} ____cacheline_aligned;		} ____cacheline_aligned;

	/* struct xpc_channel flags */		/* struct xpc_channel flags */
	@@ -467,6 +474,40 @@ struct xpc_channel {
	* for each partition (a partition will never utilize the structure that		* for each partition (a partition will never utilize the structure that
	* represents itself).		* represents itself).
	*/		*/

			struct xpc_partition_sn2 {
			u64 remote_amos_page_pa; /* phys addr of partition's amos page */
			int activate_IRQ_nasid; /* active partition's act/deact nasid */
			int activate_IRQ_phys_cpuid; /* active part's act/deact phys cpuid */

			u64 remote_vars_pa; /* phys addr of partition's vars */
			u64 remote_vars_part_pa; /* phys addr of partition's vars part */
			u8 remote_vars_version; /* version# of partition's vars */

			void local_GPs_base; / base address of kmalloc'd space */
			struct xpc_gp local_GPs; / local Get/Put values */
			void remote_GPs_base; / base address of kmalloc'd space */
			struct xpc_gp remote_GPs; / copy of remote partition's local */
			/* Get/Put values */
			u64 remote_GPs_pa; /* phys address of remote partition's local */
			/* Get/Put values */

			u64 remote_openclose_args_pa; /* phys addr of remote's args */

			int remote_IPI_nasid; /* nasid of where to send IPIs */
			int remote_IPI_phys_cpuid; /* phys CPU ID of where to send IPIs */
			char IPI_owner[8]; /* IPI owner's name */

			AMO_t remote_IPI_amo_va; / address of remote IPI AMO_t structure */
			AMO_t local_IPI_amo_va; / address of IPI AMO_t structure */

			struct timer_list dropped_notify_IRQ_timer; /* dropped IRQ timer */
			};

			struct xpc_partition_uv {
			/* >>> code is coming */
			};

	struct xpc_partition {		struct xpc_partition {

	/* XPC HB infrastructure */		/* XPC HB infrastructure */
	@@ -474,22 +515,15 @@ struct xpc_partition {
	u8 remote_rp_version; /* version# of partition's rsvd pg */		u8 remote_rp_version; /* version# of partition's rsvd pg */
	unsigned long remote_rp_stamp; /* time when rsvd pg was initialized */		unsigned long remote_rp_stamp; /* time when rsvd pg was initialized */
	u64 remote_rp_pa; /* phys addr of partition's rsvd pg */		u64 remote_rp_pa; /* phys addr of partition's rsvd pg */
	u64 remote_vars_pa; /* phys addr of partition's vars */
	u64 remote_vars_part_pa; /* phys addr of partition's vars part */
	u64 last_heartbeat; /* HB at last read */		u64 last_heartbeat; /* HB at last read */
	u64 remote_amos_page_pa; /* phys addr of partition's amos page */
	int remote_act_nasid; /* active part's act/deact nasid */
	int remote_act_phys_cpuid; /* active part's act/deact phys cpuid */
	u32 activate_IRQ_rcvd; /* IRQs since activation */		u32 activate_IRQ_rcvd; /* IRQs since activation */
	spinlock_t act_lock; /* protect updating of act_state */		spinlock_t act_lock; /* protect updating of act_state */
	u8 act_state; /* from XPC HB viewpoint */		u8 act_state; /* from XPC HB viewpoint */
	u8 remote_vars_version; /* version# of partition's vars */
	enum xp_retval reason; /* reason partition is deactivating */		enum xp_retval reason; /* reason partition is deactivating */
	int reason_line; /* line# deactivation initiated from */		int reason_line; /* line# deactivation initiated from */
	int reactivate_nasid; /* nasid in partition to reactivate */

	unsigned long disengage_request_timeout; /* timeout in jiffies */		unsigned long disengage_timeout; /* timeout in jiffies */
	struct timer_list disengage_request_timer;		struct timer_list disengage_timer;

	/* XPC infrastructure referencing and teardown control */		/* XPC infrastructure referencing and teardown control */

	@@ -502,14 +536,6 @@ struct xpc_partition {
	atomic_t nchannels_engaged; /* #of channels engaged with remote part */		atomic_t nchannels_engaged; /* #of channels engaged with remote part */
	struct xpc_channel channels; / array of channel structures */		struct xpc_channel channels; / array of channel structures */

	void local_GPs_base; / base address of kmalloc'd space */
	struct xpc_gp local_GPs; / local Get/Put values */
	void remote_GPs_base; / base address of kmalloc'd space */
	struct xpc_gp remote_GPs; / copy of remote partition's local */
	/* Get/Put values */
	u64 remote_GPs_pa; /* phys address of remote partition's local */
	/* Get/Put values */

	/* fields used to pass args when opening or closing a channel */		/* fields used to pass args when opening or closing a channel */

	void local_openclose_args_base; / base address of kmalloc'd space */		void local_openclose_args_base; / base address of kmalloc'd space */
	@@ -517,19 +543,10 @@ struct xpc_partition {
	void remote_openclose_args_base; / base address of kmalloc'd space */		void remote_openclose_args_base; / base address of kmalloc'd space */
	struct xpc_openclose_args remote_openclose_args; / copy of remote's */		struct xpc_openclose_args remote_openclose_args; / copy of remote's */
	/* args */		/* args */
	u64 remote_openclose_args_pa; /* phys addr of remote's args */

	/* IPI sending, receiving and handling related fields */		/* IPI sending, receiving and handling related fields */

	int remote_IPI_nasid; /* nasid of where to send IPIs */
	int remote_IPI_phys_cpuid; /* phys CPU ID of where to send IPIs */
	AMO_t remote_IPI_amo_va; / address of remote IPI AMO_t structure */

	AMO_t local_IPI_amo_va; / address of IPI AMO_t structure */
	u64 local_IPI_amo; /* IPI amo flags yet to be handled */		u64 local_IPI_amo; /* IPI amo flags yet to be handled */
	char IPI_owner[8]; /* IPI owner's name */
	struct timer_list dropped_IPI_timer; /* dropped IPI timer */

	spinlock_t IPI_lock; /* IPI handler lock */		spinlock_t IPI_lock; /* IPI handler lock */

	/* channel manager related fields */		/* channel manager related fields */
	@@ -537,6 +554,11 @@ struct xpc_partition {
	atomic_t channel_mgr_requests; /* #of requests to activate chan mgr */		atomic_t channel_mgr_requests; /* #of requests to activate chan mgr */
	wait_queue_head_t channel_mgr_wq; /* channel mgr's wait queue */		wait_queue_head_t channel_mgr_wq; /* channel mgr's wait queue */

			union {
			struct xpc_partition_sn2 sn2;
			struct xpc_partition_uv uv;
			} sn;

	} ____cacheline_aligned;		} ____cacheline_aligned;

	/* struct xpc_partition act_state values (for XPC HB) */		/* struct xpc_partition act_state values (for XPC HB) */
	@@ -565,10 +587,10 @@ struct xpc_partition {
	#define XPC_P_DROPPED_IPI_WAIT_INTERVAL (0.25 * HZ)		#define XPC_P_DROPPED_IPI_WAIT_INTERVAL (0.25 * HZ)

	/* number of seconds to wait for other partitions to disengage */		/* number of seconds to wait for other partitions to disengage */
	#define XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT 90		#define XPC_DISENGAGE_DEFAULT_TIMELIMIT 90

	/* interval in seconds to print 'waiting disengagement' messages */		/* interval in seconds to print 'waiting deactivation' messages */
	#define XPC_DISENGAGE_PRINTMSG_INTERVAL 10		#define XPC_DEACTIVATE_PRINTMSG_INTERVAL 10

	#define XPC_PARTID(_p) ((short)((_p) - &xpc_partitions[0]))		#define XPC_PARTID(_p) ((short)((_p) - &xpc_partitions[0]))

	@@ -578,13 +600,11 @@ extern struct xpc_registration xpc_registrations[];
	/* found in xpc_main.c */		/* found in xpc_main.c */
	extern struct device *xpc_part;		extern struct device *xpc_part;
	extern struct device *xpc_chan;		extern struct device *xpc_chan;
	extern int xpc_disengage_request_timelimit;		extern int xpc_disengage_timelimit;
	extern int xpc_disengage_request_timedout;		extern int xpc_disengage_timedout;
	extern atomic_t xpc_activate_IRQ_rcvd;		extern atomic_t xpc_activate_IRQ_rcvd;
	extern wait_queue_head_t xpc_activate_IRQ_wq;		extern wait_queue_head_t xpc_activate_IRQ_wq;
	extern void *xpc_heartbeating_to_mask;		extern void *xpc_heartbeating_to_mask;
	extern irqreturn_t xpc_notify_IRQ_handler(int, void *);
	extern void xpc_dropped_IPI_check(struct xpc_partition *);
	extern void xpc_activate_partition(struct xpc_partition *);		extern void xpc_activate_partition(struct xpc_partition *);
	extern void xpc_activate_kthreads(struct xpc_channel *, int);		extern void xpc_activate_kthreads(struct xpc_channel *, int);
	extern void xpc_create_kthreads(struct xpc_channel *, int, int);		extern void xpc_create_kthreads(struct xpc_channel *, int, int);
	@@ -598,31 +618,34 @@ extern void (*xpc_online_heartbeat) (void);
	extern void (*xpc_check_remote_hb) (void);		extern void (*xpc_check_remote_hb) (void);
	extern enum xp_retval (xpc_make_first_contact) (struct xpc_partition );		extern enum xp_retval (xpc_make_first_contact) (struct xpc_partition );
	extern u64 (xpc_get_IPI_flags) (struct xpc_partition );		extern u64 (xpc_get_IPI_flags) (struct xpc_partition );
			extern void (xpc_notify_senders_of_disconnect) (struct xpc_channel );
			extern void (xpc_process_msg_IPI) (struct xpc_partition , int);
			extern int (xpc_n_of_deliverable_msgs) (struct xpc_channel );
	extern struct xpc_msg (xpc_get_deliverable_msg) (struct xpc_channel *);		extern struct xpc_msg (xpc_get_deliverable_msg) (struct xpc_channel *);
	extern void (xpc_initiate_partition_activation) (struct xpc_rsvd_page , u64,		extern void (xpc_request_partition_activation) (struct xpc_rsvd_page , u64,
	int);		int);
			extern void (xpc_request_partition_reactivation) (struct xpc_partition );
			extern void (xpc_request_partition_deactivation) (struct xpc_partition );
			extern void (*xpc_cancel_partition_deactivation_request) (
			struct xpc_partition *);
	extern void (*xpc_process_activate_IRQ_rcvd) (int);		extern void (*xpc_process_activate_IRQ_rcvd) (int);
	extern enum xp_retval (xpc_setup_infrastructure) (struct xpc_partition );		extern enum xp_retval (xpc_setup_infrastructure) (struct xpc_partition );
	extern void (xpc_teardown_infrastructure) (struct xpc_partition );		extern void (xpc_teardown_infrastructure) (struct xpc_partition );
	extern void (xpc_mark_partition_engaged) (struct xpc_partition );
	extern void (xpc_mark_partition_disengaged) (struct xpc_partition );		extern void (xpc_indicate_partition_engaged) (struct xpc_partition );
	extern void (xpc_request_partition_disengage) (struct xpc_partition );		extern int (*xpc_partition_engaged) (short);
	extern void (xpc_cancel_partition_disengage_request) (struct xpc_partition );		extern int (*xpc_any_partition_engaged) (void);
	extern u64 (*xpc_partition_engaged) (u64);		extern void (xpc_indicate_partition_disengaged) (struct xpc_partition );
	extern u64 (*xpc_partition_disengage_requested) (u64);;		extern void (*xpc_assume_partition_disengaged) (short);
	extern void (*xpc_clear_partition_engaged) (u64);
	extern void (*xpc_clear_partition_disengage_request) (u64);		extern void (xpc_send_channel_closerequest) (struct xpc_channel ,
			unsigned long *);
	extern void (*xpc_IPI_send_local_activate) (int);		extern void (xpc_send_channel_closereply) (struct xpc_channel ,
	extern void (xpc_IPI_send_activated) (struct xpc_partition );		unsigned long *);
	extern void (*xpc_IPI_send_local_reactivate) (int);		extern void (xpc_send_channel_openrequest) (struct xpc_channel ,
	extern void (xpc_IPI_send_disengage) (struct xpc_partition );		unsigned long *);
			extern void (xpc_send_channel_openreply) (struct xpc_channel ,
	extern void (xpc_IPI_send_closerequest) (struct xpc_channel ,
	unsigned long *);		unsigned long *);
	extern void (xpc_IPI_send_closereply) (struct xpc_channel , unsigned long *);
	extern void (xpc_IPI_send_openrequest) (struct xpc_channel , unsigned long *);
	extern void (xpc_IPI_send_openreply) (struct xpc_channel , unsigned long *);

	extern enum xp_retval (xpc_send_msg) (struct xpc_channel , u32, void *, u16,		extern enum xp_retval (xpc_send_msg) (struct xpc_channel , u32, void *, u16,
	u8, xpc_notify_func, void *);		u8, xpc_notify_func, void *);
	@@ -646,8 +669,6 @@ extern char *xpc_remote_copy_buffer;
	extern void *xpc_remote_copy_buffer_base;		extern void *xpc_remote_copy_buffer_base;
	extern void xpc_kmalloc_cacheline_aligned(size_t, gfp_t, void *);		extern void xpc_kmalloc_cacheline_aligned(size_t, gfp_t, void *);
	extern struct xpc_rsvd_page *xpc_setup_rsvd_page(void);		extern struct xpc_rsvd_page *xpc_setup_rsvd_page(void);
	extern void xpc_allow_IPI_ops(void);
	extern void xpc_restrict_IPI_ops(void);
	extern int xpc_identify_activate_IRQ_sender(void);		extern int xpc_identify_activate_IRQ_sender(void);
	extern int xpc_partition_disengaged(struct xpc_partition *);		extern int xpc_partition_disengaged(struct xpc_partition *);
	extern enum xp_retval xpc_mark_partition_active(struct xpc_partition *);		extern enum xp_retval xpc_mark_partition_active(struct xpc_partition *);

drivers/misc/sgi-xp/xpc_channel.c

+17 −197

Original line number	Original line	Diff line number	Diff line
	@@ -201,7 +201,7 @@ xpc_process_connect(struct xpc_channel ch, unsigned long irq_flags)

	if (!(ch->flags & XPC_C_OPENREPLY)) {		if (!(ch->flags & XPC_C_OPENREPLY)) {
	ch->flags \|= XPC_C_OPENREPLY;		ch->flags \|= XPC_C_OPENREPLY;
	xpc_IPI_send_openreply(ch, irq_flags);		xpc_send_channel_openreply(ch, irq_flags);
	}		}

	if (!(ch->flags & XPC_C_ROPENREPLY))		if (!(ch->flags & XPC_C_ROPENREPLY))
	@@ -219,52 +219,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.
	*/
	static void
	xpc_notify_senders(struct xpc_channel *ch, enum xp_retval reason, s64 put)
	{
	struct xpc_notify *notify;
	u8 notify_type;
	s64 get = ch->w_remote_GP.get - 1;

	while (++get < put && atomic_read(&ch->n_to_notify) > 0) {

	notify = &ch->notify_queue[get % ch->local_nentries];

	/*
	* See if the notify entry indicates it was associated with
	* a message who's sender wants to be notified. It is possible
	* that it is, but someone else is doing or has done the
	* notification.
	*/
	notify_type = notify->type;
	if (notify_type == 0 \|\|
	cmpxchg(&notify->type, notify_type, 0) != notify_type) {
	continue;
	}

	DBUG_ON(notify_type != XPC_N_CALL);

	atomic_dec(&ch->n_to_notify);

	if (notify->func != NULL) {
	dev_dbg(xpc_chan, "notify->func() called, notify=0x%p, "
	"msg_number=%ld, partid=%d, channel=%d\n",
	(void *)notify, get, ch->partid, ch->number);

	notify->func(reason, ch->partid, ch->number,
	notify->key);

	dev_dbg(xpc_chan, "notify->func() returned, "
	"notify=0x%p, msg_number=%ld, partid=%d, "
	"channel=%d\n", (void *)notify, get,
	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.
	@@ -275,6 +229,8 @@ xpc_notify_senders(struct xpc_channel *ch, enum xp_retval reason, s64 put)
	static void		static void
	xpc_free_msgqueues(struct xpc_channel *ch)		xpc_free_msgqueues(struct xpc_channel *ch)
	{		{
			struct xpc_channel_sn2 *ch_sn2 = &ch->sn.sn2;

	DBUG_ON(!spin_is_locked(&ch->lock));		DBUG_ON(!spin_is_locked(&ch->lock));
	DBUG_ON(atomic_read(&ch->n_to_notify) != 0);		DBUG_ON(atomic_read(&ch->n_to_notify) != 0);

	@@ -287,15 +243,15 @@ xpc_free_msgqueues(struct xpc_channel *ch)
	ch->kthreads_assigned_limit = 0;		ch->kthreads_assigned_limit = 0;
	ch->kthreads_idle_limit = 0;		ch->kthreads_idle_limit = 0;

	ch->local_GP->get = 0;		ch_sn2->local_GP->get = 0;
	ch->local_GP->put = 0;		ch_sn2->local_GP->put = 0;
	ch->remote_GP.get = 0;		ch_sn2->remote_GP.get = 0;
	ch->remote_GP.put = 0;		ch_sn2->remote_GP.put = 0;
	ch->w_local_GP.get = 0;		ch_sn2->w_local_GP.get = 0;
	ch->w_local_GP.put = 0;		ch_sn2->w_local_GP.put = 0;
	ch->w_remote_GP.get = 0;		ch_sn2->w_remote_GP.get = 0;
	ch->w_remote_GP.put = 0;		ch_sn2->w_remote_GP.put = 0;
	ch->next_msg_to_pull = 0;		ch_sn2->next_msg_to_pull = 0;

	if (ch->flags & XPC_C_SETUP) {		if (ch->flags & XPC_C_SETUP) {
	ch->flags &= ~XPC_C_SETUP;		ch->flags &= ~XPC_C_SETUP;
	@@ -339,7 +295,7 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)

	if (part->act_state == XPC_P_DEACTIVATING) {		if (part->act_state == XPC_P_DEACTIVATING) {
	/* can't proceed until the other side disengages from us */		/* can't proceed until the other side disengages from us */
	if (xpc_partition_engaged(1UL << ch->partid))		if (xpc_partition_engaged(ch->partid))
	return;		return;

	} else {		} else {
	@@ -351,7 +307,7 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)

	if (!(ch->flags & XPC_C_CLOSEREPLY)) {		if (!(ch->flags & XPC_C_CLOSEREPLY)) {
	ch->flags \|= XPC_C_CLOSEREPLY;		ch->flags \|= XPC_C_CLOSEREPLY;
	xpc_IPI_send_closereply(ch, irq_flags);		xpc_send_channel_closereply(ch, irq_flags);
	}		}

	if (!(ch->flags & XPC_C_RCLOSEREPLY))		if (!(ch->flags & XPC_C_RCLOSEREPLY))
	@@ -361,7 +317,7 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)
	/* wake those waiting for notify completion */		/* wake those waiting for notify completion */
	if (atomic_read(&ch->n_to_notify) > 0) {		if (atomic_read(&ch->n_to_notify) > 0) {
	/* >>> we do callout while holding ch->lock */		/* >>> we do callout while holding ch->lock */
	xpc_notify_senders(ch, ch->reason, ch->w_local_GP.put);		xpc_notify_senders_of_disconnect(ch);
	}		}

	/* both sides are disconnected now */		/* both sides are disconnected now */
	@@ -734,7 +690,7 @@ xpc_connect_channel(struct xpc_channel *ch)
	/* initiate the connection */		/* initiate the connection */

	ch->flags \|= (XPC_C_OPENREQUEST \| XPC_C_CONNECTING);		ch->flags \|= (XPC_C_OPENREQUEST \| XPC_C_CONNECTING);
	xpc_IPI_send_openrequest(ch, &irq_flags);		xpc_send_channel_openrequest(ch, &irq_flags);

	xpc_process_connect(ch, &irq_flags);		xpc_process_connect(ch, &irq_flags);

	@@ -743,142 +699,6 @@ xpc_connect_channel(struct xpc_channel *ch)
	return xpSuccess;		return xpSuccess;
	}		}

	/*
	* Clear some of the msg flags in the local message queue.
	*/
	static inline void
	xpc_clear_local_msgqueue_flags(struct xpc_channel *ch)
	{
	struct xpc_msg *msg;
	s64 get;

	get = ch->w_remote_GP.get;
	do {
	msg = (struct xpc_msg *)((u64)ch->local_msgqueue +
	(get % ch->local_nentries) *
	ch->msg_size);
	msg->flags = 0;
	} while (++get < ch->remote_GP.get);
	}

	/*
	* Clear some of the msg flags in the remote message queue.
	*/
	static inline void
	xpc_clear_remote_msgqueue_flags(struct xpc_channel *ch)
	{
	struct xpc_msg *msg;
	s64 put;

	put = ch->w_remote_GP.put;
	do {
	msg = (struct xpc_msg *)((u64)ch->remote_msgqueue +
	(put % ch->remote_nentries) *
	ch->msg_size);
	msg->flags = 0;
	} while (++put < ch->remote_GP.put);
	}

	static void
	xpc_process_msg_IPI(struct xpc_partition *part, int ch_number)
	{
	struct xpc_channel *ch = &part->channels[ch_number];
	int nmsgs_sent;

	ch->remote_GP = part->remote_GPs[ch_number];

	/* See what, if anything, has changed for each connected channel */

	xpc_msgqueue_ref(ch);

	if (ch->w_remote_GP.get == ch->remote_GP.get &&
	ch->w_remote_GP.put == ch->remote_GP.put) {
	/* nothing changed since GPs were last pulled */
	xpc_msgqueue_deref(ch);
	return;
	}

	if (!(ch->flags & XPC_C_CONNECTED)) {
	xpc_msgqueue_deref(ch);
	return;
	}

	/*
	* First check to see if messages recently sent by us have been
	* received by the other side. (The remote GET value will have
	* changed since we last looked at it.)
	*/

	if (ch->w_remote_GP.get != ch->remote_GP.get) {

	/*
	* We need to notify any senders that want to be notified
	* that their sent messages have been received by their
	* intended recipients. We need to do this before updating
	* w_remote_GP.get so that we don't allocate the same message
	* queue entries prematurely (see xpc_allocate_msg()).
	*/
	if (atomic_read(&ch->n_to_notify) > 0) {
	/*
	* Notify senders that messages sent have been
	* received and delivered by the other side.
	*/
	xpc_notify_senders(ch, xpMsgDelivered,
	ch->remote_GP.get);
	}

	/*
	* Clear msg->flags in previously sent messages, so that
	* they're ready for xpc_allocate_msg().
	*/
	xpc_clear_local_msgqueue_flags(ch);

	ch->w_remote_GP.get = ch->remote_GP.get;

	dev_dbg(xpc_chan, "w_remote_GP.get changed to %ld, partid=%d, "
	"channel=%d\n", ch->w_remote_GP.get, ch->partid,
	ch->number);

	/*
	* If anyone was waiting for message queue entries to become
	* available, wake them up.
	*/
	if (atomic_read(&ch->n_on_msg_allocate_wq) > 0)
	wake_up(&ch->msg_allocate_wq);
	}

	/*
	* Now check for newly sent messages by the other side. (The remote
	* PUT value will have changed since we last looked at it.)
	*/

	if (ch->w_remote_GP.put != ch->remote_GP.put) {
	/*
	* Clear msg->flags in previously received messages, so that
	* they're ready for xpc_get_deliverable_msg().
	*/
	xpc_clear_remote_msgqueue_flags(ch);

	ch->w_remote_GP.put = ch->remote_GP.put;

	dev_dbg(xpc_chan, "w_remote_GP.put changed to %ld, partid=%d, "
	"channel=%d\n", ch->w_remote_GP.put, ch->partid,
	ch->number);

	nmsgs_sent = ch->w_remote_GP.put - ch->w_local_GP.get;
	if (nmsgs_sent > 0) {
	dev_dbg(xpc_chan, "msgs waiting to be copied and "
	"delivered=%d, partid=%d, channel=%d\n",
	nmsgs_sent, ch->partid, ch->number);

	if (ch->flags & XPC_C_CONNECTEDCALLOUT_MADE)
	xpc_activate_kthreads(ch, nmsgs_sent);
	}
	}

	xpc_msgqueue_deref(ch);
	}

	void		void
	xpc_process_channel_activity(struct xpc_partition *part)		xpc_process_channel_activity(struct xpc_partition *part)
	{		{
	@@ -1117,7 +937,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
	XPC_C_ROPENREQUEST \| XPC_C_ROPENREPLY \|		XPC_C_ROPENREQUEST \| XPC_C_ROPENREPLY \|
	XPC_C_CONNECTING \| XPC_C_CONNECTED);		XPC_C_CONNECTING \| XPC_C_CONNECTED);

	xpc_IPI_send_closerequest(ch, irq_flags);		xpc_send_channel_closerequest(ch, irq_flags);

	if (channel_was_connected)		if (channel_was_connected)
	ch->flags \|= XPC_C_WASCONNECTED;		ch->flags \|= XPC_C_WASCONNECTED;

drivers/misc/sgi-xp/xpc_main.c

+94 −184

File changed.

Preview size limit exceeded, changes collapsed.

drivers/misc/sgi-xp/xpc_partition.c

+26 −33

Original line number	Original line	Diff line number	Diff line
	@@ -242,7 +242,7 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
	return xpBadVersion;		return xpBadVersion;
	}		}

	/* check that both local and remote partids are valid for each side */		/* check that both remote and local partids are valid for each side */
	if (remote_rp->SAL_partid < 0 \|\|		if (remote_rp->SAL_partid < 0 \|\|
	remote_rp->SAL_partid >= xp_max_npartitions \|\|		remote_rp->SAL_partid >= xp_max_npartitions \|\|
	remote_rp->max_npartitions <= sn_partition_id) {		remote_rp->max_npartitions <= sn_partition_id) {
	@@ -256,8 +256,9 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids,
	}		}

	/*		/*
	* See if the other side has responded to a partition disengage request		* See if the other side has responded to a partition deactivate request
	* from us.		* from us. Though we requested the remote partition to deactivate with regard
			* to us, we really only need to wait for the other side to disengage from us.
	*/		*/
	int		int
	xpc_partition_disengaged(struct xpc_partition *part)		xpc_partition_disengaged(struct xpc_partition *part)
	@@ -265,41 +266,37 @@ xpc_partition_disengaged(struct xpc_partition *part)
	short partid = XPC_PARTID(part);		short partid = XPC_PARTID(part);
	int disengaged;		int disengaged;

	disengaged = (xpc_partition_engaged(1UL << partid) == 0);		disengaged = !xpc_partition_engaged(partid);
	if (part->disengage_request_timeout) {		if (part->disengage_timeout) {
	if (!disengaged) {		if (!disengaged) {
	if (time_is_after_jiffies(part->		if (time_is_after_jiffies(part->disengage_timeout)) {
	disengage_request_timeout)) {
	/* timelimit hasn't been reached yet */		/* timelimit hasn't been reached yet */
	return 0;		return 0;
	}		}

	/*		/*
	* Other side hasn't responded to our disengage		* Other side hasn't responded to our deactivate
	* request in a timely fashion, so assume it's dead.		* request in a timely fashion, so assume it's dead.
	*/		*/

	dev_info(xpc_part, "disengage from remote partition %d "		dev_info(xpc_part, "deactivate request to remote "
	"timed out\n", partid);		"partition %d timed out\n", partid);
	xpc_disengage_request_timedout = 1;		xpc_disengage_timedout = 1;
	xpc_clear_partition_engaged(1UL << partid);		xpc_assume_partition_disengaged(partid);
	disengaged = 1;		disengaged = 1;
	}		}
	part->disengage_request_timeout = 0;		part->disengage_timeout = 0;

	/* cancel the timer function, provided it's not us */		/* cancel the timer function, provided it's not us */
	if (!in_interrupt()) {		if (!in_interrupt())
	del_singleshot_timer_sync(&part->		del_singleshot_timer_sync(&part->disengage_timer);
	disengage_request_timer);
	}

	DBUG_ON(part->act_state != XPC_P_DEACTIVATING &&		DBUG_ON(part->act_state != XPC_P_DEACTIVATING &&
	part->act_state != XPC_P_INACTIVE);		part->act_state != XPC_P_INACTIVE);
	if (part->act_state != XPC_P_INACTIVE)		if (part->act_state != XPC_P_INACTIVE)
	xpc_wakeup_channel_mgr(part);		xpc_wakeup_channel_mgr(part);

	if (XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version))		xpc_cancel_partition_deactivation_request(part);
	xpc_cancel_partition_disengage_request(part);
	}		}
	return disengaged;		return disengaged;
	}		}
	@@ -329,7 +326,7 @@ xpc_mark_partition_active(struct xpc_partition *part)
	}		}

	/*		/*
	* Notify XPC that the partition is down.		* Start the process of deactivating the specified partition.
	*/		*/
	void		void
	xpc_deactivate_partition(const int line, struct xpc_partition *part,		xpc_deactivate_partition(const int line, struct xpc_partition *part,
	@@ -344,7 +341,7 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,
	spin_unlock_irqrestore(&part->act_lock, irq_flags);		spin_unlock_irqrestore(&part->act_lock, irq_flags);
	if (reason == xpReactivating) {		if (reason == xpReactivating) {
	/* we interrupt ourselves to reactivate partition */		/* we interrupt ourselves to reactivate partition */
	xpc_IPI_send_local_reactivate(part->reactivate_nasid);		xpc_request_partition_reactivation(part);
	}		}
	return;		return;
	}		}
	@@ -362,17 +359,13 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part,

	spin_unlock_irqrestore(&part->act_lock, irq_flags);		spin_unlock_irqrestore(&part->act_lock, irq_flags);

	if (XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version)) {		/* ask remote partition to deactivate with regard to us */
	xpc_request_partition_disengage(part);		xpc_request_partition_deactivation(part);
	xpc_IPI_send_disengage(part);

	/* set a timelimit on the disengage request */		/* set a timelimit on the disengage phase of the deactivation request */
	part->disengage_request_timeout = jiffies +		part->disengage_timeout = jiffies + (xpc_disengage_timelimit * HZ);
	(xpc_disengage_request_timelimit * HZ);		part->disengage_timer.expires = part->disengage_timeout;
	part->disengage_request_timer.expires =		add_timer(&part->disengage_timer);
	part->disengage_request_timeout;
	add_timer(&part->disengage_request_timer);
	}

	dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n",		dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n",
	XPC_PARTID(part), reason);		XPC_PARTID(part), reason);
	@@ -505,7 +498,7 @@ xpc_discovery(void)
	continue;		continue;
	}		}

	xpc_initiate_partition_activation(remote_rp,		xpc_request_partition_activation(remote_rp,
	remote_rp_pa, nasid);		remote_rp_pa, nasid);
	}		}
	}		}

drivers/misc/sgi-xp/xpc_sn2.c

+539 −312

File changed.

Preview size limit exceeded, changes collapsed.