Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[S390] cio: idset use actual number of ssids 



The functions idset_sch_new and for_each_subchannel_staged
use different values for the number of subchannel sets. Make
it consistent by changing idset_sch_new to also use the actual
number of subchannel sets.

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

drivers/s390/cio/css.c

+13 −13
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


int css_init_done = 0;

static int need_reprobe = 0;

static int max_ssid = 0;

int max_ssid;



struct channel_subsystem *channel_subsystems[__MAX_CSSID + 1];
@@ -879,6 +879,18 @@ static int __init css_bus_init(void) 
	if (ret)

		goto out;



	/* Try to enable MSS. */

	ret = chsc_enable_facility(CHSC_SDA_OC_MSS);

	switch (ret) {

	case 0: /* Success. */

		max_ssid = __MAX_SSID;

		break;

	case -ENOMEM:

		goto out;

	default:

		max_ssid = 0;

	}



	ret = slow_subchannel_init();

	if (ret)

		goto out;
@@ -890,17 +902,6 @@ static int __init css_bus_init(void) 
	if ((ret = bus_register(&css_bus_type)))

		goto out;



	/* Try to enable MSS. */

	ret = chsc_enable_facility(CHSC_SDA_OC_MSS);

	switch (ret) {

	case 0: /* Success. */

		max_ssid = __MAX_SSID;

		break;

	case -ENOMEM:

		goto out_bus;

	default:

		max_ssid = 0;

	}

	/* Setup css structure. */

	for (i = 0; i <= __MAX_CSSID; i++) {

		struct channel_subsystem *css;
@@ -966,7 +967,6 @@ out_unregister: 
					   &dev_attr_cm_enable);

		device_unregister(&css->device);

	}

out_bus:

	bus_unregister(&css_bus_type);

out:

	crw_unregister_handler(CRW_RSC_CSS);

drivers/s390/cio/css.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ extern void css_sch_device_unregister(struct subchannel *); 
extern int css_probe_device(struct subchannel_id);

extern struct subchannel *get_subchannel_by_schid(struct subchannel_id);

extern int css_init_done;

extern int max_ssid;

int for_each_subchannel_staged(int (*fn_known)(struct subchannel *, void *),

			       int (*fn_unknown)(struct subchannel_id,

			       void *), void *data);

drivers/s390/cio/idset.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static inline int idset_get_first(struct idset *set, int *ssid, int *id) 


struct idset *idset_sch_new(void)

{

	return idset_new(__MAX_SSID + 1, __MAX_SUBCHANNEL + 1);

	return idset_new(max_ssid + 1, __MAX_SUBCHANNEL + 1);

}



void idset_sch_add(struct idset *set, struct subchannel_id schid)