From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Courbot Subject: [PATCH v2 12/14] secboot: remove unneeded ls_ucode_img member Date: Thu, 27 Oct 2016 13:37:06 +0900 Message-ID: <20161027043708.22538-13-acourbot@nvidia.com> References: <20161027043708.22538-1-acourbot@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161027043708.22538-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 dWNvZGVfaGVhZGVyIGlzIG5vdCB1c2VkIGFueXdoZXJlLCBzbyBqdXN0IGdldCByaWQgb2YgaXQu CgpTaWduZWQtb2ZmLWJ5OiBBbGV4YW5kcmUgQ291cmJvdCA8YWNvdXJib3RAbnZpZGlhLmNvbT4K LS0tCiBkcm0vbm91dmVhdS9udmttL3N1YmRldi9zZWNib290L2Fjcl9yMzUyLmMgICAgfCAyNSAr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcm0vbm91dmVhdS9udmttL3N1YmRldi9zZWNib290 L2xzX3Vjb2RlLmggICAgfCAgMiAtLQogZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvc2VjYm9vdC9s c191Y29kZV9nci5jIHwgIDIgLS0KIDMgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAy MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9zZWNi b290L2Fjcl9yMzUyLmMgYi9kcm0vbm91dmVhdS9udmttL3N1YmRldi9zZWNib290L2Fjcl9yMzUy LmMKaW5kZXggZDlmMDJjMWMwZGU2Li4xNWUxZDgyOWYyNjUgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2 ZWF1L252a20vc3ViZGV2L3NlY2Jvb3QvYWNyX3IzNTIuYworKysgYi9kcm0vbm91dmVhdS9udmtt L3N1YmRldi9zZWNib290L2Fjcl9yMzUyLmMKQEAgLTIxMiwxMiArMjEyLDYgQEAgbHNfdWNvZGVf aW1nX2ZpbGxfaGVhZGVycyhzdHJ1Y3QgbnZrbV9hY3JfcjM1MiAqYWNyLCBzdHJ1Y3QgbHNfdWNv ZGVfaW1nICppbWcsCiAJY29uc3Qgc3RydWN0IG52a21fYWNyX3IzNTJfbHNfZnVuYyAqZnVuYyA9 CiAJCQkJCSAgICBhY3ItPmZ1bmMtPmxzX2Z1bmNbaW1nLT5mYWxjb25faWRdOwogCi0JaWYgKGlt Zy0+dWNvZGVfaGVhZGVyKSB7Ci0JCW52a21fZmF0YWwoYWNyLT5iYXNlLnN1YmRldiwKLQkJCSAg ICJpbWFnZXMgd2l0aG91Z2ggbG9hZGVyIGFyZSBub3Qgc3VwcG9ydGVkIHlldCFcbiIpOwotCQly ZXR1cm4gb2Zmc2V0OwotCX0KLQogCS8qIEZpbGwgV1BSIGhlYWRlciAqLwogCXdoZHItPmZhbGNv bl9pZCA9IGltZy0+ZmFsY29uX2lkOwogCXdoZHItPmJvb3RzdHJhcF9vd25lciA9IGFjci0+YmFz ZS5mdW5jLT5ib290X2ZhbGNvbjsKQEAgLTMwNyw3ICszMDEsNiBAQCBsc191Y29kZV9tZ3JfY2xl YW51cChzdHJ1Y3QgbHNfdWNvZGVfbWdyICptZ3IpCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3Nh ZmUoaW1nLCB0LCAmbWdyLT5pbWdfbGlzdCwgbm9kZSkgewogCQlrZnJlZShpbWctPnVjb2RlX2Rh dGEpOwotCQlrZnJlZShpbWctPnVjb2RlX2hlYWRlcik7CiAJCWtmcmVlKGltZyk7CiAJfQogfQpA QCAtMzYwLDYgKzM1MywxMCBAQCBsc191Y29kZV9tZ3Jfd3JpdGVfd3ByKHN0cnVjdCBudmttX2Fj cl9yMzUyICphY3IsIHN0cnVjdCBsc191Y29kZV9tZ3IgKm1nciwKIAludmttX2ttYXAod3ByX2Js b2IpOwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShpbWcsICZtZ3ItPmltZ19saXN0LCBub2RlKSB7 CisJCWNvbnN0IHN0cnVjdCBudmttX2Fjcl9yMzUyX2xzX2Z1bmMgKmxzX2Z1bmMgPQorCQkJCQkg ICAgIGFjci0+ZnVuYy0+bHNfZnVuY1tpbWctPmZhbGNvbl9pZF07CisJCXU4IGdkZXNjW2xzX2Z1 bmMtPmJsX2Rlc2Nfc2l6ZV07CisKIAkJbnZrbV9ncHVvYmpfbWVtY3B5X3RvKHdwcl9ibG9iLCBw b3MsICZpbWctPndwcl9oZWFkZXIsCiAJCQkJICAgICAgc2l6ZW9mKGltZy0+d3ByX2hlYWRlcikp OwogCkBAIC0zNjcsMTggKzM2NCwxMCBAQCBsc191Y29kZV9tZ3Jfd3JpdGVfd3ByKHN0cnVjdCBu dmttX2Fjcl9yMzUyICphY3IsIHN0cnVjdCBsc191Y29kZV9tZ3IgKm1nciwKIAkJCQkgICAgICZp bWctPmxzYl9oZWFkZXIsIHNpemVvZihpbWctPmxzYl9oZWFkZXIpKTsKIAogCQkvKiBHZW5lcmF0 ZSBhbmQgd3JpdGUgQkwgZGVzY3JpcHRvciAqLwotCQlpZiAoIWltZy0+dWNvZGVfaGVhZGVyKSB7 Ci0JCQljb25zdCBzdHJ1Y3QgbnZrbV9hY3JfcjM1Ml9sc19mdW5jICpsc19mdW5jID0KLQkJCQkJ ICAgICBhY3ItPmZ1bmMtPmxzX2Z1bmNbaW1nLT5mYWxjb25faWRdOwotCQkJdTggZ2Rlc2NbbHNf ZnVuYy0+YmxfZGVzY19zaXplXTsKLQotCQkJbHNfZnVuYy0+Z2VuZXJhdGVfYmxfZGVzYygmYWNy LT5iYXNlLCBpbWcsIHdwcl9hZGRyLAotCQkJCQkJICAmZ2Rlc2MpOworCQlsc19mdW5jLT5nZW5l cmF0ZV9ibF9kZXNjKCZhY3ItPmJhc2UsIGltZywgd3ByX2FkZHIsICZnZGVzYyk7CiAKLQkJCW52 a21fZ3B1b2JqX21lbWNweV90byh3cHJfYmxvYiwKLQkJCQkJICAgICAgaW1nLT5sc2JfaGVhZGVy LmJsX2RhdGFfb2ZmLAotCQkJCQkgICAgICAmZ2Rlc2MsIGxzX2Z1bmMtPmJsX2Rlc2Nfc2l6ZSk7 Ci0JCX0KKwkJbnZrbV9ncHVvYmpfbWVtY3B5X3RvKHdwcl9ibG9iLCBpbWctPmxzYl9oZWFkZXIu YmxfZGF0YV9vZmYsCisJCQkJICAgICAgJmdkZXNjLCBsc19mdW5jLT5ibF9kZXNjX3NpemUpOwog CiAJCS8qIENvcHkgdWNvZGUgKi8KIAkJbnZrbV9ncHVvYmpfbWVtY3B5X3RvKHdwcl9ibG9iLCBp bWctPmxzYl9oZWFkZXIudWNvZGVfb2ZmLApkaWZmIC0tZ2l0IGEvZHJtL25vdXZlYXUvbnZrbS9z dWJkZXYvc2VjYm9vdC9sc191Y29kZS5oIGIvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvc2VjYm9v dC9sc191Y29kZS5oCmluZGV4IDA1MTgzNzFhMjg3Yy4uM2Q4YzQyZTExODQ3IDEwMDY0NAotLS0g YS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9zZWNib290L2xzX3Vjb2RlLmgKKysrIGIvZHJtL25v dXZlYXUvbnZrbS9zdWJkZXYvc2VjYm9vdC9sc191Y29kZS5oCkBAIC0xNzMsNyArMTczLDYgQEAg c3RydWN0IGxzX3Vjb2RlX2ltZ19kZXNjIHsKICAqIEBub2RlOgkJdG8gbGluayB3aXRoaW4gbHNm X3Vjb2RlX21ncgogICogQGZhbGNvbl9pZDoJCUlEIG9mIHRoZSBmYWxjb24gdGhpcyBMUyBmaXJt d2FyZSBpcyBmb3IKICAqIEB1Y29kZV9kZXNjOgkJbG9hZGVkIG9yIGdlbmVyYXRlZCBtYXAgb2Yg dWNvZGVfZGF0YQotICogQHVjb2RlX2hlYWRlcjoJaGVhZGVyIG9mIHRoZSBmaXJtd2FyZQogICog QHVjb2RlX2RhdGE6CQlmaXJtd2FyZSBwYXlsb2FkIChjb2RlIGFuZCBkYXRhKQogICogQHVjb2Rl X3NpemU6CQlzaXplIGluIGJ5dGVzIG9mIGRhdGEgaW4gdWNvZGVfZGF0YQogICogQHdwcl9oZWFk ZXI6CQlXUFIgaGVhZGVyIHRvIGJlIHdyaXR0ZW4gdG8gdGhlIExTIGJsb2IKQEAgLTE4OCw3ICsx ODcsNiBAQCBzdHJ1Y3QgbHNfdWNvZGVfaW1nIHsKIAllbnVtIG52a21fZmFsY29uaWR4IGZhbGNv bl9pZDsKIAogCXN0cnVjdCBsc191Y29kZV9pbWdfZGVzYyB1Y29kZV9kZXNjOwotCXUzMiAqdWNv ZGVfaGVhZGVyOwogCXU4ICp1Y29kZV9kYXRhOwogCXUzMiB1Y29kZV9zaXplOwogCmRpZmYgLS1n aXQgYS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9zZWNib290L2xzX3Vjb2RlX2dyLmMgYi9kcm0v bm91dmVhdS9udmttL3N1YmRldi9zZWNib290L2xzX3Vjb2RlX2dyLmMKaW5kZXggMDlmNWYxZjFh NTBkLi4xYzMyY2IwZjE2ZjkgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3Nl Y2Jvb3QvbHNfdWNvZGVfZ3IuYworKysgYi9kcm0vbm91dmVhdS9udmttL3N1YmRldi9zZWNib290 L2xzX3Vjb2RlX2dyLmMKQEAgLTk4LDggKzk4LDYgQEAgbHNfdWNvZGVfaW1nX2xvYWRfZ3IoY29u c3Qgc3RydWN0IG52a21fc3ViZGV2ICpzdWJkZXYsIHN0cnVjdCBsc191Y29kZV9pbWcgKmltZywK IAljaGFyIGZbNjRdOwogCWludCByZXQ7CiAKLQlpbWctPnVjb2RlX2hlYWRlciA9IE5VTEw7Ci0K IAlzbnByaW50ZihmLCBzaXplb2YoZiksICJnci8lc19ibCIsIGZhbGNvbl9uYW1lKTsKIAlyZXQg PSBudmttX2Zpcm13YXJlX2dldChzdWJkZXYtPmRldmljZSwgZiwgJmJsKTsKIAlpZiAocmV0KQot LSAKMi4xMC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK