sgi-xpc: clean up numerous globals (a7665b0a) · Commits · e / devices / android_kernel_teracube_2e

drivers/misc/sgi-xp/xpc.h

+57 −55

Original line number	Original line	Diff line number	Diff line
	@@ -780,6 +780,62 @@ struct xpc_partition {

	} ____cacheline_aligned;		} ____cacheline_aligned;

			struct xpc_arch_operations {
			int (*setup_partitions) (void);
			void (*teardown_partitions) (void);
			void (*process_activate_IRQ_rcvd) (void);
			enum xp_retval (*get_partition_rsvd_page_pa)
			(void , u64 , unsigned long , size_t );
			int (setup_rsvd_page) (struct xpc_rsvd_page );

			void (*allow_hb) (short);
			void (*disallow_hb) (short);
			void (*disallow_all_hbs) (void);
			void (*increment_heartbeat) (void);
			void (*offline_heartbeat) (void);
			void (*online_heartbeat) (void);
			void (*heartbeat_init) (void);
			void (*heartbeat_exit) (void);
			enum xp_retval (get_remote_heartbeat) (struct xpc_partition );

			void (request_partition_activation) (struct xpc_rsvd_page ,
			unsigned long, int);
			void (request_partition_reactivation) (struct xpc_partition );
			void (request_partition_deactivation) (struct xpc_partition );
			void (cancel_partition_deactivation_request) (struct xpc_partition );
			enum xp_retval (setup_ch_structures) (struct xpc_partition );
			void (teardown_ch_structures) (struct xpc_partition );

			enum xp_retval (make_first_contact) (struct xpc_partition );

			u64 (get_chctl_all_flags) (struct xpc_partition );
			void (send_chctl_closerequest) (struct xpc_channel , unsigned long *);
			void (send_chctl_closereply) (struct xpc_channel , unsigned long *);
			void (send_chctl_openrequest) (struct xpc_channel , unsigned long *);
			void (send_chctl_openreply) (struct xpc_channel , unsigned long *);
			void (send_chctl_opencomplete) (struct xpc_channel , unsigned long *);
			void (process_msg_chctl_flags) (struct xpc_partition , int);

			enum xp_retval (save_remote_msgqueue_pa) (struct xpc_channel ,
			unsigned long);

			enum xp_retval (setup_msg_structures) (struct xpc_channel );
			void (teardown_msg_structures) (struct xpc_channel );

			void (indicate_partition_engaged) (struct xpc_partition );
			void (indicate_partition_disengaged) (struct xpc_partition );
			void (*assume_partition_disengaged) (short);
			int (*partition_engaged) (short);
			int (*any_partition_engaged) (void);

			int (n_of_deliverable_payloads) (struct xpc_channel );
			enum xp_retval (send_payload) (struct xpc_channel , u32, void *,
			u16, u8, xpc_notify_func, void *);
			void (get_deliverable_payload) (struct xpc_channel *);
			void (received_payload) (struct xpc_channel , void *);
			void (notify_senders_of_disconnect) (struct xpc_channel );
			};

	/* struct xpc_partition act_state values (for XPC HB) */		/* struct xpc_partition act_state values (for XPC HB) */

	#define XPC_P_AS_INACTIVE 0x00 /* partition is not active */		#define XPC_P_AS_INACTIVE 0x00 /* partition is not active */
	@@ -820,6 +876,7 @@ 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 struct xpc_arch_operations xpc_arch_ops;
	extern int xpc_disengage_timelimit;		extern int xpc_disengage_timelimit;
	extern int xpc_disengage_timedout;		extern int xpc_disengage_timedout;
	extern int xpc_activate_IRQ_rcvd;		extern int xpc_activate_IRQ_rcvd;
	@@ -830,61 +887,6 @@ 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);
	extern void xpc_disconnect_wait(int);		extern void xpc_disconnect_wait(int);
	extern int (*xpc_setup_partitions_sn) (void);
	extern void (*xpc_teardown_partitions_sn) (void);
	extern enum xp_retval (xpc_get_partition_rsvd_page_pa) (void , u64 *,
	unsigned long *,
	size_t *);
	extern int (xpc_setup_rsvd_page_sn) (struct xpc_rsvd_page );
	extern void (*xpc_heartbeat_init) (void);
	extern void (*xpc_heartbeat_exit) (void);
	extern void (*xpc_increment_heartbeat) (void);
	extern void (*xpc_offline_heartbeat) (void);
	extern void (*xpc_online_heartbeat) (void);
	extern enum xp_retval (xpc_get_remote_heartbeat) (struct xpc_partition );
	extern void (*xpc_allow_hb) (short);
	extern void (*xpc_disallow_hb) (short);
	extern void (*xpc_disallow_all_hbs) (void);
	extern enum xp_retval (xpc_make_first_contact) (struct xpc_partition );
	extern u64 (xpc_get_chctl_all_flags) (struct xpc_partition );
	extern enum xp_retval (xpc_setup_msg_structures) (struct xpc_channel );
	extern void (xpc_teardown_msg_structures) (struct xpc_channel );
	extern void (xpc_notify_senders_of_disconnect) (struct xpc_channel );
	extern void (xpc_process_msg_chctl_flags) (struct xpc_partition , int);
	extern int (xpc_n_of_deliverable_payloads) (struct xpc_channel );
	extern void (xpc_get_deliverable_payload) (struct xpc_channel *);
	extern void (xpc_request_partition_activation) (struct xpc_rsvd_page ,
	unsigned long, 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) (void);
	extern enum xp_retval (xpc_setup_ch_structures_sn) (struct xpc_partition );
	extern void (xpc_teardown_ch_structures_sn) (struct xpc_partition );

	extern void (xpc_indicate_partition_engaged) (struct xpc_partition );
	extern int (*xpc_partition_engaged) (short);
	extern int (*xpc_any_partition_engaged) (void);
	extern void (xpc_indicate_partition_disengaged) (struct xpc_partition );
	extern void (*xpc_assume_partition_disengaged) (short);

	extern void (xpc_send_chctl_closerequest) (struct xpc_channel ,
	unsigned long *);
	extern void (xpc_send_chctl_closereply) (struct xpc_channel ,
	unsigned long *);
	extern void (xpc_send_chctl_openrequest) (struct xpc_channel ,
	unsigned long *);
	extern void (xpc_send_chctl_openreply) (struct xpc_channel , unsigned long *);
	extern void (xpc_send_chctl_opencomplete) (struct xpc_channel ,
	unsigned long *);

	extern enum xp_retval (xpc_save_remote_msgqueue_pa) (struct xpc_channel ,
	unsigned long);

	extern enum xp_retval (xpc_send_payload) (struct xpc_channel , u32, void *,
	u16, u8, xpc_notify_func, void *);
	extern void (xpc_received_payload) (struct xpc_channel , void *);

	/* found in xpc_sn2.c */		/* found in xpc_sn2.c */
	extern int xpc_init_sn2(void);		extern int xpc_init_sn2(void);

