From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Courbot Subject: [PATCH v3 13/15] secboot: remove ls_ucode_mgr Date: Wed, 2 Nov 2016 15:02:54 +0900 Message-ID: <20161102060256.14341-14-acourbot@nvidia.com> References: <20161102060256.14341-1-acourbot@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161102060256.14341-1-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Ben Skeggs Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org VGhpcyB3YXMgdXNlZCBvbmx5IGxvY2FsbHkgdG8gb25lIGZ1bmN0aW9uIGFuZCBjYW4gYmUgcmVw bGFjZWQgYnkgYWQtaG9jCnZhcmlhYmxlcy4KClNpZ25lZC1vZmYtYnk6IEFsZXhhbmRyZSBDb3Vy Ym90IDxhY291cmJvdEBudmlkaWEuY29tPgotLS0KIGRybS9ub3V2ZWF1L252a20vc3ViZGV2L3Nl Y2Jvb3QvYWNyX3IzNTIuYyB8IDkwICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDU3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3NlY2Jvb3QvYWNyX3IzNTIuYyBiL2RybS9ub3V2 ZWF1L252a20vc3ViZGV2L3NlY2Jvb3QvYWNyX3IzNTIuYwppbmRleCBjZGJhOWZmYzViYmUuLjRi NzIzNzFiZGJhZSAxMDA2NDQKLS0tIGEvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvc2VjYm9vdC9h Y3JfcjM1Mi5jCisrKyBiL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3NlY2Jvb3QvYWNyX3IzNTIu YwpAQCAtMjc4LDc1ICsyNzgsNDQgQEAgbHNfdWNvZGVfaW1nX2ZpbGxfaGVhZGVycyhzdHJ1Y3Qg YWNyX3IzNTIgKmFjciwgc3RydWN0IGxzX3Vjb2RlX2ltZyAqaW1nLAogfQogCiAvKioKLSAqIHN0 cnVjdCBsc191Y29kZV9tZ3IgLSBtYW5hZ2VyIGZvciBhbGwgTFMgZmFsY29uIGZpcm13YXJlcwot ICogQGNvdW50OgludW1iZXIgb2YgbWFuYWdlZCBMUyBmYWxjb25zCi0gKiBAd3ByX3NpemU6CXNp emUgb2YgdGhlIHJlcXVpcmVkIFdQUiByZWdpb24gaW4gYnl0ZXMKLSAqIEBpbWdfbGlzdDoJbGlu a2VkIGxpc3Qgb2YgbHNmX3Vjb2RlX2ltZworICogYWNyX3IzNTJfbHNfZmlsbF9oZWFkZXJzIC0g ZmlsbCBXUFIgYW5kIExTQiBoZWFkZXJzIG9mIGFsbCBtYW5hZ2VkIGltYWdlcwogICovCi1zdHJ1 Y3QgbHNfdWNvZGVfbWdyIHsKLQl1MTYgY291bnQ7Ci0JdTMyIHdwcl9zaXplOwotCXN0cnVjdCBs aXN0X2hlYWQgaW1nX2xpc3Q7Ci19OwotCi1zdGF0aWMgdm9pZAotbHNfdWNvZGVfbWdyX2luaXQo c3RydWN0IGxzX3Vjb2RlX21nciAqbWdyKQotewotCW1lbXNldChtZ3IsIDAsIHNpemVvZigqbWdy KSk7Ci0JSU5JVF9MSVNUX0hFQUQoJm1nci0+aW1nX2xpc3QpOwotfQotCi1zdGF0aWMgdm9pZAot bHNfdWNvZGVfbWdyX2NsZWFudXAoc3RydWN0IGxzX3Vjb2RlX21nciAqbWdyKQotewotCXN0cnVj dCBsc191Y29kZV9pbWcgKmltZywgKnQ7Ci0KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoaW1n LCB0LCAmbWdyLT5pbWdfbGlzdCwgbm9kZSkgewotCQlrZnJlZShpbWctPnVjb2RlX2RhdGEpOwot CQlrZnJlZShpbWcpOwotCX0KLX0KLQotc3RhdGljIHZvaWQKLWxzX3Vjb2RlX21ncl9hZGRfaW1n KHN0cnVjdCBsc191Y29kZV9tZ3IgKm1nciwgc3RydWN0IGxzX3Vjb2RlX2ltZyAqaW1nKQotewot CW1nci0+Y291bnQrKzsKLQlsaXN0X2FkZF90YWlsKCZpbWctPm5vZGUsICZtZ3ItPmltZ19saXN0 KTsKLX0KLQotLyoqCi0gKiBsc191Y29kZV9tZ3JfZmlsbF9oZWFkZXJzIC0gZmlsbCBXUFIgYW5k IExTQiBoZWFkZXJzIG9mIGFsbCBtYW5hZ2VkIGltYWdlcwotICovCi1zdGF0aWMgdm9pZAotbHNf dWNvZGVfbWdyX2ZpbGxfaGVhZGVycyhzdHJ1Y3QgYWNyX3IzNTIgKmFjciwgc3RydWN0IGxzX3Vj b2RlX21nciAqbWdyKQorc3RhdGljIGludAorYWNyX3IzNTJfbHNfZmlsbF9oZWFkZXJzKHN0cnVj dCBhY3JfcjM1MiAqYWNyLCBzdHJ1Y3QgbGlzdF9oZWFkICppbWdzKQogewogCXN0cnVjdCBsc191 Y29kZV9pbWcgKmltZzsKKwlzdHJ1Y3QgbGlzdF9oZWFkICpsOworCXUzMiBjb3VudCA9IDA7CiAJ dTMyIG9mZnNldDsKIAorCS8qIENvdW50IHRoZSBudW1iZXIgb2YgaW1hZ2VzIHRvIG1hbmFnZSAq LworCWxpc3RfZm9yX2VhY2gobCwgaW1ncykKKwkJY291bnQrKzsKKwogCS8qCiAJICogU3RhcnQg d2l0aCBhbiBhcnJheSBvZiBXUFIgaGVhZGVycyBhdCB0aGUgYmFzZSBvZiB0aGUgV1BSLgogCSAq IFRoZSBleHBlY3RhdGlvbiBoZXJlIGlzIHRoYXQgdGhlIHNlY3VyZSBmYWxjb24gd2lsbCBkbyBh IHNpbmdsZSBETUEKIAkgKiByZWFkIG9mIHRoaXMgYXJyYXkgYW5kIGNhY2hlIGl0IGludGVybmFs bHkgc28gaXQncyBvayB0byBwYWNrIHRoZXNlLgogCSAqIEFsc28sIHdlIGFkZCAxIHRvIHRoZSBm YWxjb24gY291bnQgdG8gaW5kaWNhdGUgdGhlIGVuZCBvZiB0aGUgYXJyYXkuCiAJICovCi0Jb2Zm c2V0ID0gc2l6ZW9mKHN0cnVjdCBsc2Zfd3ByX2hlYWRlcikgKiAobWdyLT5jb3VudCArIDEpOwor CW9mZnNldCA9IHNpemVvZihzdHJ1Y3QgbHNmX3dwcl9oZWFkZXIpICogKGNvdW50ICsgMSk7CiAK IAkvKgogCSAqIFdhbGsgdGhlIG1hbmFnZWQgZmFsY29ucywgYWNjb3VudGluZyBmb3IgdGhlIExT QiBzdHJ1Y3RzCiAJICogYXMgd2VsbCBhcyB0aGUgdWNvZGUgaW1hZ2VzLgogCSAqLwotCWxpc3Rf Zm9yX2VhY2hfZW50cnkoaW1nLCAmbWdyLT5pbWdfbGlzdCwgbm9kZSkgeworCWxpc3RfZm9yX2Vh Y2hfZW50cnkoaW1nLCBpbWdzLCBub2RlKSB7CiAJCW9mZnNldCA9IGxzX3Vjb2RlX2ltZ19maWxs X2hlYWRlcnMoYWNyLCBpbWcsIG9mZnNldCk7CiAJfQogCi0JbWdyLT53cHJfc2l6ZSA9IG9mZnNl dDsKKwlyZXR1cm4gb2Zmc2V0OwogfQogCiAvKioKICAqIGxzX3Vjb2RlX21ncl93cml0ZV93cHIg LSB3cml0ZSB0aGUgV1BSIGJsb2IgY29udGVudHMKICAqLwogc3RhdGljIGludAotbHNfdWNvZGVf bWdyX3dyaXRlX3dwcihzdHJ1Y3QgYWNyX3IzNTIgKmFjciwgc3RydWN0IGxzX3Vjb2RlX21nciAq bWdyLAorbHNfdWNvZGVfbWdyX3dyaXRlX3dwcihzdHJ1Y3QgYWNyX3IzNTIgKmFjciwgc3RydWN0 IGxpc3RfaGVhZCAqaW1ncywKIAkJICAgICAgIHN0cnVjdCBudmttX2dwdW9iaiAqd3ByX2Jsb2Is IHUzMiB3cHJfYWRkcikKIHsKIAlzdHJ1Y3QgbHNfdWNvZGVfaW1nICppbWc7CkBAIC0zNTQsNyAr MzIzLDcgQEAgbHNfdWNvZGVfbWdyX3dyaXRlX3dwcihzdHJ1Y3QgYWNyX3IzNTIgKmFjciwgc3Ry dWN0IGxzX3Vjb2RlX21nciAqbWdyLAogCiAJbnZrbV9rbWFwKHdwcl9ibG9iKTsKIAotCWxpc3Rf Zm9yX2VhY2hfZW50cnkoaW1nLCAmbWdyLT5pbWdfbGlzdCwgbm9kZSkgeworCWxpc3RfZm9yX2Vh Y2hfZW50cnkoaW1nLCBpbWdzLCBub2RlKSB7CiAJCWNvbnN0IHN0cnVjdCBhY3JfcjM1Ml9sc19m dW5jICpsc19mdW5jID0KIAkJCQkJICAgICBhY3ItPmZ1bmMtPmxzX2Z1bmNbaW1nLT5mYWxjb25f aWRdOwogCQl1OCBnZGVzY1tsc19mdW5jLT5ibF9kZXNjX3NpemVdOwpAQCAtNDAwLDExICszNjks MTQgQEAgYWNyX3IzNTJfcHJlcGFyZV9sc19ibG9iKHN0cnVjdCBhY3JfcjM1MiAqYWNyLCB1NjQg d3ByX2FkZHIsIHUzMiB3cHJfc2l6ZSwKIAkJCSB1bnNpZ25lZCBsb25nIG1hbmFnZWRfZmFsY29u cykKIHsKIAljb25zdCBzdHJ1Y3QgbnZrbV9zdWJkZXYgKnN1YmRldiA9IGFjci0+YmFzZS5zdWJk ZXY7Ci0Jc3RydWN0IGxzX3Vjb2RlX21nciBtZ3I7CisJc3RydWN0IGxpc3RfaGVhZCBpbWdzOwor CXN0cnVjdCBsc191Y29kZV9pbWcgKmltZywgKnQ7CisJaW50IG1hbmFnZWRfY291bnQgPSAwOwor CXUzMiBpbWFnZV93cHJfc2l6ZTsKIAlpbnQgZmFsY29uX2lkOwogCWludCByZXQ7CiAKLQlsc191 Y29kZV9tZ3JfaW5pdCgmbWdyKTsKKwlJTklUX0xJU1RfSEVBRCgmaW1ncyk7CiAKIAkvKiBMb2Fk IGFsbCBMUyBibG9icyAqLwogCWZvcl9lYWNoX3NldF9iaXQoZmFsY29uX2lkLCAmbWFuYWdlZF9m YWxjb25zLCBOVktNX0ZBTENPTl9FTkQpIHsKQEAgLTQxNyw0OCArMzg5LDUyIEBAIGFjcl9yMzUy X3ByZXBhcmVfbHNfYmxvYihzdHJ1Y3QgYWNyX3IzNTIgKmFjciwgdTY0IHdwcl9hZGRyLCB1MzIg d3ByX3NpemUsCiAJCQlyZXQgPSBQVFJfRVJSKGltZyk7CiAJCQlnb3RvIGNsZWFudXA7CiAJCX0K LQkJbHNfdWNvZGVfbWdyX2FkZF9pbWcoJm1nciwgaW1nKTsKKwkJbGlzdF9hZGRfdGFpbCgmaW1n LT5ub2RlLCAmaW1ncyk7CisJCW1hbmFnZWRfY291bnQrKzsKIAl9CiAKIAkvKgogCSAqIEZpbGwg dGhlIFdQUiBhbmQgTFNGIGhlYWRlcnMgd2l0aCB0aGUgcmlnaHQgb2Zmc2V0cyBhbmQgY29tcHV0 ZQogCSAqIHJlcXVpcmVkIFdQUiBzaXplCiAJICovCi0JbHNfdWNvZGVfbWdyX2ZpbGxfaGVhZGVy cyhhY3IsICZtZ3IpOwotCW1nci53cHJfc2l6ZSA9IEFMSUdOKG1nci53cHJfc2l6ZSwgV1BSX0FM SUdOTUVOVCk7CisJaW1hZ2Vfd3ByX3NpemUgPSBhY3JfcjM1Ml9sc19maWxsX2hlYWRlcnMoYWNy LCAmaW1ncyk7CisJaW1hZ2Vfd3ByX3NpemUgPSBBTElHTihpbWFnZV93cHJfc2l6ZSwgV1BSX0FM SUdOTUVOVCk7CiAKIAkvKiBBbGxvY2F0ZSBHUFUgb2JqZWN0IHRoYXQgd2lsbCBjb250YWluIHRo ZSBXUFIgcmVnaW9uICovCi0JcmV0ID0gbnZrbV9ncHVvYmpfbmV3KHN1YmRldi0+ZGV2aWNlLCBt Z3Iud3ByX3NpemUsIFdQUl9BTElHTk1FTlQsCisJcmV0ID0gbnZrbV9ncHVvYmpfbmV3KHN1YmRl di0+ZGV2aWNlLCBpbWFnZV93cHJfc2l6ZSwgV1BSX0FMSUdOTUVOVCwKIAkJCSAgICAgIGZhbHNl LCBOVUxMLCAmYWNyLT5sc19ibG9iKTsKIAlpZiAocmV0KQogCQlnb3RvIGNsZWFudXA7CiAKIAlu dmttX2RlYnVnKHN1YmRldiwgIiVkIG1hbmFnZWQgTFMgZmFsY29ucywgV1BSIHNpemUgaXMgJWQg Ynl0ZXNcbiIsCi0JCSAgICBtZ3IuY291bnQsIG1nci53cHJfc2l6ZSk7CisJCSAgICBtYW5hZ2Vk X2NvdW50LCBpbWFnZV93cHJfc2l6ZSk7CiAKIAkvKiBJZiBXUFIgYWRkcmVzcyBhbmQgc2l6ZSBh cmUgbm90IGZpeGVkLCBzZXQgdGhlbSB0byBmaXQgdGhlIExTIGJsb2IgKi8KIAlpZiAod3ByX3Np emUgPT0gMCkgewogCQl3cHJfYWRkciA9IGFjci0+bHNfYmxvYi0+YWRkcjsKLQkJd3ByX3NpemUg PSBtZ3Iud3ByX3NpemU7CisJCXdwcl9zaXplID0gaW1hZ2Vfd3ByX3NpemU7CiAJLyoKIAkgKiBC dXQgaWYgdGhlIFdQUiByZWdpb24gaXMgc2V0IGJ5IHRoZSBib290bG9hZGVyLCBpdCBpcyBpbGxl Z2FsIGZvcgogCSAqIHRoZSBIUyBibG9iIHRvIGJlIGxhcmdlciB0aGFuIHRoaXMgcmVnaW9uLgog CSAqLwotCX0gZWxzZSBpZiAobWdyLndwcl9zaXplID4gd3ByX3NpemUpIHsKKwl9IGVsc2UgaWYg KGltYWdlX3dwcl9zaXplID4gd3ByX3NpemUpIHsKIAkJbnZrbV9lcnJvcihzdWJkZXYsICJXUFIg cmVnaW9uIHRvbyBzbWFsbCBmb3IgRlcgYmxvYiFcbiIpOwotCQludmttX2Vycm9yKHN1YmRldiwg InJlcXVpcmVkOiAlZEJcbiIsIG1nci53cHJfc2l6ZSk7CisJCW52a21fZXJyb3Ioc3ViZGV2LCAi cmVxdWlyZWQ6ICVkQlxuIiwgaW1hZ2Vfd3ByX3NpemUpOwogCQludmttX2Vycm9yKHN1YmRldiwg ImF2YWlsYWJsZTogJWRCXG4iLCB3cHJfc2l6ZSk7CiAJCXJldCA9IC1FTk9TUEM7CiAJCWdvdG8g Y2xlYW51cDsKIAl9CiAKIAkvKiBXcml0ZSBMUyBibG9iICovCi0JcmV0ID0gbHNfdWNvZGVfbWdy X3dyaXRlX3dwcihhY3IsICZtZ3IsIGFjci0+bHNfYmxvYiwgd3ByX2FkZHIpOworCXJldCA9IGxz X3Vjb2RlX21ncl93cml0ZV93cHIoYWNyLCAmaW1ncywgYWNyLT5sc19ibG9iLCB3cHJfYWRkcik7 CiAJaWYgKHJldCkKIAkJbnZrbV9ncHVvYmpfZGVsKCZhY3ItPmxzX2Jsb2IpOwogCiBjbGVhbnVw OgotCWxzX3Vjb2RlX21ncl9jbGVhbnVwKCZtZ3IpOworCWxpc3RfZm9yX2VhY2hfZW50cnlfc2Fm ZShpbWcsIHQsICZpbWdzLCBub2RlKSB7CisJCWtmcmVlKGltZy0+dWNvZGVfZGF0YSk7CisJCWtm cmVlKGltZyk7CisJfQogCiAJcmV0dXJuIHJldDsKIH0KLS0gCjIuMTAuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWlsaW5nIGxpc3QK Tm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==