10924 2017-01-13 08:52:52 +0000 RMC: Bring supported RMC functions to systemd-boot efi stub 2017-02-23 10:08:52 +0000 1 1 7 Build System, Metadata & Runtime BSPs bsps-meta-intel 2.2 x86 Multiple RESOLVED FIXED Medium+ enhancement 2.3 M3 1 mikko.ylinen mikko.ylinen bluelightning jianxun.zhang randy.macleod sgw --- --- No (bug/feature does not impact docs) oldest_to_newest 69794 0 mikko.ylinen 2017-01-13 08:52:52 +0000 So far RMC only supports systemd-boot with patches to it. The functions supported now are: - Global command line fragment (KBOOTPARAM) - Installer to deploy any files for board in RMC DB - Boot entries This ticket tracks the task to bring these RMC functions into systemd-boot's EFI stub as much as we can. 69807 1 jianxun.zhang 2017-01-13 21:17:55 +0000 Mikko, Thanks for bring this to us. we excluded RMC support in EFI stub when the use case was not clear. It should be very similar as what we did in main systemd-boot boot loader once stub can load RMC database into mem at runtime. There could be some dependency and things to be clarified: () I think we only support building a standalone main bootloader (systemd-boot.bbclass) in OE. You may already enable stub in a upper layer, but we need to have it in OE or meta-intel BSP first unless the solution happens at that higher layer. (To have another ticket?) () There could be more than one option for the location of RMC database when seeing the embedded image with stub. Keeping it on ESP (FAT partition) as what we did can keep design image-agnostic unless we face other requirements or preferences, say, the way you want to verify things in an image on boot. Just share these initial thoughts without much investigation. 69824 2 mikko.ylinen 2017-01-16 13:18:57 +0000 (In reply to comment #1) > Mikko, > Thanks for bring this to us. we excluded RMC support in EFI stub when the > use case was not clear. It should be very similar as what we did in main > systemd-boot boot loader once stub can load RMC database into mem at runtime. True. You'll find one concrete use-case in Ostro OS where the kernel, initrd, cmdline, and the stub is bundled in a single EFI executable. I'd need this setup to utilize RMC too. > > () I think we only support building a standalone main bootloader > (systemd-boot.bbclass) in OE. You may already enable stub in a upper layer, > but we need to have it in OE or meta-intel BSP first unless the solution > happens at that higher layer. (To have another ticket?) I'm working on making it possible to build the systemd-boot's EFI stub in OE-Core and submitting the "combo EFI app" functionality there too. Before that's in place, I'd be happy to test any patch that enables RMC in the stub. 69865 3 jianxun.zhang 2017-01-17 19:20:40 +0000 I will work on this with Mikko to bring RMC into systemd-boot stub. I think we could prototype it in EFI context first without a real embedded image in meta-intel. Mikko, Currently we patched systemd-boot to have these RMC functionalities in the main boot loader: () Loading board-specific conf files from RMC db at boot I don't see the support of conf files in EFI stub. I assume we won't have this feature in stub. () A global command line fragment (KBOOTPARAM) It is appended to the base cmdline before booting kernel at runtime. A base cmdline can be from a conf file generated by OE or a board-specific conf in RMC. If stub won't support conf file, a base version of cmdline working as default could be packed into embedded image by ostro This is for boards not checked in RMC database. Appending to the base cmdline, or overriding it, should be clarified. (more for use cases, less on coding) () EFI installer deploy conf files on ESP in installation. (actually, it also deploy any files to rootfs for user space) I am not sure if Ostro has an installer use case at this point. This is related but not _in_ EFI bootloader. 69870 4 3595 jianxun.zhang 2017-01-17 22:55:33 +0000 Created attachment 3595 WIP Patch: [RMC]-support-global-kernel-cmdline-fragment.path 69871 5 jianxun.zhang 2017-01-17 23:01:52 +0000 Mikko, I attached a WIP patch that fetches a board-specific command line fragment and appends it to the base command line. I tried it in EFI shell on my broxton-m board and I can see stub gets the fragment if I put a print message to show it. However, no more test has been done. You will need to add it in meta-intel or your systemd-boot layer to make it effective in a Yocto or Ostro build. Please also refer to my previous comment #3 for some clarifications. 69927 6 mikko.ylinen 2017-01-19 11:43:06 +0000 (In reply to comment #3) > > () A global command line fragment (KBOOTPARAM) For me to get started, KBOOTPARAM is enough. (In reply to comment #5) > I attached a WIP patch that fetches a board-specific command line fragment > and appends it to the base command line. Thanks! 69943 7 jianxun.zhang 2017-01-19 20:52:24 +0000 Saul & Mikko, Just for the tracking's sake, you may want to add "blocked by" in this task since the final result depends on enabling stub and embedded image build, although technically we could merge this without breaking anything first in meta-intel... 69958 8 3598 mikko.ylinen 2017-01-20 13:21:43 +0000 Created attachment 3598 Updated 'Link RMC' patch 70003 9 3599 mikko.ylinen 2017-01-23 14:33:21 +0000 Created attachment 3599 WIP Patch v2: [RMC]-support-global-kernel-cmdline-fragment.patch v2 of the "add RMC in stub" patch. 70004 10 mikko.ylinen 2017-01-23 14:38:58 +0000 (In reply to comment #5) > I tried it in EFI shell on my broxton-m board and I can see stub gets the > fragment if I put a print message to show it. However, no more test has been > done. You will need to add it in meta-intel or your systemd-boot layer to > make it effective in a Yocto or Ostro build. v2 uploaded. I noticed the fragment was found OK but the system never booted with the new cmdline. That was because linux_exec() only copied the "old" part. Another observation: Joule 5700 maps to the broxton-m fingerprint (both get the same signature). I'm not sure that's expected. 70893 11 mikko.ylinen 2017-02-23 10:08:52 +0000 Fixed by my patch set merged in meta-intel http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/commit/?id=7fba4baa0ec6e5e02b1bd6da55dec2746a56b381 3595 2017-01-17 22:55:33 +0000 2017-01-23 14:33:21 +0000 WIP Patch: [RMC]-support-global-kernel-cmdline-fragment.path 0001-WIP-rmc-Support-global-kernel-command-line-fragment.patch text/plain 4298 jianxun.zhang RnJvbSA2MDAzMTRiMzIxNDA1NTRiN2QxNTI0MzU0YmVlOWY3YzhiZGU3MjUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaWFueHVuIFpoYW5nIDxqaWFueHVuLnpoYW5nQGxpbnV4Lmlu dGVsLmNvbT4KRGF0ZTogVHVlLCAxNyBKYW4gMjAxNyAxNDo0NDo0MyAtMDgwMApTdWJqZWN0OiBb UEFUQ0hdIFtXSVBdcm1jOiBTdXBwb3J0IGdsb2JhbCBrZXJuZWwgY29tbWFuZCBsaW5lIGZyYWdt ZW50CgpUaGlzIGNoYW5nZSBpbnRlZ3JhdGVzIHJtYyBpbnRvIEVGSSBzdHViIGFuZCBzdXBwb3J0 cyBhCmdsb2JhbCBmcmFnbWVudCB0aGF0IGlzIGFwcGVuZGVkIHRvIHRoZSBjbWRsaW5lIGF0IGJv b3QuCgpUaGUgZnJhZ21lbnQgaXMgYm9hcmQtc3BlY2lmaWMuCgpjb21taXQgbXNnIG5lZWRzIHRv IGJlIHJldmlzZWQuLi4KClNpZ25lZC1vZmYtYnk6IEppYW54dW4gWmhhbmcgPGppYW54dW4uemhh bmdAbGludXguaW50ZWwuY29tPgotLS0KIHNyYy9ib290L2VmaS9zdHViLmMgfCA1NSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogMSBmaWxlIGNo YW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3Jj L2Jvb3QvZWZpL3N0dWIuYyBiL3NyYy9ib290L2VmaS9zdHViLmMKaW5kZXggMWUyNTBmMy4uNGNi Y2JhZSAxMDA2NDQKLS0tIGEvc3JjL2Jvb3QvZWZpL3N0dWIuYworKysgYi9zcmMvYm9vdC9lZmkv c3R1Yi5jCkBAIC0xMyw3ICsxMyw3IEBACiAKICNpbmNsdWRlIDxlZmkuaD4KICNpbmNsdWRlIDxl ZmlsaWIuaD4KLQorI2luY2x1ZGUgPHJtY19hcGkuaD4KICNpbmNsdWRlICJkaXNrLmgiCiAjaW5j bHVkZSAiZ3JhcGhpY3MuaCIKICNpbmNsdWRlICJsaW51eC5oIgpAQCAtMjQsOSArMjQsMzQgQEAK IAogLyogbWFnaWMgc3RyaW5nIHRvIGZpbmQgaW4gdGhlIGJpbmFyeSBpbWFnZSAqLwogc3RhdGlj IGNvbnN0IGNoYXIgX19hdHRyaWJ1dGVfXygodXNlZCkpIG1hZ2ljW10gPSAiIyMjIyBMb2FkZXJJ bmZvOiBzeXN0ZW1kLXN0dWIgIiBWRVJTSU9OICIgIyMjIyI7CitzdGF0aWMgQ0hBUjgqIHJtY19k YjsKIAogc3RhdGljIGNvbnN0IEVGSV9HVUlEIGdsb2JhbF9ndWlkID0gRUZJX0dMT0JBTF9WQVJJ QUJMRTsKIAorc3RhdGljIFVJTlROIHJtY19pbml0aWFsaXplKEVGSV9GSUxFICpyb290X2Rpciwg Q0hBUjggKipkYikgeworICAgICAgICBVSU5UTiBsZW47CisgICAgICAgIFVJTlROIHJldCA9IDE7 CisKKyAgICAgICAgaWYgKCFkYikKKyAgICAgICAgICAgICAgICByZXR1cm4gcmV0OworCisgICAg ICAgICpkYiA9IE5VTEw7CisKKyAgICAgICAgLyogbG9hZCBybWMgZGF0YWJhc2UgKi8KKyAgICAg ICAgbGVuID0gZmlsZV9yZWFkKHJvb3RfZGlyLCBMIlxccm1jLmRiIiwgMCwgMCwgZGIpOworCisg ICAgICAgIGlmIChsZW4gPD0gMCkKKyAgICAgICAgICAgICAgICBnb3RvIGRvbmU7CisKKyAgICAg ICAgcmV0ID0gMDsKK2RvbmU6CisgICAgICAgIGlmIChyZXQpCisgICAgICAgICAgICAgICAgRnJl ZVBvb2woKmRiKTsKKworICAgICAgICByZXR1cm4gcmV0OworfQorCisKIEVGSV9TVEFUVVMgZWZp X21haW4oRUZJX0hBTkRMRSBpbWFnZSwgRUZJX1NZU1RFTV9UQUJMRSAqc3lzX3RhYmxlKSB7CiAg ICAgICAgIEVGSV9MT0FERURfSU1BR0UgKmxvYWRlZF9pbWFnZTsKICAgICAgICAgRUZJX0ZJTEUg KnJvb3RfZGlyOwpAQCAtNDYsNiArNzEsMTAgQEAgRUZJX1NUQVRVUyBlZmlfbWFpbihFRklfSEFO RExFIGltYWdlLCBFRklfU1lTVEVNX1RBQkxFICpzeXNfdGFibGUpIHsKICAgICAgICAgVUlOVE4g c3pzW0VMRU1FTlRTT0Yoc2VjdGlvbnMpLTFdID0ge307CiAgICAgICAgIENIQVI4ICpjbWRsaW5l ID0gTlVMTDsKICAgICAgICAgVUlOVE4gY21kbGluZV9sZW47CisgICAgICAgIHJtY19maWxlX3Qg cm1jX2ZpbGU7CisgICAgICAgIFVJTlQ2NCBuZXdfY21kbGluZV9sZW4gPSAwOworICAgICAgICBD SEFSOCAqbmV3X2NtZGxpbmUgPSBOVUxMOworICAgICAgICBDSEFSOCAqcCA9IE5VTEw7CiAgICAg ICAgIENIQVIxNiB1dWlkWzM3XTsKICAgICAgICAgRUZJX1NUQVRVUyBlcnI7CiAKQEAgLTY2LDYg Kzk1LDkgQEAgRUZJX1NUQVRVUyBlZmlfbWFpbihFRklfSEFORExFIGltYWdlLCBFRklfU1lTVEVN X1RBQkxFICpzeXNfdGFibGUpIHsKICAgICAgICAgICAgICAgICByZXR1cm4gRUZJX0xPQURfRVJS T1I7CiAgICAgICAgIH0KIAorICAgICAgICAvKiBJbml0aWFsaXplIHJtYyAqLworICAgICAgICBy bWNfaW5pdGlhbGl6ZShyb290X2RpciwgJnJtY19kYik7CisKICAgICAgICAgbG9hZGVkX2ltYWdl X3BhdGggPSBEZXZpY2VQYXRoVG9TdHIobG9hZGVkX2ltYWdlLT5GaWxlUGF0aCk7CiAKICAgICAg ICAgaWYgKGVmaXZhcl9nZXRfcmF3KCZnbG9iYWxfZ3VpZCwgTCJTZWN1cmVCb290IiwgJmIsICZz aXplKSA9PSBFRklfU1VDQ0VTUykgewpAQCAtMTEyLDYgKzE0NCwyNSBAQCBFRklfU1RBVFVTIGVm aV9tYWluKEVGSV9IQU5ETEUgaW1hZ2UsIEVGSV9TWVNURU1fVEFCTEUgKnN5c190YWJsZSkgewog I2VuZGlmCiAgICAgICAgIH0KIAorICAgICAgICAvKiBJZiBib2FyZCBoYXMgYSBmcmFnbWVudCBp biBybWMgZGF0YWJhc2UsIGFwcGVuZCBpdCB0byB0aGUgY21kbGluZSAqLworICAgICAgICBpZiAo cm1jX2RiKSB7CisgICAgICAgICAgICAgICAgaWYgKCFybWNfZ2ltbWVfZmlsZShzeXNfdGFibGUs IHJtY19kYiwgIktCT09UUEFSQU0iLCAmcm1jX2ZpbGUpKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICBuZXdfY21kbGluZV9sZW4gPSBybWNfZmlsZS5ibG9iX2xlbiArIGNtZGxpbmVfbGVuICsg MjsKKyAgICAgICAgICAgICAgICAgICAgICAgIG5ld19jbWRsaW5lID0gQWxsb2NhdGVQb29sKG5l d19jbWRsaW5lX2xlbiAqIHNpemVvZihDSEFSOCkpOworICAgICAgICAgICAgICAgICAgICAgICAg aWYgKG5ld19jbWRsaW5lKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENvcHlN ZW0obmV3X2NtZGxpbmUsIGNtZGxpbmUsIGNtZGxpbmVfbGVuKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcCA9IG5ld19jbWRsaW5lICsgY21kbGluZV9sZW4gLSAxOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBsYXp5Li4uIGFzc3VtaW5nIG9ubHkgb25lIG51 bGwgY2hhciAqLworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoKnAgIT0gJ1ww JykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwKys7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICpwKysgPSAnICc7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIENvcHlNZW0ocCwgcm1jX2ZpbGUuYmxvYiwgcm1jX2ZpbGUuYmxvYl9sZW4p OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAqKHAgKyBybWNfZmlsZS5ibG9iX2xl bikgPSAnXDAnOworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0K KyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgbmV3X2NtZGxpbmUgPSBjbWRsaW5lOwor CiAgICAgICAgIC8qIGV4cG9ydCB0aGUgZGV2aWNlIHBhdGggdGhpcyBpbWFnZSBpcyBzdGFydGVk IGZyb20gKi8KICAgICAgICAgaWYgKGRpc2tfZ2V0X3BhcnRfdXVpZChsb2FkZWRfaW1hZ2UtPkRl dmljZUhhbmRsZSwgdXVpZCkgPT0gRUZJX1NVQ0NFU1MpCiAgICAgICAgICAgICAgICAgZWZpdmFy X3NldChMIkxvYWRlckRldmljZVBhcnRVVUlEIiwgdXVpZCwgRkFMU0UpOwpAQCAtMTE5LDcgKzE3 MCw3IEBAIEVGSV9TVEFUVVMgZWZpX21haW4oRUZJX0hBTkRMRSBpbWFnZSwgRUZJX1NZU1RFTV9U QUJMRSAqc3lzX3RhYmxlKSB7CiAgICAgICAgIGlmIChzenNbM10gPiAwKQogICAgICAgICAgICAg ICAgIGdyYXBoaWNzX3NwbGFzaCgoVUlOVDggKikoKFVJTlROKWxvYWRlZF9pbWFnZS0+SW1hZ2VC YXNlICsgYWRkcnNbM10pLCBzenNbM10sIE5VTEwpOwogCi0gICAgICAgIGVyciA9IGxpbnV4X2V4 ZWMoaW1hZ2UsIGNtZGxpbmUsIGNtZGxpbmVfbGVuLAorICAgICAgICBlcnIgPSBsaW51eF9leGVj KGltYWdlLCBuZXdfY21kbGluZSwgY21kbGluZV9sZW4sCiAgICAgICAgICAgICAgICAgICAgICAg ICAgKFVJTlROKWxvYWRlZF9pbWFnZS0+SW1hZ2VCYXNlICsgYWRkcnNbMV0sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgKFVJTlROKWxvYWRlZF9pbWFnZS0+SW1hZ2VCYXNlICsgYWRkcnNbMl0s IHN6c1syXSk7CiAKLS0gCjIuNy40Cgo= 3598 2017-01-20 13:21:43 +0000 2017-01-20 13:21:43 +0000 Updated 'Link RMC' patch 0001-sd-boot-Link-RMC-library-into-bootloader-and-stub.patch text/plain 1402 mikko.ylinen RnJvbSBmZTFjMmZkZmU4MWYyYWMyYjQxZmU4NTQzYmEwN2YxOTExNzcwZDI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaWFueHVuIFpoYW5nIDxqaWFueHVuLnpoYW5nQGxpbnV4Lmlu dGVsLmNvbT4KRGF0ZTogU2F0LCAyMSBNYXkgMjAxNiAxODo1MjowNyAtMDcwMApTdWJqZWN0OiBb UEFUQ0hdIHNkLWJvb3Q6IExpbmsgUk1DIGxpYnJhcnkgaW50byBib290bG9hZGVyIGFuZCBzdHVi CgpBZGQgUk1DIGxpYnJhcnkgaW50byBib290bG9hZGVyIGJpbmFyeSBhbmQgc3R1Yi4KClVwc3Ry ZWFtLVN0YXR1czogUGVuZGluZwoKU2lnbmVkLW9mZi1ieTogSmlhbnh1biBaaGFuZyA8amlhbnh1 bi56aGFuZ0BsaW51eC5pbnRlbC5jb20+Ci0tLQogTWFrZWZpbGUuYW0gfCA0ICsrLS0KIDEgZmls ZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv TWFrZWZpbGUuYW0gYi9NYWtlZmlsZS5hbQppbmRleCAzMDUwOTlhYjYuLjlmYjZmOWI3YiAxMDA2 NDQKLS0tIGEvTWFrZWZpbGUuYW0KKysrIGIvTWFrZWZpbGUuYW0KQEAgLTI4MDIsNyArMjgwMiw3 IEBAICQodG9wX2J1aWxkZGlyKS9zcmMvYm9vdC9lZmkvJS5vOiAkKHRvcF9zcmNkaXIpL3NyYy9i b290L2VmaS8lLmMgJChhZGRwcmVmaXggJCh0CiAKICQoc3lzdGVtZF9ib290X3NvbGliKTogJChz eXN0ZW1kX2Jvb3Rfb2JqZWN0cykKIAkkKEFNX1ZfQ0NMRCkkKExEKSAkKGVmaV9sZGZsYWdzKSAk KHN5c3RlbWRfYm9vdF9vYmplY3RzKSBcCi0JCS1vICRAIC1sZWZpIC1sZ251ZWZpICQoc2hlbGwg JChDQykgLXByaW50LWxpYmdjYy1maWxlLW5hbWUpOyBcCisJCS1vICRAIC1sZWZpIC1sZ251ZWZp IC1scm1jZWZpICQoc2hlbGwgJChDQykgLXByaW50LWxpYmdjYy1maWxlLW5hbWUpOyBcCiAJbm0g LUQgLXUgJEAgfCBncmVwICcgVSAnICYmIGV4aXQgMSB8fCA6CiAKICQoc3lzdGVtZF9ib290KTog JChzeXN0ZW1kX2Jvb3Rfc29saWIpCkBAIC0yODUyLDcgKzI4NTIsNyBAQCAkKHRvcF9idWlsZGRp cikvc3JjL2Jvb3QvZWZpLyUubzogJCh0b3Bfc3JjZGlyKS9zcmMvYm9vdC9lZmkvJS5jICQoYWRk cHJlZml4ICQodAogCiAkKHN0dWJfc29saWIpOiAkKHN0dWJfb2JqZWN0cykKIAkkKEFNX1ZfQ0NM RCkkKExEKSAkKGVmaV9sZGZsYWdzKSAkKHN0dWJfb2JqZWN0cykgXAotCQktbyAkQCAtbGVmaSAt bGdudWVmaSAkKHNoZWxsICQoQ0MpIC1wcmludC1saWJnY2MtZmlsZS1uYW1lKTsgXAorCQktbyAk QCAtbGVmaSAtbGdudWVmaSAtbHJtY2VmaSAkKHNoZWxsICQoQ0MpIC1wcmludC1saWJnY2MtZmls ZS1uYW1lKTsgXAogCW5tIC1EIC11ICRAIHwgZ3JlcCAnIFUgJyAmJiBleGl0IDEgfHwgOgogCiAk KHN0dWIpOiAkKHN0dWJfc29saWIpCi0tIAoyLjExLjAKCg== 3599 2017-01-23 14:33:21 +0000 2017-01-23 14:33:21 +0000 WIP Patch v2: [RMC]-support-global-kernel-cmdline-fragment.patch 0001-WIP-rmc-Support-global-kernel-command-line-fragment.patch text/plain 4603 mikko.ylinen RnJvbSBmODdiMDcyNTMwOTE5YjNkMzFkODE5NzQyMDg3MzQzYWNkOGY3ZDA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaWFueHVuIFpoYW5nIDxqaWFueHVuLnpoYW5nQGxpbnV4Lmlu dGVsLmNvbT4KRGF0ZTogVHVlLCAxNyBKYW4gMjAxNyAxNDo0NDo0MyAtMDgwMApTdWJqZWN0OiBb UEFUQ0hdIHJtYzogU3VwcG9ydCBnbG9iYWwga2VybmVsIGNvbW1hbmQgbGluZSBmcmFnbWVudAoK VGhpcyBjaGFuZ2UgaW50ZWdyYXRlcyBybWMgaW50byBFRkkgc3R1YiBhbmQgc3VwcG9ydHMgYQpn bG9iYWwgZnJhZ21lbnQgdGhhdCBpcyBhcHBlbmRlZCB0byB0aGUgY21kbGluZSBhdCBib290LgoK VGhlIGZyYWdtZW50IGlzIGJvYXJkLXNwZWNpZmljLgoKVGhlIG9yaWdpbmFsIGltcGxlbWVudGF0 aW9uIGlzIHBlciBbWU9DVE8gIzEwOTI0XS4KCnYyIChieSBNaWtrbyk6IGFkZCBuZXdfY21kbGlu ZV9sZW4gdG8gbGludXhfZXhlYygpLiBPdGhlcndpc2UKdGhlICJuZXciIHBhcnQgZnJvbSB0aGUg ZGF0YWJhc2UgaXMgbm90IGNvcGllZCB3aGVuIGJvb3RpbmcKdGhlIGtlcm5lbC4KCmNvbW1pdCBt c2cgbmVlZHMgdG8gYmUgcmV2aXNlZC4uLgoKU2lnbmVkLW9mZi1ieTogSmlhbnh1biBaaGFuZyA8 amlhbnh1bi56aGFuZ0BsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pa2tvIFlsaW5l biA8bWlra28ueWxpbmVuQGludGVsLmNvbT4KLS0tCiBzcmMvYm9vdC9lZmkvc3R1Yi5jIHwgNTcg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0KIDEg ZmlsZSBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL3NyYy9ib290L2VmaS9zdHViLmMgYi9zcmMvYm9vdC9lZmkvc3R1Yi5jCmluZGV4IDFlMjUw ZjM0Zi4uMDg4YzQyMjI1IDEwMDY0NAotLS0gYS9zcmMvYm9vdC9lZmkvc3R1Yi5jCisrKyBiL3Ny Yy9ib290L2VmaS9zdHViLmMKQEAgLTEzLDcgKzEzLDcgQEAKIAogI2luY2x1ZGUgPGVmaS5oPgog I2luY2x1ZGUgPGVmaWxpYi5oPgotCisjaW5jbHVkZSA8cm1jX2FwaS5oPgogI2luY2x1ZGUgImRp c2suaCIKICNpbmNsdWRlICJncmFwaGljcy5oIgogI2luY2x1ZGUgImxpbnV4LmgiCkBAIC0yNCw5 ICsyNCwzNCBAQAogCiAvKiBtYWdpYyBzdHJpbmcgdG8gZmluZCBpbiB0aGUgYmluYXJ5IGltYWdl ICovCiBzdGF0aWMgY29uc3QgY2hhciBfX2F0dHJpYnV0ZV9fKCh1c2VkKSkgbWFnaWNbXSA9ICIj IyMjIExvYWRlckluZm86IHN5c3RlbWQtc3R1YiAiIFZFUlNJT04gIiAjIyMjIjsKK3N0YXRpYyBD SEFSOCogcm1jX2RiOwogCiBzdGF0aWMgY29uc3QgRUZJX0dVSUQgZ2xvYmFsX2d1aWQgPSBFRklf R0xPQkFMX1ZBUklBQkxFOwogCitzdGF0aWMgVUlOVE4gcm1jX2luaXRpYWxpemUoRUZJX0ZJTEUg KnJvb3RfZGlyLCBDSEFSOCAqKmRiKSB7CisgICAgICAgIFVJTlROIGxlbjsKKyAgICAgICAgVUlO VE4gcmV0ID0gMTsKKworICAgICAgICBpZiAoIWRiKQorICAgICAgICAgICAgICAgIHJldHVybiBy ZXQ7CisKKyAgICAgICAgKmRiID0gTlVMTDsKKworICAgICAgICAvKiBsb2FkIHJtYyBkYXRhYmFz ZSAqLworICAgICAgICBsZW4gPSBmaWxlX3JlYWQocm9vdF9kaXIsIEwiXFxybWMuZGIiLCAwLCAw LCBkYik7CisKKyAgICAgICAgaWYgKGxlbiA8PSAwKQorICAgICAgICAgICAgICAgIGdvdG8gZG9u ZTsKKworICAgICAgICByZXQgPSAwOworZG9uZToKKyAgICAgICAgaWYgKHJldCkKKyAgICAgICAg ICAgICAgICBGcmVlUG9vbCgqZGIpOworCisgICAgICAgIHJldHVybiByZXQ7Cit9CisKKwogRUZJ X1NUQVRVUyBlZmlfbWFpbihFRklfSEFORExFIGltYWdlLCBFRklfU1lTVEVNX1RBQkxFICpzeXNf dGFibGUpIHsKICAgICAgICAgRUZJX0xPQURFRF9JTUFHRSAqbG9hZGVkX2ltYWdlOwogICAgICAg ICBFRklfRklMRSAqcm9vdF9kaXI7CkBAIC00Niw2ICs3MSwxMCBAQCBFRklfU1RBVFVTIGVmaV9t YWluKEVGSV9IQU5ETEUgaW1hZ2UsIEVGSV9TWVNURU1fVEFCTEUgKnN5c190YWJsZSkgewogICAg ICAgICBVSU5UTiBzenNbRUxFTUVOVFNPRihzZWN0aW9ucyktMV0gPSB7fTsKICAgICAgICAgQ0hB UjggKmNtZGxpbmUgPSBOVUxMOwogICAgICAgICBVSU5UTiBjbWRsaW5lX2xlbjsKKyAgICAgICAg cm1jX2ZpbGVfdCBybWNfZmlsZTsKKyAgICAgICAgVUlOVDY0IG5ld19jbWRsaW5lX2xlbiA9IDA7 CisgICAgICAgIENIQVI4ICpuZXdfY21kbGluZSA9IE5VTEw7CisgICAgICAgIENIQVI4ICpwID0g TlVMTDsKICAgICAgICAgQ0hBUjE2IHV1aWRbMzddOwogICAgICAgICBFRklfU1RBVFVTIGVycjsK IApAQCAtNjYsNiArOTUsOSBAQCBFRklfU1RBVFVTIGVmaV9tYWluKEVGSV9IQU5ETEUgaW1hZ2Us IEVGSV9TWVNURU1fVEFCTEUgKnN5c190YWJsZSkgewogICAgICAgICAgICAgICAgIHJldHVybiBF RklfTE9BRF9FUlJPUjsKICAgICAgICAgfQogCisgICAgICAgIC8qIEluaXRpYWxpemUgcm1jICov CisgICAgICAgIHJtY19pbml0aWFsaXplKHJvb3RfZGlyLCAmcm1jX2RiKTsKKwogICAgICAgICBs b2FkZWRfaW1hZ2VfcGF0aCA9IERldmljZVBhdGhUb1N0cihsb2FkZWRfaW1hZ2UtPkZpbGVQYXRo KTsKIAogICAgICAgICBpZiAoZWZpdmFyX2dldF9yYXcoJmdsb2JhbF9ndWlkLCBMIlNlY3VyZUJv b3QiLCAmYiwgJnNpemUpID09IEVGSV9TVUNDRVNTKSB7CkBAIC0xMTIsNiArMTQ0LDI3IEBAIEVG SV9TVEFUVVMgZWZpX21haW4oRUZJX0hBTkRMRSBpbWFnZSwgRUZJX1NZU1RFTV9UQUJMRSAqc3lz X3RhYmxlKSB7CiAjZW5kaWYKICAgICAgICAgfQogCisgICAgICAgIC8qIElmIGJvYXJkIGhhcyBh IGZyYWdtZW50IGluIHJtYyBkYXRhYmFzZSwgYXBwZW5kIGl0IHRvIHRoZSBjbWRsaW5lICovCisg ICAgICAgIGlmIChybWNfZGIpIHsKKyAgICAgICAgICAgICAgICBpZiAoIXJtY19naW1tZV9maWxl KHN5c190YWJsZSwgcm1jX2RiLCAiS0JPT1RQQVJBTSIsICZybWNfZmlsZSkpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgIG5ld19jbWRsaW5lX2xlbiA9IHJtY19maWxlLmJsb2JfbGVuICsgY21k bGluZV9sZW4gKyAyOworICAgICAgICAgICAgICAgICAgICAgICAgbmV3X2NtZGxpbmUgPSBBbGxv Y2F0ZVBvb2wobmV3X2NtZGxpbmVfbGVuICogc2l6ZW9mKENIQVI4KSk7CisgICAgICAgICAgICAg ICAgICAgICAgICBpZiAobmV3X2NtZGxpbmUpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgQ29weU1lbShuZXdfY21kbGluZSwgY21kbGluZSwgY21kbGluZV9sZW4pOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBwID0gbmV3X2NtZGxpbmUgKyBjbWRsaW5lX2xlbiAt IDE7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxhenkuLi4gYXNzdW1pbmcg b25seSBvbmUgbnVsbCBjaGFyICovCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlm ICgqcCAhPSAnXDAnKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAr KzsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKnArKyA9ICcgJzsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQ29weU1lbShwLCBybWNfZmlsZS5ibG9iLCBybWNfZmls ZS5ibG9iX2xlbik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICoocCArIHJtY19m aWxlLmJsb2JfbGVuKSA9ICdcMCc7CisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgfQorICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIG5ld19jbWRsaW5l ID0gY21kbGluZTsKKyAgICAgICAgICAgICAgICBuZXdfY21kbGluZV9sZW4gPSBjbWRsaW5lX2xl bjsKKyAgICAgICAgfQorCiAgICAgICAgIC8qIGV4cG9ydCB0aGUgZGV2aWNlIHBhdGggdGhpcyBp bWFnZSBpcyBzdGFydGVkIGZyb20gKi8KICAgICAgICAgaWYgKGRpc2tfZ2V0X3BhcnRfdXVpZChs b2FkZWRfaW1hZ2UtPkRldmljZUhhbmRsZSwgdXVpZCkgPT0gRUZJX1NVQ0NFU1MpCiAgICAgICAg ICAgICAgICAgZWZpdmFyX3NldChMIkxvYWRlckRldmljZVBhcnRVVUlEIiwgdXVpZCwgRkFMU0Up OwpAQCAtMTE5LDcgKzE3Miw3IEBAIEVGSV9TVEFUVVMgZWZpX21haW4oRUZJX0hBTkRMRSBpbWFn ZSwgRUZJX1NZU1RFTV9UQUJMRSAqc3lzX3RhYmxlKSB7CiAgICAgICAgIGlmIChzenNbM10gPiAw KQogICAgICAgICAgICAgICAgIGdyYXBoaWNzX3NwbGFzaCgoVUlOVDggKikoKFVJTlROKWxvYWRl ZF9pbWFnZS0+SW1hZ2VCYXNlICsgYWRkcnNbM10pLCBzenNbM10sIE5VTEwpOwogCi0gICAgICAg IGVyciA9IGxpbnV4X2V4ZWMoaW1hZ2UsIGNtZGxpbmUsIGNtZGxpbmVfbGVuLAorICAgICAgICBl cnIgPSBsaW51eF9leGVjKGltYWdlLCBuZXdfY21kbGluZSwgbmV3X2NtZGxpbmVfbGVuLAogICAg ICAgICAgICAgICAgICAgICAgICAgIChVSU5UTilsb2FkZWRfaW1hZ2UtPkltYWdlQmFzZSArIGFk ZHJzWzFdLAogICAgICAgICAgICAgICAgICAgICAgICAgIChVSU5UTilsb2FkZWRfaW1hZ2UtPklt YWdlQmFzZSArIGFkZHJzWzJdLCBzenNbMl0pOwogCi0tIAoyLjExLjAKCg==