From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A9B289938 for ; Wed, 5 Jun 2019 12:36:09 +0000 (UTC) From: Oleg Vasilev Date: Wed, 5 Jun 2019 15:33:32 +0300 Message-Id: <20190605123332.2170-1-oleg.vasilev@intel.com> In-Reply-To: <20190507085154.32256-1-oleg.vasilev@intel.com> References: <20190507085154.32256-1-oleg.vasilev@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH] 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 ZCBpcyBwcmludGVkLgoKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNDA5NwpDYzogQXJrYWRpdXN6IEhpbGVyIDxhcmthZGl1c3ouaGlsZXJA aW50ZWwuY29tPgpDYzogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpDYzogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTog T2xlZyBWYXNpbGV2IDxvbGVnLnZhc2lsZXZAaW50ZWwuY29tPgotLS0KIHRlc3RzL2k5MTUvaTkx NV9wbV9ycG0uYyB8IDE3NiArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxMDggaW5zZXJ0aW9ucygrKSwgNjggZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvdGVzdHMvaTkxNS9pOTE1X3BtX3JwbS5jIGIvdGVzdHMvaTkxNS9pOTE1X3BtX3Jw bS5jCmluZGV4IGEyYzlkMGVkLi5mMTUzMDM5MSAxMDA2NDQKLS0tIGEvdGVzdHMvaTkxNS9pOTE1 X3BtX3JwbS5jCisrKyBiL3Rlc3RzL2k5MTUvaTkxNV9wbV9ycG0uYwpAQCAtNTcxLDMzICs1NzEs NTYgQEAgc3RhdGljIHZvaWQgYXNzZXJ0X2RybV9pbmZvc19lcXVhbChzdHJ1Y3QgY29tcGFyZV9k YXRhICpkMSwKIAkJYXNzZXJ0X2RybV9jcnRjc19lcXVhbChkMS0+Y3J0Y3NbaV0sIGQyLT5jcnRj c1tpXSk7CiB9CiAKLS8qIFdlIGNvdWxkIGNoZWNrIHRoZSBjaGVja3N1bSB0b28sIGJ1dCBqdXN0 IHRoZSBoZWFkZXIgaXMgcHJvYmFibHkgZW5vdWdoLiAqLwotc3RhdGljIGJvb2wgZWRpZF9pc192 YWxpZChjb25zdCB1bnNpZ25lZCBjaGFyICplZGlkKQorc3RhdGljIGJvb2wgZmluZF9pMmNfcGF0 aChjaGFyICpjb25uZWN0b3JfbmFtZSwgY2hhciAqaTJjX3BhdGgpCiB7Ci0JY2hhciBlZGlkX2hl YWRlcltdID0gewotCQkweDAsIDB4RkYsIDB4RkYsIDB4RkYsIDB4RkYsIDB4RkYsIDB4RkYsIDB4 MCwKLQl9OworCXN0cnVjdCBkaXJlbnQgKmRpcmVudDsKKwlESVIgKmRpcjsKKwlpbnQgc3lzZnNf Y2FyZF9mZCA9IGlndF9zeXNmc19vcGVuKGRybV9mZCk7CisJaW50IGNvbm5lY3Rvcl9mZCA9IC0x OworCWJvb2wgZm91bmRfaTJjX2ZpbGUgPSBmYWxzZTsKIAotCXJldHVybiAobWVtY21wKGVkaWQs IGVkaWRfaGVhZGVyLCBzaXplb2YoZWRpZF9oZWFkZXIpKSA9PSAwKTsKLX0KKwlkaXIgPSBmZG9w ZW5kaXIoc3lzZnNfY2FyZF9mZCk7CisJaWd0X2Fzc2VydChkaXIpOwogCi1zdGF0aWMgaW50IGNv dW50X2RybV92YWxpZF9lZGlkcyhzdHJ1Y3QgbW9kZV9zZXRfZGF0YSAqZGF0YSkKLXsKLQlpbnQg cmV0ID0gMDsKKwl3aGlsZSAoKGRpcmVudCA9IHJlYWRkaXIoZGlyKSkpIHsKKwkJLyogU2tpcCAi Y2FyZHgtIiBwcmVmaXggKi8KKwkJY2hhciAqZGlybmFtZSA9IGRpcmVudC0+ZF9uYW1lOworCQl3 aGlsZShkaXJuYW1lWzBdICE9ICdcMCcgJiYgZGlybmFtZVswXSAhPSAnLScpCisJCQkrK2Rpcm5h bWU7CiAKLQlpZiAoIWRhdGEtPnJlcykKLQkJcmV0dXJuIDA7CisJCWlmKCpkaXJuYW1lID09ICct JykKKwkJCSsrZGlybmFtZTsKIAotCWZvciAoaW50IGkgPSAwOyBpIDwgZGF0YS0+cmVzLT5jb3Vu dF9jb25uZWN0b3JzOyBpKyspCi0JCWlmIChkYXRhLT5lZGlkc1tpXSAmJiBlZGlkX2lzX3ZhbGlk KGRhdGEtPmVkaWRzW2ldLT5kYXRhKSkKLQkJCXJldCsrOwotCXJldHVybiByZXQ7CisJCWlmIChz dHJjbXAoZGlybmFtZSwgY29ubmVjdG9yX25hbWUpID09IDApIHsKKwkJCWNvbm5lY3Rvcl9mZCA9 IG9wZW5hdChzeXNmc19jYXJkX2ZkLCBkaXJlbnQtPmRfbmFtZSwgT19SRE9OTFkpOworCQkJYnJl YWs7CisJCX0KKwl9CisJY2xvc2VkaXIoZGlyKTsKKworCWlmKGNvbm5lY3Rvcl9mZCA8IDApCisJ CXJldHVybiBmYWxzZTsKKworCWRpciA9IGZkb3BlbmRpcihjb25uZWN0b3JfZmQpOworCWlndF9h c3NlcnQoZGlyKTsKKworCXdoaWxlICgoZGlyZW50ID0gcmVhZGRpcihkaXIpKSkgeworCQlpZiAo c3RybmNtcChkaXJlbnQtPmRfbmFtZSwgImkyYy0iLCA0KSA9PSAwKSB7CisJCQlzcHJpbnRmKGky Y19wYXRoLCAiL2Rldi8lcyIsIGRpcmVudC0+ZF9uYW1lKTsKKwkJCWZvdW5kX2kyY19maWxlID0g dHJ1ZTsKKwkJfQorCX0KKwljbG9zZWRpcihkaXIpOworCXJldHVybiBmb3VuZF9pMmNfZmlsZTsK IH0KIAotc3RhdGljIGJvb2wgaTJjX2VkaWRfaXNfdmFsaWQoaW50IGZkKQorCitzdGF0aWMgYm9v bCBpMmNfcmVhZF9lZGlkKGNoYXIgKmNvbm5lY3Rvcl9uYW1lLCB1bnNpZ25lZCBjaGFyICplZGlk KQogewotCWludCByYzsKLQl1bnNpZ25lZCBjaGFyIGVkaWRbMTI4XSA9IHt9OworCWNoYXIgaTJj X3BhdGhbUEFUSF9NQVhdOworCWJvb2wgcmVzdWx0ID0gZmluZF9pMmNfcGF0aChjb25uZWN0b3Jf bmFtZSwgaTJjX3BhdGgpOworCWludCByYywgZmQ7CisKIAlzdHJ1Y3QgaTJjX21zZyBtc2dzW10g PSB7CiAJCXsgLyogU3RhcnQgYXQgMC4gKi8KIAkJCS5hZGRyID0gMHg1MCwKQEAgLTYxNiw2OSAr NjM5LDg2IEBAIHN0YXRpYyBib29sIGkyY19lZGlkX2lzX3ZhbGlkKGludCBmZCkKIAkJLm5tc2dz ID0gMiwKIAl9OwogCisKKwlpZiAoIXJlc3VsdCkKKwkJcmV0dXJuIGZhbHNlOworCisJZmQgPSBv cGVuKGkyY19wYXRoLCBPX1JEV1IpOworCWlndF9hc3NlcnRfbmVxKGZkLCAtMSk7CisKIAlyYyA9 IGlvY3RsKGZkLCBJMkNfUkRXUiwgJm1zZ3NldCk7Ci0JcmV0dXJuIChyYyA+PSAwKSA/IGVkaWRf aXNfdmFsaWQoZWRpZCkgOiBmYWxzZTsKKworCWNsb3NlKGZkKTsKKwlyZXR1cm4gcmMgPj0gMDsK IH0KIAotc3RhdGljIGludCBjb3VudF9pMmNfdmFsaWRfZWRpZHModm9pZCkKK3N0YXRpYyB2b2lk IGZvcm1hdF9oZXhfc3RyaW5nKHVuc2lnbmVkIGNoYXIgZWRpZFtzdGF0aWMgRURJRF9MRU5HVEhd LAorCQkJICAgICAgY2hhciBidWZbc3RhdGljIEVESURfTEVOR1RIICogNSArIDFdKQogewotCWlu dCBmZCwgcmV0ID0gMDsKLQlESVIgKmRpcjsKKwlmb3IgKHNpemVfdCBpID0gMDsgaSA8IEVESURf TEVOR1RIOyArK2kpCisJCXNwcmludGYoYnVmK2kqNSwgIjB4JTAyeCAiLCBlZGlkW2ldKTsKK30K IAotCXN0cnVjdCBkaXJlbnQgKmRpcmVudDsKLQljaGFyIGZ1bGxfbmFtZVtQQVRIX01BWF07Citz dGF0aWMgdm9pZCB0ZXN0X2kyYyhzdHJ1Y3QgbW9kZV9zZXRfZGF0YSAqZGF0YSkKK3sKKwlib29s IGZhaWxlZCA9IGZhbHNlOworCWlndF9kaXNwbGF5X3QgZGlzcGxheTsKKwlpZ3RfZGlzcGxheV9y ZXF1aXJlKCZkaXNwbGF5LCBkcm1fZmQpOwogCi0JZGlyID0gb3BlbmRpcigiL2Rldi8iKTsKLQlp Z3RfYXNzZXJ0KGRpcik7CisJZm9yIChpbnQgaSA9IDA7IGkgPCBkYXRhLT5yZXMtPmNvdW50X2Nv bm5lY3RvcnM7IGkrKykgeworCQl1bnNpZ25lZCBjaGFyICpkcm1fZWRpZCA9IGRhdGEtPmVkaWRz W2ldID8gZGF0YS0+ZWRpZHNbaV0tPmRhdGEgOiBOVUxMOworCQl1bnNpZ25lZCBjaGFyIGkyY19l ZGlkW0VESURfTEVOR1RIXSA9IHt9OwogCi0Jd2hpbGUgKChkaXJlbnQgPSByZWFkZGlyKGRpcikp KSB7Ci0JCWlmIChzdHJuY21wKGRpcmVudC0+ZF9uYW1lLCAiaTJjLSIsIDQpID09IDApIHsKLQkJ CXNwcmludGYoZnVsbF9uYW1lLCAiL2Rldi8lcyIsIGRpcmVudC0+ZF9uYW1lKTsKLQkJCWZkID0g b3BlbihmdWxsX25hbWUsIE9fUkRXUik7Ci0JCQlpZ3RfYXNzZXJ0X25lcShmZCwgLTEpOwotCQkJ aWYgKGkyY19lZGlkX2lzX3ZhbGlkKGZkKSkKLQkJCQlyZXQrKzsKLQkJCWNsb3NlKGZkKTsKLQkJ fQotCX0KKwkJaWd0X291dHB1dF90ICpvdXRwdXQgPSBpZ3Rfb3V0cHV0X2Zyb21fY29ubmVjdG9y KCZkaXNwbGF5LAorCQkJCQkJCQkgZGF0YS0+Y29ubmVjdG9yc1tpXSk7CisJCWNoYXIgKmNvbm5l Y3Rvcl9uYW1lID0gKGNoYXIgKikgaWd0X291dHB1dF9uYW1lKG91dHB1dCk7CiAKLQljbG9zZWRp cihkaXIpOworCQlib29sIGdvdF9pMmNfZWRpZCA9IGkyY19yZWFkX2VkaWQoY29ubmVjdG9yX25h bWUsIGkyY19lZGlkKTsKKwkJYm9vbCBnb3RfZHJtX2VkaWQgPSBkcm1fZWRpZCAhPSBOVUxMOwor CQlib29sIGlzX3ZnYSA9IGRhdGEtPmNvbm5lY3RvcnNbaV0tPmNvbm5lY3Rvcl90eXBlID09IERS TV9NT0RFX0NPTk5FQ1RPUl9WR0E7CiAKLQlyZXR1cm4gcmV0OwotfQorCQlib29sIGVkaWRzX2Vx dWFsOwogCi1zdGF0aWMgaW50IGNvdW50X3ZnYV9vdXRwdXRzKHN0cnVjdCBtb2RlX3NldF9kYXRh ICpkYXRhKQotewotCWludCBjb3VudCA9IDA7CisJCS8qIFdlIGZhaWwgdG8gZGV0ZWN0IHNvbWUg VkdBIG1vbml0b3JzIHVzaW5nIG91ciBpMmMgbWV0aG9kLiBJZiB5b3UgbG9vaworCQkgKiBhdCB0 aGUgZG1lc2cgb2YgdGhlc2UgY2FzZXMsIHlvdSdsbCBzZWUgdGhlIEtlcm5lbCBjb21wbGFpbmlu ZyBhYm91dAorCQkgKiB0aGUgRURJRCByZWFkaW5nIG1vc3RseSBGRnMgYW5kIHRoZW4gZGlzYWJs aW5nIGJpdC1iYW5naW5nLiBTaW5jZSB3ZQorCQkgKiBkb24ndCB3YW50IHRvIHJlaW1wbGVtZW50 IGV2ZXJ5dGhpbmcgdGhlIEtlcm5lbCBkb2VzLCBsZXQncyBqdXN0CisJCSAqIGFjY2VwdCB0aGUg ZmFjdCB0aGF0IHNvbWUgVkdBIG91dHB1dHMgd29uJ3QgYmUgcHJvcGVybHkgZGV0ZWN0ZWQuICov CisJCWlmKGlzX3ZnYSkKKwkJCWNvbnRpbnVlOwogCi0JaWYgKCFkYXRhLT5yZXMpCi0JCXJldHVy biAwOworCQlpZighZ290X2kyY19lZGlkICYmICFnb3RfZHJtX2VkaWQpCisJCQljb250aW51ZTsK KworCQlpZihnb3RfaTJjX2VkaWQgJiYgZ290X2RybV9lZGlkKQorCQkJZWRpZHNfZXF1YWwgPSAo MCA9PSBtZW1jbXAoZHJtX2VkaWQsIGkyY19lZGlkLCBFRElEX0xFTkdUSCkpOworCQllbHNlCisJ CQllZGlkc19lcXVhbCA9IGZhbHNlOwogCi0JZm9yIChpbnQgaSA9IDA7IGkgPCBkYXRhLT5yZXMt PmNvdW50X2Nvbm5lY3RvcnM7IGkrKykKLQkJaWYgKGRhdGEtPmNvbm5lY3RvcnNbaV0tPmNvbm5l Y3Rvcl90eXBlID09Ci0JCSAgICBEUk1fTU9ERV9DT05ORUNUT1JfVkdBKQotCQkJY291bnQrKzsK IAotCXJldHVybiBjb3VudDsKLX0KKwkJaWYgKCFlZGlkc19lcXVhbCkgeworCQkJY2hhciBidWZb NSAqIEVESURfTEVOR1RIICsgMV07CisJCQlpZ3RfY3JpdGljYWwoIkZvciBjb25uZWN0b3IgJXMg RURJRCBtaXNtYXRjaCFcbiIsCisJCQkJICAgICBjb25uZWN0b3JfbmFtZSk7CiAKLXN0YXRpYyB2 b2lkIHRlc3RfaTJjKHN0cnVjdCBtb2RlX3NldF9kYXRhICpkYXRhKQotewotCWludCBpMmNfZWRp ZHMgPSBjb3VudF9pMmNfdmFsaWRfZWRpZHMoKTsKLQlpbnQgZHJtX2VkaWRzID0gY291bnRfZHJt X3ZhbGlkX2VkaWRzKGRhdGEpOwotCWludCB2Z2Ffb3V0cHV0cyA9IGNvdW50X3ZnYV9vdXRwdXRz KGRhdGEpOwotCWludCBkaWZmOwotCi0JaWd0X2RlYnVnKCJpMmMgZWRpZHM6JWQgZHJtIGVkaWRz OiVkIHZnYSBvdXRwdXRzOiVkXG4iLAotCQkgIGkyY19lZGlkcywgZHJtX2VkaWRzLCB2Z2Ffb3V0 cHV0cyk7Ci0KLQkvKiBXZSBmYWlsIHRvIGRldGVjdCBzb21lIFZHQSBtb25pdG9ycyB1c2luZyBv dXIgaTJjIG1ldGhvZC4gSWYgeW91IGxvb2sKLQkgKiBhdCB0aGUgZG1lc2cgb2YgdGhlc2UgY2Fz ZXMsIHlvdSdsbCBzZWUgdGhlIEtlcm5lbCBjb21wbGFpbmluZyBhYm91dAotCSAqIHRoZSBFRElE IHJlYWRpbmcgbW9zdGx5IEZGcyBhbmQgdGhlbiBkaXNhYmxpbmcgYml0LWJhbmdpbmcuIFNpbmNl IHdlCi0JICogZG9uJ3Qgd2FudCB0byByZWltcGxlbWVudCBldmVyeXRoaW5nIHRoZSBLZXJuZWwg ZG9lcywgbGV0J3MganVzdAotCSAqIGFjY2VwdCB0aGUgZmFjdCB0aGF0IHNvbWUgVkdBIG91dHB1 dHMgd29uJ3QgYmUgcHJvcGVybHkgZGV0ZWN0ZWQuICovCi0JZGlmZiA9IGRybV9lZGlkcyAtIGky Y19lZGlkczsKLQlpZ3RfYXNzZXJ0KGRpZmYgPD0gdmdhX291dHB1dHMgJiYgZGlmZiA+PSAwKTsK KwkJCWlmKGdvdF9pMmNfZWRpZCkKKwkJCQlmb3JtYXRfaGV4X3N0cmluZyhpMmNfZWRpZCwgYnVm KTsKKwkJCWVsc2UKKwkJCQlzcHJpbnRmKGJ1ZiwgIk5VTEwiKTsKKworCQkJaWd0X2NyaXRpY2Fs KCJpMmM6ICVzXG4iLCBidWYpOworCisJCQlpZihnb3RfZHJtX2VkaWQpCisJCQkJZm9ybWF0X2hl eF9zdHJpbmcoZHJtX2VkaWQsIGJ1Zik7CisJCQllbHNlCisJCQkJc3ByaW50ZihidWYsICJOVUxM Iik7CisKKwkJCWlndF9jcml0aWNhbCgiZHJtOiAlc1xuIiwgYnVmKTsKKworCQkJZmFpbGVkID0g dHJ1ZTsKKwkJfQorCX0KKwlpZ3RfZmFpbF9vbl9mKGZhaWxlZCwgIk1pc21hdGNoIG9uIEVESUQg d2UgZ290IGZyb20gaTJjIGFuZCBEUk0hXG4iKTsKIH0KIAogc3RhdGljIHZvaWQgc2V0dXBfcGM4 KHZvaWQpCi0tIAoyLjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRl dg==