From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754899AbdCBSBY (ORCPT ); Thu, 2 Mar 2017 13:01:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58792 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754910AbdCBSA6 (ORCPT ); Thu, 2 Mar 2017 13:00:58 -0500 From: Vitaly Kuznetsov To: xen-devel@lists.xenproject.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Boris Ostrovsky , Juergen Gross , Andrew Jones Subject: [PATCH v2 04/21] x86/xen: split off enlighten_pvh.c Date: Thu, 2 Mar 2017 18:53:40 +0100 Message-Id: <20170302175357.8222-5-vkuznets@redhat.com> In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 02 Mar 2017 17:54:08 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Create enlighten_pvh.c by splitting off PVH related code from enlighten.c, put it under CONFIG_XEN_PVH. Signed-off-by: Vitaly Kuznetsov --- arch/x86/xen/Makefile | 2 + arch/x86/xen/enlighten.c | 110 ----------------------------------------- arch/x86/xen/enlighten_pvh.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 110 deletions(-) create mode 100644 arch/x86/xen/enlighten_pvh.c diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index cb0164a..348128b 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -15,6 +15,8 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ grant-table.o suspend.o platform-pci-unplug.o \ p2m.o apic.o pmu.o +obj-$(CONFIG_XEN_PVH) += enlighten_pvh.o + obj-$(CONFIG_EVENT_TRACING) += trace.o obj-$(CONFIG_SMP) += smp.o diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index de77be9..d66debd 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -179,20 +179,6 @@ struct tls_descs { */ static DEFINE_PER_CPU(struct tls_descs, shadow_tls_desc); -#ifdef CONFIG_XEN_PVH -/* - * PVH variables. - * - * xen_pvh and pvh_bootparams need to live in data segment since they - * are used after startup_{32|64}, which clear .bss, are invoked. - */ -bool xen_pvh __attribute__((section(".data"))) = 0; -struct boot_params pvh_bootparams __attribute__((section(".data"))); - -struct hvm_start_info pvh_start_info; -unsigned int pvh_start_info_sz = sizeof(pvh_start_info); -#endif - static void clamp_max_cpus(void) { #ifdef CONFIG_SMP @@ -1674,102 +1660,6 @@ asmlinkage __visible void __init xen_start_kernel(void) #endif } -#ifdef CONFIG_XEN_PVH - -static void xen_pvh_arch_setup(void) -{ -#ifdef CONFIG_ACPI - /* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */ - if (nr_ioapics == 0) - acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; -#endif -} - -static void __init init_pvh_bootparams(void) -{ - struct xen_memory_map memmap; - unsigned int i; - int rc; - - memset(&pvh_bootparams, 0, sizeof(pvh_bootparams)); - - memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_map); - set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_map); - rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); - if (rc) { - xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc); - BUG(); - } - - if (memmap.nr_entries < E820MAX - 1) { - pvh_bootparams.e820_map[memmap.nr_entries].addr = - ISA_START_ADDRESS; - pvh_bootparams.e820_map[memmap.nr_entries].size = - ISA_END_ADDRESS - ISA_START_ADDRESS; - pvh_bootparams.e820_map[memmap.nr_entries].type = - E820_RESERVED; - memmap.nr_entries++; - } else - xen_raw_printk("Warning: Can fit ISA range into e820\n"); - - sanitize_e820_map(pvh_bootparams.e820_map, - ARRAY_SIZE(pvh_bootparams.e820_map), - &memmap.nr_entries); - - pvh_bootparams.e820_entries = memmap.nr_entries; - for (i = 0; i < pvh_bootparams.e820_entries; i++) - e820_add_region(pvh_bootparams.e820_map[i].addr, - pvh_bootparams.e820_map[i].size, - pvh_bootparams.e820_map[i].type); - - pvh_bootparams.hdr.cmd_line_ptr = - pvh_start_info.cmdline_paddr; - - /* The first module is always ramdisk. */ - if (pvh_start_info.nr_modules) { - struct hvm_modlist_entry *modaddr = - __va(pvh_start_info.modlist_paddr); - pvh_bootparams.hdr.ramdisk_image = modaddr->paddr; - pvh_bootparams.hdr.ramdisk_size = modaddr->size; - } - - /* - * See Documentation/x86/boot.txt. - * - * Version 2.12 supports Xen entry point but we will use default x86/PC - * environment (i.e. hardware_subarch 0). - */ - pvh_bootparams.hdr.version = 0x212; - pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */ -} - -/* - * This routine (and those that it might call) should not use - * anything that lives in .bss since that segment will be cleared later. - */ -void __init xen_prepare_pvh(void) -{ - u32 msr; - u64 pfn; - - if (pvh_start_info.magic != XEN_HVM_START_MAGIC_VALUE) { - xen_raw_printk("Error: Unexpected magic value (0x%08x)\n", - pvh_start_info.magic); - BUG(); - } - - xen_pvh = 1; - - msr = cpuid_ebx(xen_cpuid_base() + 2); - pfn = __pa(hypercall_page); - wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32)); - - init_pvh_bootparams(); - - x86_init.oem.arch_setup = xen_pvh_arch_setup; -} -#endif - void __ref xen_hvm_init_shared_info(void) { int cpu; diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c new file mode 100644 index 0000000..ba534ca --- /dev/null +++ b/arch/x86/xen/enlighten_pvh.c @@ -0,0 +1,114 @@ +#include + +#include + +#include + +#include +#include + +#include +#include + +/* + * PVH variables. + * + * xen_pvh and pvh_bootparams need to live in data segment since they + * are used after startup_{32|64}, which clear .bss, are invoked. + */ +bool xen_pvh __attribute__((section(".data"))) = 0; +struct boot_params pvh_bootparams __attribute__((section(".data"))); + +struct hvm_start_info pvh_start_info; +unsigned int pvh_start_info_sz = sizeof(pvh_start_info); + +static void xen_pvh_arch_setup(void) +{ + /* Make sure we don't fall back to (default) ACPI_IRQ_MODEL_PIC. */ + if (nr_ioapics == 0) + acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; +} + +static void __init init_pvh_bootparams(void) +{ + struct xen_memory_map memmap; + unsigned int i; + int rc; + + memset(&pvh_bootparams, 0, sizeof(pvh_bootparams)); + + memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_map); + set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_map); + rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); + if (rc) { + xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc); + BUG(); + } + + if (memmap.nr_entries < E820MAX - 1) { + pvh_bootparams.e820_map[memmap.nr_entries].addr = + ISA_START_ADDRESS; + pvh_bootparams.e820_map[memmap.nr_entries].size = + ISA_END_ADDRESS - ISA_START_ADDRESS; + pvh_bootparams.e820_map[memmap.nr_entries].type = + E820_RESERVED; + memmap.nr_entries++; + } else + xen_raw_printk("Warning: Can fit ISA range into e820\n"); + + sanitize_e820_map(pvh_bootparams.e820_map, + ARRAY_SIZE(pvh_bootparams.e820_map), + &memmap.nr_entries); + + pvh_bootparams.e820_entries = memmap.nr_entries; + for (i = 0; i < pvh_bootparams.e820_entries; i++) + e820_add_region(pvh_bootparams.e820_map[i].addr, + pvh_bootparams.e820_map[i].size, + pvh_bootparams.e820_map[i].type); + + pvh_bootparams.hdr.cmd_line_ptr = + pvh_start_info.cmdline_paddr; + + /* The first module is always ramdisk. */ + if (pvh_start_info.nr_modules) { + struct hvm_modlist_entry *modaddr = + __va(pvh_start_info.modlist_paddr); + pvh_bootparams.hdr.ramdisk_image = modaddr->paddr; + pvh_bootparams.hdr.ramdisk_size = modaddr->size; + } + + /* + * See Documentation/x86/boot.txt. + * + * Version 2.12 supports Xen entry point but we will use default x86/PC + * environment (i.e. hardware_subarch 0). + */ + pvh_bootparams.hdr.version = 0x212; + pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */ +} + +/* + * This routine (and those that it might call) should not use + * anything that lives in .bss since that segment will be cleared later. + */ +void __init xen_prepare_pvh(void) +{ + u32 msr; + u64 pfn; + + if (pvh_start_info.magic != XEN_HVM_START_MAGIC_VALUE) { + xen_raw_printk("Error: Unexpected magic value (0x%08x)\n", + pvh_start_info.magic); + BUG(); + } + + xen_pvh = 1; + + msr = cpuid_ebx(xen_cpuid_base() + 2); + pfn = __pa(hypercall_page); + wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32)); + + init_pvh_bootparams(); + + x86_init.oem.arch_setup = xen_pvh_arch_setup; +} -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vitaly Kuznetsov Subject: [PATCH v2 04/21] x86/xen: split off enlighten_pvh.c Date: Thu, 2 Mar 2017 18:53:40 +0100 Message-ID: <20170302175357.8222-5-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjUvZ-0003PS-VL for xen-devel@lists.xenproject.org; Thu, 02 Mar 2017 17:54:10 +0000 In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Boris Ostrovsky , x86@kernel.org, Andrew Jones , linux-kernel@vger.kernel.org List-Id: xen-devel@lists.xenproject.org Q3JlYXRlIGVubGlnaHRlbl9wdmguYyBieSBzcGxpdHRpbmcgb2ZmIFBWSCByZWxhdGVkIGNvZGUg ZnJvbSBlbmxpZ2h0ZW4uYywKcHV0IGl0IHVuZGVyIENPTkZJR19YRU5fUFZILgoKU2lnbmVkLW9m Zi1ieTogVml0YWx5IEt1em5ldHNvdiA8dmt1em5ldHNAcmVkaGF0LmNvbT4KLS0tCiBhcmNoL3g4 Ni94ZW4vTWFrZWZpbGUgICAgICAgIHwgICAyICsKIGFyY2gveDg2L3hlbi9lbmxpZ2h0ZW4uYyAg ICAgfCAxMTAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGFyY2gv eDg2L3hlbi9lbmxpZ2h0ZW5fcHZoLmMgfCAxMTQgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAxMTYgaW5zZXJ0aW9ucygrKSwgMTEw IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGFyY2gveDg2L3hlbi9lbmxpZ2h0ZW5f cHZoLmMKCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4vTWFrZWZpbGUgYi9hcmNoL3g4Ni94ZW4v TWFrZWZpbGUKaW5kZXggY2IwMTY0YS4uMzQ4MTI4YiAxMDA2NDQKLS0tIGEvYXJjaC94ODYveGVu L01ha2VmaWxlCisrKyBiL2FyY2gveDg2L3hlbi9NYWtlZmlsZQpAQCAtMTUsNiArMTUsOCBAQCBv YmoteQkJOj0gZW5saWdodGVuLm8gc2V0dXAubyBtdWx0aWNhbGxzLm8gbW11Lm8gaXJxLm8gXAog CQkJZ3JhbnQtdGFibGUubyBzdXNwZW5kLm8gcGxhdGZvcm0tcGNpLXVucGx1Zy5vIFwKIAkJCXAy bS5vIGFwaWMubyBwbXUubwogCitvYmotJChDT05GSUdfWEVOX1BWSCkJCQkrPSBlbmxpZ2h0ZW5f cHZoLm8KKwogb2JqLSQoQ09ORklHX0VWRU5UX1RSQUNJTkcpICs9IHRyYWNlLm8KIAogb2JqLSQo Q09ORklHX1NNUCkJCSs9IHNtcC5vCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4vZW5saWdodGVu LmMgYi9hcmNoL3g4Ni94ZW4vZW5saWdodGVuLmMKaW5kZXggZGU3N2JlOS4uZDY2ZGViZCAxMDA2 NDQKLS0tIGEvYXJjaC94ODYveGVuL2VubGlnaHRlbi5jCisrKyBiL2FyY2gveDg2L3hlbi9lbmxp Z2h0ZW4uYwpAQCAtMTc5LDIwICsxNzksNiBAQCBzdHJ1Y3QgdGxzX2Rlc2NzIHsKICAqLwogc3Rh dGljIERFRklORV9QRVJfQ1BVKHN0cnVjdCB0bHNfZGVzY3MsIHNoYWRvd190bHNfZGVzYyk7CiAK LSNpZmRlZiBDT05GSUdfWEVOX1BWSAotLyoKLSAqIFBWSCB2YXJpYWJsZXMuCi0gKgotICogeGVu X3B2aCBhbmQgcHZoX2Jvb3RwYXJhbXMgbmVlZCB0byBsaXZlIGluIGRhdGEgc2VnbWVudCBzaW5j ZSB0aGV5Ci0gKiBhcmUgdXNlZCBhZnRlciBzdGFydHVwX3szMnw2NH0sIHdoaWNoIGNsZWFyIC5i c3MsIGFyZSBpbnZva2VkLgotICovCi1ib29sIHhlbl9wdmggX19hdHRyaWJ1dGVfXygoc2VjdGlv bigiLmRhdGEiKSkpID0gMDsKLXN0cnVjdCBib290X3BhcmFtcyBwdmhfYm9vdHBhcmFtcyBfX2F0 dHJpYnV0ZV9fKChzZWN0aW9uKCIuZGF0YSIpKSk7Ci0KLXN0cnVjdCBodm1fc3RhcnRfaW5mbyBw dmhfc3RhcnRfaW5mbzsKLXVuc2lnbmVkIGludCBwdmhfc3RhcnRfaW5mb19zeiA9IHNpemVvZihw dmhfc3RhcnRfaW5mbyk7Ci0jZW5kaWYKLQogc3RhdGljIHZvaWQgY2xhbXBfbWF4X2NwdXModm9p ZCkKIHsKICNpZmRlZiBDT05GSUdfU01QCkBAIC0xNjc0LDEwMiArMTY2MCw2IEBAIGFzbWxpbmth Z2UgX192aXNpYmxlIHZvaWQgX19pbml0IHhlbl9zdGFydF9rZXJuZWwodm9pZCkKICNlbmRpZgog fQogCi0jaWZkZWYgQ09ORklHX1hFTl9QVkgKLQotc3RhdGljIHZvaWQgeGVuX3B2aF9hcmNoX3Nl dHVwKHZvaWQpCi17Ci0jaWZkZWYgQ09ORklHX0FDUEkKLQkvKiBNYWtlIHN1cmUgd2UgZG9uJ3Qg ZmFsbCBiYWNrIHRvIChkZWZhdWx0KSBBQ1BJX0lSUV9NT0RFTF9QSUMuICovCi0JaWYgKG5yX2lv YXBpY3MgPT0gMCkKLQkJYWNwaV9pcnFfbW9kZWwgPSBBQ1BJX0lSUV9NT0RFTF9QTEFURk9STTsK LSNlbmRpZgotfQotCi1zdGF0aWMgdm9pZCBfX2luaXQgaW5pdF9wdmhfYm9vdHBhcmFtcyh2b2lk KQotewotCXN0cnVjdCB4ZW5fbWVtb3J5X21hcCBtZW1tYXA7Ci0JdW5zaWduZWQgaW50IGk7Ci0J aW50IHJjOwotCi0JbWVtc2V0KCZwdmhfYm9vdHBhcmFtcywgMCwgc2l6ZW9mKHB2aF9ib290cGFy YW1zKSk7Ci0KLQltZW1tYXAubnJfZW50cmllcyA9IEFSUkFZX1NJWkUocHZoX2Jvb3RwYXJhbXMu ZTgyMF9tYXApOwotCXNldF94ZW5fZ3Vlc3RfaGFuZGxlKG1lbW1hcC5idWZmZXIsIHB2aF9ib290 cGFyYW1zLmU4MjBfbWFwKTsKLQlyYyA9IEhZUEVSVklTT1JfbWVtb3J5X29wKFhFTk1FTV9tZW1v cnlfbWFwLCAmbWVtbWFwKTsKLQlpZiAocmMpIHsKLQkJeGVuX3Jhd19wcmludGsoIlhFTk1FTV9t ZW1vcnlfbWFwIGZhaWxlZCAoJWQpXG4iLCByYyk7Ci0JCUJVRygpOwotCX0KLQotCWlmIChtZW1t YXAubnJfZW50cmllcyA8IEU4MjBNQVggLSAxKSB7Ci0JCXB2aF9ib290cGFyYW1zLmU4MjBfbWFw W21lbW1hcC5ucl9lbnRyaWVzXS5hZGRyID0KLQkJCUlTQV9TVEFSVF9BRERSRVNTOwotCQlwdmhf Ym9vdHBhcmFtcy5lODIwX21hcFttZW1tYXAubnJfZW50cmllc10uc2l6ZSA9Ci0JCQlJU0FfRU5E X0FERFJFU1MgLSBJU0FfU1RBUlRfQUREUkVTUzsKLQkJcHZoX2Jvb3RwYXJhbXMuZTgyMF9tYXBb bWVtbWFwLm5yX2VudHJpZXNdLnR5cGUgPQotCQkJRTgyMF9SRVNFUlZFRDsKLQkJbWVtbWFwLm5y X2VudHJpZXMrKzsKLQl9IGVsc2UKLQkJeGVuX3Jhd19wcmludGsoIldhcm5pbmc6IENhbiBmaXQg SVNBIHJhbmdlIGludG8gZTgyMFxuIik7Ci0KLQlzYW5pdGl6ZV9lODIwX21hcChwdmhfYm9vdHBh cmFtcy5lODIwX21hcCwKLQkJCSAgQVJSQVlfU0laRShwdmhfYm9vdHBhcmFtcy5lODIwX21hcCks Ci0JCQkgICZtZW1tYXAubnJfZW50cmllcyk7Ci0KLQlwdmhfYm9vdHBhcmFtcy5lODIwX2VudHJp ZXMgPSBtZW1tYXAubnJfZW50cmllczsKLQlmb3IgKGkgPSAwOyBpIDwgcHZoX2Jvb3RwYXJhbXMu ZTgyMF9lbnRyaWVzOyBpKyspCi0JCWU4MjBfYWRkX3JlZ2lvbihwdmhfYm9vdHBhcmFtcy5lODIw X21hcFtpXS5hZGRyLAotCQkJCXB2aF9ib290cGFyYW1zLmU4MjBfbWFwW2ldLnNpemUsCi0JCQkJ cHZoX2Jvb3RwYXJhbXMuZTgyMF9tYXBbaV0udHlwZSk7Ci0KLQlwdmhfYm9vdHBhcmFtcy5oZHIu Y21kX2xpbmVfcHRyID0KLQkJcHZoX3N0YXJ0X2luZm8uY21kbGluZV9wYWRkcjsKLQotCS8qIFRo ZSBmaXJzdCBtb2R1bGUgaXMgYWx3YXlzIHJhbWRpc2suICovCi0JaWYgKHB2aF9zdGFydF9pbmZv Lm5yX21vZHVsZXMpIHsKLQkJc3RydWN0IGh2bV9tb2RsaXN0X2VudHJ5ICptb2RhZGRyID0KLQkJ CV9fdmEocHZoX3N0YXJ0X2luZm8ubW9kbGlzdF9wYWRkcik7Ci0JCXB2aF9ib290cGFyYW1zLmhk ci5yYW1kaXNrX2ltYWdlID0gbW9kYWRkci0+cGFkZHI7Ci0JCXB2aF9ib290cGFyYW1zLmhkci5y YW1kaXNrX3NpemUgPSBtb2RhZGRyLT5zaXplOwotCX0KLQotCS8qCi0JICogU2VlIERvY3VtZW50 YXRpb24veDg2L2Jvb3QudHh0LgotCSAqCi0JICogVmVyc2lvbiAyLjEyIHN1cHBvcnRzIFhlbiBl bnRyeSBwb2ludCBidXQgd2Ugd2lsbCB1c2UgZGVmYXVsdCB4ODYvUEMKLQkgKiBlbnZpcm9ubWVu dCAoaS5lLiBoYXJkd2FyZV9zdWJhcmNoIDApLgotCSAqLwotCXB2aF9ib290cGFyYW1zLmhkci52 ZXJzaW9uID0gMHgyMTI7Ci0JcHZoX2Jvb3RwYXJhbXMuaGRyLnR5cGVfb2ZfbG9hZGVyID0gKDkg PDwgNCkgfCAwOyAvKiBYZW4gbG9hZGVyICovCi19Ci0KLS8qCi0gKiBUaGlzIHJvdXRpbmUgKGFu ZCB0aG9zZSB0aGF0IGl0IG1pZ2h0IGNhbGwpIHNob3VsZCBub3QgdXNlCi0gKiBhbnl0aGluZyB0 aGF0IGxpdmVzIGluIC5ic3Mgc2luY2UgdGhhdCBzZWdtZW50IHdpbGwgYmUgY2xlYXJlZCBsYXRl ci4KLSAqLwotdm9pZCBfX2luaXQgeGVuX3ByZXBhcmVfcHZoKHZvaWQpCi17Ci0JdTMyIG1zcjsK LQl1NjQgcGZuOwotCi0JaWYgKHB2aF9zdGFydF9pbmZvLm1hZ2ljICE9IFhFTl9IVk1fU1RBUlRf TUFHSUNfVkFMVUUpIHsKLQkJeGVuX3Jhd19wcmludGsoIkVycm9yOiBVbmV4cGVjdGVkIG1hZ2lj IHZhbHVlICgweCUwOHgpXG4iLAotCQkJCXB2aF9zdGFydF9pbmZvLm1hZ2ljKTsKLQkJQlVHKCk7 Ci0JfQotCi0JeGVuX3B2aCA9IDE7Ci0KLQltc3IgPSBjcHVpZF9lYngoeGVuX2NwdWlkX2Jhc2Uo KSArIDIpOwotCXBmbiA9IF9fcGEoaHlwZXJjYWxsX3BhZ2UpOwotCXdybXNyX3NhZmUobXNyLCAo dTMyKXBmbiwgKHUzMikocGZuID4+IDMyKSk7Ci0KLQlpbml0X3B2aF9ib290cGFyYW1zKCk7Ci0K LQl4ODZfaW5pdC5vZW0uYXJjaF9zZXR1cCA9IHhlbl9wdmhfYXJjaF9zZXR1cDsKLX0KLSNlbmRp ZgotCiB2b2lkIF9fcmVmIHhlbl9odm1faW5pdF9zaGFyZWRfaW5mbyh2b2lkKQogewogCWludCBj cHU7CmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4vZW5saWdodGVuX3B2aC5jIGIvYXJjaC94ODYv eGVuL2VubGlnaHRlbl9wdmguYwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5i YTUzNGNhCi0tLSAvZGV2L251bGwKKysrIGIvYXJjaC94ODYveGVuL2VubGlnaHRlbl9wdmguYwpA QCAtMCwwICsxLDExNCBAQAorI2luY2x1ZGUgPGxpbnV4L2FjcGkuaD4KKworI2luY2x1ZGUgPHhl bi9odmMtY29uc29sZS5oPgorCisjaW5jbHVkZSA8YXNtL2h5cGVydmlzb3IuaD4KKworI2luY2x1 ZGUgPGFzbS94ZW4vaW50ZXJmYWNlLmg+CisjaW5jbHVkZSA8YXNtL3hlbi9oeXBlcmNhbGwuaD4K KworI2luY2x1ZGUgPHhlbi9pbnRlcmZhY2UvbWVtb3J5Lmg+CisjaW5jbHVkZSA8eGVuL2ludGVy ZmFjZS9odm0vc3RhcnRfaW5mby5oPgorCisvKgorICogUFZIIHZhcmlhYmxlcy4KKyAqCisgKiB4 ZW5fcHZoIGFuZCBwdmhfYm9vdHBhcmFtcyBuZWVkIHRvIGxpdmUgaW4gZGF0YSBzZWdtZW50IHNp bmNlIHRoZXkKKyAqIGFyZSB1c2VkIGFmdGVyIHN0YXJ0dXBfezMyfDY0fSwgd2hpY2ggY2xlYXIg LmJzcywgYXJlIGludm9rZWQuCisgKi8KK2Jvb2wgeGVuX3B2aCBfX2F0dHJpYnV0ZV9fKChzZWN0 aW9uKCIuZGF0YSIpKSkgPSAwOworc3RydWN0IGJvb3RfcGFyYW1zIHB2aF9ib290cGFyYW1zIF9f YXR0cmlidXRlX18oKHNlY3Rpb24oIi5kYXRhIikpKTsKKworc3RydWN0IGh2bV9zdGFydF9pbmZv IHB2aF9zdGFydF9pbmZvOwordW5zaWduZWQgaW50IHB2aF9zdGFydF9pbmZvX3N6ID0gc2l6ZW9m KHB2aF9zdGFydF9pbmZvKTsKKworc3RhdGljIHZvaWQgeGVuX3B2aF9hcmNoX3NldHVwKHZvaWQp Cit7CisJLyogTWFrZSBzdXJlIHdlIGRvbid0IGZhbGwgYmFjayB0byAoZGVmYXVsdCkgQUNQSV9J UlFfTU9ERUxfUElDLiAqLworCWlmIChucl9pb2FwaWNzID09IDApCisJCWFjcGlfaXJxX21vZGVs ID0gQUNQSV9JUlFfTU9ERUxfUExBVEZPUk07Cit9CisKK3N0YXRpYyB2b2lkIF9faW5pdCBpbml0 X3B2aF9ib290cGFyYW1zKHZvaWQpCit7CisJc3RydWN0IHhlbl9tZW1vcnlfbWFwIG1lbW1hcDsK Kwl1bnNpZ25lZCBpbnQgaTsKKwlpbnQgcmM7CisKKwltZW1zZXQoJnB2aF9ib290cGFyYW1zLCAw LCBzaXplb2YocHZoX2Jvb3RwYXJhbXMpKTsKKworCW1lbW1hcC5ucl9lbnRyaWVzID0gQVJSQVlf U0laRShwdmhfYm9vdHBhcmFtcy5lODIwX21hcCk7CisJc2V0X3hlbl9ndWVzdF9oYW5kbGUobWVt bWFwLmJ1ZmZlciwgcHZoX2Jvb3RwYXJhbXMuZTgyMF9tYXApOworCXJjID0gSFlQRVJWSVNPUl9t ZW1vcnlfb3AoWEVOTUVNX21lbW9yeV9tYXAsICZtZW1tYXApOworCWlmIChyYykgeworCQl4ZW5f cmF3X3ByaW50aygiWEVOTUVNX21lbW9yeV9tYXAgZmFpbGVkICglZClcbiIsIHJjKTsKKwkJQlVH KCk7CisJfQorCisJaWYgKG1lbW1hcC5ucl9lbnRyaWVzIDwgRTgyME1BWCAtIDEpIHsKKwkJcHZo X2Jvb3RwYXJhbXMuZTgyMF9tYXBbbWVtbWFwLm5yX2VudHJpZXNdLmFkZHIgPQorCQkJSVNBX1NU QVJUX0FERFJFU1M7CisJCXB2aF9ib290cGFyYW1zLmU4MjBfbWFwW21lbW1hcC5ucl9lbnRyaWVz XS5zaXplID0KKwkJCUlTQV9FTkRfQUREUkVTUyAtIElTQV9TVEFSVF9BRERSRVNTOworCQlwdmhf Ym9vdHBhcmFtcy5lODIwX21hcFttZW1tYXAubnJfZW50cmllc10udHlwZSA9CisJCQlFODIwX1JF U0VSVkVEOworCQltZW1tYXAubnJfZW50cmllcysrOworCX0gZWxzZQorCQl4ZW5fcmF3X3ByaW50 aygiV2FybmluZzogQ2FuIGZpdCBJU0EgcmFuZ2UgaW50byBlODIwXG4iKTsKKworCXNhbml0aXpl X2U4MjBfbWFwKHB2aF9ib290cGFyYW1zLmU4MjBfbWFwLAorCQkJICBBUlJBWV9TSVpFKHB2aF9i b290cGFyYW1zLmU4MjBfbWFwKSwKKwkJCSAgJm1lbW1hcC5ucl9lbnRyaWVzKTsKKworCXB2aF9i b290cGFyYW1zLmU4MjBfZW50cmllcyA9IG1lbW1hcC5ucl9lbnRyaWVzOworCWZvciAoaSA9IDA7 IGkgPCBwdmhfYm9vdHBhcmFtcy5lODIwX2VudHJpZXM7IGkrKykKKwkJZTgyMF9hZGRfcmVnaW9u KHB2aF9ib290cGFyYW1zLmU4MjBfbWFwW2ldLmFkZHIsCisJCQkJcHZoX2Jvb3RwYXJhbXMuZTgy MF9tYXBbaV0uc2l6ZSwKKwkJCQlwdmhfYm9vdHBhcmFtcy5lODIwX21hcFtpXS50eXBlKTsKKwor CXB2aF9ib290cGFyYW1zLmhkci5jbWRfbGluZV9wdHIgPQorCQlwdmhfc3RhcnRfaW5mby5jbWRs aW5lX3BhZGRyOworCisJLyogVGhlIGZpcnN0IG1vZHVsZSBpcyBhbHdheXMgcmFtZGlzay4gKi8K KwlpZiAocHZoX3N0YXJ0X2luZm8ubnJfbW9kdWxlcykgeworCQlzdHJ1Y3QgaHZtX21vZGxpc3Rf ZW50cnkgKm1vZGFkZHIgPQorCQkJX192YShwdmhfc3RhcnRfaW5mby5tb2RsaXN0X3BhZGRyKTsK KwkJcHZoX2Jvb3RwYXJhbXMuaGRyLnJhbWRpc2tfaW1hZ2UgPSBtb2RhZGRyLT5wYWRkcjsKKwkJ cHZoX2Jvb3RwYXJhbXMuaGRyLnJhbWRpc2tfc2l6ZSA9IG1vZGFkZHItPnNpemU7CisJfQorCisJ LyoKKwkgKiBTZWUgRG9jdW1lbnRhdGlvbi94ODYvYm9vdC50eHQuCisJICoKKwkgKiBWZXJzaW9u IDIuMTIgc3VwcG9ydHMgWGVuIGVudHJ5IHBvaW50IGJ1dCB3ZSB3aWxsIHVzZSBkZWZhdWx0IHg4 Ni9QQworCSAqIGVudmlyb25tZW50IChpLmUuIGhhcmR3YXJlX3N1YmFyY2ggMCkuCisJICovCisJ cHZoX2Jvb3RwYXJhbXMuaGRyLnZlcnNpb24gPSAweDIxMjsKKwlwdmhfYm9vdHBhcmFtcy5oZHIu dHlwZV9vZl9sb2FkZXIgPSAoOSA8PCA0KSB8IDA7IC8qIFhlbiBsb2FkZXIgKi8KK30KKworLyoK KyAqIFRoaXMgcm91dGluZSAoYW5kIHRob3NlIHRoYXQgaXQgbWlnaHQgY2FsbCkgc2hvdWxkIG5v dCB1c2UKKyAqIGFueXRoaW5nIHRoYXQgbGl2ZXMgaW4gLmJzcyBzaW5jZSB0aGF0IHNlZ21lbnQg d2lsbCBiZSBjbGVhcmVkIGxhdGVyLgorICovCit2b2lkIF9faW5pdCB4ZW5fcHJlcGFyZV9wdmgo dm9pZCkKK3sKKwl1MzIgbXNyOworCXU2NCBwZm47CisKKwlpZiAocHZoX3N0YXJ0X2luZm8ubWFn aWMgIT0gWEVOX0hWTV9TVEFSVF9NQUdJQ19WQUxVRSkgeworCQl4ZW5fcmF3X3ByaW50aygiRXJy b3I6IFVuZXhwZWN0ZWQgbWFnaWMgdmFsdWUgKDB4JTA4eClcbiIsCisJCQkJcHZoX3N0YXJ0X2lu Zm8ubWFnaWMpOworCQlCVUcoKTsKKwl9CisKKwl4ZW5fcHZoID0gMTsKKworCW1zciA9IGNwdWlk X2VieCh4ZW5fY3B1aWRfYmFzZSgpICsgMik7CisJcGZuID0gX19wYShoeXBlcmNhbGxfcGFnZSk7 CisJd3Jtc3Jfc2FmZShtc3IsICh1MzIpcGZuLCAodTMyKShwZm4gPj4gMzIpKTsKKworCWluaXRf cHZoX2Jvb3RwYXJhbXMoKTsKKworCXg4Nl9pbml0Lm9lbS5hcmNoX3NldHVwID0geGVuX3B2aF9h cmNoX3NldHVwOworfQotLSAKMi45LjMKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK