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

Commit d0ff1f52 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

qeth: allow OSA CHPARM change in suspend state 



For OSA the CHPARM-definition determines the number of available
outbound queues.
A CHPARM-change may occur while a Linux system with probed
OSA device is in suspend state. This patch enables proper
resuming of an OSA device in this case.

Signed-off-by: default avatarUrsula braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b2e18f6

drivers/s390/net/qeth_core_main.c

+63 −41
Original line number Diff line number Diff line
@@ -988,15 +988,29 @@ static void qeth_get_channel_path_desc(struct qeth_card *card) 
	chp_dsc = (struct channelPath_dsc *)ccw_device_get_chp_desc(ccwdev, 0);

	if (chp_dsc != NULL) {

		/* CHPP field bit 6 == 1 -> single queue */

		if ((chp_dsc->chpp & 0x02) == 0x02)

		if ((chp_dsc->chpp & 0x02) == 0x02) {

			if ((atomic_read(&card->qdio.state) !=

				QETH_QDIO_UNINITIALIZED) &&

			    (card->qdio.no_out_queues == 4))

				/* change from 4 to 1 outbound queues */

				qeth_free_qdio_buffers(card);

			card->qdio.no_out_queues = 1;

		card->info.func_level = 0x4100 + chp_dsc->desc;

		kfree(chp_dsc);

	}

	if (card->qdio.no_out_queues == 1) {

		card->qdio.default_out_queue = 0;

			if (card->qdio.default_out_queue != 0)

				dev_info(&card->gdev->dev,

					"Priority Queueing not supported\n");

			card->qdio.default_out_queue = 0;

		} else {

			if ((atomic_read(&card->qdio.state) !=

				QETH_QDIO_UNINITIALIZED) &&

			    (card->qdio.no_out_queues == 1)) {

				/* change from 1 to 4 outbound queues */

				qeth_free_qdio_buffers(card);

				card->qdio.default_out_queue = 2;

			}

			card->qdio.no_out_queues = 4;

		}

		card->info.func_level = 0x4100 + chp_dsc->desc;

		kfree(chp_dsc);

	}

	QETH_DBF_TEXT_(SETUP, 2, "nr:%x", card->qdio.no_out_queues);

	QETH_DBF_TEXT_(SETUP, 2, "lvl:%02x", card->info.func_level);
@@ -3756,6 +3770,47 @@ static inline int qeth_get_qdio_q_format(struct qeth_card *card) 
	}

}



static void qeth_determine_capabilities(struct qeth_card *card)

{

	int rc;

	int length;

	char *prcd;

	struct ccw_device *ddev;

	int ddev_offline = 0;



	QETH_DBF_TEXT(SETUP, 2, "detcapab");

	ddev = CARD_DDEV(card);

	if (!ddev->online) {

		ddev_offline = 1;

		rc = ccw_device_set_online(ddev);

		if (rc) {

			QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);

			goto out;

		}

	}



	rc = qeth_read_conf_data(card, (void **) &prcd, &length);

	if (rc) {

		QETH_DBF_MESSAGE(2, "%s qeth_read_conf_data returned %i\n",

			dev_name(&card->gdev->dev), rc);

		QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);

		goto out_offline;

	}

	qeth_configure_unitaddr(card, prcd);

	qeth_configure_blkt_default(card, prcd);

	kfree(prcd);



	rc = qdio_get_ssqd_desc(ddev, &card->ssqd);

	if (rc)

		QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);



out_offline:

	if (ddev_offline == 1)

		ccw_device_set_offline(ddev);

out:

	return;

}



static int qeth_qdio_establish(struct qeth_card *card)

{

	struct qdio_initialize init_data;
@@ -3886,6 +3941,7 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 


	QETH_DBF_TEXT(SETUP, 2, "hrdsetup");

	atomic_set(&card->force_alloc_skb, 0);

	qeth_get_channel_path_desc(card);

retry:

	if (retries)

		QETH_DBF_MESSAGE(2, "%s Retrying to do IDX activates.\n",
@@ -3914,6 +3970,7 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 
		else

			goto retry;

	}

	qeth_determine_capabilities(card);

	qeth_init_tokens(card);

	qeth_init_func_level(card);

	rc = qeth_idx_activate_channel(&card->read, qeth_idx_read_cb);
@@ -4183,41 +4240,6 @@ void qeth_core_free_discipline(struct qeth_card *card) 
	card->discipline.ccwgdriver = NULL;

}



static void qeth_determine_capabilities(struct qeth_card *card)

{

	int rc;

	int length;

	char *prcd;



	QETH_DBF_TEXT(SETUP, 2, "detcapab");

	rc = ccw_device_set_online(CARD_DDEV(card));

	if (rc) {

		QETH_DBF_TEXT_(SETUP, 2, "3err%d", rc);

		goto out;

	}





	rc = qeth_read_conf_data(card, (void **) &prcd, &length);

	if (rc) {

		QETH_DBF_MESSAGE(2, "%s qeth_read_conf_data returned %i\n",

			dev_name(&card->gdev->dev), rc);

		QETH_DBF_TEXT_(SETUP, 2, "5err%d", rc);

		goto out_offline;

	}

	qeth_configure_unitaddr(card, prcd);

	qeth_configure_blkt_default(card, prcd);

	kfree(prcd);



	rc = qdio_get_ssqd_desc(CARD_DDEV(card), &card->ssqd);

	if (rc)

		QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);



out_offline:

	ccw_device_set_offline(CARD_DDEV(card));

out:

	return;

}



static int qeth_core_probe_device(struct ccwgroup_device *gdev)

{

	struct qeth_card *card;