From: Alex Deucher Subject: [PATCH 071/102] drm/amdgpu: skip get/update xgmi topology info when no psp exists Date: Mon, 15 Jul 2019 16:24:06 -0500 Message-ID: <20190715212437.31793-69-alexander.deucher@amd.com> References: <20190715212437.31793-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190715212437.31793-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org> 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: Alex Deucher , Le Ma , Feifei Xu RnJvbTogTGUgTWEgPGxlLm1hQGFtZC5jb20+CgpTaWduZWQtb2ZmLWJ5OiBMZSBNYSA8bGUubWFA YW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEZlaWZlaSBYdSA8RmVpZmVpLlh1QGFtZC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfeGdtaS5jIHwgNDcgKysrKysrKysrKysr Ky0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3hn bWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV94Z21pLmMKaW5kZXggYjAy NDA3MGFkMWNmLi40MWU2NDhkNTZlY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV94Z21pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3hnbWkuYwpAQCAtMjk2LDcgKzI5Niw3IEBAIGludCBhbWRncHVfeGdtaV9hZGRfZGV2aWNl KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXN0cnVjdCBhbWRncHVfeGdtaQkqZW50cnk7 CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKnRtcF9hZGV2ID0gTlVMTDsKIAotCWludCBjb3VudCA9 IDAsIHJldCA9IC1FSU5WQUw7CisJaW50IGNvdW50ID0gMCwgcmV0ID0gMDsKIAogCWlmICghYWRl di0+Z21jLnhnbWkuc3VwcG9ydGVkKQogCQlyZXR1cm4gMDsKQEAgLTMzNywyOSArMzM3LDMyIEBA IGludCBhbWRncHVfeGdtaV9hZGRfZGV2aWNlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQog CXRvcF9pbmZvLT5udW1fbm9kZXMgPSBjb3VudDsKIAloaXZlLT5udW1iZXJfZGV2aWNlcyA9IGNv dW50OwogCi0JbGlzdF9mb3JfZWFjaF9lbnRyeSh0bXBfYWRldiwgJmhpdmUtPmRldmljZV9saXN0 LCBnbWMueGdtaS5oZWFkKSB7Ci0JCS8qIHVwZGF0ZSBub2RlIGxpc3QgZm9yIG90aGVyIGRldmlj ZSBpbiB0aGUgaGl2ZSAqLwotCQlpZiAodG1wX2FkZXYgIT0gYWRldikgewotCQkJdG9wX2luZm8g PSAmdG1wX2FkZXYtPnBzcC54Z21pX2NvbnRleHQudG9wX2luZm87Ci0JCQl0b3BfaW5mby0+bm9k ZXNbY291bnQgLSAxXS5ub2RlX2lkID0gYWRldi0+Z21jLnhnbWkubm9kZV9pZDsKLQkJCXRvcF9p bmZvLT5udW1fbm9kZXMgPSBjb3VudDsKKwlpZiAoYW1kZ3B1X2RldmljZV9pcF9nZXRfaXBfYmxv Y2soYWRldiwgQU1EX0lQX0JMT0NLX1RZUEVfUFNQKSkgeworCQlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHRtcF9hZGV2LCAmaGl2ZS0+ZGV2aWNlX2xpc3QsIGdtYy54Z21pLmhlYWQpIHsKKwkJCS8qIHVw ZGF0ZSBub2RlIGxpc3QgZm9yIG90aGVyIGRldmljZSBpbiB0aGUgaGl2ZSAqLworCQkJaWYgKHRt cF9hZGV2ICE9IGFkZXYpIHsKKwkJCQl0b3BfaW5mbyA9ICZ0bXBfYWRldi0+cHNwLnhnbWlfY29u dGV4dC50b3BfaW5mbzsKKwkJCQl0b3BfaW5mby0+bm9kZXNbY291bnQgLSAxXS5ub2RlX2lkID0K KwkJCQkJYWRldi0+Z21jLnhnbWkubm9kZV9pZDsKKwkJCQl0b3BfaW5mby0+bnVtX25vZGVzID0g Y291bnQ7CisJCQl9CisJCQlyZXQgPSBhbWRncHVfeGdtaV91cGRhdGVfdG9wb2xvZ3koaGl2ZSwg dG1wX2FkZXYpOworCQkJaWYgKHJldCkKKwkJCQlnb3RvIGV4aXQ7CiAJCX0KLQkJcmV0ID0gYW1k Z3B1X3hnbWlfdXBkYXRlX3RvcG9sb2d5KGhpdmUsIHRtcF9hZGV2KTsKLQkJaWYgKHJldCkKLQkJ CWdvdG8gZXhpdDsKLQl9CiAKLQkvKiBnZXQgbGF0ZXN0IHRvcG9sb2d5IGluZm8gZm9yIGVhY2gg ZGV2aWNlIGZyb20gcHNwICovCi0JbGlzdF9mb3JfZWFjaF9lbnRyeSh0bXBfYWRldiwgJmhpdmUt PmRldmljZV9saXN0LCBnbWMueGdtaS5oZWFkKSB7Ci0JCXJldCA9IHBzcF94Z21pX2dldF90b3Bv bG9neV9pbmZvKCZ0bXBfYWRldi0+cHNwLCBjb3VudCwKLQkJCQkmdG1wX2FkZXYtPnBzcC54Z21p X2NvbnRleHQudG9wX2luZm8pOwotCQlpZiAocmV0KSB7Ci0JCQlkZXZfZXJyKHRtcF9hZGV2LT5k ZXYsCi0JCQkJIlhHTUk6IEdldCB0b3BvbG9neSBmYWlsdXJlIG9uIGRldmljZSAlbGx4LCBoaXZl ICVsbHgsIHJldCAlZCIsCi0JCQkJdG1wX2FkZXYtPmdtYy54Z21pLm5vZGVfaWQsCi0JCQkJdG1w X2FkZXYtPmdtYy54Z21pLmhpdmVfaWQsIHJldCk7Ci0JCQkvKiBUbyBkbyA6IGNvbnRpbnVlIHdp dGggc29tZSBub2RlIGZhaWxlZCBvciBkaXNhYmxlIHRoZSB3aG9sZSBoaXZlICovCi0JCQlnb3Rv IGV4aXQ7CisJCS8qIGdldCBsYXRlc3QgdG9wb2xvZ3kgaW5mbyBmb3IgZWFjaCBkZXZpY2UgZnJv bSBwc3AgKi8KKwkJbGlzdF9mb3JfZWFjaF9lbnRyeSh0bXBfYWRldiwgJmhpdmUtPmRldmljZV9s aXN0LCBnbWMueGdtaS5oZWFkKSB7CisJCQlyZXQgPSBwc3BfeGdtaV9nZXRfdG9wb2xvZ3lfaW5m bygmdG1wX2FkZXYtPnBzcCwgY291bnQsCisJCQkJCSZ0bXBfYWRldi0+cHNwLnhnbWlfY29udGV4 dC50b3BfaW5mbyk7CisJCQlpZiAocmV0KSB7CisJCQkJZGV2X2Vycih0bXBfYWRldi0+ZGV2LAor CQkJCQkiWEdNSTogR2V0IHRvcG9sb2d5IGZhaWx1cmUgb24gZGV2aWNlICVsbHgsIGhpdmUgJWxs eCwgcmV0ICVkIiwKKwkJCQkJdG1wX2FkZXYtPmdtYy54Z21pLm5vZGVfaWQsCisJCQkJCXRtcF9h ZGV2LT5nbWMueGdtaS5oaXZlX2lkLCByZXQpOworCQkJCS8qIFRvIGRvIDogY29udGludWUgd2l0 aCBzb21lIG5vZGUgZmFpbGVkIG9yIGRpc2FibGUgdGhlIHdob2xlIGhpdmUgKi8KKwkJCQlnb3Rv IGV4aXQ7CisJCQl9CiAJCX0KIAl9CiAKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9hbWQtZ2Z4