From: Tom St Denis Subject: [PATCH umr] Improve NPI support (include/name/family) Date: Thu, 27 Jul 2017 12:00:07 -0400 Message-ID: <20170727160007.30809-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Tom St Denis QWRkIHRoZSBhYmlsaXR5IHRvIGluY2x1ZGUgZmlsZXMgd2hpY2ggaXMgdXNlZnVsIGZvciBsYXJn ZXIgYXNpY3Mgd2hpY2gKY2FuIHRha2UgdGltZSB0byBwYXJzZS4gIE5vdyB5b3UgY2FuIHNwbGl0 IGl0IHVwIHBlciBJUCBibG9jayBhbmQgdGhlbiBpbmNsdWRlCm11bHRpcGxlIElQIGJsb2NrcyBv bmx5IHdoZW4gbmVjZXNzYXJ5LgoKQWxzbyBhZGRlZCB0aGUgYWJpbGl0eSB0byBhc3NpZ24gZmFt aWx5IElEcyAob2YgdGhlIFVNUiBlbnVtIHNvcnQgbm90IGtlcm5lbAp2YWx1ZXMpIGFuZCBjaGFu Z2UgdGhlIG5hbWUgb2YgdGhlIEFTSUMgc28gaXQncyBub3QgdGllZCB0byB0aGUgZmlsZW5hbWUu CgpTaWduZWQtb2ZmLWJ5OiBUb20gU3QgRGVuaXMgPHRvbS5zdGRlbmlzQGFtZC5jb20+Ci0tLQog ZGVtby9ucGkvZmFrZXJpem8gICAgICAgICAgICAgICAgIHwgIDE1ICstLS0KIGRlbW8vbnBpL2Zh a2VyaXpvMiAgICAgICAgICAgICAgICB8ICAxNiArKysrKwogc3JjL2xpYi9jcmVhdGVfYXNpY19m cm9tX3NjcmlwdC5jIHwgMTM5ICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t CiAzIGZpbGVzIGNoYW5nZWQsIDExMiBpbnNlcnRpb25zKCspLCA1OCBkZWxldGlvbnMoLSkKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBkZW1vL25waS9mYWtlcml6bzIKCmRpZmYgLS1naXQgYS9kZW1vL25w aS9mYWtlcml6byBiL2RlbW8vbnBpL2Zha2VyaXpvCmluZGV4IDhlYzNhMThmN2M1Ny4uNmQ3YWM5 NTgwNzBkIDEwMDY0NAotLS0gYS9kZW1vL25waS9mYWtlcml6bworKysgYi9kZW1vL25waS9mYWtl cml6bwpAQCAtOSwxOCArOSw1IEBAIGJpdCBnZng4MCBtbUdSQk1fU1RBVFVTIENCX0NMRUFOIDEz IDEzCiBiaXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBUQV9CVVNZIDE0IDE0IAogYml0IGdmeDgwIG1t R1JCTV9TVEFUVVMgR0RTX0JVU1kgMTUgMTUgCiBiaXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBXRF9C VVNZX05PX0RNQSAxNiAxNiAKLWJpdCBnZng4MCBtbUdSQk1fU1RBVFVTIFZHVF9CVVNZIDE3IDE3 IAotYml0IGdmeDgwIG1tR1JCTV9TVEFUVVMgSUFfQlVTWV9OT19ETUEgMTggMTggCi1iaXQgZ2Z4 ODAgbW1HUkJNX1NUQVRVUyBJQV9CVVNZIDE5IDE5IAotYml0IGdmeDgwIG1tR1JCTV9TVEFUVVMg U1hfQlVTWSAyMCAyMCAKLWJpdCBnZng4MCBtbUdSQk1fU1RBVFVTIFdEX0JVU1kgMjEgMjEgCi1i aXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBTUElfQlVTWSAyMiAyMiAKLWJpdCBnZng4MCBtbUdSQk1f U1RBVFVTIEJDSV9CVVNZIDIzIDIzIAotYml0IGdmeDgwIG1tR1JCTV9TVEFUVVMgU0NfQlVTWSAy NCAyNCAKLWJpdCBnZng4MCBtbUdSQk1fU1RBVFVTIFBBX0JVU1kgMjUgMjUgCi1iaXQgZ2Z4ODAg bW1HUkJNX1NUQVRVUyBEQl9CVVNZIDI2IDI2IAotYml0IGdmeDgwIG1tR1JCTV9TVEFUVVMgQ1Bf Q09IRVJFTkNZX0JVU1kgMjggMjggCi1iaXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBDUF9CVVNZIDI5 IDI5IAotYml0IGdmeDgwIG1tR1JCTV9TVEFUVVMgQ0JfQlVTWSAzMCAzMCAKLWJpdCBnZng4MCBt bUdSQk1fU1RBVFVTIEdVSV9BQ1RJVkUgMzEgMzEgCitpbmNsdWRlIGZha2VyaXpvMgogCmRpZmYg LS1naXQgYS9kZW1vL25waS9mYWtlcml6bzIgYi9kZW1vL25waS9mYWtlcml6bzIKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi43OGMzMTdhYWE2MGYKLS0tIC9kZXYvbnVs bAorKysgYi9kZW1vL25waS9mYWtlcml6bzIKQEAgLTAsMCArMSwxNiBAQAorYml0IGdmeDgwIG1t R1JCTV9TVEFUVVMgVkdUX0JVU1kgMTcgMTcKK2JpdCBnZng4MCBtbUdSQk1fU1RBVFVTIElBX0JV U1lfTk9fRE1BIDE4IDE4CitiaXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBJQV9CVVNZIDE5IDE5Citi aXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBTWF9CVVNZIDIwIDIwCitiaXQgZ2Z4ODAgbW1HUkJNX1NU QVRVUyBXRF9CVVNZIDIxIDIxCitiaXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBTUElfQlVTWSAyMiAy MgorYml0IGdmeDgwIG1tR1JCTV9TVEFUVVMgQkNJX0JVU1kgMjMgMjMKK2JpdCBnZng4MCBtbUdS Qk1fU1RBVFVTIFNDX0JVU1kgMjQgMjQKK2JpdCBnZng4MCBtbUdSQk1fU1RBVFVTIFBBX0JVU1kg MjUgMjUKK2JpdCBnZng4MCBtbUdSQk1fU1RBVFVTIERCX0JVU1kgMjYgMjYKK2JpdCBnZng4MCBt bUdSQk1fU1RBVFVTIENQX0NPSEVSRU5DWV9CVVNZIDI4IDI4CitiaXQgZ2Z4ODAgbW1HUkJNX1NU QVRVUyBDUF9CVVNZIDI5IDI5CitiaXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBDQl9CVVNZIDMwIDMw CitiaXQgZ2Z4ODAgbW1HUkJNX1NUQVRVUyBHVUlfQUNUSVZFIDMxIDMxCituYW1lIGNhcnJpem8K K2ZhbWlseSAyCmRpZmYgLS1naXQgYS9zcmMvbGliL2NyZWF0ZV9hc2ljX2Zyb21fc2NyaXB0LmMg Yi9zcmMvbGliL2NyZWF0ZV9hc2ljX2Zyb21fc2NyaXB0LmMKaW5kZXggMzRjNzc4NzBlYzFjLi4w YzIyZjNiYTFiOWIgMTAwNjQ0Ci0tLSBhL3NyYy9saWIvY3JlYXRlX2FzaWNfZnJvbV9zY3JpcHQu YworKysgYi9zcmMvbGliL2NyZWF0ZV9hc2ljX2Zyb21fc2NyaXB0LmMKQEAgLTE5OCw2ICsxOTgs MTQgQEAgb3V0X29mX21lbToKIAlyZXR1cm4gLTE7CiB9CiAKK3N0YXRpYyB2b2lkIGNob21wKGNo YXIgKnN0cikKK3sKKwljaGFyICpwID0gJnN0cltzdHJsZW4oc3RyKS0xXTsKKwl3aGlsZSAocCAh PSBzdHIgJiYgKCpwID09ICdccicgfHwgKnAgPT0gJ1xuJykpIHsKKwkJKnAgPSAwOworCQktLXA7 CisJfQorfQogCiAvLyBjcmVhdGUgYW4gYXNpYyBmcm9tIGEgc2NyaXB0IHdpdGggbXVsdGlwbGVz IG9mIHRoZSBmb2xsb3dpbmcgbGluZXMKIC8vIHJlZyAke2lwbmFtZX0gJHtyZWduYW1lfSAke3R5 cGV9ICR7YWRkcn0KQEAgLTIwNSw0MyArMjEzLDIyIEBAIG91dF9vZl9tZW06CiAvLwogLy8gZm9y IHNvYzE1IGRldmljZXMgeW91IG5lZWQgdG8gY29tcHV0ZSB0aGUgbGluZWFyIG9mZnNldCBmb3Ig dGhlIHJlZ2lzdGVyCiAvLyBmb3IgdGhhdCBwYXJ0aWN1bGFyIEFTSUMuCi1zdHJ1Y3QgdW1yX2Fz aWMgKnVtcl9jcmVhdGVfYXNpY19mcm9tX3NjcmlwdChzdHJ1Y3QgdW1yX29wdGlvbnMgKm9wdGlv bnMsIGNoYXIgKm5hbWUpCisKK3N0YXRpYyBpbnQgcGFyc2VfZmlsZShzdHJ1Y3QgdW1yX2FzaWMg KmFzaWMsIGNoYXIgKnBhdGgsIGNoYXIgKm5hbWUpCiB7Ci0Jc3RydWN0IHVtcl9hc2ljICphc2lj OwotCWNoYXIgKnR4dCwgbGluZVs1MTJdOwogCUZJTEUgKmY7Ci0JaW50IGxpbmVubyA9IDEsIGks IGosIGs7Ci0KLQlpZiAoIW9wdGlvbnMtPnVzZV9wY2kpCi0JCWZwcmludGYoc3RkZXJyLCAiW1dB Uk5JTkddOiBTaG91bGQgdXNlIC0tcGNpIHdoZW4gdXNpbmcgY3JlYXRlX2FzaWNfZnJvbV9zY3Jp cHQoKVxuIik7CisJY2hhciAqdHh0LCBsaW5lWzUxMl07CisJaW50IGxpbmVubyA9IDE7CiAKLQlm ID0gZm9wZW4obmFtZSwgInIiKTsKKwlzbnByaW50ZihsaW5lLCBzaXplb2YobGluZSktMSwgIiVz JXMiLCBwYXRoLCBuYW1lKTsKKwlmID0gZm9wZW4obGluZSwgInIiKTsKIAlpZiAoIWYpIHsKIAkJ cGVycm9yKCJDYW5ub3Qgb3BlbiBzY3JpcHQgZmlsZSIpOwotCQlyZXR1cm4gTlVMTDsKLQl9Ci0K LQl0eHQgPSBuYW1lICsgc3RybGVuKG5hbWUpIC0gMTsKLQkvLyB3YWxrIGJhY2sgdG8gc3RhcnQg b3IgZmlyc3QKLQl3aGlsZSAodHh0ICE9IG5hbWUpIHsKLQkJaWYgKCp0eHQgPT0gJy8nKSB7Ci0J CQkrK3R4dDsKLQkJCWJyZWFrOwotCQl9Ci0JCS0tdHh0OwotCX0KLQotCWFzaWMgPSBjYWxsb2Mo MSwgc2l6ZW9mICphc2ljKTsKLQlpZiAoIWFzaWMgfHwgIShhc2ljLT5hc2ljbmFtZSA9IHN0cmR1 cCh0eHQpKSkgewotCQlmcHJpbnRmKHN0ZGVyciwgIltFUlJPUl06IE91dCBvZiBtZW1vcnlcbiIp OwotCQlmcmVlKGFzaWMpOwotCQlmY2xvc2UoZik7Ci0JCXJldHVybiBOVUxMOworCQlyZXR1cm4g LTE7CiAJfQotCWFzaWMtPm9wdGlvbnMgPSAqb3B0aW9uczsKLQlhc2ljLT5mYW1pbHkgPSBGQU1J TFlfTlBJOwogCiAJd2hpbGUgKGZnZXRzKGxpbmUsIHNpemVvZihsaW5lKS0xLCBmKSAhPSBOVUxM KSB7CisJCWNob21wKGxpbmUpOwogCQl0eHQgPSAmbGluZVswXTsKIAkJc2tpcF93aGl0ZXNwYWNl KCZ0eHQpOwogCQlpZiAoIW1lbWNtcCh0eHQsICJyZWciLCAzKSkgewpAQCAtMjU2LDYgKzI0Mywy OSBAQCBzdHJ1Y3QgdW1yX2FzaWMgKnVtcl9jcmVhdGVfYXNpY19mcm9tX3NjcmlwdChzdHJ1Y3Qg dW1yX29wdGlvbnMgKm9wdGlvbnMsIGNoYXIgKgogCQkJCWZwcmludGYoc3RkZXJyLCAiW0VSUk9S XTogRXJyb3IgYWRkaW5nIGJpdCBkZWZpbml0aW9uXG4iKTsKIAkJCQlnb3RvIGVycm9yOwogCQkJ fQorCQl9IGVsc2UgaWYgKCFtZW1jbXAodHh0LCAiaW5jbHVkZSIsIDcpKSB7CisJCQl0eHQgKz0g NzsKKwkJCXNraXBfd2hpdGVzcGFjZSgmdHh0KTsKKwkJCWlmIChwYXJzZV9maWxlKGFzaWMsIHBh dGgsIHR4dCkpCisJCQkJZ290byBlcnJvcjsKKwkJfSBlbHNlIGlmICghbWVtY21wKHR4dCwgIm5h bWUiLCA0KSkgeworCQkJdHh0ICs9IDQ7CisJCQlza2lwX3doaXRlc3BhY2UoJnR4dCk7CisJCQlm cmVlKGFzaWMtPmFzaWNuYW1lKTsKKwkJCWFzaWMtPmFzaWNuYW1lID0gc3RyZHVwKHR4dCk7CisJ CQlpZiAoIWFzaWMtPmFzaWNuYW1lKSB7CisJCQkJZnByaW50ZihzdGRlcnIsICJbRVJST1JdOiBP dXQgb2YgbWVtb3J5XG4iKTsKKwkJCQlnb3RvIGVycm9yOworCQkJfQorCQl9IGVsc2UgaWYgKCFt ZW1jbXAodHh0LCAiZmFtaWx5IiwgNikpIHsKKwkJCWludCBmYW1pbHk7CisJCQl0eHQgKz0gNjsK KwkJCXNraXBfd2hpdGVzcGFjZSgmdHh0KTsKKwkJCWlmIChzc2NhbmYodHh0LCAiJWQiLCAmZmFt aWx5KSAhPSAxKSB7CisJCQkJZnByaW50ZihzdGRlcnIsICJbRVJST1JdOiBFeHBlY3RpbmcgZGVj aW1hbCBudW1iZXIgZm9yIGFzaWMgZmFtaWx5XG4iKTsKKwkJCQlnb3RvIGVycm9yOworCQkJfQor CQkJYXNpYy0+ZmFtaWx5ID0gZmFtaWx5OwogCQl9IGVsc2UgaWYgKHR4dFswXSkgewogCQkJZnBy aW50ZihzdGRlcnIsICJbRVJST1JdOiBJbnZhbGlkIHNjcmlwdCBjb21tYW5kIDwlcz5cbiIsIHR4 dCk7CiAJCQlnb3RvIGVycm9yOwpAQCAtMjYzLDI0ICsyNzMsNjUgQEAgc3RydWN0IHVtcl9hc2lj ICp1bXJfY3JlYXRlX2FzaWNfZnJvbV9zY3JpcHQoc3RydWN0IHVtcl9vcHRpb25zICpvcHRpb25z LCBjaGFyICoKIAkJKytsaW5lbm87CiAJfQogCWZjbG9zZShmKTsKLQlyZXR1cm4gYXNpYzsKKwly ZXR1cm4gMDsKIGVycm9yOgotCWZwcmludGYoc3RkZXJyLCAiW0VSUk9SXTogUGFyc2VyIGVycm9y IG9uIGxpbmUgJWQ6XG5cdFx0JXNcbiIsIGxpbmVubywgbGluZSk7CisJZnByaW50ZihzdGRlcnIs ICJbRVJST1JdOiBQYXJzZXIgZXJyb3Igb24gbGluZSAlcyVzOiVkOlxuXHRcdCVzXG4iLCBwYXRo LCBuYW1lLCBsaW5lbm8sIGxpbmUpOwogCWZjbG9zZShmKTsKLQlmb3IgKGkgPSAwOyBpIDwgYXNp Yy0+bm9fYmxvY2tzOyBpKyspIHsKLQkJZm9yIChqID0gMDsgaiA8IGFzaWMtPmJsb2Nrc1tpXS0+ bm9fcmVnczsgaisrKSB7Ci0JCQlmb3IgKGsgPSAwOyBrIDwgYXNpYy0+YmxvY2tzW2ldLT5yZWdz W2pdLm5vX2JpdHM7IGsrKykKLQkJCQlmcmVlKGFzaWMtPmJsb2Nrc1tpXS0+cmVnc1tqXS5iaXRz W2tdLnJlZ25hbWUpOwotCQkJZnJlZShhc2ljLT5ibG9ja3NbaV0tPnJlZ3Nbal0uYml0cyk7Ci0J CQlmcmVlKGFzaWMtPmJsb2Nrc1tpXS0+cmVnc1tqXS5yZWduYW1lKTsKKwlyZXR1cm4gLTE7Cit9 CisKK3N0cnVjdCB1bXJfYXNpYyAqdW1yX2NyZWF0ZV9hc2ljX2Zyb21fc2NyaXB0KHN0cnVjdCB1 bXJfb3B0aW9ucyAqb3B0aW9ucywgY2hhciAqbmFtZSkKK3sKKwlzdHJ1Y3QgdW1yX2FzaWMgKmFz aWM7CisJY2hhciAqdHh0LCBwYXRoWzUxMl07CisJaW50IGksIGosIGs7CisKKwlpZiAoIW9wdGlv bnMtPnVzZV9wY2kpCisJCWZwcmludGYoc3RkZXJyLCAiW1dBUk5JTkddOiBTaG91bGQgdXNlIC0t cGNpIHdoZW4gdXNpbmcgY3JlYXRlX2FzaWNfZnJvbV9zY3JpcHQoKVxuIik7CisKKwl0eHQgPSBu YW1lICsgc3RybGVuKG5hbWUpIC0gMTsKKwkvLyB3YWxrIGJhY2sgdG8gc3RhcnQgb3IgZmlyc3QK Kwl3aGlsZSAodHh0ICE9IG5hbWUpIHsKKwkJaWYgKCp0eHQgPT0gJy8nKSB7CisJCQkrK3R4dDsK KwkJCWJyZWFrOwogCQl9Ci0JCWZyZWUoYXNpYy0+YmxvY2tzW2ldLT5yZWdzKTsKLQkJZnJlZShh c2ljLT5ibG9ja3NbaV0tPmlwbmFtZSk7Ci0JCWZyZWUoYXNpYy0+YmxvY2tzW2ldKTsKKwkJLS10 eHQ7CiAJfQotCWZyZWUoYXNpYy0+YmxvY2tzKTsKLQlmcmVlKGFzaWMtPmFzaWNuYW1lKTsKLQlm cmVlKGFzaWMpOwogCi0JcmV0dXJuIE5VTEw7CisJLy8gZGVmYXVsdCB0byAuLyBmb3IgdGhlIHBh dGggb3IgcmVhZCB0aGUgcGF0aCBvdXQgb2YgdGhlIG5hbWUKKwlpZiAodHh0ID09IG5hbWUpIHsK KwkJc3RyY3B5KHBhdGgsICIuLyIpOworCX0gZWxzZSB7CisJCW1lbXNldChwYXRoLCAwLCBzaXpl b2YgcGF0aCk7CisJCW1lbWNweShwYXRoLCBuYW1lLCAoaW50KSh0eHQgLSBuYW1lKSk7CisJfQor CisJYXNpYyA9IGNhbGxvYygxLCBzaXplb2YgKmFzaWMpOworCWlmICghYXNpYyB8fCAhKGFzaWMt PmFzaWNuYW1lID0gc3RyZHVwKHR4dCkpKSB7CisJCWZwcmludGYoc3RkZXJyLCAiW0VSUk9SXTog T3V0IG9mIG1lbW9yeVxuIik7CisJCWZyZWUoYXNpYyk7CisJCXJldHVybiBOVUxMOworCX0KKwlh c2ljLT5vcHRpb25zID0gKm9wdGlvbnM7CisJYXNpYy0+ZmFtaWx5ID0gRkFNSUxZX05QSTsKKwor CWlmIChwYXJzZV9maWxlKGFzaWMsIHBhdGgsIHR4dCkpIHsKKwkJZm9yIChpID0gMDsgaSA8IGFz aWMtPm5vX2Jsb2NrczsgaSsrKSB7CisJCQlmb3IgKGogPSAwOyBqIDwgYXNpYy0+YmxvY2tzW2ld LT5ub19yZWdzOyBqKyspIHsKKwkJCQlmb3IgKGsgPSAwOyBrIDwgYXNpYy0+YmxvY2tzW2ldLT5y ZWdzW2pdLm5vX2JpdHM7IGsrKykKKwkJCQkJZnJlZShhc2ljLT5ibG9ja3NbaV0tPnJlZ3Nbal0u Yml0c1trXS5yZWduYW1lKTsKKwkJCQlmcmVlKGFzaWMtPmJsb2Nrc1tpXS0+cmVnc1tqXS5iaXRz KTsKKwkJCQlmcmVlKGFzaWMtPmJsb2Nrc1tpXS0+cmVnc1tqXS5yZWduYW1lKTsKKwkJCX0KKwkJ CWZyZWUoYXNpYy0+YmxvY2tzW2ldLT5yZWdzKTsKKwkJCWZyZWUoYXNpYy0+YmxvY2tzW2ldLT5p cG5hbWUpOworCQkJZnJlZShhc2ljLT5ibG9ja3NbaV0pOworCQl9CisJCWZyZWUoYXNpYy0+Ymxv Y2tzKTsKKwkJZnJlZShhc2ljLT5hc2ljbmFtZSk7CisJCWZyZWUoYXNpYyk7CisJCXJldHVybiBO VUxMOworCX0KKwlyZXR1cm4gYXNpYzsKIH0KLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==