drivers/misc/sgi-xp/xpc_channel.c

+22 −21

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

	if (!(ch->flags & XPC_C_SETUP)) {		if (!(ch->flags & XPC_C_SETUP)) {
	spin_unlock_irqrestore(&ch->lock, *irq_flags);		spin_unlock_irqrestore(&ch->lock, *irq_flags);
	ret = xpc_setup_msg_structures(ch);		ret = xpc_arch_ops.setup_msg_structures(ch);
	spin_lock_irqsave(&ch->lock, *irq_flags);		spin_lock_irqsave(&ch->lock, *irq_flags);

	if (ret != xpSuccess)		if (ret != xpSuccess)
	@@ -53,7 +53,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_send_chctl_openreply(ch, irq_flags);		xpc_arch_ops.send_chctl_openreply(ch, irq_flags);
	}		}

	if (!(ch->flags & XPC_C_ROPENREPLY))		if (!(ch->flags & XPC_C_ROPENREPLY))
	@@ -61,7 +61,7 @@ xpc_process_connect(struct xpc_channel ch, unsigned long irq_flags)

	if (!(ch->flags & XPC_C_OPENCOMPLETE)) {		if (!(ch->flags & XPC_C_OPENCOMPLETE)) {
	ch->flags \|= (XPC_C_OPENCOMPLETE \| XPC_C_CONNECTED);		ch->flags \|= (XPC_C_OPENCOMPLETE \| XPC_C_CONNECTED);
	xpc_send_chctl_opencomplete(ch, irq_flags);		xpc_arch_ops.send_chctl_opencomplete(ch, irq_flags);
	}		}

	if (!(ch->flags & XPC_C_ROPENCOMPLETE))		if (!(ch->flags & XPC_C_ROPENCOMPLETE))
	@@ -100,7 +100,7 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)

	if (part->act_state == XPC_P_AS_DEACTIVATING) {		if (part->act_state == XPC_P_AS_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(ch->partid))		if (xpc_arch_ops.partition_engaged(ch->partid))
	return;		return;

	} else {		} else {
	@@ -112,7 +112,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_send_chctl_closereply(ch, irq_flags);		xpc_arch_ops.send_chctl_closereply(ch, irq_flags);
	}		}

	if (!(ch->flags & XPC_C_RCLOSEREPLY))		if (!(ch->flags & XPC_C_RCLOSEREPLY))
	@@ -122,7 +122,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, callout can't block */		/* we do callout while holding ch->lock, callout can't block */
	xpc_notify_senders_of_disconnect(ch);		xpc_arch_ops.notify_senders_of_disconnect(ch);
	}		}

	/* both sides are disconnected now */		/* both sides are disconnected now */
	@@ -136,7 +136,7 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)
	DBUG_ON(atomic_read(&ch->n_to_notify) != 0);		DBUG_ON(atomic_read(&ch->n_to_notify) != 0);

	/* it's now safe to free the channel's message queues */		/* it's now safe to free the channel's message queues */
	xpc_teardown_msg_structures(ch);		xpc_arch_ops.teardown_msg_structures(ch);

	ch->func = NULL;		ch->func = NULL;
	ch->key = NULL;		ch->key = NULL;
	@@ -148,8 +148,9 @@ xpc_process_disconnect(struct xpc_channel ch, unsigned long irq_flags)

	/*		/*
	* Mark the channel disconnected and clear all other flags, including		* Mark the channel disconnected and clear all other flags, including
	* XPC_C_SETUP (because of call to xpc_teardown_msg_structures()) but		* XPC_C_SETUP (because of call to
	* not including XPC_C_WDISCONNECT (if it was set).		* xpc_arch_ops.teardown_msg_structures()) but not including
			* XPC_C_WDISCONNECT (if it was set).
	*/		*/
	ch->flags = (XPC_C_DISCONNECTED \| (ch->flags & XPC_C_WDISCONNECT));		ch->flags = (XPC_C_DISCONNECTED \| (ch->flags & XPC_C_WDISCONNECT));

	@@ -395,7 +396,8 @@ xpc_process_openclose_chctl_flags(struct xpc_partition *part, int ch_number,
	DBUG_ON(args->local_nentries == 0);		DBUG_ON(args->local_nentries == 0);
	DBUG_ON(args->remote_nentries == 0);		DBUG_ON(args->remote_nentries == 0);

	ret = xpc_save_remote_msgqueue_pa(ch, args->local_msgqueue_pa);		ret = xpc_arch_ops.save_remote_msgqueue_pa(ch,
			args->local_msgqueue_pa);
	if (ret != xpSuccess) {		if (ret != xpSuccess) {
	XPC_DISCONNECT_CHANNEL(ch, ret, &irq_flags);		XPC_DISCONNECT_CHANNEL(ch, ret, &irq_flags);
	goto out;		goto out;
	@@ -531,7 +533,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_send_chctl_openrequest(ch, &irq_flags);		xpc_arch_ops.send_chctl_openrequest(ch, &irq_flags);

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

	@@ -549,7 +551,7 @@ xpc_process_sent_chctl_flags(struct xpc_partition *part)
	int ch_number;		int ch_number;
	u32 ch_flags;		u32 ch_flags;

	chctl.all_flags = xpc_get_chctl_all_flags(part);		chctl.all_flags = xpc_arch_ops.get_chctl_all_flags(part);

	/*		/*
	* Initiate channel connections for registered channels.		* Initiate channel connections for registered channels.
	@@ -598,7 +600,7 @@ xpc_process_sent_chctl_flags(struct xpc_partition *part)
	*/		*/

	if (chctl.flags[ch_number] & XPC_MSG_CHCTL_FLAGS)		if (chctl.flags[ch_number] & XPC_MSG_CHCTL_FLAGS)
	xpc_process_msg_chctl_flags(part, ch_number);		xpc_arch_ops.process_msg_chctl_flags(part, ch_number);
	}		}
	}		}

	@@ -774,7 +776,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_send_chctl_closerequest(ch, irq_flags);		xpc_arch_ops.send_chctl_closerequest(ch, irq_flags);

	if (channel_was_connected)		if (channel_was_connected)
	ch->flags \|= XPC_C_WASCONNECTED;		ch->flags \|= XPC_C_WASCONNECTED;
	@@ -881,8 +883,8 @@ xpc_initiate_send(short partid, int ch_number, u32 flags, void *payload,
	DBUG_ON(payload == NULL);		DBUG_ON(payload == NULL);

	if (xpc_part_ref(part)) {		if (xpc_part_ref(part)) {
	ret = xpc_send_payload(&part->channels[ch_number], flags,		ret = xpc_arch_ops.send_payload(&part->channels[ch_number],
	payload, payload_size, 0, NULL, NULL);		flags, payload, payload_size, 0, NULL, NULL);
	xpc_part_deref(part);		xpc_part_deref(part);
	}		}

	@@ -933,9 +935,8 @@ xpc_initiate_send_notify(short partid, int ch_number, u32 flags, void *payload,
	DBUG_ON(func == NULL);		DBUG_ON(func == NULL);

	if (xpc_part_ref(part)) {		if (xpc_part_ref(part)) {
	ret = xpc_send_payload(&part->channels[ch_number], flags,		ret = xpc_arch_ops.send_payload(&part->channels[ch_number],
	payload, payload_size, XPC_N_CALL, func,		flags, payload, payload_size, XPC_N_CALL, func, key);
	key);
	xpc_part_deref(part);		xpc_part_deref(part);
	}		}
	return ret;		return ret;
	@@ -949,7 +950,7 @@ xpc_deliver_payload(struct xpc_channel *ch)
	{		{
	void *payload;		void *payload;

	payload = xpc_get_deliverable_payload(ch);		payload = xpc_arch_ops.get_deliverable_payload(ch);
	if (payload != NULL) {		if (payload != NULL) {

	/*		/*
	@@ -1003,7 +1004,7 @@ xpc_initiate_received(short partid, int ch_number, void *payload)
	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];
	xpc_received_payload(ch, payload);		xpc_arch_ops.received_payload(ch, payload);

	/* the call to xpc_msgqueue_ref() was done by xpc_deliver_payload() */		/* the call to xpc_msgqueue_ref() was done by xpc_deliver_payload() */
	xpc_msgqueue_deref(ch);		xpc_msgqueue_deref(ch);

drivers/misc/sgi-xp/xpc_main.c

+38 −92

Original line number	Original line	Diff line number	Diff line
	@@ -169,68 +169,7 @@ static struct notifier_block xpc_die_notifier = {
	.notifier_call = xpc_system_die,		.notifier_call = xpc_system_die,
	};		};

	int (*xpc_setup_partitions_sn) (void);		struct xpc_arch_operations xpc_arch_ops;
	void (*xpc_teardown_partitions_sn) (void);
	enum xp_retval (xpc_get_partition_rsvd_page_pa) (void buf, u64 *cookie,
	unsigned long *rp_pa,
	size_t *len);
	int (xpc_setup_rsvd_page_sn) (struct xpc_rsvd_page rp);

	void (*xpc_allow_hb) (short partid);
	void (*xpc_disallow_hb) (short partid);
	void (*xpc_disallow_all_hbs) (void);
	void (*xpc_heartbeat_init) (void);
	void (*xpc_heartbeat_exit) (void);
	void (*xpc_increment_heartbeat) (void);
	void (*xpc_offline_heartbeat) (void);
	void (*xpc_online_heartbeat) (void);
	enum xp_retval (xpc_get_remote_heartbeat) (struct xpc_partition part);

	enum xp_retval (xpc_make_first_contact) (struct xpc_partition part);
	void (xpc_notify_senders_of_disconnect) (struct xpc_channel ch);
	u64 (xpc_get_chctl_all_flags) (struct xpc_partition part);
	enum xp_retval (xpc_setup_msg_structures) (struct xpc_channel ch);
	void (xpc_teardown_msg_structures) (struct xpc_channel ch);
	void (xpc_process_msg_chctl_flags) (struct xpc_partition part, int ch_number);
	int (xpc_n_of_deliverable_payloads) (struct xpc_channel ch);
	void (xpc_get_deliverable_payload) (struct xpc_channel *ch);

	void (xpc_request_partition_activation) (struct xpc_rsvd_page remote_rp,
	unsigned long remote_rp_pa,
	int nasid);
	void (xpc_request_partition_reactivation) (struct xpc_partition part);
	void (xpc_request_partition_deactivation) (struct xpc_partition part);
	void (xpc_cancel_partition_deactivation_request) (struct xpc_partition part);

	void (*xpc_process_activate_IRQ_rcvd) (void);
	enum xp_retval (xpc_setup_ch_structures_sn) (struct xpc_partition part);
	void (xpc_teardown_ch_structures_sn) (struct xpc_partition part);

	void (xpc_indicate_partition_engaged) (struct xpc_partition part);
	int (*xpc_partition_engaged) (short partid);
	int (*xpc_any_partition_engaged) (void);
	void (xpc_indicate_partition_disengaged) (struct xpc_partition part);
	void (*xpc_assume_partition_disengaged) (short partid);

	void (xpc_send_chctl_closerequest) (struct xpc_channel ch,
	unsigned long *irq_flags);
	void (xpc_send_chctl_closereply) (struct xpc_channel ch,
	unsigned long *irq_flags);
	void (xpc_send_chctl_openrequest) (struct xpc_channel ch,
	unsigned long *irq_flags);
	void (xpc_send_chctl_openreply) (struct xpc_channel ch,
	unsigned long *irq_flags);
	void (xpc_send_chctl_opencomplete) (struct xpc_channel ch,
	unsigned long *irq_flags);

	enum xp_retval (xpc_save_remote_msgqueue_pa) (struct xpc_channel ch,
	unsigned long msgqueue_pa);

	enum xp_retval (xpc_send_payload) (struct xpc_channel ch, u32 flags,
	void *payload, u16 payload_size,
	u8 notify_type, xpc_notify_func func,
	void *key);
	void (xpc_received_payload) (struct xpc_channel ch, void *payload);

	/*		/*
	* Timer function to enforce the timelimit on the partition disengage.		* Timer function to enforce the timelimit on the partition disengage.
	@@ -245,7 +184,7 @@ xpc_timeout_partition_disengage(unsigned long data)
	(void)xpc_partition_disengaged(part);		(void)xpc_partition_disengaged(part);

	DBUG_ON(part->disengage_timeout != 0);		DBUG_ON(part->disengage_timeout != 0);
	DBUG_ON(xpc_partition_engaged(XPC_PARTID(part)));		DBUG_ON(xpc_arch_ops.partition_engaged(XPC_PARTID(part)));
	}		}

	/*		/*
	@@ -256,7 +195,7 @@ xpc_timeout_partition_disengage(unsigned long data)
	static void		static void
	xpc_hb_beater(unsigned long dummy)		xpc_hb_beater(unsigned long dummy)
	{		{
	xpc_increment_heartbeat();		xpc_arch_ops.increment_heartbeat();

	if (time_is_before_eq_jiffies(xpc_hb_check_timeout))		if (time_is_before_eq_jiffies(xpc_hb_check_timeout))
	wake_up_interruptible(&xpc_activate_IRQ_wq);		wake_up_interruptible(&xpc_activate_IRQ_wq);
	@@ -268,7 +207,7 @@ xpc_hb_beater(unsigned long dummy)
	static void		static void
	xpc_start_hb_beater(void)		xpc_start_hb_beater(void)
	{		{
	xpc_heartbeat_init();		xpc_arch_ops.heartbeat_init();
	init_timer(&xpc_hb_timer);		init_timer(&xpc_hb_timer);
	xpc_hb_timer.function = xpc_hb_beater;		xpc_hb_timer.function = xpc_hb_beater;
	xpc_hb_beater(0);		xpc_hb_beater(0);
	@@ -278,7 +217,7 @@ static void
	xpc_stop_hb_beater(void)		xpc_stop_hb_beater(void)
	{		{
	del_timer_sync(&xpc_hb_timer);		del_timer_sync(&xpc_hb_timer);
	xpc_heartbeat_exit();		xpc_arch_ops.heartbeat_exit();
	}		}

	/*		/*
	@@ -307,7 +246,7 @@ xpc_check_remote_hb(void)
	continue;		continue;
	}		}

	ret = xpc_get_remote_heartbeat(part);		ret = xpc_arch_ops.get_remote_heartbeat(part);
	if (ret != xpSuccess)		if (ret != xpSuccess)
	XPC_DEACTIVATE_PARTITION(part, ret);		XPC_DEACTIVATE_PARTITION(part, ret);
	}		}
	@@ -358,7 +297,7 @@ xpc_hb_checker(void *ignore)
	force_IRQ = 0;		force_IRQ = 0;
	dev_dbg(xpc_part, "processing activate IRQs "		dev_dbg(xpc_part, "processing activate IRQs "
	"received\n");		"received\n");
	xpc_process_activate_IRQ_rcvd();		xpc_arch_ops.process_activate_IRQ_rcvd();
	}		}

	/* wait for IRQ or timeout */		/* wait for IRQ or timeout */
	@@ -533,7 +472,7 @@ xpc_setup_ch_structures(struct xpc_partition *part)
	init_waitqueue_head(&ch->idle_wq);		init_waitqueue_head(&ch->idle_wq);
	}		}

	ret = xpc_setup_ch_structures_sn(part);		ret = xpc_arch_ops.setup_ch_structures(part);
	if (ret != xpSuccess)		if (ret != xpSuccess)
	goto out_2;		goto out_2;

	@@ -577,7 +516,7 @@ xpc_teardown_ch_structures(struct xpc_partition *part)

	/* now we can begin tearing down the infrastructure */		/* now we can begin tearing down the infrastructure */

	xpc_teardown_ch_structures_sn(part);		xpc_arch_ops.teardown_ch_structures(part);

	kfree(part->remote_openclose_args_base);		kfree(part->remote_openclose_args_base);
	part->remote_openclose_args = NULL;		part->remote_openclose_args = NULL;
	@@ -625,12 +564,12 @@ xpc_activating(void *__partid)

	dev_dbg(xpc_part, "activating partition %d\n", partid);		dev_dbg(xpc_part, "activating partition %d\n", partid);

	xpc_allow_hb(partid);		xpc_arch_ops.allow_hb(partid);

	if (xpc_setup_ch_structures(part) == xpSuccess) {		if (xpc_setup_ch_structures(part) == xpSuccess) {
	(void)xpc_part_ref(part); /* this will always succeed */		(void)xpc_part_ref(part); /* this will always succeed */

	if (xpc_make_first_contact(part) == xpSuccess) {		if (xpc_arch_ops.make_first_contact(part) == xpSuccess) {
	xpc_mark_partition_active(part);		xpc_mark_partition_active(part);
	xpc_channel_mgr(part);		xpc_channel_mgr(part);
	/* won't return until partition is deactivating */		/* won't return until partition is deactivating */
	@@ -640,12 +579,12 @@ xpc_activating(void *__partid)
	xpc_teardown_ch_structures(part);		xpc_teardown_ch_structures(part);
	}		}

	xpc_disallow_hb(partid);		xpc_arch_ops.disallow_hb(partid);
	xpc_mark_partition_inactive(part);		xpc_mark_partition_inactive(part);

	if (part->reason == xpReactivating) {		if (part->reason == xpReactivating) {
	/* interrupting ourselves results in activating partition */		/* interrupting ourselves results in activating partition */
	xpc_request_partition_reactivation(part);		xpc_arch_ops.request_partition_reactivation(part);
	}		}

	return 0;		return 0;
	@@ -718,10 +657,13 @@ xpc_activate_kthreads(struct xpc_channel *ch, int needed)
	static void		static void
	xpc_kthread_waitmsgs(struct xpc_partition part, struct xpc_channel ch)		xpc_kthread_waitmsgs(struct xpc_partition part, struct xpc_channel ch)
	{		{
			int (n_of_deliverable_payloads) (struct xpc_channel ) =
			xpc_arch_ops.n_of_deliverable_payloads;

	do {		do {
	/* deliver messages to their intended recipients */		/* deliver messages to their intended recipients */

	while (xpc_n_of_deliverable_payloads(ch) > 0 &&		while (n_of_deliverable_payloads(ch) > 0 &&
	!(ch->flags & XPC_C_DISCONNECTING)) {		!(ch->flags & XPC_C_DISCONNECTING)) {
	xpc_deliver_payload(ch);		xpc_deliver_payload(ch);
	}		}
	@@ -737,7 +679,7 @@ xpc_kthread_waitmsgs(struct xpc_partition part, struct xpc_channel ch)
	"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,
	(xpc_n_of_deliverable_payloads(ch) > 0 \|\|		(n_of_deliverable_payloads(ch) > 0 \|\|
	(ch->flags & XPC_C_DISCONNECTING)));		(ch->flags & XPC_C_DISCONNECTING)));

	atomic_dec(&ch->kthreads_idle);		atomic_dec(&ch->kthreads_idle);
	@@ -754,6 +696,8 @@ xpc_kthread_start(void *args)
	struct xpc_channel *ch;		struct xpc_channel *ch;
	int n_needed;		int n_needed;
	unsigned long irq_flags;		unsigned long irq_flags;
			int (n_of_deliverable_payloads) (struct xpc_channel ) =
			xpc_arch_ops.n_of_deliverable_payloads;

	dev_dbg(xpc_chan, "kthread starting, partid=%d, channel=%d\n",		dev_dbg(xpc_chan, "kthread starting, partid=%d, channel=%d\n",
	partid, ch_number);		partid, ch_number);
	@@ -782,7 +726,7 @@ xpc_kthread_start(void *args)
	* additional kthreads to help deliver them. We only		* additional kthreads to help deliver them. We only
	* need one less than total #of messages to deliver.		* need one less than total #of messages to deliver.
	*/		*/
	n_needed = xpc_n_of_deliverable_payloads(ch) - 1;		n_needed = n_of_deliverable_payloads(ch) - 1;
	if (n_needed > 0 && !(ch->flags & XPC_C_DISCONNECTING))		if (n_needed > 0 && !(ch->flags & XPC_C_DISCONNECTING))
	xpc_activate_kthreads(ch, n_needed);		xpc_activate_kthreads(ch, n_needed);

	@@ -810,7 +754,7 @@ xpc_kthread_start(void *args)

	if (atomic_dec_return(&ch->kthreads_assigned) == 0 &&		if (atomic_dec_return(&ch->kthreads_assigned) == 0 &&
	atomic_dec_return(&part->nchannels_engaged) == 0) {		atomic_dec_return(&part->nchannels_engaged) == 0) {
	xpc_indicate_partition_disengaged(part);		xpc_arch_ops.indicate_partition_disengaged(part);
	}		}

	xpc_msgqueue_deref(ch);		xpc_msgqueue_deref(ch);
	@@ -842,6 +786,8 @@ 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];
	struct task_struct *kthread;		struct task_struct *kthread;
			void (indicate_partition_disengaged) (struct xpc_partition ) =
			xpc_arch_ops.indicate_partition_disengaged;

	while (needed-- > 0) {		while (needed-- > 0) {

	@@ -863,7 +809,7 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,

	} else if (atomic_inc_return(&ch->kthreads_assigned) == 1 &&		} else if (atomic_inc_return(&ch->kthreads_assigned) == 1 &&
	atomic_inc_return(&part->nchannels_engaged) == 1) {		atomic_inc_return(&part->nchannels_engaged) == 1) {
	xpc_indicate_partition_engaged(part);		xpc_arch_ops.indicate_partition_engaged(part);
	}		}
	(void)xpc_part_ref(part);		(void)xpc_part_ref(part);
	xpc_msgqueue_ref(ch);		xpc_msgqueue_ref(ch);
	@@ -885,7 +831,7 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed,

	if (atomic_dec_return(&ch->kthreads_assigned) == 0 &&		if (atomic_dec_return(&ch->kthreads_assigned) == 0 &&
	atomic_dec_return(&part->nchannels_engaged) == 0) {		atomic_dec_return(&part->nchannels_engaged) == 0) {
	xpc_indicate_partition_disengaged(part);		indicate_partition_disengaged(part);
	}		}
	xpc_msgqueue_deref(ch);		xpc_msgqueue_deref(ch);
	xpc_part_deref(part);		xpc_part_deref(part);
	@@ -998,13 +944,13 @@ xpc_setup_partitions(void)
	atomic_set(&part->references, 0);		atomic_set(&part->references, 0);
	}		}

	return xpc_setup_partitions_sn();		return xpc_arch_ops.setup_partitions();
	}		}

	static void		static void
	xpc_teardown_partitions(void)		xpc_teardown_partitions(void)
	{		{
	xpc_teardown_partitions_sn();		xpc_arch_ops.teardown_partitions();
	kfree(xpc_partitions);		kfree(xpc_partitions);
	}		}

	@@ -1060,7 +1006,7 @@ xpc_do_exit(enum xp_retval reason)
	disengage_timeout = part->disengage_timeout;		disengage_timeout = part->disengage_timeout;
	}		}

	if (xpc_any_partition_engaged()) {		if (xpc_arch_ops.any_partition_engaged()) {
	if (time_is_before_jiffies(printmsg_time)) {		if (time_is_before_jiffies(printmsg_time)) {
	dev_info(xpc_part, "waiting for remote "		dev_info(xpc_part, "waiting for remote "
	"partitions to deactivate, timeout in "		"partitions to deactivate, timeout in "
	@@ -1091,7 +1037,7 @@ xpc_do_exit(enum xp_retval reason)

	} while (1);		} while (1);

	DBUG_ON(xpc_any_partition_engaged());		DBUG_ON(xpc_arch_ops.any_partition_engaged());

	xpc_teardown_rsvd_page();		xpc_teardown_rsvd_page();

	@@ -1156,15 +1102,15 @@ xpc_die_deactivate(void)
	/* 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;

	xpc_disallow_all_hbs(); /indicate we're deactivated /		xpc_arch_ops.disallow_all_hbs(); /indicate we're deactivated /

	for (partid = 0; partid < xp_max_npartitions; partid++) {		for (partid = 0; partid < xp_max_npartitions; partid++) {
	part = &xpc_partitions[partid];		part = &xpc_partitions[partid];

	if (xpc_partition_engaged(partid) \|\|		if (xpc_arch_ops.partition_engaged(partid) \|\|
	part->act_state != XPC_P_AS_INACTIVE) {		part->act_state != XPC_P_AS_INACTIVE) {
	xpc_request_partition_deactivation(part);		xpc_arch_ops.request_partition_deactivation(part);
	xpc_indicate_partition_disengaged(part);		xpc_arch_ops.indicate_partition_disengaged(part);
	}		}
	}		}

	@@ -1181,7 +1127,7 @@ xpc_die_deactivate(void)
	wait_to_print = XPC_DEACTIVATE_PRINTMSG_INTERVAL * 1000 * 5;		wait_to_print = XPC_DEACTIVATE_PRINTMSG_INTERVAL * 1000 * 5;

	while (1) {		while (1) {
	any_engaged = xpc_any_partition_engaged();		any_engaged = xpc_arch_ops.any_partition_engaged();
	if (!any_engaged) {		if (!any_engaged) {
	dev_info(xpc_part, "all partitions have deactivated\n");		dev_info(xpc_part, "all partitions have deactivated\n");
	break;		break;
	@@ -1190,7 +1136,7 @@ xpc_die_deactivate(void)
	if (!keep_waiting--) {		if (!keep_waiting--) {
	for (partid = 0; partid < xp_max_npartitions;		for (partid = 0; partid < xp_max_npartitions;
	partid++) {		partid++) {
	if (xpc_partition_engaged(partid)) {		if (xpc_arch_ops.partition_engaged(partid)) {
	dev_info(xpc_part, "deactivate from "		dev_info(xpc_part, "deactivate from "
	"remote partition %d timed "		"remote partition %d timed "
	"out\n", partid);		"out\n", partid);
	@@ -1237,7 +1183,7 @@ xpc_system_die(struct notifier_block nb, unsigned long event, void unused)
	/* fall through */		/* fall through */
	case DIE_MCA_MONARCH_ENTER:		case DIE_MCA_MONARCH_ENTER:
	case DIE_INIT_MONARCH_ENTER:		case DIE_INIT_MONARCH_ENTER:
	xpc_offline_heartbeat();		xpc_arch_ops.offline_heartbeat();
	break;		break;

	case DIE_KDEBUG_LEAVE:		case DIE_KDEBUG_LEAVE:
	@@ -1248,7 +1194,7 @@ xpc_system_die(struct notifier_block nb, unsigned long event, void unused)
	/* fall through */		/* fall through */
	case DIE_MCA_MONARCH_LEAVE:		case DIE_MCA_MONARCH_LEAVE:
	case DIE_INIT_MONARCH_LEAVE:		case DIE_INIT_MONARCH_LEAVE:
	xpc_online_heartbeat();		xpc_arch_ops.online_heartbeat();
	break;		break;
	}		}
	#else		#else

drivers/misc/sgi-xp/xpc_partition.c

+11 −9

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,9 @@ xpc_get_rsvd_page_pa(int nasid)
	size_t buf_len = 0;		size_t buf_len = 0;
	void *buf = buf;		void *buf = buf;
	void *buf_base = NULL;		void *buf_base = NULL;
			enum xp_retval (*get_partition_rsvd_page_pa)
			(void , u64 , unsigned long , size_t ) =
			xpc_arch_ops.get_partition_rsvd_page_pa;

	while (1) {		while (1) {

	@@ -79,8 +82,7 @@ xpc_get_rsvd_page_pa(int nasid)
	* ??? function or have two versions? Rename rp_pa for UV to		* ??? function or have two versions? Rename rp_pa for UV to
	* ??? rp_gpa?		* ??? rp_gpa?
	*/		*/
	ret = xpc_get_partition_rsvd_page_pa(buf, &cookie, &rp_pa,		ret = get_partition_rsvd_page_pa(buf, &cookie, &rp_pa, &len);
	&len);

	dev_dbg(xpc_part, "SAL returned with ret=%d, cookie=0x%016lx, "		dev_dbg(xpc_part, "SAL returned with ret=%d, cookie=0x%016lx, "
	"address=0x%016lx, len=0x%016lx\n", ret,		"address=0x%016lx, len=0x%016lx\n", ret,
	@@ -172,7 +174,7 @@ xpc_setup_rsvd_page(void)
	xpc_part_nasids = XPC_RP_PART_NASIDS(rp);		xpc_part_nasids = XPC_RP_PART_NASIDS(rp);
	xpc_mach_nasids = XPC_RP_MACH_NASIDS(rp);		xpc_mach_nasids = XPC_RP_MACH_NASIDS(rp);

	ret = xpc_setup_rsvd_page_sn(rp);		ret = xpc_arch_ops.setup_rsvd_page(rp);
	if (ret != 0)		if (ret != 0)
	return ret;		return ret;

	@@ -264,7 +266,7 @@ 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(partid);		disengaged = !xpc_arch_ops.partition_engaged(partid);
	if (part->disengage_timeout) {		if (part->disengage_timeout) {
	if (!disengaged) {		if (!disengaged) {
	if (time_is_after_jiffies(part->disengage_timeout)) {		if (time_is_after_jiffies(part->disengage_timeout)) {
	@@ -280,7 +282,7 @@ xpc_partition_disengaged(struct xpc_partition *part)
	dev_info(xpc_part, "deactivate request to remote "		dev_info(xpc_part, "deactivate request to remote "
	"partition %d timed out\n", partid);		"partition %d timed out\n", partid);
	xpc_disengage_timedout = 1;		xpc_disengage_timedout = 1;
	xpc_assume_partition_disengaged(partid);		xpc_arch_ops.assume_partition_disengaged(partid);
	disengaged = 1;		disengaged = 1;
	}		}
	part->disengage_timeout = 0;		part->disengage_timeout = 0;
	@@ -294,7 +296,7 @@ xpc_partition_disengaged(struct xpc_partition *part)
	if (part->act_state != XPC_P_AS_INACTIVE)		if (part->act_state != XPC_P_AS_INACTIVE)
	xpc_wakeup_channel_mgr(part);		xpc_wakeup_channel_mgr(part);

	xpc_cancel_partition_deactivation_request(part);		xpc_arch_ops.cancel_partition_deactivation_request(part);
	}		}
	return disengaged;		return disengaged;
	}		}
	@@ -339,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_request_partition_reactivation(part);		xpc_arch_ops.request_partition_reactivation(part);
	}		}
	return;		return;
	}		}
	@@ -358,7 +360,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);

	/* ask remote partition to deactivate with regard to us */		/* ask remote partition to deactivate with regard to us */
	xpc_request_partition_deactivation(part);		xpc_arch_ops.request_partition_deactivation(part);

	/* set a timelimit on the disengage phase of the deactivation request */		/* set a timelimit on the disengage phase of the deactivation request */
	part->disengage_timeout = jiffies + (xpc_disengage_timelimit * HZ);		part->disengage_timeout = jiffies + (xpc_disengage_timelimit * HZ);
	@@ -496,7 +498,7 @@ xpc_discovery(void)
	continue;		continue;
	}		}

	xpc_request_partition_activation(remote_rp,		xpc_arch_ops.request_partition_activation(remote_rp,
	remote_rp_pa, nasid);		remote_rp_pa, nasid);
	}		}
	}		}

drivers/misc/sgi-xp/xpc_sn2.c

+63 −59

File changed.

Preview size limit exceeded, changes collapsed.