From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom St Denis <tstdenis82-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 6/7] drm/amd/amdgpu: Tidy up SI SMC code
Date: Tue,  6 Sep 2016 12:18:43 -0400
Message-ID: <20160906161844.21370-7-tom.stdenis@amd.com>
References: <20160906161844.21370-1-tom.stdenis@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
In-Reply-To: <20160906161844.21370-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
List-Id: Discussion list for AMD gfx <amd-gfx.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/amd-gfx>
List-Post: <mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
List-Help: <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=subscribe>
Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Sender: "amd-gfx" <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Tom St Denis <tom.stdenis-5C7GfCeVMHo@public.gmane.org>

QXMgd2VsbCBhcyBtZXJnZSBTTUMgY2xvY2sgZnVuY3Rpb25zIGludG8gb25lIHRvIHJlZHVjZSBM
T0MuCgpTaWduZWQtb2ZmLWJ5OiBUb20gU3QgRGVuaXMgPHRvbS5zdGRlbmlzQGFtZC5jb20+Ci0t
LQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMgICAgICAgfCAgNiArKystLS0K
IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NpX3NtYy5jICAgICAgIHwgMjUgKysrKysrKyst
LS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lzbGFuZHNfc21j
LmggfCAgMyArLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRp
b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMg
Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYwppbmRleCA4ZTZiYmFmMzgwZDAu
LjdiOWRlYmVmZDY0YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lf
ZHBtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMKQEAgLTM5NDQs
MTMgKzM5NDQsMTMgQEAgc3RhdGljIHZvaWQgc2lfZHBtX3N0YXJ0X3NtYyhzdHJ1Y3QgYW1kZ3B1
X2RldmljZSAqYWRldikKIHsKIAlzaV9wcm9ncmFtX2p1bXBfb25fc3RhcnQoYWRldik7CiAJc2lf
c3RhcnRfc21jKGFkZXYpOwotCXNpX3N0YXJ0X3NtY19jbG9jayhhZGV2KTsKKwlzaV9zbWNfY2xv
Y2soYWRldiwgdHJ1ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIHNpX2RwbV9zdG9wX3NtYyhzdHJ1Y3Qg
YW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlzaV9yZXNldF9zbWMoYWRldik7Ci0Jc2lfc3RvcF9z
bWNfY2xvY2soYWRldik7CisJc2lfc21jX2Nsb2NrKGFkZXYsIGZhbHNlKTsKIH0KIAogc3RhdGlj
IGludCBzaV9wcm9jZXNzX2Zpcm13YXJlX2hlYWRlcihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl
dikKQEAgLTQzNjYsNyArNDM2Niw3IEBAIHN0YXRpYyBpbnQgc2lfdXBsb2FkX2Zpcm13YXJlKHN0
cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXN0cnVjdCBzaV9wb3dlcl9pbmZvICpzaV9waSA9
IHNpX2dldF9waShhZGV2KTsKIAogCXNpX3Jlc2V0X3NtYyhhZGV2KTsKLQlzaV9zdG9wX3NtY19j
bG9jayhhZGV2KTsKKwlzaV9zbWNfY2xvY2soYWRldiwgZmFsc2UpOwogCiAJcmV0dXJuIHNpX2xv
YWRfc21jX3Vjb2RlKGFkZXYsIHNpX3BpLT5zcmFtX2VuZCk7CiB9CmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9zbWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k
Z3B1L3NpX3NtYy5jCmluZGV4IGMxYzI1OTQ2NGFlNy4uMmNjNjI4Y2QyNDdjIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9zbWMuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vYW1kL2FtZGdwdS9zaV9zbWMuYwpAQCAtODQsNyArODQsNiBAQCBpbnQgc2lfY29weV9ieXRl
c190b19zbWMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQlnb3RvIGRvbmU7CiAKIAkJ
b3JpZ2luYWxfZGF0YSA9IFJSRUczMihTTUNfSU5EX0RBVEFfMCk7Ci0KIAkJZXh0cmFfc2hpZnQg
PSA4ICogKDQgLSBieXRlX2NvdW50KTsKIAogCQl3aGlsZSAoYnl0ZV9jb3VudCA+IDApIHsKQEAg
LTk0LDcgKzkzLDYgQEAgaW50IHNpX2NvcHlfYnl0ZXNfdG9fc21jKHN0cnVjdCBhbWRncHVfZGV2
aWNlICphZGV2LAogCQl9CiAKIAkJZGF0YSA8PD0gZXh0cmFfc2hpZnQ7Ci0KIAkJZGF0YSB8PSAo
b3JpZ2luYWxfZGF0YSAmIH4oKH4wVUwpIDw8IGV4dHJhX3NoaWZ0KSk7CiAKIAkJcmV0ID0gc2lf
c2V0X3NtY19zcmFtX2FkZHJlc3MoYWRldiwgYWRkciwgbGltaXQpOwpAQCAtMTI4LDggKzEyNiw4
IEBAIHZvaWQgc2lfcmVzZXRfc21jKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCVJSRUcz
MihDQl9DR1RUX1NDTEtfQ1RSTCk7CiAJUlJFRzMyKENCX0NHVFRfU0NMS19DVFJMKTsKIAotCXRt
cCA9IFJSRUczMl9TTUMoU01DX1NZU0NPTl9SRVNFVF9DTlRMKTsKLQl0bXAgfD0gUlNUX1JFRzsK
Kwl0bXAgPSBSUkVHMzJfU01DKFNNQ19TWVNDT05fUkVTRVRfQ05UTCkgfAorCSAgICAgIFJTVF9S
RUc7CiAJV1JFRzMyX1NNQyhTTUNfU1lTQ09OX1JFU0VUX0NOVEwsIHRtcCk7CiB9CiAKQEAgLTE0
MCwyMCArMTM4LDE0IEBAIGludCBzaV9wcm9ncmFtX2p1bXBfb25fc3RhcnQoc3RydWN0IGFtZGdw
dV9kZXZpY2UgKmFkZXYpCiAJcmV0dXJuIHNpX2NvcHlfYnl0ZXNfdG9fc21jKGFkZXYsIDB4MCwg
ZGF0YSwgNCwgc2l6ZW9mKGRhdGEpKzEpOwogfQogCi12b2lkIHNpX3N0b3Bfc21jX2Nsb2NrKHN0
cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotewotCXUzMiB0bXAgPSBSUkVHMzJfU01DKFNNQ19T
WVNDT05fQ0xPQ0tfQ05UTF8wKTsKLQotCXRtcCB8PSBDS19ESVNBQkxFOwotCi0JV1JFRzMyX1NN
QyhTTUNfU1lTQ09OX0NMT0NLX0NOVExfMCwgdG1wKTsKLX0KLQotdm9pZCBzaV9zdGFydF9zbWNf
Y2xvY2soc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCit2b2lkIHNpX3NtY19jbG9jayhzdHJ1
Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBlbmFibGUpCiB7CiAJdTMyIHRtcCA9IFJSRUcz
Ml9TTUMoU01DX1NZU0NPTl9DTE9DS19DTlRMXzApOwogCi0JdG1wICY9IH5DS19ESVNBQkxFOwor
CWlmIChlbmFibGUpCisJCXRtcCB8PSBDS19ESVNBQkxFOworCWVsc2UKKwkJdG1wICY9IH5DS19E
SVNBQkxFOwogCiAJV1JFRzMyX1NNQyhTTUNfU1lTQ09OX0NMT0NLX0NOVExfMCwgdG1wKTsKIH0K
QEAgLTE4NSw5ICsxNzcsOCBAQCBQUFNNQ19SZXN1bHQgc2lfc2VuZF9tc2dfdG9fc21jKHN0cnVj
dCBhbWRncHVfZGV2aWNlICphZGV2LCBQUFNNQ19Nc2cgbXNnKQogCQkJYnJlYWs7CiAJCXVkZWxh
eSgxKTsKIAl9Ci0JdG1wID0gUlJFRzMyKFNNQ19SRVNQXzApOwogCi0JcmV0dXJuIChQUFNNQ19S
ZXN1bHQpdG1wOworCXJldHVybiAoUFBTTUNfUmVzdWx0KVJSRUczMihTTUNfUkVTUF8wKTsKIH0K
IAogUFBTTUNfUmVzdWx0IHNpX3dhaXRfZm9yX3NtY19pbmFjdGl2ZShzdHJ1Y3QgYW1kZ3B1X2Rl
dmljZSAqYWRldikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Npc2xh
bmRzX3NtYy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lzbGFuZHNfc21jLmgKaW5k
ZXggNTQyYWI0NmFlYjQwLi5jNWIzMzc3ZGYyZGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9hbWQvYW1kZ3B1L3Npc2xhbmRzX3NtYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k
Z3B1L3Npc2xhbmRzX3NtYy5oCkBAIC00MDgsOCArNDA4LDcgQEAgaW50IHNpX2NvcHlfYnl0ZXNf
dG9fc21jKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogdm9pZCBzaV9zdGFydF9zbWMoc3Ry
dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogdm9pZCBzaV9yZXNldF9zbWMoc3RydWN0IGFtZGdw
dV9kZXZpY2UgKmFkZXYpOwogaW50IHNpX3Byb2dyYW1fanVtcF9vbl9zdGFydChzdHJ1Y3QgYW1k
Z3B1X2RldmljZSAqYWRldik7Ci12b2lkIHNpX3N0b3Bfc21jX2Nsb2NrKHN0cnVjdCBhbWRncHVf
ZGV2aWNlICphZGV2KTsKLXZvaWQgc2lfc3RhcnRfc21jX2Nsb2NrKHN0cnVjdCBhbWRncHVfZGV2
aWNlICphZGV2KTsKK3ZvaWQgc2lfc21jX2Nsb2NrKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2
LCBib29sIGVuYWJsZSk7CiBib29sIHNpX2lzX3NtY19ydW5uaW5nKHN0cnVjdCBhbWRncHVfZGV2
aWNlICphZGV2KTsKIFBQU01DX1Jlc3VsdCBzaV9zZW5kX21zZ190b19zbWMoc3RydWN0IGFtZGdw
dV9kZXZpY2UgKmFkZXYsIFBQU01DX01zZyBtc2cpOwogUFBTTUNfUmVzdWx0IHNpX3dhaXRfZm9y
X3NtY19pbmFjdGl2ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7Ci0tIAoyLjkuMwoKX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWls
aW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==