From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 142EF898FA for ; Thu, 13 Jun 2019 13:06:48 +0000 (UTC) From: Oleg Vasilev Date: Thu, 13 Jun 2019 16:06:23 +0300 Message-Id: <20190613130623.5499-1-oleg.vasilev@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH v2] tests/i915_pm_rpm: improved strictness and verbosity of i2c subtest List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: VGVzdCBjaGVja2VkIHRoYXQgdGhlIG51bWJlciBvZiB2YWxpZCBlZGlkcyBmcm9tIGRybSBpcyBl cXVhbCB0byB0aGUKc2FtZSBudW1iZXIgZnJvbSBpMmMuCgpOb3cgZm9yIGVhY2ggZWRpZCB0aGUg d2hvbGUgYmxvYiBpcyBjb21wYXJlZC4gSW4gY2FzZSBvZiBtaXNtYXRjaCB0aGUKd2hvbGUgZWRp ZCBpcyBwcmludGVkLgoKdjI6CiAtIEltcHJvdmVkIG1lc3NhZ2VzIGluIG9yZGVyIHRvIHNldCB1 cCBDSSBmaWx0ZXIKIC0gTG9nIGFuZCBjbGVhciBlcnJubyBpbiBjYXNlIG9mIGkyYyBmYWlsdXJl CgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA0MDk3CkNjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogQXJrYWRpdXN6IEhpbGVy IDxhcmthZGl1c3ouaGlsZXJAaW50ZWwuY29tPgpDYzogTWFydGluIFBlcmVzIDxtYXJ0aW4ucGVy ZXNAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBPbGVnIFZhc2lsZXYgPG9sZWcudmFz aWxldkBpbnRlbC5jb20+Ci0tLQogdGVzdHMvaTkxNS9pOTE1X3BtX3JwbS5jIHwgMTgwICsrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDExMiBp bnNlcnRpb25zKCspLCA2OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9pOTE1L2k5 MTVfcG1fcnBtLmMgYi90ZXN0cy9pOTE1L2k5MTVfcG1fcnBtLmMKaW5kZXggZjlmNjdlZDMuLjg3 MTQwZTMwIDEwMDY0NAotLS0gYS90ZXN0cy9pOTE1L2k5MTVfcG1fcnBtLmMKKysrIGIvdGVzdHMv aTkxNS9pOTE1X3BtX3JwbS5jCkBAIC01NzIsMzMgKzU3Miw1NSBAQCBzdGF0aWMgdm9pZCBhc3Nl cnRfZHJtX2luZm9zX2VxdWFsKHN0cnVjdCBjb21wYXJlX2RhdGEgKmQxLAogCQlhc3NlcnRfZHJt X2NydGNzX2VxdWFsKGQxLT5jcnRjc1tpXSwgZDItPmNydGNzW2ldKTsKIH0KIAotLyogV2UgY291 bGQgY2hlY2sgdGhlIGNoZWNrc3VtIHRvbywgYnV0IGp1c3QgdGhlIGhlYWRlciBpcyBwcm9iYWJs eSBlbm91Z2guICovCi1zdGF0aWMgYm9vbCBlZGlkX2lzX3ZhbGlkKGNvbnN0IHVuc2lnbmVkIGNo YXIgKmVkaWQpCitzdGF0aWMgYm9vbCBmaW5kX2kyY19wYXRoKGNoYXIgKmNvbm5lY3Rvcl9uYW1l LCBjaGFyICppMmNfcGF0aCkKIHsKLQljaGFyIGVkaWRfaGVhZGVyW10gPSB7Ci0JCTB4MCwgMHhG RiwgMHhGRiwgMHhGRiwgMHhGRiwgMHhGRiwgMHhGRiwgMHgwLAotCX07CisJc3RydWN0IGRpcmVu dCAqZGlyZW50OworCURJUiAqZGlyOworCWludCBzeXNmc19jYXJkX2ZkID0gaWd0X3N5c2ZzX29w ZW4oZHJtX2ZkKTsKKwlpbnQgY29ubmVjdG9yX2ZkID0gLTE7CisJYm9vbCBmb3VuZF9pMmNfZmls ZSA9IGZhbHNlOwogCi0JcmV0dXJuIChtZW1jbXAoZWRpZCwgZWRpZF9oZWFkZXIsIHNpemVvZihl ZGlkX2hlYWRlcikpID09IDApOwotfQorCWRpciA9IGZkb3BlbmRpcihzeXNmc19jYXJkX2ZkKTsK KwlpZ3RfYXNzZXJ0KGRpcik7CiAKLXN0YXRpYyBpbnQgY291bnRfZHJtX3ZhbGlkX2VkaWRzKHN0 cnVjdCBtb2RlX3NldF9kYXRhICpkYXRhKQotewotCWludCByZXQgPSAwOworCXdoaWxlICgoZGly ZW50ID0gcmVhZGRpcihkaXIpKSkgeworCQkvKiBTa2lwICJjYXJkeC0iIHByZWZpeCAqLworCQlj aGFyICpkaXJuYW1lID0gZGlyZW50LT5kX25hbWU7CisJCXdoaWxlKGRpcm5hbWVbMF0gIT0gJ1ww JyAmJiBkaXJuYW1lWzBdICE9ICctJykKKwkJCSsrZGlybmFtZTsKIAotCWlmICghZGF0YS0+cmVz KQotCQlyZXR1cm4gMDsKKwkJaWYoKmRpcm5hbWUgPT0gJy0nKQorCQkJKytkaXJuYW1lOwogCi0J Zm9yIChpbnQgaSA9IDA7IGkgPCBkYXRhLT5yZXMtPmNvdW50X2Nvbm5lY3RvcnM7IGkrKykKLQkJ aWYgKGRhdGEtPmVkaWRzW2ldICYmIGVkaWRfaXNfdmFsaWQoZGF0YS0+ZWRpZHNbaV0tPmRhdGEp KQotCQkJcmV0Kys7Ci0JcmV0dXJuIHJldDsKKwkJaWYgKHN0cmNtcChkaXJuYW1lLCBjb25uZWN0 b3JfbmFtZSkgPT0gMCkgeworCQkJY29ubmVjdG9yX2ZkID0gb3BlbmF0KHN5c2ZzX2NhcmRfZmQs IGRpcmVudC0+ZF9uYW1lLCBPX1JET05MWSk7CisJCQlicmVhazsKKwkJfQorCX0KKwljbG9zZWRp cihkaXIpOworCisJaWYoY29ubmVjdG9yX2ZkIDwgMCkKKwkJcmV0dXJuIGZhbHNlOworCisJZGly ID0gZmRvcGVuZGlyKGNvbm5lY3Rvcl9mZCk7CisJaWd0X2Fzc2VydChkaXIpOworCisJd2hpbGUg KChkaXJlbnQgPSByZWFkZGlyKGRpcikpKSB7CisJCWlmIChzdHJuY21wKGRpcmVudC0+ZF9uYW1l LCAiaTJjLSIsIDQpID09IDApIHsKKwkJCXNwcmludGYoaTJjX3BhdGgsICIvZGV2LyVzIiwgZGly ZW50LT5kX25hbWUpOworCQkJZm91bmRfaTJjX2ZpbGUgPSB0cnVlOworCQl9CisJfQorCWNsb3Nl ZGlyKGRpcik7CisJcmV0dXJuIGZvdW5kX2kyY19maWxlOwogfQogCi1zdGF0aWMgYm9vbCBpMmNf ZWRpZF9pc192YWxpZChpbnQgZmQpCisKK3N0YXRpYyBib29sIGkyY19yZWFkX2VkaWQoY2hhciAq Y29ubmVjdG9yX25hbWUsIHVuc2lnbmVkIGNoYXIgKmVkaWQpCiB7Ci0JaW50IHJjOwotCXVuc2ln bmVkIGNoYXIgZWRpZFsxMjhdID0ge307CisJY2hhciBpMmNfcGF0aFtQQVRIX01BWF07CisJYm9v bCByZXN1bHQgPSBmaW5kX2kyY19wYXRoKGNvbm5lY3Rvcl9uYW1lLCBpMmNfcGF0aCk7CisJaW50 IHJjLCBmZDsKIAlzdHJ1Y3QgaTJjX21zZyBtc2dzW10gPSB7CiAJCXsgLyogU3RhcnQgYXQgMC4g Ki8KIAkJCS5hZGRyID0gMHg1MCwKQEAgLTYxNyw2OSArNjM5LDkxIEBAIHN0YXRpYyBib29sIGky Y19lZGlkX2lzX3ZhbGlkKGludCBmZCkKIAkJLm5tc2dzID0gMiwKIAl9OwogCisJaWYgKCFyZXN1 bHQpCisJCXJldHVybiBmYWxzZTsKKworCWZkID0gb3BlbihpMmNfcGF0aCwgT19SRFdSKTsKKwlp Z3RfYXNzZXJ0X25lcShmZCwgLTEpOworCiAJcmMgPSBpb2N0bChmZCwgSTJDX1JEV1IsICZtc2dz ZXQpOwotCXJldHVybiAocmMgPj0gMCkgPyBlZGlkX2lzX3ZhbGlkKGVkaWQpIDogZmFsc2U7CisJ aWYocmM9PS0xKXsKKwkJaWd0X2RlYnVnKCJJMkMgYWNjZXNzIGZhaWxlZCB3aXRoIGVycm5vICVk LCAlc1xuIiwKKwkJCQllcnJubywgc3RyZXJyb3IoZXJybm8pKTsKKwkJZXJybm8gPSAwOworCX0K KworCWNsb3NlKGZkKTsKKwlyZXR1cm4gcmMgPj0gMDsKIH0KIAotc3RhdGljIGludCBjb3VudF9p MmNfdmFsaWRfZWRpZHModm9pZCkKK3N0YXRpYyB2b2lkIGZvcm1hdF9oZXhfc3RyaW5nKHVuc2ln bmVkIGNoYXIgZWRpZFtzdGF0aWMgRURJRF9MRU5HVEhdLAorCQkJICAgICAgY2hhciBidWZbc3Rh dGljIEVESURfTEVOR1RIICogNSArIDFdKQogewotCWludCBmZCwgcmV0ID0gMDsKLQlESVIgKmRp cjsKKwlmb3IgKHNpemVfdCBpID0gMDsgaSA8IEVESURfTEVOR1RIOyArK2kpCisJCXNwcmludGYo YnVmK2kqNSwgIjB4JTAyeCAiLCBlZGlkW2ldKTsKK30KIAotCXN0cnVjdCBkaXJlbnQgKmRpcmVu dDsKLQljaGFyIGZ1bGxfbmFtZVtQQVRIX01BWF07CitzdGF0aWMgdm9pZCB0ZXN0X2kyYyhzdHJ1 Y3QgbW9kZV9zZXRfZGF0YSAqZGF0YSkKK3sKKwlib29sIGVkaWRfbWlzdG1hY2hfaTJjX3ZzX2Ry bSA9IGZhbHNlOworCWlndF9kaXNwbGF5X3QgZGlzcGxheTsKKwlpZ3RfZGlzcGxheV9yZXF1aXJl KCZkaXNwbGF5LCBkcm1fZmQpOwogCi0JZGlyID0gb3BlbmRpcigiL2Rldi8iKTsKLQlpZ3RfYXNz ZXJ0KGRpcik7CisJZm9yIChpbnQgaSA9IDA7IGkgPCBkYXRhLT5yZXMtPmNvdW50X2Nvbm5lY3Rv cnM7IGkrKykgeworCQl1bnNpZ25lZCBjaGFyICpkcm1fZWRpZCA9IGRhdGEtPmVkaWRzW2ldID8g ZGF0YS0+ZWRpZHNbaV0tPmRhdGEgOiBOVUxMOworCQl1bnNpZ25lZCBjaGFyIGkyY19lZGlkW0VE SURfTEVOR1RIXSA9IHt9OwogCi0Jd2hpbGUgKChkaXJlbnQgPSByZWFkZGlyKGRpcikpKSB7Ci0J CWlmIChzdHJuY21wKGRpcmVudC0+ZF9uYW1lLCAiaTJjLSIsIDQpID09IDApIHsKLQkJCXNwcmlu dGYoZnVsbF9uYW1lLCAiL2Rldi8lcyIsIGRpcmVudC0+ZF9uYW1lKTsKLQkJCWZkID0gb3Blbihm dWxsX25hbWUsIE9fUkRXUik7Ci0JCQlpZ3RfYXNzZXJ0X25lcShmZCwgLTEpOwotCQkJaWYgKGky Y19lZGlkX2lzX3ZhbGlkKGZkKSkKLQkJCQlyZXQrKzsKLQkJCWNsb3NlKGZkKTsKLQkJfQotCX0K KwkJaWd0X291dHB1dF90ICpvdXRwdXQgPSBpZ3Rfb3V0cHV0X2Zyb21fY29ubmVjdG9yKCZkaXNw bGF5LAorCQkJCQkJCQkgZGF0YS0+Y29ubmVjdG9yc1tpXSk7CisJCWNoYXIgKmNvbm5lY3Rvcl9u YW1lID0gKGNoYXIgKikgaWd0X291dHB1dF9uYW1lKG91dHB1dCk7CiAKLQljbG9zZWRpcihkaXIp OworCQlib29sIGdvdF9pMmNfZWRpZCA9IGkyY19yZWFkX2VkaWQoY29ubmVjdG9yX25hbWUsIGky Y19lZGlkKTsKKwkJYm9vbCBnb3RfZHJtX2VkaWQgPSBkcm1fZWRpZCAhPSBOVUxMOworCQlib29s IGlzX3ZnYSA9IGRhdGEtPmNvbm5lY3RvcnNbaV0tPmNvbm5lY3Rvcl90eXBlID09IERSTV9NT0RF X0NPTk5FQ1RPUl9WR0E7CiAKLQlyZXR1cm4gcmV0OwotfQorCQlib29sIGVkaWRzX2VxdWFsOwog Ci1zdGF0aWMgaW50IGNvdW50X3ZnYV9vdXRwdXRzKHN0cnVjdCBtb2RlX3NldF9kYXRhICpkYXRh KQotewotCWludCBjb3VudCA9IDA7CisJCS8qIFdlIGZhaWwgdG8gZGV0ZWN0IHNvbWUgVkdBIG1v bml0b3JzIHVzaW5nIG91ciBpMmMgbWV0aG9kLiBJZiB5b3UgbG9vaworCQkgKiBhdCB0aGUgZG1l c2cgb2YgdGhlc2UgY2FzZXMsIHlvdSdsbCBzZWUgdGhlIEtlcm5lbCBjb21wbGFpbmluZyBhYm91 dAorCQkgKiB0aGUgRURJRCByZWFkaW5nIG1vc3RseSBGRnMgYW5kIHRoZW4gZGlzYWJsaW5nIGJp dC1iYW5naW5nLiBTaW5jZSB3ZQorCQkgKiBkb24ndCB3YW50IHRvIHJlaW1wbGVtZW50IGV2ZXJ5 dGhpbmcgdGhlIEtlcm5lbCBkb2VzLCBsZXQncyBqdXN0CisJCSAqIGFjY2VwdCB0aGUgZmFjdCB0 aGF0IHNvbWUgVkdBIG91dHB1dHMgd29uJ3QgYmUgcHJvcGVybHkgZGV0ZWN0ZWQuICovCisJCWlm KGlzX3ZnYSkKKwkJCWNvbnRpbnVlOwogCi0JaWYgKCFkYXRhLT5yZXMpCi0JCXJldHVybiAwOwor CQlpZighZ290X2kyY19lZGlkICYmICFnb3RfZHJtX2VkaWQpCisJCQljb250aW51ZTsKKworCQlp Zihnb3RfaTJjX2VkaWQgJiYgZ290X2RybV9lZGlkKQorCQkJZWRpZHNfZXF1YWwgPSAoMCA9PSBt ZW1jbXAoZHJtX2VkaWQsIGkyY19lZGlkLCBFRElEX0xFTkdUSCkpOworCQllbHNlCisJCQllZGlk c19lcXVhbCA9IGZhbHNlOwogCi0JZm9yIChpbnQgaSA9IDA7IGkgPCBkYXRhLT5yZXMtPmNvdW50 X2Nvbm5lY3RvcnM7IGkrKykKLQkJaWYgKGRhdGEtPmNvbm5lY3RvcnNbaV0tPmNvbm5lY3Rvcl90 eXBlID09Ci0JCSAgICBEUk1fTU9ERV9DT05ORUNUT1JfVkdBKQotCQkJY291bnQrKzsKIAotCXJl dHVybiBjb3VudDsKLX0KKwkJaWYgKCFlZGlkc19lcXVhbCkgeworCQkJY2hhciBidWZbNSAqIEVE SURfTEVOR1RIICsgMV07CisJCQlpZ3RfY3JpdGljYWwoIkRldGVjdGVkIEVESUQgbWlzbWF0Y2gg b24gY29ubmVjdG9yICVzXG4iLAorCQkJCSAgICAgY29ubmVjdG9yX25hbWUpOwogCi1zdGF0aWMg dm9pZCB0ZXN0X2kyYyhzdHJ1Y3QgbW9kZV9zZXRfZGF0YSAqZGF0YSkKLXsKLQlpbnQgaTJjX2Vk aWRzID0gY291bnRfaTJjX3ZhbGlkX2VkaWRzKCk7Ci0JaW50IGRybV9lZGlkcyA9IGNvdW50X2Ry bV92YWxpZF9lZGlkcyhkYXRhKTsKLQlpbnQgdmdhX291dHB1dHMgPSBjb3VudF92Z2Ffb3V0cHV0 cyhkYXRhKTsKLQlpbnQgZGlmZjsKLQotCWlndF9kZWJ1ZygiaTJjIGVkaWRzOiVkIGRybSBlZGlk czolZCB2Z2Egb3V0cHV0czolZFxuIiwKLQkJICBpMmNfZWRpZHMsIGRybV9lZGlkcywgdmdhX291 dHB1dHMpOwotCi0JLyogV2UgZmFpbCB0byBkZXRlY3Qgc29tZSBWR0EgbW9uaXRvcnMgdXNpbmcg b3VyIGkyYyBtZXRob2QuIElmIHlvdSBsb29rCi0JICogYXQgdGhlIGRtZXNnIG9mIHRoZXNlIGNh c2VzLCB5b3UnbGwgc2VlIHRoZSBLZXJuZWwgY29tcGxhaW5pbmcgYWJvdXQKLQkgKiB0aGUgRURJ RCByZWFkaW5nIG1vc3RseSBGRnMgYW5kIHRoZW4gZGlzYWJsaW5nIGJpdC1iYW5naW5nLiBTaW5j ZSB3ZQotCSAqIGRvbid0IHdhbnQgdG8gcmVpbXBsZW1lbnQgZXZlcnl0aGluZyB0aGUgS2VybmVs IGRvZXMsIGxldCdzIGp1c3QKLQkgKiBhY2NlcHQgdGhlIGZhY3QgdGhhdCBzb21lIFZHQSBvdXRw dXRzIHdvbid0IGJlIHByb3Blcmx5IGRldGVjdGVkLiAqLwotCWRpZmYgPSBkcm1fZWRpZHMgLSBp MmNfZWRpZHM7Ci0JaWd0X2Fzc2VydChkaWZmIDw9IHZnYV9vdXRwdXRzICYmIGRpZmYgPj0gMCk7 CisJCQlpZihnb3RfaTJjX2VkaWQpCisJCQkJZm9ybWF0X2hleF9zdHJpbmcoaTJjX2VkaWQsIGJ1 Zik7CisJCQllbHNlCisJCQkJc3ByaW50ZihidWYsICJOVUxMIik7CisKKwkJCWlndF9jcml0aWNh bCgiaTJjOiAlc1xuIiwgYnVmKTsKKworCQkJaWYoZ290X2RybV9lZGlkKQorCQkJCWZvcm1hdF9o ZXhfc3RyaW5nKGRybV9lZGlkLCBidWYpOworCQkJZWxzZQorCQkJCXNwcmludGYoYnVmLCAiTlVM TCIpOworCisJCQlpZ3RfY3JpdGljYWwoImRybTogJXNcbiIsIGJ1Zik7CisKKwkJCWVkaWRfbWlz dG1hY2hfaTJjX3ZzX2RybSA9IHRydWU7CisJCX0KKwl9CisJaWd0X2ZhaWxfb25fZihlZGlkX21p c3RtYWNoX2kyY192c19kcm0sCisJCQkiVGhlcmUgaXMgYW4gRURJRCBtaXNtYXRjaCBiZXR3ZWVu IGkyYyBhbmQgRFJNIVxuIik7CiB9CiAKIHN0YXRpYyB2b2lkIHNldHVwX3BjOCh2b2lkKQotLSAK Mi4yMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpp Z3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=