From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A0BD06ED02 for ; Fri, 6 Mar 2020 12:50:08 +0000 (UTC) From: Ville Syrjala Date: Fri, 6 Mar 2020 14:50:00 +0200 Message-Id: <20200306125002.21316-2-ville.syrjala@linux.intel.com> In-Reply-To: <20200306125002.21316-1-ville.syrjala@linux.intel.com> References: <20200306125002.21316-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 2/4] tools/intel_reg: Support 8 and 16 bit mmio registers 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: RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFk ZCBuZXcgInBvcnRzIiBmb3IgZG9pbmcgOCBhbmQgMTYgYml0IG1taW8gYWNjZXNzZXMuCgpTaWdu ZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29t PgotLS0KIHRvb2xzL2ludGVsX3JlZy5jICAgICAgfCA1MyArKysrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0KIHRvb2xzL2ludGVsX3JlZ19zcGVjLmMgfCAxOSArKysrKysr KystLS0tLS0KIHRvb2xzL2ludGVsX3JlZ19zcGVjLmggfCAgOCArKysrLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rv b2xzL2ludGVsX3JlZy5jIGIvdG9vbHMvaW50ZWxfcmVnLmMKaW5kZXggNWYxYmViYTRhMjY5Li43 ZjhkZGJkOGU5MjcgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2ludGVsX3JlZy5jCisrKyBiL3Rvb2xzL2lu dGVsX3JlZy5jCkBAIC0xNzksNiArMTc5LDE4IEBAIHN0YXRpYyB2b2lkIHRvX2JpbmFyeShjaGFy ICpidWYsIHNpemVfdCBidWZsZW4sIHVpbnQzMl90IHZhbCkKIAlzbnByaW50ZihidWYsIGJ1Zmxl biwgIlxuIik7CiB9CiAKK3N0YXRpYyBib29sIHBvcnRfaXNfbW1pbyhlbnVtIHBvcnRfYWRkciBw b3J0KQoreworCXN3aXRjaCAocG9ydCkgeworCWNhc2UgUE9SVF9NTUlPXzMyOgorCWNhc2UgUE9S VF9NTUlPXzE2OgorCWNhc2UgUE9SVF9NTUlPXzg6CisJCXJldHVybiB0cnVlOworCWRlZmF1bHQ6 CisJCXJldHVybiBmYWxzZTsKKwl9Cit9CisKIHN0YXRpYyB2b2lkIGR1bXBfZGVjb2RlKHN0cnVj dCBjb25maWcgKmNvbmZpZywgc3RydWN0IHJlZyAqcmVnLCB1aW50MzJfdCB2YWwpCiB7CiAJY2hh ciBkZWNvZGVbMTMwMF07CkBAIC0yMDcsNyArMjE5LDcgQEAgc3RhdGljIHZvaWQgZHVtcF9kZWNv ZGUoc3RydWN0IGNvbmZpZyAqY29uZmlnLCBzdHJ1Y3QgcmVnICpyZWcsIHVpbnQzMl90IHZhbCkK IAkJc25wcmludGYoZGVjb2RlLCBzaXplb2YoZGVjb2RlKSwgIlxuIik7CiAJfQogCi0JaWYgKHJl Zy0+cG9ydF9kZXNjLnBvcnQgPT0gUE9SVF9NTUlPKSB7CisJaWYgKHBvcnRfaXNfbW1pbyhyZWct PnBvcnRfZGVzYy5wb3J0KSkgewogCQkvKiBPbWl0IHBvcnQgbmFtZSBmb3IgTU1JTywgb3B0aW9u YWxseSBpbmNsdWRlIE1NSU8gb2Zmc2V0LiAqLwogCQlpZiAocmVnLT5tbWlvX29mZnNldCkKIAkJ CXByaW50ZigiJTI0cyAoMHglMDh4OjB4JTA4eCk6IDB4JTA4eCVzIiwKQEAgLTM1OSwyMCArMzcx LDIzIEBAIHN0YXRpYyBpbnQgcmVhZF9yZWdpc3RlcihzdHJ1Y3QgY29uZmlnICpjb25maWcsIHN0 cnVjdCByZWcgKnJlZywgdWludDMyX3QgKnZhbHApCiAJdWludDMyX3QgdmFsID0gMDsKIAogCXN3 aXRjaCAocmVnLT5wb3J0X2Rlc2MucG9ydCkgewotCWNhc2UgUE9SVF9NTUlPOgorCWNhc2UgUE9S VF9NTUlPXzMyOgogCQlpZiAocmVnLT5lbmdpbmUpCiAJCQl2YWwgPSByZWdpc3Rlcl9zcm0oY29u ZmlnLCByZWcsIE5VTEwpOwogCQllbHNlCiAJCQl2YWwgPSBJTlJFRyhyZWctPm1taW9fb2Zmc2V0 ICsgcmVnLT5hZGRyKTsKIAkJYnJlYWs7Ci0JY2FzZSBQT1JUX1BPUlRJT19WR0E6CisJY2FzZSBQ T1JUX01NSU9fMTY6CisJCXZhbCA9IElOUkVHMTYocmVnLT5tbWlvX29mZnNldCArIHJlZy0+YWRk cik7CisJCWJyZWFrOworCWNhc2UgUE9SVF9NTUlPXzg6CisJCXZhbCA9IElOUkVHOChyZWctPm1t aW9fb2Zmc2V0ICsgcmVnLT5hZGRyKTsKKwkJYnJlYWs7CisJY2FzZSBQT1JUX1BPUlRJTzoKIAkJ aW9wbCgzKTsKIAkJdmFsID0gaW5iKHJlZy0+YWRkcik7CiAJCWlvcGwoMCk7CiAJCWJyZWFrOwot CWNhc2UgUE9SVF9NTUlPX1ZHQToKLQkJdmFsID0gSU5SRUc4KHJlZy0+YWRkcik7Ci0JCWJyZWFr OwogCWNhc2UgUE9SVF9CVU5JVDoKIAljYXNlIFBPUlRfUFVOSVQ6CiAJY2FzZSBQT1JUX05DOgpA QCAtNDE5LDMwICs0MzQsMzggQEAgc3RhdGljIGludCB3cml0ZV9yZWdpc3RlcihzdHJ1Y3QgY29u ZmlnICpjb25maWcsIHN0cnVjdCByZWcgKnJlZywgdWludDMyX3QgdmFsKQogCX0KIAogCXN3aXRj aCAocmVnLT5wb3J0X2Rlc2MucG9ydCkgewotCWNhc2UgUE9SVF9NTUlPOgorCWNhc2UgUE9SVF9N TUlPXzMyOgogCQlpZiAocmVnLT5lbmdpbmUpIHsKIAkJCXJlZ2lzdGVyX3NybShjb25maWcsIHJl ZywgJnZhbCk7CiAJCX0gZWxzZSB7CiAJCQlPVVRSRUcocmVnLT5tbWlvX29mZnNldCArIHJlZy0+ YWRkciwgdmFsKTsKIAkJfQogCQlicmVhazsKLQljYXNlIFBPUlRfUE9SVElPX1ZHQToKKwljYXNl IFBPUlRfTU1JT18xNjoKKwkJaWYgKHZhbCA+IDB4ZmZmZikgeworCQkJZnByaW50ZihzdGRlcnIs ICJ2YWx1ZSAweCUwOHggb3V0IG9mIHJhbmdlIGZvciBwb3J0ICVzXG4iLAorCQkJCXZhbCwgcmVn LT5wb3J0X2Rlc2MubmFtZSk7CisJCQlyZXR1cm4gLTE7CisJCX0KKwkJT1VUUkVHMTYocmVnLT5t bWlvX29mZnNldCArIHJlZy0+YWRkciwgdmFsKTsKKwkJYnJlYWs7CisJY2FzZSBQT1JUX01NSU9f ODoKIAkJaWYgKHZhbCA+IDB4ZmYpIHsKIAkJCWZwcmludGYoc3RkZXJyLCAidmFsdWUgMHglMDh4 IG91dCBvZiByYW5nZSBmb3IgcG9ydCAlc1xuIiwKIAkJCQl2YWwsIHJlZy0+cG9ydF9kZXNjLm5h bWUpOwogCQkJcmV0dXJuIC0xOwogCQl9Ci0JCWlvcGwoMyk7Ci0JCW91dGIodmFsLCByZWctPmFk ZHIpOwotCQlpb3BsKDApOworCQlPVVRSRUc4KHJlZy0+bW1pb19vZmZzZXQgKyByZWctPmFkZHIs IHZhbCk7CiAJCWJyZWFrOwotCWNhc2UgUE9SVF9NTUlPX1ZHQToKKwljYXNlIFBPUlRfUE9SVElP OgogCQlpZiAodmFsID4gMHhmZikgewogCQkJZnByaW50ZihzdGRlcnIsICJ2YWx1ZSAweCUwOHgg b3V0IG9mIHJhbmdlIGZvciBwb3J0ICVzXG4iLAogCQkJCXZhbCwgcmVnLT5wb3J0X2Rlc2MubmFt ZSk7CiAJCQlyZXR1cm4gLTE7CiAJCX0KLQkJT1VUUkVHOChyZWctPmFkZHIsIHZhbCk7CisJCWlv cGwoMyk7CisJCW91dGIodmFsLCByZWctPmFkZHIpOworCQlpb3BsKDApOwogCQlicmVhazsKIAlj YXNlIFBPUlRfQlVOSVQ6CiAJY2FzZSBQT1JUX1BVTklUOgpAQCAtNDgyLDcgKzUwNSw3IEBAIHN0 YXRpYyBpbnQgcGFyc2VfZW5naW5lKHN0cnVjdCByZWcgKnJlZywgY29uc3QgY2hhciAqcykKIAog CWUgPSBmaW5kX2VuZ2luZShzKTsKIAlpZiAoZSkgewotCQlyZWctPnBvcnRfZGVzYy5wb3J0ID0g UE9SVF9NTUlPOworCQlyZWctPnBvcnRfZGVzYy5wb3J0ID0gUE9SVF9NTUlPXzMyOwogCQlyZWct PnBvcnRfZGVzYy5uYW1lID0gc3RyZHVwKHMpOwogCQlyZWctPnBvcnRfZGVzYy5zdHJpZGUgPSA0 OwogCQlyZWctPmVuZ2luZSA9IHN0cmR1cChzKTsKQEAgLTYyOSw3ICs2NTIsNyBAQCBzdGF0aWMg aW50IGludGVsX3JlZ19kdW1wKHN0cnVjdCBjb25maWcgKmNvbmZpZywgaW50IGFyZ2MsIGNoYXIg KmFyZ3ZbXSkKIAkJcmVnID0gJmNvbmZpZy0+cmVnc1tpXTsKIAogCQkvKiBjYW4ndCBkdW1wIHNp ZGViYW5kIHdpdGggbW1pb2ZpbGUgKi8KLQkJaWYgKGNvbmZpZy0+bW1pb2ZpbGUgJiYgcmVnLT5w b3J0X2Rlc2MucG9ydCAhPSBQT1JUX01NSU8pCisJCWlmIChjb25maWctPm1taW9maWxlICYmICFw b3J0X2lzX21taW8ocmVnLT5wb3J0X2Rlc2MucG9ydCkpCiAJCQljb250aW51ZTsKIAogCQlkdW1w X3JlZ2lzdGVyKGNvbmZpZywgJmNvbmZpZy0+cmVnc1tpXSk7CmRpZmYgLS1naXQgYS90b29scy9p bnRlbF9yZWdfc3BlYy5jIGIvdG9vbHMvaW50ZWxfcmVnX3NwZWMuYwppbmRleCA1YWI1NmVjMWEz MWYuLjdjMWM2ZWQzNGE5ZSAxMDA2NDQKLS0tIGEvdG9vbHMvaW50ZWxfcmVnX3NwZWMuYworKysg Yi90b29scy9pbnRlbF9yZWdfc3BlYy5jCkBAIC0zNSwxNyArMzUsMjIgQEAKIHN0YXRpYyBjb25z dCBzdHJ1Y3QgcG9ydF9kZXNjIHBvcnRfZGVzY3NbXSA9IHsKIAl7CiAJCS5uYW1lID0gIm1taW8i LAotCQkucG9ydCA9IFBPUlRfTU1JTywKKwkJLnBvcnQgPSBQT1JUX01NSU9fMzIsCiAJCS5zdHJp ZGUgPSA0LAogCX0sCiAJewotCQkubmFtZSA9ICJwb3J0aW8tdmdhIiwKLQkJLnBvcnQgPSBQT1JU X1BPUlRJT19WR0EsCisJCS5uYW1lID0gIm1taW8xNiIsCisJCS5wb3J0ID0gUE9SVF9NTUlPXzE2 LAorCQkuc3RyaWRlID0gMiwKKwl9LAorCXsKKwkJLm5hbWUgPSAibW1pbzgiLAorCQkucG9ydCA9 IFBPUlRfTU1JT184LAogCQkuc3RyaWRlID0gMSwKIAl9LAogCXsKLQkJLm5hbWUgPSAibW1pby12 Z2EiLAotCQkucG9ydCA9IFBPUlRfTU1JT19WR0EsCisJCS5uYW1lID0gInBvcnRpbyIsCisJCS5w b3J0ID0gUE9SVF9QT1JUSU8sCiAJCS5zdHJpZGUgPSAxLAogCX0sCiAJewpAQCAtMTE2LDcgKzEy MSw3IEBAIGludCBwYXJzZV9wb3J0X2Rlc2Moc3RydWN0IHJlZyAqcmVnLCBjb25zdCBjaGFyICpz KQogCQlpZiAoZW5kcCA+IHMgJiYgKmVuZHAgPT0gMCkgewogCQkJaWYgKG4gPiBQT1JUX01BWCkg ewogCQkJCS8qIE5vdCBhIHNpZGViYW5kIHBvcnQsIGFzc3VtZSBNTUlPIG9mZnNldC4gKi8KLQkJ CQlwb3J0ID0gUE9SVF9NTUlPOworCQkJCXBvcnQgPSBQT1JUX01NSU9fMzI7CiAJCQkJcmVnLT5t bWlvX29mZnNldCA9IG47CiAJCQl9IGVsc2UgewogCQkJCXBvcnQgPSBuOwpAQCAtMTI3LDcgKzEz Miw3IEBAIGludCBwYXJzZV9wb3J0X2Rlc2Moc3RydWN0IHJlZyAqcmVnLCBjb25zdCBjaGFyICpz KQogCQl9CiAJfSBlbHNlIHsKIAkJLyogTm8gcG9ydCwgZGVmYXVsdCB0byBzZWFyY2hpbmcgZm9y IE1NSU8uICovCi0JCXBvcnQgPSBQT1JUX01NSU87CisJCXBvcnQgPSBQT1JUX01NSU9fMzI7CiAJ CXJlZy0+bW1pb19vZmZzZXQgPSAwOwogCX0KIApkaWZmIC0tZ2l0IGEvdG9vbHMvaW50ZWxfcmVn X3NwZWMuaCBiL3Rvb2xzL2ludGVsX3JlZ19zcGVjLmgKaW5kZXggYTZlMDUxNDM4N2RmLi4yOWY0 ZDlhZTJhNDcgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2ludGVsX3JlZ19zcGVjLmgKKysrIGIvdG9vbHMv aW50ZWxfcmVnX3NwZWMuaApAQCAtMjUsOSArMjUsMTEgQEAKICNkZWZpbmUgX19JTlRFTF9SRUdf U1BFQ19IX18KIAogZW51bSBwb3J0X2FkZHIgewotCVBPUlRfTU1JTyA9IC0xMjcsCi0JUE9SVF9Q T1JUSU9fVkdBLAkvKiBzZWUgdmdhIHJlZyByZWFkL3dyaXRlICovCi0JUE9SVF9NTUlPX1ZHQSwJ CS8qIHNlZSB2Z2EgcmVnIHJlYWQvd3JpdGUgKi8KKwlQT1JUX01NSU9fMzIgPSAtMTI3LAorCVBP UlRfTU1JT18xNiwKKwlQT1JUX01NSU9fOCwKKworCVBPUlRfUE9SVElPLAogCiAJUE9SVF9OT05F ID0gMCwKIAotLSAKMi4yNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1k ZXYK