From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Ernst=20Sj=C3=B6strand?= Subject: [PATCH 5/5] drm/amd/powerplay: Followup fixes to mc_reg_address Date: Sun, 19 Nov 2017 18:52:46 +0100 Message-ID: <20171119175246.4791-5-ernstp@gmail.com> References: <20171119175246.4791-1-ernstp@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171119175246.4791-1-ernstp-Re5JQEeQqe8AvxtiuMwx3w@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 VGhpcyBpcyBhIGZvbGxvd3VwIHRvOgpkcm0vYW1kL3Bvd2VycGxheTogRml4IGJ1ZmZlciBvdmVy Zmxvd3Mgd2l0aCBtY19yZWdfYWRkcmVzcwoKUmV3b3JrICpfc2V0X21jX3NwZWNpYWxfcmVnaXN0 ZXJzIGZvciB0aGUgb3RoZXIgYXJjaGl0ZWN0dXJlcyB0bwp1c2UgdGhlIHNhbWUgbG9naWMgYXMg dGhlIGZpcnN0IHBhdGNoLiBUaGlzIGFsbG93cyB0aGUgbGFzdCBlbnRyeQpvZiB0aGUgYXJyYXkg dG8gYmUgZmlsbGVkIHdpdGhvdXQgYW4gZXJyb3IgbWVzc2FnZSBmb3IgZXhhbXBsZS4KVGhpcyBk b2Vzbid0IGZpeCBhbnkga25vd24gcHJvYmxlbXMsIHBlcmhhcHMgYXZvaWRlZCBieSBsdWNrLgoK U2lnbmVkLW9mZi1ieTogRXJuc3QgU2rDtnN0cmFuZCA8ZXJuc3RwQGdtYWlsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYyAgICAgICAgICAgICAgICAgICB8IDEw ICsrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci9jaV9zbXVt Z3IuYyAgICAgIHwgMTIgKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxh eS9zbXVtZ3IvaWNlbGFuZF9zbXVtZ3IuYyB8IDEyICsrKystLS0tLS0tLQogMyBmaWxlcyBjaGFu Z2VkLCAxMSBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L3NpX2RwbS5jCmluZGV4IDUxZmQwYzlhMjBhNS4uMjk5Y2IzMTYxYjJjIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9zaV9kcG0uYwpAQCAtNTg0NSw5ICs1ODQ1LDkgQEAgc3RhdGljIGludCBz aV9zZXRfbWNfc3BlY2lhbF9yZWdpc3RlcnMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJ CQkJCSgodGVtcF9yZWcgJiAweGZmZmYwMDAwKSkgfAogCQkJCQkoKHRhYmxlLT5tY19yZWdfdGFi bGVfZW50cnlba10ubWNfZGF0YVtpXSAmIDB4ZmZmZjAwMDApID4+IDE2KTsKIAkJCWorKzsKKwog CQkJaWYgKGogPj0gU01DX1NJU0xBTkRTX01DX1JFR0lTVEVSX0FSUkFZX1NJWkUpCiAJCQkJcmV0 dXJuIC1FSU5WQUw7Ci0KIAkJCXRlbXBfcmVnID0gUlJFRzMyKE1DX1BNR19DTURfTVJTKTsKIAkJ CXRhYmxlLT5tY19yZWdfYWRkcmVzc1tqXS5zMSA9IE1DX1BNR19DTURfTVJTOwogCQkJdGFibGUt Pm1jX3JlZ19hZGRyZXNzW2pdLnMwID0gTUNfU0VRX1BNR19DTURfTVJTX0xQOwpAQCAtNTg1OSwx OCArNTg1OSwxNiBAQCBzdGF0aWMgaW50IHNpX3NldF9tY19zcGVjaWFsX3JlZ2lzdGVycyhzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkJdGFibGUtPm1jX3JlZ190YWJsZV9lbnRyeVtr XS5tY19kYXRhW2pdIHw9IDB4MTAwOwogCQkJfQogCQkJaisrOwotCQkJaWYgKGogPj0gU01DX1NJ U0xBTkRTX01DX1JFR0lTVEVSX0FSUkFZX1NJWkUpCi0JCQkJcmV0dXJuIC1FSU5WQUw7CiAKIAkJ CWlmIChhZGV2LT5tYy52cmFtX3R5cGUgIT0gQU1ER1BVX1ZSQU1fVFlQRV9HRERSNSkgeworCQkJ CWlmIChqID49IFNNQ19TSVNMQU5EU19NQ19SRUdJU1RFUl9BUlJBWV9TSVpFKQorCQkJCQlyZXR1 cm4gLUVJTlZBTDsKIAkJCQl0YWJsZS0+bWNfcmVnX2FkZHJlc3Nbal0uczEgPSBNQ19QTUdfQVVU T19DTUQ7CiAJCQkJdGFibGUtPm1jX3JlZ19hZGRyZXNzW2pdLnMwID0gTUNfUE1HX0FVVE9fQ01E OwogCQkJCWZvciAoayA9IDA7IGsgPCB0YWJsZS0+bnVtX2VudHJpZXM7IGsrKykKIAkJCQkJdGFi bGUtPm1jX3JlZ190YWJsZV9lbnRyeVtrXS5tY19kYXRhW2pdID0KIAkJCQkJCSh0YWJsZS0+bWNf cmVnX3RhYmxlX2VudHJ5W2tdLm1jX2RhdGFbaV0gJiAweGZmZmYwMDAwKSA+PiAxNjsKIAkJCQlq Kys7Ci0JCQkJaWYgKGogPj0gU01DX1NJU0xBTkRTX01DX1JFR0lTVEVSX0FSUkFZX1NJWkUpCi0J CQkJCXJldHVybiAtRUlOVkFMOwogCQkJfQogCQkJYnJlYWs7CiAJCWNhc2UgTUNfU0VRX1JFU0VS VkVfTToKQEAgLTU4ODIsOCArNTg4MCw2IEBAIHN0YXRpYyBpbnQgc2lfc2V0X21jX3NwZWNpYWxf cmVnaXN0ZXJzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCQkodGVtcF9yZWcgJiAw eGZmZmYwMDAwKSB8CiAJCQkJCSh0YWJsZS0+bWNfcmVnX3RhYmxlX2VudHJ5W2tdLm1jX2RhdGFb aV0gJiAweDAwMDBmZmZmKTsKIAkJCWorKzsKLQkJCWlmIChqID49IFNNQ19TSVNMQU5EU19NQ19S RUdJU1RFUl9BUlJBWV9TSVpFKQotCQkJCXJldHVybiAtRUlOVkFMOwogCQkJYnJlYWs7CiAJCWRl ZmF1bHQ6CiAJCQlicmVhazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJw bGF5L3NtdW1nci9jaV9zbXVtZ3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3Nt dW1nci9jaV9zbXVtZ3IuYwppbmRleCBlZDRiMzdlNTY2YTMuLmMzNmYwMGVmNDZmMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL2NpX3NtdW1nci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci9jaV9zbXVtZ3IuYwpAQCAt MjYwMCw5ICsyNjAwLDkgQEAgc3RhdGljIGludCBjaV9zZXRfbWNfc3BlY2lhbF9yZWdpc3RlcnMo c3RydWN0IHBwX2h3bWdyICpod21nciwKIAkJCQkJKCh0YWJsZS0+bWNfcmVnX3RhYmxlX2VudHJ5 W2tdLm1jX2RhdGFbaV0gJiAweGZmZmYwMDAwKSA+PiAxNik7CiAJCQl9CiAJCQlqKys7CisKIAkJ CVBQX0FTU0VSVF9XSVRIX0NPREUoKGogPCBTTVU3X0RJU0NSRVRFX01DX1JFR0lTVEVSX0FSUkFZ X1NJWkUpLAogCQkJCSJJbnZhbGlkIFZyYW1JbmZvIHRhYmxlLiIsIHJldHVybiAtRUlOVkFMKTsK LQogCQkJdGVtcF9yZWcgPSBjZ3NfcmVhZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLCBtbU1DX1BN R19DTURfTVJTKTsKIAkJCXRhYmxlLT5tY19yZWdfYWRkcmVzc1tqXS5zMSA9IG1tTUNfUE1HX0NN RF9NUlM7CiAJCQl0YWJsZS0+bWNfcmVnX2FkZHJlc3Nbal0uczAgPSBtbU1DX1NFUV9QTUdfQ01E X01SU19MUDsKQEAgLTI2MTUsMTAgKzI2MTUsMTAgQEAgc3RhdGljIGludCBjaV9zZXRfbWNfc3Bl Y2lhbF9yZWdpc3RlcnMoc3RydWN0IHBwX2h3bWdyICpod21nciwKIAkJCQkJdGFibGUtPm1jX3Jl Z190YWJsZV9lbnRyeVtrXS5tY19kYXRhW2pdIHw9IDB4MTAwOwogCQkJfQogCQkJaisrOwotCQkJ UFBfQVNTRVJUX1dJVEhfQ09ERSgoaiA8PSBTTVU3X0RJU0NSRVRFX01DX1JFR0lTVEVSX0FSUkFZ X1NJWkUpLAotCQkJCSJJbnZhbGlkIFZyYW1JbmZvIHRhYmxlLiIsIHJldHVybiAtRUlOVkFMKTsK IAotCQkJaWYgKCFkYXRhLT5pc19tZW1vcnlfZ2RkcjUgJiYgaiA8IFNNVTdfRElTQ1JFVEVfTUNf UkVHSVNURVJfQVJSQVlfU0laRSkgeworCQkJaWYgKCFkYXRhLT5pc19tZW1vcnlfZ2RkcjUpIHsK KwkJCQlQUF9BU1NFUlRfV0lUSF9DT0RFKChqIDwgU01VN19ESVNDUkVURV9NQ19SRUdJU1RFUl9B UlJBWV9TSVpFKSwKKwkJCQkJIkludmFsaWQgVnJhbUluZm8gdGFibGUuIiwgcmV0dXJuIC1FSU5W QUwpOwogCQkJCXRhYmxlLT5tY19yZWdfYWRkcmVzc1tqXS5zMSA9IG1tTUNfUE1HX0FVVE9fQ01E OwogCQkJCXRhYmxlLT5tY19yZWdfYWRkcmVzc1tqXS5zMCA9IG1tTUNfUE1HX0FVVE9fQ01EOwog CQkJCWZvciAoayA9IDA7IGsgPCB0YWJsZS0+bnVtX2VudHJpZXM7IGsrKykgewpAQCAtMjYyNiw4 ICsyNjI2LDYgQEAgc3RhdGljIGludCBjaV9zZXRfbWNfc3BlY2lhbF9yZWdpc3RlcnMoc3RydWN0 IHBwX2h3bWdyICpod21nciwKIAkJCQkJCSh0YWJsZS0+bWNfcmVnX3RhYmxlX2VudHJ5W2tdLm1j X2RhdGFbaV0gJiAweGZmZmYwMDAwKSA+PiAxNjsKIAkJCQl9CiAJCQkJaisrOwotCQkJCVBQX0FT U0VSVF9XSVRIX0NPREUoKGogPD0gU01VN19ESVNDUkVURV9NQ19SRUdJU1RFUl9BUlJBWV9TSVpF KSwKLQkJCQkJIkludmFsaWQgVnJhbUluZm8gdGFibGUuIiwgcmV0dXJuIC1FSU5WQUwpOwogCQkJ fQogCiAJCQlicmVhazsKQEAgLTI2NDIsOCArMjY0MCw2IEBAIHN0YXRpYyBpbnQgY2lfc2V0X21j X3NwZWNpYWxfcmVnaXN0ZXJzKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsCiAJCQkJCSh0YWJsZS0+ bWNfcmVnX3RhYmxlX2VudHJ5W2tdLm1jX2RhdGFbaV0gJiAweDAwMDBmZmZmKTsKIAkJCX0KIAkJ CWorKzsKLQkJCVBQX0FTU0VSVF9XSVRIX0NPREUoKGogPD0gU01VN19ESVNDUkVURV9NQ19SRUdJ U1RFUl9BUlJBWV9TSVpFKSwKLQkJCQkiSW52YWxpZCBWcmFtSW5mbyB0YWJsZS4iLCByZXR1cm4g LUVJTlZBTCk7CiAJCQlicmVhazsKIAogCQlkZWZhdWx0OgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL2ljZWxhbmRfc211bWdyLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvaWNlbGFuZF9zbXVtZ3IuYwppbmRleCAyZmY2ODJk NDRlOGMuLmQ2MjA3ODY4MWNhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dl cnBsYXkvc211bWdyL2ljZWxhbmRfc211bWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9w b3dlcnBsYXkvc211bWdyL2ljZWxhbmRfc211bWdyLmMKQEAgLTI1NDksOSArMjU0OSw5IEBAIHN0 YXRpYyBpbnQgaWNlbGFuZF9zZXRfbWNfc3BlY2lhbF9yZWdpc3RlcnMoc3RydWN0IHBwX2h3bWdy ICpod21nciwKIAkJCQkJKCh0YWJsZS0+bWNfcmVnX3RhYmxlX2VudHJ5W2tdLm1jX2RhdGFbaV0g JiAweGZmZmYwMDAwKSA+PiAxNik7CiAJCQl9CiAJCQlqKys7CisKIAkJCVBQX0FTU0VSVF9XSVRI X0NPREUoKGogPCBTTVU3MV9ESVNDUkVURV9NQ19SRUdJU1RFUl9BUlJBWV9TSVpFKSwKIAkJCQki SW52YWxpZCBWcmFtSW5mbyB0YWJsZS4iLCByZXR1cm4gLUVJTlZBTCk7Ci0KIAkJCXRlbXBfcmVn ID0gY2dzX3JlYWRfcmVnaXN0ZXIoaHdtZ3ItPmRldmljZSwgbW1NQ19QTUdfQ01EX01SUyk7CiAJ CQl0YWJsZS0+bWNfcmVnX2FkZHJlc3Nbal0uczEgPSBtbU1DX1BNR19DTURfTVJTOwogCQkJdGFi bGUtPm1jX3JlZ19hZGRyZXNzW2pdLnMwID0gbW1NQ19TRVFfUE1HX0NNRF9NUlNfTFA7CkBAIC0y NTY1LDEwICsyNTY1LDEwIEBAIHN0YXRpYyBpbnQgaWNlbGFuZF9zZXRfbWNfc3BlY2lhbF9yZWdp c3RlcnMoc3RydWN0IHBwX2h3bWdyICpod21nciwKIAkJCQl9CiAJCQl9CiAJCQlqKys7Ci0JCQlQ UF9BU1NFUlRfV0lUSF9DT0RFKChqIDw9IFNNVTcxX0RJU0NSRVRFX01DX1JFR0lTVEVSX0FSUkFZ X1NJWkUpLAotCQkJCSJJbnZhbGlkIFZyYW1JbmZvIHRhYmxlLiIsIHJldHVybiAtRUlOVkFMKTsK IAotCQkJaWYgKCFkYXRhLT5pc19tZW1vcnlfZ2RkcjUgJiYgaiA8IFNNVTcxX0RJU0NSRVRFX01D X1JFR0lTVEVSX0FSUkFZX1NJWkUpIHsKKwkJCWlmICghZGF0YS0+aXNfbWVtb3J5X2dkZHI1KSB7 CisJCQkJUFBfQVNTRVJUX1dJVEhfQ09ERSgoaiA8IFNNVTcxX0RJU0NSRVRFX01DX1JFR0lTVEVS X0FSUkFZX1NJWkUpLAorCQkJCQkiSW52YWxpZCBWcmFtSW5mbyB0YWJsZS4iLCByZXR1cm4gLUVJ TlZBTCk7CiAJCQkJdGFibGUtPm1jX3JlZ19hZGRyZXNzW2pdLnMxID0gbW1NQ19QTUdfQVVUT19D TUQ7CiAJCQkJdGFibGUtPm1jX3JlZ19hZGRyZXNzW2pdLnMwID0gbW1NQ19QTUdfQVVUT19DTUQ7 CiAJCQkJZm9yIChrID0gMDsgayA8IHRhYmxlLT5udW1fZW50cmllczsgaysrKSB7CkBAIC0yNTc2 LDggKzI1NzYsNiBAQCBzdGF0aWMgaW50IGljZWxhbmRfc2V0X21jX3NwZWNpYWxfcmVnaXN0ZXJz KHN0cnVjdCBwcF9od21nciAqaHdtZ3IsCiAJCQkJCQkodGFibGUtPm1jX3JlZ190YWJsZV9lbnRy eVtrXS5tY19kYXRhW2ldICYgMHhmZmZmMDAwMCkgPj4gMTY7CiAJCQkJfQogCQkJCWorKzsKLQkJ CQlQUF9BU1NFUlRfV0lUSF9DT0RFKChqIDw9IFNNVTcxX0RJU0NSRVRFX01DX1JFR0lTVEVSX0FS UkFZX1NJWkUpLAotCQkJCQkiSW52YWxpZCBWcmFtSW5mbyB0YWJsZS4iLCByZXR1cm4gLUVJTlZB TCk7CiAJCQl9CiAKIAkJCWJyZWFrOwpAQCAtMjU5Miw4ICsyNTkwLDYgQEAgc3RhdGljIGludCBp Y2VsYW5kX3NldF9tY19zcGVjaWFsX3JlZ2lzdGVycyhzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLAog CQkJCQkodGFibGUtPm1jX3JlZ190YWJsZV9lbnRyeVtrXS5tY19kYXRhW2ldICYgMHgwMDAwZmZm Zik7CiAJCQl9CiAJCQlqKys7Ci0JCQlQUF9BU1NFUlRfV0lUSF9DT0RFKChqIDw9IFNNVTcxX0RJ U0NSRVRFX01DX1JFR0lTVEVSX0FSUkFZX1NJWkUpLAotCQkJCSJJbnZhbGlkIFZyYW1JbmZvIHRh YmxlLiIsIHJldHVybiAtRUlOVkFMKTsKIAkJCWJyZWFrOwogCiAJCWRlZmF1bHQ6Ci0tIAoyLjE0 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=