From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gwenn =?ISO-8859-1?Q?Bourr=E9e?= Subject: [PATCH]: MUX n_gsm debug print improvements Date: Mon, 29 Jun 2015 17:54:58 +0200 Message-ID: <1435593298.25711.4.camel@tldlab125> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Sender: linux-kernel-owner@vger.kernel.org To: gregkh@linuxfoundation.org, jslaby@suse.cz Cc: linux-api@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-api@vger.kernel.org CkRlYXIga2VybmVsIHR0eSBtYWludGFpbmVycywKClBsZWFzZSByZXZpZXcgdGhlIGZvbGxvd2lu ZyBwYXRjaDoKCkZyb20gMGFjNWRhMGE0NjUzZjQzY2U0YjA3NjFhMmJlODA3MzE4NWM1NDliYiBN b24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKRnJvbTogR3dlbm4gQm91cnJlZSA8Z3dlbm4uYm91cnJl ZUBpbnRlbC5jb20+CkRhdGU6IE1vbiwgMjkgSnVuIDIwMTUgMTY6MDk6MDYgKzAyMDAKU3ViamVj dDogW1BBVENIXSBBZGQgRGVidWcgZGVmaW5lCgpJbXByb3ZlIHRoZSBkZWJ1ZyBwcmludCBvdXQg YW5kIG1ha2UgYmUgY2xlYXJlc3QKClNpZ25lZC1vZmYtYnk6IEd3ZW5uIEJvdXJyZWUgPGd3ZW5u LmJvdXJyZWVAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNdXN0YXBoYSBCZW4gWm91YmVpciA8 bXVzdGFwaGF4LmJlbi56b3ViZWlyQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTmljb2xhcyBM T1VJUyA8bmljb2xhc3gubG91aXNAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogUmF2aW5kcmFuLCBB cnVuIDxhcnVuLnJhdmluZHJhbkBpbnRlbC5jb20KCi0tLQogZHJpdmVycy90dHkvbl9nc20uYyB8 IDQ5CisrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL3R0eS9uX2dzbS5jIGIvZHJpdmVycy90dHkvbl9nc20uYwppbmRleCAzODJk M2ZjLi5kNmUwZWEwIDEwMDY0NAotLS0gYS9kcml2ZXJzL3R0eS9uX2dzbS5jCisrKyBiL2RyaXZl cnMvdHR5L25fZ3NtLmMKQEAgLTY2LDE3ICs2NiwxOCBAQAogc3RhdGljIGludCBkZWJ1ZzsKIG1v ZHVsZV9wYXJhbShkZWJ1ZywgaW50LCAwNjAwKTsKIAotLyogRGVmYXVsdHM6IHRoZXNlIGFyZSBm cm9tIHRoZSBzcGVjaWZpY2F0aW9uICovCisjZGVmaW5lIEdTTURCR19WRVJCT1NFX1BBQ0tFVF9S RVBPUlQoeCkgKCh4KSAmICAxKQorI2RlZmluZSBHU01EQkdfRk9SQ0VfQ0FSUklFUih4KSAgICAg ICAgICgoeCkgJiAgMikKKyNkZWZpbmUgR1NNREJHX0RBVEFfRlVMTF9SRVBPUlQoeCkgICAgICAo KHgpICYgIDQpCisjZGVmaW5lIEdTTURCR19ETENJX1NUUkVBTV9SRVBPUlQoeCkgICAgKCh4KSAm ICA4KQorI2RlZmluZSBHU01EQkdfRExDSV9EQVRBX1JFUE9SVCh4KSAgICAgICgoeCkgJiAxNikK KyNkZWZpbmUgR1NNREJHX0RBVEFfTEVOX1JFUE9SVCh4KSAgICAgICAoKHgpICYgMzIpCiAKLSNk ZWZpbmUgVDEJMTAJCS8qIDEwMG1TICovCi0jZGVmaW5lIFQyCTM0CQkvKiAzMzNtUyAqLwotI2Rl ZmluZSBOMgkzCQkvKiBSZXRyeSAzIHRpbWVzICovCisvKiBEZWZhdWx0czogdGhlc2UgYXJlIGZy b20gdGhlIHNwZWNpZmljYXRpb24gKi8KIAotLyogVXNlIGxvbmcgdGltZXJzIGZvciB0ZXN0aW5n IGF0IGxvdyBzcGVlZCB3aXRoIGRlYnVnIG9uICovCi0jaWZkZWYgREVCVUdfVElNSU5HCi0jZGVm aW5lIFQxCTEwMAotI2RlZmluZSBUMgkyMDAKLSNlbmRpZgorI2RlZmluZSBUMSAgICAgMTAgICAg ICAgICAgICAgIC8qIDEwMG1TICovCisjZGVmaW5lIFQyICAgICAzNCAgICAgICAgICAgICAgLyog MzMzbVMgKi8KKyNkZWZpbmUgTjIgICAgIDMgICAgICAgICAgICAgICAvKiBSZXRyeSAzIHRpbWVz ICovCiAKIC8qCiAgKiBTZW1pLWFyYml0cmFyeSBidWZmZXIgc2l6ZSBsaW1pdHMuIDA3MTAgaXMg bm9ybWFsbHkgcnVuIHdpdGggMzItNjQKYnl0ZQpAQCAtNDYxLDcgKzQ2Miw3IEBAIHN0YXRpYyB1 OCBnc21fZW5jb2RlX21vZGVtKGNvbnN0IHN0cnVjdCBnc21fZGxjaQoqZGxjaSkKIHN0YXRpYyB2 b2lkIGdzbV9wcmludF9wYWNrZXQoY29uc3QgY2hhciAqaGRyLCBpbnQgYWRkciwgaW50IGNyLAog CQkJCQl1OCBjb250cm9sLCBjb25zdCB1OCAqZGF0YSwgaW50IGRsZW4pCiB7Ci0JaWYgKCEoZGVi dWcgJiAxKSkKKwlpZiAoIUdTTURCR19WRVJCT1NFX1BBQ0tFVF9SRVBPUlQoZGVidWcpKQogCQly ZXR1cm47CiAKIAlwcl9pbmZvKCIlcyAlZCkgJWM6ICIsIGhkciwgYWRkciwgIlJDIltjcl0pOwpA QCAtNzAwLDcgKzcwMSw3IEBAIHN0YXRpYyB2b2lkIGdzbV9kYXRhX2tpY2soc3RydWN0IGdzbV9t dXggKmdzbSkKIAkJCWxlbiA9IG1zZy0+bGVuICsgMjsKIAkJfQogCi0JCWlmIChkZWJ1ZyAmIDQp CisJCWlmIChHU01EQkdfREFUQV9GVUxMX1JFUE9SVChkZWJ1ZykpCiAJCQlwcmludF9oZXhfZHVt cF9ieXRlcygiZ3NtX2RhdGFfa2ljazogIiwKIAkJCQkJICAgICBEVU1QX1BSRUZJWF9PRkZTRVQs CiAJCQkJCSAgICAgZ3NtLT50eGZyYW1lLCBsZW4pOwpAQCAtMTQyNiw3ICsxNDI3LDcgQEAgc3Rh dGljIGludCBnc21fY29udHJvbF93YWl0KHN0cnVjdCBnc21fbXV4ICpnc20sCnN0cnVjdCBnc21f Y29udHJvbCAqY29udHJvbCkKIHN0YXRpYyB2b2lkIGdzbV9kbGNpX2Nsb3NlKHN0cnVjdCBnc21f ZGxjaSAqZGxjaSkKIHsKIAlkZWxfdGltZXIoJmRsY2ktPnQxKTsKLQlpZiAoZGVidWcgJiA4KQor CWlmIChHU01EQkdfRExDSV9TVFJFQU1fUkVQT1JUKGRlYnVnKSkKIAkJcHJfZGVidWcoIkRMQ0kg JWQgZ29lcyBjbG9zZWQuXG4iLCBkbGNpLT5hZGRyKTsKIAlkbGNpLT5zdGF0ZSA9IERMQ0lfQ0xP U0VEOwogCWlmIChkbGNpLT5hZGRyICE9IDApIHsKQEAgLTE0NTMsNyArMTQ1NCw3IEBAIHN0YXRp YyB2b2lkIGdzbV9kbGNpX29wZW4oc3RydWN0IGdzbV9kbGNpICpkbGNpKQogCWRlbF90aW1lcigm ZGxjaS0+dDEpOwogCS8qIFRoaXMgd2lsbCBsZXQgYSB0dHkgb3BlbiBjb250aW51ZSAqLwogCWRs Y2ktPnN0YXRlID0gRExDSV9PUEVOOwotCWlmIChkZWJ1ZyAmIDgpCisJaWYgKEdTTURCR19ETENJ X1NUUkVBTV9SRVBPUlQoZGVidWcpKQogCQlwcl9kZWJ1ZygiRExDSSAlZCBnb2VzIG9wZW4uXG4i LCBkbGNpLT5hZGRyKTsKIAl3YWtlX3VwKCZkbGNpLT5nc20tPmV2ZW50KTsKIH0KQEAgLTE1NTYs OCArMTU1Nyw4IEBAIHN0YXRpYyB2b2lkIGdzbV9kbGNpX2RhdGEoc3RydWN0IGdzbV9kbGNpICpk bGNpLAp1OCAqZGF0YSwgaW50IGNsZW4pCiAJdW5zaWduZWQgaW50IG1vZGVtID0gMDsKIAlpbnQg bGVuID0gY2xlbjsKIAotCWlmIChkZWJ1ZyAmIDE2KQotCQlwcl9kZWJ1ZygiJWQgYnl0ZXMgZm9y IHR0eVxuIiwgbGVuKTsKKwlpZiAoR1NNREJHX0RMQ0lfREFUQV9SRVBPUlQoZGVidWcpKQorCQlw cl9kZWJ1ZygiJXM6ICVkIGJ5dGVzIGZvciB0dHlcbiIsIF9fZnVuY19fLCBsZW4pOwogCXN3aXRj aCAoZGxjaS0+YWRhcHRpb24pICB7CiAJLyogVW5zdXBwb3J0ZWQgdHlwZXMgKi8KIAkvKiBQYWNr ZXRpc2VkIGludGVycnVwdGlibGUgZGF0YSAqLwpAQCAtMTc1OCw3ICsxNzU5LDcgQEAgc3RhdGlj IHZvaWQgZ3NtX3F1ZXVlKHN0cnVjdCBnc21fbXV4ICpnc20pCiAJfQogCWlmIChnc20tPmZjcyAh PSBHT09EX0ZDUykgewogCQlnc20tPmJhZF9mY3MrKzsKLQkJaWYgKGRlYnVnICYgNCkKKwkJaWYg KEdTTURCR19EQVRBX0ZVTExfUkVQT1JUKGRlYnVnKSkKIAkJCXByX2RlYnVnKCJCQUQgRkNTICUw MnhcbiIsIGdzbS0+ZmNzKTsKIAkJcmV0dXJuOwogCX0KQEAgLTE5MjIsNiArMTkyMyw3IEBAIHN0 YXRpYyB2b2lkIGdzbTBfcmVjZWl2ZShzdHJ1Y3QgZ3NtX211eCAqZ3NtLAp1bnNpZ25lZCBjaGFy IGMpCiAJCQlnc20tPnN0YXRlID0gR1NNX1NFQVJDSDsKIAkJCWJyZWFrOwogCQl9CisJCXByX2Rl YnVnKCJ3YWl0IGZvciBHU00wX1NPRiwgd2hpbGUgZ290IDB4JXhcbiIsICh1MzIpYyk7CiAJCWJy ZWFrOwogCX0KIH0KQEAgLTIyMDksOSArMjIxMSwxMiBAQCBzdGF0aWMgaW50IGdzbWxkX291dHB1 dChzdHJ1Y3QgZ3NtX211eCAqZ3NtLCB1OAoqZGF0YSwgaW50IGxlbikKIAkJc2V0X2JpdChUVFlf RE9fV1JJVEVfV0FLRVVQLCAmZ3NtLT50dHktPmZsYWdzKTsKIAkJcmV0dXJuIC1FTk9TUEM7CiAJ fQotCWlmIChkZWJ1ZyAmIDQpCi0JCXByaW50X2hleF9kdW1wX2J5dGVzKCJnc21sZF9vdXRwdXQ6 ICIsIERVTVBfUFJFRklYX09GRlNFVCwKKwlpZiAoR1NNREJHX0RBVEFfRlVMTF9SRVBPUlQoZGVi dWcpKQorCQlwcmludF9oZXhfZHVtcF9ieXRlcyhfX2Z1bmNfXywgRFVNUF9QUkVGSVhfT0ZGU0VU LAogCQkJCSAgICAgZGF0YSwgbGVuKTsKKwllbHNlIGlmIChHU01EQkdfREFUQV9MRU5fUkVQT1JU KGRlYnVnKSkKKwkJcHJfZGVidWcoIm5fZ3NtOiA+PiAlZCBieXRlc1xuIiwgbGVuKTsKKwogCWdz bS0+dHR5LT5vcHMtPndyaXRlKGdzbS0+dHR5LCBkYXRhLCBsZW4pOwogCXJldHVybiBsZW47CiB9 CkBAIC0yMjc2LDkgKzIyODEsMTEgQEAgc3RhdGljIHZvaWQgZ3NtbGRfcmVjZWl2ZV9idWYoc3Ry dWN0IHR0eV9zdHJ1Y3QKKnR0eSwgY29uc3QgdW5zaWduZWQgY2hhciAqY3AsCiAJaW50IGk7CiAJ Y2hhciBmbGFncyA9IFRUWV9OT1JNQUw7CiAKLQlpZiAoZGVidWcgJiA0KQotCQlwcmludF9oZXhf ZHVtcF9ieXRlcygiZ3NtbGRfcmVjZWl2ZTogIiwgRFVNUF9QUkVGSVhfT0ZGU0VULAorCWlmIChH U01EQkdfREFUQV9GVUxMX1JFUE9SVChkZWJ1ZykpCisJCXByaW50X2hleF9kdW1wX2J5dGVzKF9f ZnVuY19fLCBEVU1QX1BSRUZJWF9PRkZTRVQsCiAJCQkJICAgICBjcCwgY291bnQpOworCWVsc2Ug aWYgKEdTTURCR19EQVRBX0xFTl9SRVBPUlQoZGVidWcpKQorCQlwcl9kZWJ1Zygibl9nc206IDw8 ICVkIGJ5dGVzXG4iLCBjb3VudCk7CiAKIAlmb3IgKGkgPSBjb3VudCwgZHAgPSBjcCwgZiA9IGZw OyBpOyBpLS0sIGRwKyspIHsKIAkJaWYgKGYpCkBAIC0yODcxLDcgKzI4NzgsNyBAQCBzdGF0aWMg aW50IGdzbV9jYXJyaWVyX3JhaXNlZChzdHJ1Y3QgdHR5X3BvcnQKKnBvcnQpCiAJLyogTm90IHll dCBvcGVuIHNvIG5vIGNhcnJpZXIgaW5mbyAqLwogCWlmIChkbGNpLT5zdGF0ZSAhPSBETENJX09Q RU4pCiAJCXJldHVybiAwOwotCWlmIChkZWJ1ZyAmIDIpCisJaWYgKEdTTURCR19GT1JDRV9DQVJS SUVSKGRlYnVnKSkKIAkJcmV0dXJuIDE7CiAJcmV0dXJuIGRsY2ktPm1vZGVtX3J4ICYgVElPQ01f Q0Q7CiB9CgoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCkludGVsIENvcnBvcmF0aW9uIFNBUyAoRnJlbmNoIHNpbXBs aWZpZWQgam9pbnQgc3RvY2sgY29tcGFueSkKUmVnaXN0ZXJlZCBoZWFkcXVhcnRlcnM6ICJMZXMg TW9udGFsZXRzIi0gMiwgcnVlIGRlIFBhcmlzLCAKOTIxOTYgTWV1ZG9uIENlZGV4LCBGcmFuY2UK UmVnaXN0cmF0aW9uIE51bWJlcjogIDMwMiA0NTYgMTk5IFIuQy5TLiBOQU5URVJSRQpDYXBpdGFs OiA0LDU3MiwwMDAgRXVyb3MKClRoaXMgZS1tYWlsIGFuZCBhbnkgYXR0YWNobWVudHMgbWF5IGNv bnRhaW4gY29uZmlkZW50aWFsIG1hdGVyaWFsIGZvcgp0aGUgc29sZSB1c2Ugb2YgdGhlIGludGVu ZGVkIHJlY2lwaWVudChzKS4gQW55IHJldmlldyBvciBkaXN0cmlidXRpb24KYnkgb3RoZXJzIGlz IHN0cmljdGx5IHByb2hpYml0ZWQuIElmIHlvdSBhcmUgbm90IHRoZSBpbnRlbmRlZApyZWNpcGll bnQsIHBsZWFzZSBjb250YWN0IHRoZSBzZW5kZXIgYW5kIGRlbGV0ZSBhbGwgY29waWVzLgo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817AbbF2P54 (ORCPT ); Mon, 29 Jun 2015 11:57:56 -0400 Received: from mga02.intel.com ([134.134.136.20]:13268 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752712AbbF2P5r (ORCPT ); Mon, 29 Jun 2015 11:57:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,699,1427785200"; d="scan'208";a="755227201" Message-ID: <1435593298.25711.4.camel@tldlab125> Subject: [PATCH]: MUX n_gsm debug print improvements From: Gwenn =?ISO-8859-1?Q?Bourr=E9e?= To: gregkh@linuxfoundation.org, jslaby@suse.cz Cc: linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 29 Jun 2015 17:54:58 +0200 X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id t5TFvxco006727 Dear kernel tty maintainers, Please review the following patch: >>From 0ac5da0a4653f43ce4b0761a2be8073185c549bb Mon Sep 17 00:00:00 2001 From: Gwenn Bourree Date: Mon, 29 Jun 2015 16:09:06 +0200 Subject: [PATCH] Add Debug define Improve the debug print out and make be clearest Signed-off-by: Gwenn Bourree Signed-off-by: Mustapha Ben Zoubeir Signed-off-by: Nicolas LOUIS Reviewed-by: Ravindran, Arun len + 2; } - if (debug & 4) + if (GSMDBG_DATA_FULL_REPORT(debug)) print_hex_dump_bytes("gsm_data_kick: ", DUMP_PREFIX_OFFSET, gsm->txframe, len); @@ -1426,7 +1427,7 @@ static int gsm_control_wait(struct gsm_mux *gsm, struct gsm_control *control) static void gsm_dlci_close(struct gsm_dlci *dlci) { del_timer(&dlci->t1); - if (debug & 8) + if (GSMDBG_DLCI_STREAM_REPORT(debug)) pr_debug("DLCI %d goes closed.\n", dlci->addr); dlci->state = DLCI_CLOSED; if (dlci->addr != 0) { @@ -1453,7 +1454,7 @@ static void gsm_dlci_open(struct gsm_dlci *dlci) del_timer(&dlci->t1); /* This will let a tty open continue */ dlci->state = DLCI_OPEN; - if (debug & 8) + if (GSMDBG_DLCI_STREAM_REPORT(debug)) pr_debug("DLCI %d goes open.\n", dlci->addr); wake_up(&dlci->gsm->event); } @@ -1556,8 +1557,8 @@ static void gsm_dlci_data(struct gsm_dlci *dlci, u8 *data, int clen) unsigned int modem = 0; int len = clen; - if (debug & 16) - pr_debug("%d bytes for tty\n", len); + if (GSMDBG_DLCI_DATA_REPORT(debug)) + pr_debug("%s: %d bytes for tty\n", __func__, len); switch (dlci->adaption) { /* Unsupported types */ /* Packetised interruptible data */ @@ -1758,7 +1759,7 @@ static void gsm_queue(struct gsm_mux *gsm) } if (gsm->fcs != GOOD_FCS) { gsm->bad_fcs++; - if (debug & 4) + if (GSMDBG_DATA_FULL_REPORT(debug)) pr_debug("BAD FCS %02x\n", gsm->fcs); return; } @@ -1922,6 +1923,7 @@ static void gsm0_receive(struct gsm_mux *gsm, unsigned char c) gsm->state = GSM_SEARCH; break; } + pr_debug("wait for GSM0_SOF, while got 0x%x\n", (u32)c); break; } } @@ -2209,9 +2211,12 @@ static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len) set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags); return -ENOSPC; } - if (debug & 4) - print_hex_dump_bytes("gsmld_output: ", DUMP_PREFIX_OFFSET, + if (GSMDBG_DATA_FULL_REPORT(debug)) + print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET, data, len); + else if (GSMDBG_DATA_LEN_REPORT(debug)) + pr_debug("n_gsm: >> %d bytes\n", len); + gsm->tty->ops->write(gsm->tty, data, len); return len; } @@ -2276,9 +2281,11 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp, int i; char flags = TTY_NORMAL; - if (debug & 4) - print_hex_dump_bytes("gsmld_receive: ", DUMP_PREFIX_OFFSET, + if (GSMDBG_DATA_FULL_REPORT(debug)) + print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET, cp, count); + else if (GSMDBG_DATA_LEN_REPORT(debug)) + pr_debug("n_gsm: << %d bytes\n", count); for (i = count, dp = cp, f = fp; i; i--, dp++) { if (f) @@ -2871,7 +2878,7 @@ static int gsm_carrier_raised(struct tty_port *port) /* Not yet open so no carrier info */ if (dlci->state != DLCI_OPEN) return 0; - if (debug & 2) + if (GSMDBG_FORCE_CARRIER(debug)) return 1; return dlci->modem_rx & TIOCM_CD; } --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I