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

Commit af039068 authored by Carsten Otte's avatar Carsten Otte Committed by David S. Miller
Browse files

qeth: Add new s390 debug feature for each qeth card 



This patch adds a debug area for each qeth card. This debug area will replace
various other debug areas that are global for all cards handled by the device
driver. On crash dump analysis this makes life easier when trying to find out
what's going on with an interface. Also, the forest of debug areas for this
device driver is significantly cleared up.

Signed-off-by: default avatarCarsten Otte <cotte@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 8e96c51c

drivers/s390/net/qeth_core.h

+13 −0
Original line number Diff line number Diff line
@@ -73,6 +73,18 @@ struct qeth_dbf_info { 
#define QETH_DBF_TEXT_(name, level, text...) \

	qeth_dbf_longtext(qeth_dbf[QETH_DBF_##name].id, level, text)



#define QETH_CARD_TEXT(card, level, text) \

	debug_text_event(card->debug, level, text)



#define QETH_CARD_HEX(card, level, addr, len) \

	debug_event(card->debug, level, (void *)(addr), len)



#define QETH_CARD_MESSAGE(card, text...) \

	debug_sprintf_event(card->debug, level, text)



#define QETH_CARD_TEXT_(card, level, text...) \

	qeth_dbf_longtext(card->debug, level, text)



#define SENSE_COMMAND_REJECT_BYTE 0

#define SENSE_COMMAND_REJECT_FLAG 0x80

#define SENSE_RESETTING_EVENT_BYTE 1
@@ -738,6 +750,7 @@ struct qeth_card { 
	atomic_t force_alloc_skb;

	struct service_level qeth_service_level;

	struct qdio_ssqd_desc ssqd;

	debug_info_t *debug;

	struct mutex conf_mutex;

};

drivers/s390/net/qeth_core_main.c

+18 −3
Original line number Diff line number Diff line
@@ -4282,6 +4282,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) 
	struct device *dev;

	int rc;

	unsigned long flags;

	char dbf_name[20];



	QETH_DBF_TEXT(SETUP, 2, "probedev");
@@ -4297,6 +4298,17 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) 
		rc = -ENOMEM;

		goto err_dev;

	}



	snprintf(dbf_name, sizeof(dbf_name), "qeth_card_%s",

		dev_name(&gdev->dev));

	card->debug = debug_register(dbf_name, 2, 1, 8);

	if (!card->debug) {

		QETH_DBF_TEXT_(SETUP, 2, "%s", "qcdbf");

		rc = -ENOMEM;

		goto err_card;

	}

	debug_register_view(card->debug, &debug_hex_ascii_view);



	card->read.ccwdev  = gdev->cdev[0];

	card->write.ccwdev = gdev->cdev[1];

	card->data.ccwdev  = gdev->cdev[2];
@@ -4309,12 +4321,12 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) 
	rc = qeth_determine_card_type(card);

	if (rc) {

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

		goto err_card;

		goto err_dbf;

	}

	rc = qeth_setup_card(card);

	if (rc) {

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

		goto err_card;

		goto err_dbf;

	}



	if (card->info.type == QETH_CARD_TYPE_OSN)
@@ -4322,7 +4334,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) 
	else

		rc = qeth_core_create_device_attributes(dev);

	if (rc)

		goto err_card;

		goto err_dbf;

	switch (card->info.type) {

	case QETH_CARD_TYPE_OSN:

	case QETH_CARD_TYPE_OSM:
@@ -4352,6 +4364,8 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) 
		qeth_core_remove_osn_attributes(dev);

	else

		qeth_core_remove_device_attributes(dev);

err_dbf:

	debug_unregister(card->debug);

err_card:

	qeth_core_free_card(card);

err_dev:
@@ -4375,6 +4389,7 @@ static void qeth_core_remove_device(struct ccwgroup_device *gdev) 
	} else {

		qeth_core_remove_device_attributes(&gdev->dev);

	}

	debug_unregister(card->debug);

	write_lock_irqsave(&qeth_core_card_list.rwlock, flags);

	list_del(&card->list);

	write_unlock_irqrestore(&qeth_core_card_list.rwlock, flags);