From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Osipenko Subject: [PATCH v10 7/7] ARM: tegra: Add firmware calls required for suspend-resume on Tegra30 Date: Mon, 18 Mar 2019 01:52:10 +0300 Message-ID: <20190317225211.23091-8-digetx@gmail.com> References: <20190317225211.23091-1-digetx@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190317225211.23091-1-digetx@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Russell King , Thierry Reding , Jonathan Hunter , Robert Yang , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Cc: linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-tegra@vger.kernel.org In order to suspend-resume CPU with Trusted Foundations firmware being present on Tegra30, the LP1/LP2 boot vectors and CPU caches need to be set up using the firmware calls and then suspend code shall avoid re-disabling parts that were disabled by the firmware. Tested-by: Robert Yang Tested-by: Michał Mirosław Signed-off-by: Dmitry Osipenko --- arch/arm/mach-tegra/pm.c | 49 +++++++++++++++++++++++++++++ arch/arm/mach-tegra/reset-handler.S | 26 +++++++++++++++ arch/arm/mach-tegra/sleep.S | 14 ++++++--- 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index 1ad5719779b0..abf5f88778f4 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c @@ -33,11 +33,13 @@ #include #include +#include #include #include #include #include #include +#include #include "iomap.h" #include "pm.h" @@ -159,6 +161,28 @@ int tegra_cpu_do_idle(void) static int tegra_sleep_cpu(unsigned long v2p) { + /* + * L2 cache disabling using kernel API only allowed when all + * secondary CPU's are offline. Cache have to be disabled with + * MMU-on if cache maintenance is done via Trusted Foundations + * firmware. Note that CPUIDLE won't ever enter powergate on Tegra30 + * if any of secondary CPU's is online and this is the LP2-idle + * code-path only for Tegra20/30. + */ + if (trusted_foundations_registered()) + outer_disable(); + + /* + * Note that besides of setting up CPU reset vector this firmware + * call may also do the following, depending on the FW version: + * 1) Disable L2. But this doesn't matter since we already + * disabled the L2. + * 2) Disable D-cache. This need to be taken into account in + * particular by the tegra_disable_clean_inv_dcache() which + * shall avoid the re-disable. + */ + call_firmware_op(prepare_idle, TF_PM_MODE_LP2); + setup_mm_for_reboot(); tegra_sleep_cpu_finish(v2p); @@ -197,6 +221,14 @@ void tegra_idle_lp2_last(void) cpu_suspend(PHYS_OFFSET - PAGE_OFFSET, &tegra_sleep_cpu); + /* + * Resume L2 cache if it wasn't re-enabled early during resume, + * which is the case for Tegra30 that has to re-enable the cache + * via firmware call. In other cases cache is already enabled and + * hence re-enabling is a no-op. This is always a no-op on Tegra114+. + */ + outer_resume(); + restore_cpu_complex(); cpu_cluster_pm_exit(); } @@ -215,6 +247,15 @@ enum tegra_suspend_mode tegra_pm_validate_suspend_mode( static int tegra_sleep_core(unsigned long v2p) { + /* + * Cache have to be disabled with MMU-on if cache maintenance is done + * via Trusted Foundations firmware. This is a no-op on Tegra114+. + */ + if (trusted_foundations_registered()) + outer_disable(); + + call_firmware_op(prepare_idle, TF_PM_MODE_LP1); + setup_mm_for_reboot(); tegra_sleep_core_finish(v2p); @@ -342,6 +383,14 @@ static int tegra_suspend_enter(suspend_state_t state) cpu_suspend(PHYS_OFFSET - PAGE_OFFSET, tegra_sleep_func); + /* + * Resume L2 cache if it wasn't re-enabled early during resume, + * which is the case for Tegra30 that has to re-enable the cache + * via firmware call. In other cases cache is already enabled and + * hence re-enabling is a no-op. + */ + outer_resume(); + switch (mode) { case TEGRA_SUSPEND_LP1: tegra_suspend_exit_lp1(); diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index 31fb53f9ce13..cd94d7c41fc0 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -76,6 +77,7 @@ ENTRY(tegra_resume) orr r1, r1, #1 str r1, [r0] #endif + bl tegra_resume_trusted_foundations #ifdef CONFIG_CACHE_L2X0 /* L2 cache resume & re-enable */ @@ -88,6 +90,30 @@ end_ca9_scu_l2_resume: b cpu_resume ENDPROC(tegra_resume) + +/* + * tegra_resume_trusted_foundations + * + * Trusted Foundations firmware initialization. + * + * Doesn't return if firmware presents. + * Corrupted registers: r1, r2 + */ +ENTRY(tegra_resume_trusted_foundations) + /* Check whether Trusted Foundations firmware presents. */ + mov32 r2, TEGRA_IRAM_BASE + TEGRA_IRAM_RESET_HANDLER_OFFSET + ldr r1, =__tegra_cpu_reset_handler_data_offset + \ + RESET_DATA(TF_PRESENT) + ldr r1, [r2, r1] + cmp r1, #0 + reteq lr + + .arch_extension sec + /* First call after suspend wakes firmware. No arguments required. */ + smc #0 + + b cpu_resume +ENDPROC(tegra_resume_trusted_foundations) #endif .align L1_CACHE_SHIFT diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S index 5e3496753df1..1735ded5a812 100644 --- a/arch/arm/mach-tegra/sleep.S +++ b/arch/arm/mach-tegra/sleep.S @@ -49,8 +49,9 @@ ENTRY(tegra_disable_clean_inv_dcache) /* Disable the D-cache */ mrc p15, 0, r2, c1, c0, 0 + tst r2, #CR_C @ see tegra_sleep_cpu() bic r2, r2, #CR_C - mcr p15, 0, r2, c1, c0, 0 + mcrne p15, 0, r2, c1, c0, 0 isb /* Flush the D-cache */ @@ -132,10 +133,13 @@ ENTRY(tegra_shut_off_mmu) #ifdef CONFIG_CACHE_L2X0 /* Disable L2 cache */ check_cpu_part_num 0xc09, r9, r10 - movweq r2, #:lower16:(TEGRA_ARM_PERIF_BASE + 0x3000) - movteq r2, #:upper16:(TEGRA_ARM_PERIF_BASE + 0x3000) - moveq r3, #0 - streq r3, [r2, #L2X0_CTRL] + retne r0 + + mov32 r2, TEGRA_ARM_PERIF_BASE + 0x3000 + ldr r3, [r2, #L2X0_CTRL] + tst r3, #L2X0_CTRL_EN @ see tegra_sleep_cpu() + mov r3, #0 + strne r3, [r2, #L2X0_CTRL] #endif ret r0 ENDPROC(tegra_shut_off_mmu) -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65A39C43381 for ; Sun, 17 Mar 2019 22:57:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2E7FE2064A for ; Sun, 17 Mar 2019 22:57:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AZJ1qxXG"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MolOMgiL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E7FE2064A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LmHBasSi9YET2EX15rSRr/6CEDqfFgjNNLI6kGolkg0=; b=AZJ1qxXGKzHeqp U4Dsn6r9CfEiZYrs0UyM0fCtfbnED94DPZsm1cYBgIajArcEodNVkyq/0GWMpx+Wgs9eygcQNcmje hWjiCbxZpXcTu0dvzOjXC2nY6v0CGaUuZ2CtiNUTVjBa9wiYrTW8lPj77l2DhT4FkHNsVkIx/YOJg /sgni97O34EZ6Fh0srCrFtQ3X0qqLWeb+G9fq+n3PX8kYzVOTEjAFmar1QsbJbla6MnwVa+/pSUiq D7vJmLgt9UcZ1sr94Vvb2dGDuvF8h6daHt5RrRYv8kRzZPRKyj4H4GvKxsEownICD44qdBxezdWJa EUmNXAia6c0Qtlz5CHjQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5eiU-0000FR-4g; Sun, 17 Mar 2019 22:57:18 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5ehS-0007YO-Gd for linux-arm-kernel@lists.infradead.org; Sun, 17 Mar 2019 22:56:25 +0000 Received: by mail-pf1-x444.google.com with SMTP id p10so3119956pff.3 for ; Sun, 17 Mar 2019 15:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S/ZyEhorrdTBL7u6Ya1Op9P6A1v1DuFjJTJQoxPu4VY=; b=MolOMgiLIqn0Zzod22JLytqh3LSjhHxcL3OvBhnYcojMOikknOVBEYd24Mdee5T9mp YvJIK5agvLU5mj+UNOgC+cnO7Xz0R5iLX+cxyOs+thjEFBK2aAT/yC8eEdlfULXd1J20 7W8/rDDQ3NcICYZRySdM/7qDBjlLGfii5a4r/wm5j1AR8ecAQy3MaquMyuSc30HQDB8c cxGuJxt8eIGOai6Fj0FcyliDxjtPcznZDxmuepnLT9Gn/wELQvm8V1l0m57HkmeenGF3 5YTwyww7xljXV1QRZxM8G1WvXGF6NY/7SPDBOYk21CAVLhxcxBWHL4vknXKACCe+ffNO uOvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S/ZyEhorrdTBL7u6Ya1Op9P6A1v1DuFjJTJQoxPu4VY=; b=kWFRmqePmM8uoCMx8hZzz/woWUPDEJNVvhViKHcpeIaAMQRrOX3WJWKclzCEduy+kk v7RhDwkVyt3Zng6NNh7Jp0kr+Ngqm+JFJaks8VvaFj0eu8m9Xiln3KX3fg6yY6VvzKs9 SsdNVRdBgItbtp8hGYLUuP45gqVkDQjK3T/THbhe15L3KaT/79a8HlDGQdHljsRytJ99 RgmTKJWTKrnQGGuFg+myAHIZqt+1upB1ITEH5nHYAviZVWShf7CkndDvrB3BbcnB3H6q IRZhEPVfmnRkgw0rZ3fzhErI0I6pA58uX1cV6wHol1MkzkHqbqxPbTx4PaHZhzZXvY3a ZREQ== X-Gm-Message-State: APjAAAVic88Q8HvMCoOKVNW4ayDd0qUJYMv75AOTob/VTRhqDdraBDVM f+KvIH74DD0H41WCgYQnUOw= X-Google-Smtp-Source: APXvYqxAvoy3u6Y7NzZ1q41nEoP5wDlRHUo52KnQX74sRaXEq9ReZ10ZYA5j3+HVtbsSwjd0ZUWTIw== X-Received: by 2002:a63:c06:: with SMTP id b6mr3267034pgl.440.1552863373957; Sun, 17 Mar 2019 15:56:13 -0700 (PDT) Received: from localhost.localdomain (ppp94-29-37-86.pppoe.spdop.ru. [94.29.37.86]) by smtp.gmail.com with ESMTPSA id v2sm13738838pfg.118.2019.03.17.15.56.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Mar 2019 15:56:13 -0700 (PDT) From: Dmitry Osipenko To: Russell King , Thierry Reding , Jonathan Hunter , Robert Yang , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH v10 7/7] ARM: tegra: Add firmware calls required for suspend-resume on Tegra30 Date: Mon, 18 Mar 2019 01:52:10 +0300 Message-Id: <20190317225211.23091-8-digetx@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190317225211.23091-1-digetx@gmail.com> References: <20190317225211.23091-1-digetx@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190317_155614_784220_77830D27 X-CRM114-Status: GOOD ( 17.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org SW4gb3JkZXIgdG8gc3VzcGVuZC1yZXN1bWUgQ1BVIHdpdGggVHJ1c3RlZCBGb3VuZGF0aW9ucyBm aXJtd2FyZSBiZWluZwpwcmVzZW50IG9uIFRlZ3JhMzAsIHRoZSBMUDEvTFAyIGJvb3QgdmVjdG9y cyBhbmQgQ1BVIGNhY2hlcyBuZWVkIHRvIGJlCnNldCB1cCB1c2luZyB0aGUgZmlybXdhcmUgY2Fs bHMgYW5kIHRoZW4gc3VzcGVuZCBjb2RlIHNoYWxsIGF2b2lkCnJlLWRpc2FibGluZyBwYXJ0cyB0 aGF0IHdlcmUgZGlzYWJsZWQgYnkgdGhlIGZpcm13YXJlLgoKVGVzdGVkLWJ5OiBSb2JlcnQgWWFu ZyA8ZGVjYXRmQGdtYWlsLmNvbT4KVGVzdGVkLWJ5OiBNaWNoYcWCIE1pcm9zxYJhdyA8bWlycS1s aW51eEByZXJlLnFtcW0ucGw+ClNpZ25lZC1vZmYtYnk6IERtaXRyeSBPc2lwZW5rbyA8ZGlnZXR4 QGdtYWlsLmNvbT4KLS0tCiBhcmNoL2FybS9tYWNoLXRlZ3JhL3BtLmMgICAgICAgICAgICB8IDQ5 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBhcmNoL2FybS9tYWNoLXRlZ3JhL3Jlc2V0 LWhhbmRsZXIuUyB8IDI2ICsrKysrKysrKysrKysrKwogYXJjaC9hcm0vbWFjaC10ZWdyYS9zbGVl cC5TICAgICAgICAgfCAxNCArKysrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgODQgaW5zZXJ0aW9u cygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLXRlZ3JhL3Bt LmMgYi9hcmNoL2FybS9tYWNoLXRlZ3JhL3BtLmMKaW5kZXggMWFkNTcxOTc3OWIwLi5hYmY1Zjg4 Nzc4ZjQgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21hY2gtdGVncmEvcG0uYworKysgYi9hcmNoL2Fy bS9tYWNoLXRlZ3JhL3BtLmMKQEAgLTMzLDExICszMywxMyBAQAogI2luY2x1ZGUgPHNvYy90ZWdy YS9wbWMuaD4KIAogI2luY2x1ZGUgPGFzbS9jYWNoZWZsdXNoLmg+CisjaW5jbHVkZSA8YXNtL2Zp cm13YXJlLmg+CiAjaW5jbHVkZSA8YXNtL2lkbWFwLmg+CiAjaW5jbHVkZSA8YXNtL3Byb2MtZm5z Lmg+CiAjaW5jbHVkZSA8YXNtL3NtcF9wbGF0Lmg+CiAjaW5jbHVkZSA8YXNtL3N1c3BlbmQuaD4K ICNpbmNsdWRlIDxhc20vdGxiZmx1c2guaD4KKyNpbmNsdWRlIDxhc20vdHJ1c3RlZF9mb3VuZGF0 aW9ucy5oPgogCiAjaW5jbHVkZSAiaW9tYXAuaCIKICNpbmNsdWRlICJwbS5oIgpAQCAtMTU5LDYg KzE2MSwyOCBAQCBpbnQgdGVncmFfY3B1X2RvX2lkbGUodm9pZCkKIAogc3RhdGljIGludCB0ZWdy YV9zbGVlcF9jcHUodW5zaWduZWQgbG9uZyB2MnApCiB7CisJLyoKKwkgKiBMMiBjYWNoZSBkaXNh YmxpbmcgdXNpbmcga2VybmVsIEFQSSBvbmx5IGFsbG93ZWQgd2hlbiBhbGwKKwkgKiBzZWNvbmRh cnkgQ1BVJ3MgYXJlIG9mZmxpbmUuIENhY2hlIGhhdmUgdG8gYmUgZGlzYWJsZWQgd2l0aAorCSAq IE1NVS1vbiBpZiBjYWNoZSBtYWludGVuYW5jZSBpcyBkb25lIHZpYSBUcnVzdGVkIEZvdW5kYXRp b25zCisJICogZmlybXdhcmUuIE5vdGUgdGhhdCBDUFVJRExFIHdvbid0IGV2ZXIgZW50ZXIgcG93 ZXJnYXRlIG9uIFRlZ3JhMzAKKwkgKiBpZiBhbnkgb2Ygc2Vjb25kYXJ5IENQVSdzIGlzIG9ubGlu ZSBhbmQgdGhpcyBpcyB0aGUgTFAyLWlkbGUKKwkgKiBjb2RlLXBhdGggb25seSBmb3IgVGVncmEy MC8zMC4KKwkgKi8KKwlpZiAodHJ1c3RlZF9mb3VuZGF0aW9uc19yZWdpc3RlcmVkKCkpCisJCW91 dGVyX2Rpc2FibGUoKTsKKworCS8qCisJICogTm90ZSB0aGF0IGJlc2lkZXMgb2Ygc2V0dGluZyB1 cCBDUFUgcmVzZXQgdmVjdG9yIHRoaXMgZmlybXdhcmUKKwkgKiBjYWxsIG1heSBhbHNvIGRvIHRo ZSBmb2xsb3dpbmcsIGRlcGVuZGluZyBvbiB0aGUgRlcgdmVyc2lvbjoKKwkgKiAgMSkgRGlzYWJs ZSBMMi4gQnV0IHRoaXMgZG9lc24ndCBtYXR0ZXIgc2luY2Ugd2UgYWxyZWFkeQorCSAqICAgICBk aXNhYmxlZCB0aGUgTDIuCisJICogIDIpIERpc2FibGUgRC1jYWNoZS4gVGhpcyBuZWVkIHRvIGJl IHRha2VuIGludG8gYWNjb3VudCBpbgorCSAqICAgICBwYXJ0aWN1bGFyIGJ5IHRoZSB0ZWdyYV9k aXNhYmxlX2NsZWFuX2ludl9kY2FjaGUoKSB3aGljaAorCSAqICAgICBzaGFsbCBhdm9pZCB0aGUg cmUtZGlzYWJsZS4KKwkgKi8KKwljYWxsX2Zpcm13YXJlX29wKHByZXBhcmVfaWRsZSwgVEZfUE1f TU9ERV9MUDIpOworCiAJc2V0dXBfbW1fZm9yX3JlYm9vdCgpOwogCXRlZ3JhX3NsZWVwX2NwdV9m aW5pc2godjJwKTsKIApAQCAtMTk3LDYgKzIyMSwxNCBAQCB2b2lkIHRlZ3JhX2lkbGVfbHAyX2xh c3Qodm9pZCkKIAogCWNwdV9zdXNwZW5kKFBIWVNfT0ZGU0VUIC0gUEFHRV9PRkZTRVQsICZ0ZWdy YV9zbGVlcF9jcHUpOwogCisJLyoKKwkgKiBSZXN1bWUgTDIgY2FjaGUgaWYgaXQgd2Fzbid0IHJl LWVuYWJsZWQgZWFybHkgZHVyaW5nIHJlc3VtZSwKKwkgKiB3aGljaCBpcyB0aGUgY2FzZSBmb3Ig VGVncmEzMCB0aGF0IGhhcyB0byByZS1lbmFibGUgdGhlIGNhY2hlCisJICogdmlhIGZpcm13YXJl IGNhbGwuIEluIG90aGVyIGNhc2VzIGNhY2hlIGlzIGFscmVhZHkgZW5hYmxlZCBhbmQKKwkgKiBo ZW5jZSByZS1lbmFibGluZyBpcyBhIG5vLW9wLiBUaGlzIGlzIGFsd2F5cyBhIG5vLW9wIG9uIFRl Z3JhMTE0Ky4KKwkgKi8KKwlvdXRlcl9yZXN1bWUoKTsKKwogCXJlc3RvcmVfY3B1X2NvbXBsZXgo KTsKIAljcHVfY2x1c3Rlcl9wbV9leGl0KCk7CiB9CkBAIC0yMTUsNiArMjQ3LDE1IEBAIGVudW0g dGVncmFfc3VzcGVuZF9tb2RlIHRlZ3JhX3BtX3ZhbGlkYXRlX3N1c3BlbmRfbW9kZSgKIAogc3Rh dGljIGludCB0ZWdyYV9zbGVlcF9jb3JlKHVuc2lnbmVkIGxvbmcgdjJwKQogeworCS8qCisJICog Q2FjaGUgaGF2ZSB0byBiZSBkaXNhYmxlZCB3aXRoIE1NVS1vbiBpZiBjYWNoZSBtYWludGVuYW5j ZSBpcyBkb25lCisJICogdmlhIFRydXN0ZWQgRm91bmRhdGlvbnMgZmlybXdhcmUuIFRoaXMgaXMg YSBuby1vcCBvbiBUZWdyYTExNCsuCisJICovCisJaWYgKHRydXN0ZWRfZm91bmRhdGlvbnNfcmVn aXN0ZXJlZCgpKQorCQlvdXRlcl9kaXNhYmxlKCk7CisKKwljYWxsX2Zpcm13YXJlX29wKHByZXBh cmVfaWRsZSwgVEZfUE1fTU9ERV9MUDEpOworCiAJc2V0dXBfbW1fZm9yX3JlYm9vdCgpOwogCXRl Z3JhX3NsZWVwX2NvcmVfZmluaXNoKHYycCk7CiAKQEAgLTM0Miw2ICszODMsMTQgQEAgc3RhdGlj IGludCB0ZWdyYV9zdXNwZW5kX2VudGVyKHN1c3BlbmRfc3RhdGVfdCBzdGF0ZSkKIAogCWNwdV9z dXNwZW5kKFBIWVNfT0ZGU0VUIC0gUEFHRV9PRkZTRVQsIHRlZ3JhX3NsZWVwX2Z1bmMpOwogCisJ LyoKKwkgKiBSZXN1bWUgTDIgY2FjaGUgaWYgaXQgd2Fzbid0IHJlLWVuYWJsZWQgZWFybHkgZHVy aW5nIHJlc3VtZSwKKwkgKiB3aGljaCBpcyB0aGUgY2FzZSBmb3IgVGVncmEzMCB0aGF0IGhhcyB0 byByZS1lbmFibGUgdGhlIGNhY2hlCisJICogdmlhIGZpcm13YXJlIGNhbGwuIEluIG90aGVyIGNh c2VzIGNhY2hlIGlzIGFscmVhZHkgZW5hYmxlZCBhbmQKKwkgKiBoZW5jZSByZS1lbmFibGluZyBp cyBhIG5vLW9wLgorCSAqLworCW91dGVyX3Jlc3VtZSgpOworCiAJc3dpdGNoIChtb2RlKSB7CiAJ Y2FzZSBURUdSQV9TVVNQRU5EX0xQMToKIAkJdGVncmFfc3VzcGVuZF9leGl0X2xwMSgpOwpkaWZm IC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC10ZWdyYS9yZXNldC1oYW5kbGVyLlMgYi9hcmNoL2FybS9t YWNoLXRlZ3JhL3Jlc2V0LWhhbmRsZXIuUwppbmRleCAzMWZiNTNmOWNlMTMuLmNkOTRkN2M0MWZj MCAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vbWFjaC10ZWdyYS9yZXNldC1oYW5kbGVyLlMKKysrIGIv YXJjaC9hcm0vbWFjaC10ZWdyYS9yZXNldC1oYW5kbGVyLlMKQEAgLTIwLDYgKzIwLDcgQEAKICNp bmNsdWRlIDxzb2MvdGVncmEvZmxvd2N0cmwuaD4KICNpbmNsdWRlIDxzb2MvdGVncmEvZnVzZS5o PgogCisjaW5jbHVkZSA8YXNtL2Fzc2VtYmxlci5oPgogI2luY2x1ZGUgPGFzbS9hc20tb2Zmc2V0 cy5oPgogI2luY2x1ZGUgPGFzbS9jYWNoZS5oPgogCkBAIC03Niw2ICs3Nyw3IEBAIEVOVFJZKHRl Z3JhX3Jlc3VtZSkKIAlvcnIJcjEsIHIxLCAjMQogCXN0cglyMSwgW3IwXQogI2VuZGlmCisJYmwJ dGVncmFfcmVzdW1lX3RydXN0ZWRfZm91bmRhdGlvbnMKIAogI2lmZGVmIENPTkZJR19DQUNIRV9M MlgwCiAJLyogTDIgY2FjaGUgcmVzdW1lICYgcmUtZW5hYmxlICovCkBAIC04OCw2ICs5MCwzMCBA QCBlbmRfY2E5X3NjdV9sMl9yZXN1bWU6CiAKIAliCWNwdV9yZXN1bWUKIEVORFBST0ModGVncmFf cmVzdW1lKQorCisvKgorICoJdGVncmFfcmVzdW1lX3RydXN0ZWRfZm91bmRhdGlvbnMKKyAqCisg KgkgIFRydXN0ZWQgRm91bmRhdGlvbnMgZmlybXdhcmUgaW5pdGlhbGl6YXRpb24uCisgKgorICoJ RG9lc24ndCByZXR1cm4gaWYgZmlybXdhcmUgcHJlc2VudHMuCisgKglDb3JydXB0ZWQgcmVnaXN0 ZXJzOiByMSwgcjIKKyAqLworRU5UUlkodGVncmFfcmVzdW1lX3RydXN0ZWRfZm91bmRhdGlvbnMp CisJLyogQ2hlY2sgd2hldGhlciBUcnVzdGVkIEZvdW5kYXRpb25zIGZpcm13YXJlIHByZXNlbnRz LiAqLworCW1vdjMyCXIyLCBURUdSQV9JUkFNX0JBU0UgKyBURUdSQV9JUkFNX1JFU0VUX0hBTkRM RVJfT0ZGU0VUCisJbGRyCXIxLCA9X190ZWdyYV9jcHVfcmVzZXRfaGFuZGxlcl9kYXRhX29mZnNl dCArIFwKKwkJCQkJCQlSRVNFVF9EQVRBKFRGX1BSRVNFTlQpCisJbGRyCXIxLCBbcjIsIHIxXQor CWNtcAlyMSwgIzAKKwlyZXRlcQlscgorCisgLmFyY2hfZXh0ZW5zaW9uIHNlYworCS8qIEZpcnN0 IGNhbGwgYWZ0ZXIgc3VzcGVuZCB3YWtlcyBmaXJtd2FyZS4gTm8gYXJndW1lbnRzIHJlcXVpcmVk LiAqLworCXNtYwkjMAorCisJYgljcHVfcmVzdW1lCitFTkRQUk9DKHRlZ3JhX3Jlc3VtZV90cnVz dGVkX2ZvdW5kYXRpb25zKQogI2VuZGlmCiAKIAkuYWxpZ24gTDFfQ0FDSEVfU0hJRlQKZGlmZiAt LWdpdCBhL2FyY2gvYXJtL21hY2gtdGVncmEvc2xlZXAuUyBiL2FyY2gvYXJtL21hY2gtdGVncmEv c2xlZXAuUwppbmRleCA1ZTM0OTY3NTNkZjEuLjE3MzVkZWQ1YTgxMiAxMDA2NDQKLS0tIGEvYXJj aC9hcm0vbWFjaC10ZWdyYS9zbGVlcC5TCisrKyBiL2FyY2gvYXJtL21hY2gtdGVncmEvc2xlZXAu UwpAQCAtNDksOCArNDksOSBAQCBFTlRSWSh0ZWdyYV9kaXNhYmxlX2NsZWFuX2ludl9kY2FjaGUp CiAKIAkvKiBEaXNhYmxlIHRoZSBELWNhY2hlICovCiAJbXJjCXAxNSwgMCwgcjIsIGMxLCBjMCwg MAorCXRzdAlyMiwgI0NSX0MJCQlAIHNlZSB0ZWdyYV9zbGVlcF9jcHUoKQogCWJpYwlyMiwgcjIs ICNDUl9DCi0JbWNyCXAxNSwgMCwgcjIsIGMxLCBjMCwgMAorCW1jcm5lCXAxNSwgMCwgcjIsIGMx LCBjMCwgMAogCWlzYgogCiAJLyogRmx1c2ggdGhlIEQtY2FjaGUgKi8KQEAgLTEzMiwxMCArMTMz LDEzIEBAIEVOVFJZKHRlZ3JhX3NodXRfb2ZmX21tdSkKICNpZmRlZiBDT05GSUdfQ0FDSEVfTDJY MAogCS8qIERpc2FibGUgTDIgY2FjaGUgKi8KIAljaGVja19jcHVfcGFydF9udW0gMHhjMDksIHI5 LCByMTAKLQltb3Z3ZXEJcjIsICM6bG93ZXIxNjooVEVHUkFfQVJNX1BFUklGX0JBU0UgKyAweDMw MDApCi0JbW92dGVxCXIyLCAjOnVwcGVyMTY6KFRFR1JBX0FSTV9QRVJJRl9CQVNFICsgMHgzMDAw KQotCW1vdmVxCXIzLCAjMAotCXN0cmVxCXIzLCBbcjIsICNMMlgwX0NUUkxdCisJcmV0bmUJcjAK KworCW1vdjMyCXIyLCBURUdSQV9BUk1fUEVSSUZfQkFTRSArIDB4MzAwMAorCWxkcglyMywgW3Iy LCAjTDJYMF9DVFJMXQorCXRzdAlyMywgI0wyWDBfQ1RSTF9FTgkJQCBzZWUgdGVncmFfc2xlZXBf Y3B1KCkKKwltb3YJcjMsICMwCisJc3RybmUJcjMsIFtyMiwgI0wyWDBfQ1RSTF0KICNlbmRpZgog CXJldAlyMAogRU5EUFJPQyh0ZWdyYV9zaHV0X29mZl9tbXUpCi0tIAoyLjIwLjEKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVs IG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDov L2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==