Commit c38a90a3 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

[S390] cio: update descriptor in chsc_chp_vary 



Update the channel path descriptor at the beginning of to the
vary_on operation.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 906c9768

drivers/s390/cio/chp.c

+0 −6
Original line number Diff line number Diff line
@@ -54,12 +54,6 @@ static struct work_struct cfg_work; 
/* Wait queue for configure completion events. */

static wait_queue_head_t cfg_wait_queue;



/* Return channel_path struct for given chpid. */

static inline struct channel_path *chpid_to_chp(struct chp_id chpid)

{

	return channel_subsystems[chpid.cssid]->chps[chpid.id];

}



/* Set vary state for given chpid. */

static void set_chp_logically_online(struct chp_id chpid, int onoff)

{

drivers/s390/cio/chp.h

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ struct channel_path { 
	void *cmg_chars;

};



/* Return channel_path struct for given chpid. */

static inline struct channel_path *chpid_to_chp(struct chp_id chpid)

{

	return channel_subsystems[chpid.cssid]->chps[chpid.id];

}



int chp_get_status(struct chp_id chpid);

u8 chp_get_sch_opm(struct subchannel *sch);

int chp_is_registered(struct chp_id chpid);

drivers/s390/cio/chsc.c

+5 −3
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ __s390_vary_chpid_on(struct subchannel_id schid, void *data) 
 */

int chsc_chp_vary(struct chp_id chpid, int on)

{

	struct channel_path *chp = chpid_to_chp(chpid);

	struct chp_link link;



	memset(&link, 0, sizeof(struct chp_link));
@@ -504,11 +505,12 @@ int chsc_chp_vary(struct chp_id chpid, int on) 
	/*

	 * Redo PathVerification on the devices the chpid connects to

	 */



	if (on)

	if (on) {

		/* Try to update the channel path descritor. */

		chsc_determine_base_channel_path_desc(chpid, &chp->desc);

		for_each_subchannel_staged(s390_subchannel_vary_chpid_on,

					   __s390_vary_chpid_on, &link);

	else

	} else

		for_each_subchannel_staged(s390_subchannel_vary_chpid_off,

					   NULL, &link);