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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B82E7C433EF for ; Thu, 23 Dec 2021 16:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233560AbhLWQIr (ORCPT ); Thu, 23 Dec 2021 11:08:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233535AbhLWQIq (ORCPT ); Thu, 23 Dec 2021 11:08:46 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8948C061756 for ; Thu, 23 Dec 2021 08:08:45 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id s1so12455467wrg.1 for ; Thu, 23 Dec 2021 08:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=oJXYVflRE3V64ZwTkze2Be2oIi2LQyb10c2T5nTmSn4=; b=HKl8naAkHKH3A0izGYbkezfjVnJRGOl/6P3kKwDT32f2LotS4FLbcQynVMNuv2CvmX HhT5cKiR7hh0ifERsc+ZOS2bbvJgxFDnZRLQKpArUeKe2YSlWEJGt3OfAhJ7mplmPE5t tQoSvov3TUig68rS6q9U76EWgK5seb3mJgTzuLu79FjsxF4VCmmvQcXQ25kbp6AVOJxy QZYdGfXKFAwJ7/7DqgyG3vV+Zz058/LSvgcKRZb1O95xzYcQ29aDrmtl+HP2/s2KQORb 4lQHX1Go5+wZ9HEpTRqty/sC4LOYKBgaexG9Du2SQeGzV5NJVENa9J7XFHxmQoti/lab ybug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=oJXYVflRE3V64ZwTkze2Be2oIi2LQyb10c2T5nTmSn4=; b=TplGdX+9YZwf2a9GBQ3uwJBuiYVVFhTFAuJRlerCu6xSj7aqdmrdfHygAOkN74Oims yBc8cSKZ5v7Cilj6apA5Ccrr9i7ZA4CAD90W+K8z1G0eOXFKWHD5TCKS3GzWRLdXRSi0 Cxk/9vE2z5tQA3YXBk3z3X4VGzHZeJGg5WykgVFSeBWvy+akl+LyAhSHEJV/w2zKkzx7 i9cuFnzWRGT7xIDeimM60f8V3fTqzC1qAfcnnMuauQMVro+pPeigRtLMJJ4UG/tYMCE4 gXRJhZMt23LmdZXOm7qYlOcGyQawosR+tjwumAzNmn5MRpU47he5SnxqmU+UPv7TGsWt 4utA== X-Gm-Message-State: AOAM5332XN+NJuxi8AXJ2EkoL5ZUL5Ci9Psf+Zrw7KvIRf5meXKMRsxG ozzpc7VmyMad8+KW5iDL4e4X8w== X-Google-Smtp-Source: ABdhPJza6AAwk7pJ9pEL9RVmQUeHc0F5cBOz2j+9khEhOuKlGzMFiW+G5NG1ix3Od4uDJxxT5k3bfw== X-Received: by 2002:a5d:608a:: with SMTP id w10mr2071735wrt.596.1640275724296; Thu, 23 Dec 2021 08:08:44 -0800 (PST) Received: from ?IPv6:2a01:e34:ed2f:f020:34ca:f67b:b782:1949? ([2a01:e34:ed2f:f020:34ca:f67b:b782:1949]) by smtp.googlemail.com with ESMTPSA id i8sm5302981wmq.4.2021.12.23.08.08.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Dec 2021 08:08:43 -0800 (PST) Subject: Re: [PATCH v3 3/4] firmware: qcom: scm: Drop cpumask parameter from set_boot_addr() To: Stephan Gerhold , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, Arnd Bergmann , Andy Gross References: <20211201130505.257379-1-stephan@gerhold.net> <20211201130505.257379-4-stephan@gerhold.net> From: Daniel Lezcano Message-ID: <4da4b3ec-68a8-5a74-d38d-b483c97caa95@linaro.org> Date: Thu, 23 Dec 2021 17:08:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211201130505.257379-4-stephan@gerhold.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 01/12/2021 14:05, Stephan Gerhold wrote: > qcom_scm_set_cold/warm_boot_addr() currently take a cpumask parameter, > but it's not very useful because at the end we always set the same entry > address for all CPUs. This also allows speeding up probe of > cpuidle-qcom-spm a bit because only one SCM call needs to be made to > the TrustZone firmware, instead of one per CPU. > > The main reason for this change is that it allows implementing the > "multi-cluster" variant of the set_boot_addr() call more easily > without having to rely on functions that break in certain build > configurations or that are not exported to modules. > > Signed-off-by: Stephan Gerhold Acked-by: Daniel Lezcano > --- > arch/arm/mach-qcom/platsmp.c | 3 +-- > drivers/cpuidle/cpuidle-qcom-spm.c | 8 ++++---- > drivers/firmware/qcom_scm.c | 19 ++++++++----------- > include/linux/qcom_scm.h | 4 ++-- > 4 files changed, 15 insertions(+), 19 deletions(-) > > diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c > index 58a4228455ce..65a0d5ce2bb3 100644 > --- a/arch/arm/mach-qcom/platsmp.c > +++ b/arch/arm/mach-qcom/platsmp.c > @@ -357,8 +357,7 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus) > { > int cpu; > > - if (qcom_scm_set_cold_boot_addr(secondary_startup_arm, > - cpu_present_mask)) { > + if (qcom_scm_set_cold_boot_addr(secondary_startup_arm)) { > for_each_present_cpu(cpu) { > if (cpu == smp_processor_id()) > continue; > diff --git a/drivers/cpuidle/cpuidle-qcom-spm.c b/drivers/cpuidle/cpuidle-qcom-spm.c > index 5f27dcc6c110..beedf22cbe78 100644 > --- a/drivers/cpuidle/cpuidle-qcom-spm.c > +++ b/drivers/cpuidle/cpuidle-qcom-spm.c > @@ -122,10 +122,6 @@ static int spm_cpuidle_register(struct device *cpuidle_dev, int cpu) > if (ret <= 0) > return ret ? : -ENODEV; > > - ret = qcom_scm_set_warm_boot_addr(cpu_resume_arm, cpumask_of(cpu)); > - if (ret) > - return ret; > - > return cpuidle_register(&data->cpuidle_driver, NULL); > } > > @@ -136,6 +132,10 @@ static int spm_cpuidle_drv_probe(struct platform_device *pdev) > if (!qcom_scm_is_available()) > return -EPROBE_DEFER; > > + ret = qcom_scm_set_warm_boot_addr(cpu_resume_arm); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "set warm boot addr failed"); > + > for_each_possible_cpu(cpu) { > ret = spm_cpuidle_register(&pdev->dev, cpu); > if (ret && ret != -ENODEV) { > diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c > index e0fca80bf6fc..e89be2f0cdec 100644 > --- a/drivers/firmware/qcom_scm.c > +++ b/drivers/firmware/qcom_scm.c > @@ -246,8 +246,7 @@ static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, > return ret ? false : !!res.result[0]; > } > > -static int qcom_scm_set_boot_addr(void *entry, const cpumask_t *cpus, > - const u8 *cpu_bits) > +static int qcom_scm_set_boot_addr(void *entry, const u8 *cpu_bits) > { > int cpu; > unsigned int flags = 0; > @@ -258,7 +257,7 @@ static int qcom_scm_set_boot_addr(void *entry, const cpumask_t *cpus, > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - for_each_cpu(cpu, cpus) { > + for_each_present_cpu(cpu) { > if (cpu >= QCOM_SCM_BOOT_MAX_CPUS) > return -EINVAL; > flags |= cpu_bits[cpu]; > @@ -271,27 +270,25 @@ static int qcom_scm_set_boot_addr(void *entry, const cpumask_t *cpus, > } > > /** > - * qcom_scm_set_warm_boot_addr() - Set the warm boot address for cpus > + * qcom_scm_set_warm_boot_addr() - Set the warm boot address for all cpus > * @entry: Entry point function for the cpus > - * @cpus: The cpumask of cpus that will use the entry point > * > * Set the Linux entry point for the SCM to transfer control to when coming > * out of a power down. CPU power down may be executed on cpuidle or hotplug. > */ > -int qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus) > +int qcom_scm_set_warm_boot_addr(void *entry) > { > - return qcom_scm_set_boot_addr(entry, cpus, qcom_scm_cpu_warm_bits); > + return qcom_scm_set_boot_addr(entry, qcom_scm_cpu_warm_bits); > } > EXPORT_SYMBOL(qcom_scm_set_warm_boot_addr); > > /** > - * qcom_scm_set_cold_boot_addr() - Set the cold boot address for cpus > + * qcom_scm_set_cold_boot_addr() - Set the cold boot address for all cpus > * @entry: Entry point function for the cpus > - * @cpus: The cpumask of cpus that will use the entry point > */ > -int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus) > +int qcom_scm_set_cold_boot_addr(void *entry) > { > - return qcom_scm_set_boot_addr(entry, cpus, qcom_scm_cpu_cold_bits); > + return qcom_scm_set_boot_addr(entry, qcom_scm_cpu_cold_bits); > } > EXPORT_SYMBOL(qcom_scm_set_cold_boot_addr); > > diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h > index 81cad9e1e412..048d09e1965b 100644 > --- a/include/linux/qcom_scm.h > +++ b/include/linux/qcom_scm.h > @@ -63,8 +63,8 @@ enum qcom_scm_ice_cipher { > > extern bool qcom_scm_is_available(void); > > -extern int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus); > -extern int qcom_scm_set_warm_boot_addr(void *entry, const cpumask_t *cpus); > +extern int qcom_scm_set_cold_boot_addr(void *entry); > +extern int qcom_scm_set_warm_boot_addr(void *entry); > extern void qcom_scm_cpu_power_down(u32 flags); > extern int qcom_scm_set_remote_state(u32 state, u32 id); > > -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B50ADC433FE for ; Thu, 23 Dec 2021 16:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=elSeo8o0dE2gLMkbRMmpiwGlpAjFfT1vTWqTl8JdstM=; b=pK8PB0p5YoOMcr4H1xozcy/duo 29A5DE7ZGz+MiOidzVKdOmIW4WI2rqAIlEAx/EabqmAToK47qX1/IHG6zOfzZmhpCvdw2MclOIxTQ QXUD6A0IRtsSFgvvhkLXKKc32Ji5wIrj6cGIJMsTf6CTmk/Gwi6KcEN9SXoCJhfG9Nf/Ha7U4ssTQ E9oQ0a8/6UA7MecVMA99WciXhhQtOgEJeTPQ3rTLwVo2xbH6im/ks5GEq8sSycbH6lokggkUOEZDi b3TayevzznGY0furr7xP7dELB4bg8qhgmV5nOyRRf80iTeZqC928iL5P6l5KFWdf7cR8vsescw417 4DA5uJhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0Qe9-00D25G-N7; Thu, 23 Dec 2021 16:08:49 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0Qe5-00D247-JU for linux-arm-kernel@lists.infradead.org; Thu, 23 Dec 2021 16:08:47 +0000 Received: by mail-wr1-x432.google.com with SMTP id a9so12366924wrr.8 for ; Thu, 23 Dec 2021 08:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=oJXYVflRE3V64ZwTkze2Be2oIi2LQyb10c2T5nTmSn4=; b=HKl8naAkHKH3A0izGYbkezfjVnJRGOl/6P3kKwDT32f2LotS4FLbcQynVMNuv2CvmX HhT5cKiR7hh0ifERsc+ZOS2bbvJgxFDnZRLQKpArUeKe2YSlWEJGt3OfAhJ7mplmPE5t tQoSvov3TUig68rS6q9U76EWgK5seb3mJgTzuLu79FjsxF4VCmmvQcXQ25kbp6AVOJxy QZYdGfXKFAwJ7/7DqgyG3vV+Zz058/LSvgcKRZb1O95xzYcQ29aDrmtl+HP2/s2KQORb 4lQHX1Go5+wZ9HEpTRqty/sC4LOYKBgaexG9Du2SQeGzV5NJVENa9J7XFHxmQoti/lab ybug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=oJXYVflRE3V64ZwTkze2Be2oIi2LQyb10c2T5nTmSn4=; b=kFDA3AdFeCRZia1Gy4lXZhoBhdeJORW+2MrfiIw4Twvg5+XM2gy3H2faC0l3pdONhm d441KifGgOVxdYUDPxUL8R5ePOmytLjp8xbv4YQEkoc3qvYxtxQMha6vBvbuR2z4VhdL GmPoT5lhRl8zqyAyzYdKEgEijibBIidMHnxc6MddhO5V01L2Apj+Rpdq2xkr168vEEwF Xy9aliNVyr2JIjiiQUWpT+epFs7Vj5pjcCajOuFPclXAqf4vutPk6D8V80kKiNpqiUGP Sx48eZmaoAedJyTG6DHVHrnO7DxBNKm6CSOR/VD4VLGeKpLYuirkztGMIWFfg4zBcck4 y79Q== X-Gm-Message-State: AOAM531mCEna5SURUYJK1jPA0ORDYpIULANN3xnDlI4//Qk8Qbu3p2Di DjF3k/1KQvnH3OoETt24LB1RgswVWkiASAfE X-Google-Smtp-Source: ABdhPJza6AAwk7pJ9pEL9RVmQUeHc0F5cBOz2j+9khEhOuKlGzMFiW+G5NG1ix3Od4uDJxxT5k3bfw== X-Received: by 2002:a5d:608a:: with SMTP id w10mr2071735wrt.596.1640275724296; Thu, 23 Dec 2021 08:08:44 -0800 (PST) Received: from ?IPv6:2a01:e34:ed2f:f020:34ca:f67b:b782:1949? ([2a01:e34:ed2f:f020:34ca:f67b:b782:1949]) by smtp.googlemail.com with ESMTPSA id i8sm5302981wmq.4.2021.12.23.08.08.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Dec 2021 08:08:43 -0800 (PST) Subject: Re: [PATCH v3 3/4] firmware: qcom: scm: Drop cpumask parameter from set_boot_addr() To: Stephan Gerhold , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, Arnd Bergmann , Andy Gross References: <20211201130505.257379-1-stephan@gerhold.net> <20211201130505.257379-4-stephan@gerhold.net> From: Daniel Lezcano Message-ID: <4da4b3ec-68a8-5a74-d38d-b483c97caa95@linaro.org> Date: Thu, 23 Dec 2021 17:08:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211201130505.257379-4-stephan@gerhold.net> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211223_080845_673074_D00C603F X-CRM114-Status: GOOD ( 30.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gMDEvMTIvMjAyMSAxNDowNSwgU3RlcGhhbiBHZXJob2xkIHdyb3RlOgo+IHFjb21fc2NtX3Nl dF9jb2xkL3dhcm1fYm9vdF9hZGRyKCkgY3VycmVudGx5IHRha2UgYSBjcHVtYXNrIHBhcmFtZXRl ciwKPiBidXQgaXQncyBub3QgdmVyeSB1c2VmdWwgYmVjYXVzZSBhdCB0aGUgZW5kIHdlIGFsd2F5 cyBzZXQgdGhlIHNhbWUgZW50cnkKPiBhZGRyZXNzIGZvciBhbGwgQ1BVcy4gVGhpcyBhbHNvIGFs bG93cyBzcGVlZGluZyB1cCBwcm9iZSBvZgo+IGNwdWlkbGUtcWNvbS1zcG0gYSBiaXQgYmVjYXVz ZSBvbmx5IG9uZSBTQ00gY2FsbCBuZWVkcyB0byBiZSBtYWRlIHRvCj4gdGhlIFRydXN0Wm9uZSBm aXJtd2FyZSwgaW5zdGVhZCBvZiBvbmUgcGVyIENQVS4KPiAKPiBUaGUgbWFpbiByZWFzb24gZm9y IHRoaXMgY2hhbmdlIGlzIHRoYXQgaXQgYWxsb3dzIGltcGxlbWVudGluZyB0aGUKPiAibXVsdGkt Y2x1c3RlciIgdmFyaWFudCBvZiB0aGUgc2V0X2Jvb3RfYWRkcigpIGNhbGwgbW9yZSBlYXNpbHkK PiB3aXRob3V0IGhhdmluZyB0byByZWx5IG9uIGZ1bmN0aW9ucyB0aGF0IGJyZWFrIGluIGNlcnRh aW4gYnVpbGQKPiBjb25maWd1cmF0aW9ucyBvciB0aGF0IGFyZSBub3QgZXhwb3J0ZWQgdG8gbW9k dWxlcy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBTdGVwaGFuIEdlcmhvbGQgPHN0ZXBoYW5AZ2VyaG9s ZC5uZXQ+CgpBY2tlZC1ieTogRGFuaWVsIExlemNhbm8gPGRhbmllbC5sZXpjYW5vQGxpbmFyby5v cmc+Cgo+IC0tLQo+ICBhcmNoL2FybS9tYWNoLXFjb20vcGxhdHNtcC5jICAgICAgIHwgIDMgKy0t Cj4gIGRyaXZlcnMvY3B1aWRsZS9jcHVpZGxlLXFjb20tc3BtLmMgfCAgOCArKysrLS0tLQo+ICBk cml2ZXJzL2Zpcm13YXJlL3Fjb21fc2NtLmMgICAgICAgIHwgMTkgKysrKysrKystLS0tLS0tLS0t LQo+ICBpbmNsdWRlL2xpbnV4L3Fjb21fc2NtLmggICAgICAgICAgIHwgIDQgKystLQo+ICA0IGZp bGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYg LS1naXQgYS9hcmNoL2FybS9tYWNoLXFjb20vcGxhdHNtcC5jIGIvYXJjaC9hcm0vbWFjaC1xY29t L3BsYXRzbXAuYwo+IGluZGV4IDU4YTQyMjg0NTVjZS4uNjVhMGQ1Y2UyYmIzIDEwMDY0NAo+IC0t LSBhL2FyY2gvYXJtL21hY2gtcWNvbS9wbGF0c21wLmMKPiArKysgYi9hcmNoL2FybS9tYWNoLXFj b20vcGxhdHNtcC5jCj4gQEAgLTM1Nyw4ICszNTcsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgcWNv bV9zbXBfcHJlcGFyZV9jcHVzKHVuc2lnbmVkIGludCBtYXhfY3B1cykKPiAgewo+ICAJaW50IGNw dTsKPiAgCj4gLQlpZiAocWNvbV9zY21fc2V0X2NvbGRfYm9vdF9hZGRyKHNlY29uZGFyeV9zdGFy dHVwX2FybSwKPiAtCQkJCQljcHVfcHJlc2VudF9tYXNrKSkgewo+ICsJaWYgKHFjb21fc2NtX3Nl dF9jb2xkX2Jvb3RfYWRkcihzZWNvbmRhcnlfc3RhcnR1cF9hcm0pKSB7Cj4gIAkJZm9yX2VhY2hf cHJlc2VudF9jcHUoY3B1KSB7Cj4gIAkJCWlmIChjcHUgPT0gc21wX3Byb2Nlc3Nvcl9pZCgpKQo+ ICAJCQkJY29udGludWU7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvY3B1aWRsZS9jcHVpZGxlLXFj b20tc3BtLmMgYi9kcml2ZXJzL2NwdWlkbGUvY3B1aWRsZS1xY29tLXNwbS5jCj4gaW5kZXggNWYy N2RjYzZjMTEwLi5iZWVkZjIyY2JlNzggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9jcHVpZGxlL2Nw dWlkbGUtcWNvbS1zcG0uYwo+ICsrKyBiL2RyaXZlcnMvY3B1aWRsZS9jcHVpZGxlLXFjb20tc3Bt LmMKPiBAQCAtMTIyLDEwICsxMjIsNiBAQCBzdGF0aWMgaW50IHNwbV9jcHVpZGxlX3JlZ2lzdGVy KHN0cnVjdCBkZXZpY2UgKmNwdWlkbGVfZGV2LCBpbnQgY3B1KQo+ICAJaWYgKHJldCA8PSAwKQo+ ICAJCXJldHVybiByZXQgPyA6IC1FTk9ERVY7Cj4gIAo+IC0JcmV0ID0gcWNvbV9zY21fc2V0X3dh cm1fYm9vdF9hZGRyKGNwdV9yZXN1bWVfYXJtLCBjcHVtYXNrX29mKGNwdSkpOwo+IC0JaWYgKHJl dCkKPiAtCQlyZXR1cm4gcmV0Owo+IC0KPiAgCXJldHVybiBjcHVpZGxlX3JlZ2lzdGVyKCZkYXRh LT5jcHVpZGxlX2RyaXZlciwgTlVMTCk7Cj4gIH0KPiAgCj4gQEAgLTEzNiw2ICsxMzIsMTAgQEAg c3RhdGljIGludCBzcG1fY3B1aWRsZV9kcnZfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikKPiAgCWlmICghcWNvbV9zY21faXNfYXZhaWxhYmxlKCkpCj4gIAkJcmV0dXJuIC1FUFJP QkVfREVGRVI7Cj4gIAo+ICsJcmV0ID0gcWNvbV9zY21fc2V0X3dhcm1fYm9vdF9hZGRyKGNwdV9y ZXN1bWVfYXJtKTsKPiArCWlmIChyZXQpCj4gKwkJcmV0dXJuIGRldl9lcnJfcHJvYmUoJnBkZXYt PmRldiwgcmV0LCAic2V0IHdhcm0gYm9vdCBhZGRyIGZhaWxlZCIpOwo+ICsKPiAgCWZvcl9lYWNo X3Bvc3NpYmxlX2NwdShjcHUpIHsKPiAgCQlyZXQgPSBzcG1fY3B1aWRsZV9yZWdpc3RlcigmcGRl di0+ZGV2LCBjcHUpOwo+ICAJCWlmIChyZXQgJiYgcmV0ICE9IC1FTk9ERVYpIHsKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9maXJtd2FyZS9xY29tX3NjbS5jIGIvZHJpdmVycy9maXJtd2FyZS9xY29t X3NjbS5jCj4gaW5kZXggZTBmY2E4MGJmNmZjLi5lODliZTJmMGNkZWMgMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy9maXJtd2FyZS9xY29tX3NjbS5jCj4gKysrIGIvZHJpdmVycy9maXJtd2FyZS9xY29t X3NjbS5jCj4gQEAgLTI0Niw4ICsyNDYsNyBAQCBzdGF0aWMgYm9vbCBfX3Fjb21fc2NtX2lzX2Nh bGxfYXZhaWxhYmxlKHN0cnVjdCBkZXZpY2UgKmRldiwgdTMyIHN2Y19pZCwKPiAgCXJldHVybiBy ZXQgPyBmYWxzZSA6ICEhcmVzLnJlc3VsdFswXTsKPiAgfQo+ICAKPiAtc3RhdGljIGludCBxY29t X3NjbV9zZXRfYm9vdF9hZGRyKHZvaWQgKmVudHJ5LCBjb25zdCBjcHVtYXNrX3QgKmNwdXMsCj4g LQkJCQkgIGNvbnN0IHU4ICpjcHVfYml0cykKPiArc3RhdGljIGludCBxY29tX3NjbV9zZXRfYm9v dF9hZGRyKHZvaWQgKmVudHJ5LCBjb25zdCB1OCAqY3B1X2JpdHMpCj4gIHsKPiAgCWludCBjcHU7 Cj4gIAl1bnNpZ25lZCBpbnQgZmxhZ3MgPSAwOwo+IEBAIC0yNTgsNyArMjU3LDcgQEAgc3RhdGlj IGludCBxY29tX3NjbV9zZXRfYm9vdF9hZGRyKHZvaWQgKmVudHJ5LCBjb25zdCBjcHVtYXNrX3Qg KmNwdXMsCj4gIAkJLm93bmVyID0gQVJNX1NNQ0NDX09XTkVSX1NJUCwKPiAgCX07Cj4gIAo+IC0J Zm9yX2VhY2hfY3B1KGNwdSwgY3B1cykgewo+ICsJZm9yX2VhY2hfcHJlc2VudF9jcHUoY3B1KSB7 Cj4gIAkJaWYgKGNwdSA+PSBRQ09NX1NDTV9CT09UX01BWF9DUFVTKQo+ICAJCQlyZXR1cm4gLUVJ TlZBTDsKPiAgCQlmbGFncyB8PSBjcHVfYml0c1tjcHVdOwo+IEBAIC0yNzEsMjcgKzI3MCwyNSBA QCBzdGF0aWMgaW50IHFjb21fc2NtX3NldF9ib290X2FkZHIodm9pZCAqZW50cnksIGNvbnN0IGNw dW1hc2tfdCAqY3B1cywKPiAgfQo+ICAKPiAgLyoqCj4gLSAqIHFjb21fc2NtX3NldF93YXJtX2Jv b3RfYWRkcigpIC0gU2V0IHRoZSB3YXJtIGJvb3QgYWRkcmVzcyBmb3IgY3B1cwo+ICsgKiBxY29t X3NjbV9zZXRfd2FybV9ib290X2FkZHIoKSAtIFNldCB0aGUgd2FybSBib290IGFkZHJlc3MgZm9y IGFsbCBjcHVzCj4gICAqIEBlbnRyeTogRW50cnkgcG9pbnQgZnVuY3Rpb24gZm9yIHRoZSBjcHVz Cj4gLSAqIEBjcHVzOiBUaGUgY3B1bWFzayBvZiBjcHVzIHRoYXQgd2lsbCB1c2UgdGhlIGVudHJ5 IHBvaW50Cj4gICAqCj4gICAqIFNldCB0aGUgTGludXggZW50cnkgcG9pbnQgZm9yIHRoZSBTQ00g dG8gdHJhbnNmZXIgY29udHJvbCB0byB3aGVuIGNvbWluZwo+ICAgKiBvdXQgb2YgYSBwb3dlciBk b3duLiBDUFUgcG93ZXIgZG93biBtYXkgYmUgZXhlY3V0ZWQgb24gY3B1aWRsZSBvciBob3RwbHVn Lgo+ICAgKi8KPiAtaW50IHFjb21fc2NtX3NldF93YXJtX2Jvb3RfYWRkcih2b2lkICplbnRyeSwg Y29uc3QgY3B1bWFza190ICpjcHVzKQo+ICtpbnQgcWNvbV9zY21fc2V0X3dhcm1fYm9vdF9hZGRy KHZvaWQgKmVudHJ5KQo+ICB7Cj4gLQlyZXR1cm4gcWNvbV9zY21fc2V0X2Jvb3RfYWRkcihlbnRy eSwgY3B1cywgcWNvbV9zY21fY3B1X3dhcm1fYml0cyk7Cj4gKwlyZXR1cm4gcWNvbV9zY21fc2V0 X2Jvb3RfYWRkcihlbnRyeSwgcWNvbV9zY21fY3B1X3dhcm1fYml0cyk7Cj4gIH0KPiAgRVhQT1JU X1NZTUJPTChxY29tX3NjbV9zZXRfd2FybV9ib290X2FkZHIpOwo+ICAKPiAgLyoqCj4gLSAqIHFj b21fc2NtX3NldF9jb2xkX2Jvb3RfYWRkcigpIC0gU2V0IHRoZSBjb2xkIGJvb3QgYWRkcmVzcyBm b3IgY3B1cwo+ICsgKiBxY29tX3NjbV9zZXRfY29sZF9ib290X2FkZHIoKSAtIFNldCB0aGUgY29s ZCBib290IGFkZHJlc3MgZm9yIGFsbCBjcHVzCj4gICAqIEBlbnRyeTogRW50cnkgcG9pbnQgZnVu Y3Rpb24gZm9yIHRoZSBjcHVzCj4gLSAqIEBjcHVzOiBUaGUgY3B1bWFzayBvZiBjcHVzIHRoYXQg d2lsbCB1c2UgdGhlIGVudHJ5IHBvaW50Cj4gICAqLwo+IC1pbnQgcWNvbV9zY21fc2V0X2NvbGRf Ym9vdF9hZGRyKHZvaWQgKmVudHJ5LCBjb25zdCBjcHVtYXNrX3QgKmNwdXMpCj4gK2ludCBxY29t X3NjbV9zZXRfY29sZF9ib290X2FkZHIodm9pZCAqZW50cnkpCj4gIHsKPiAtCXJldHVybiBxY29t X3NjbV9zZXRfYm9vdF9hZGRyKGVudHJ5LCBjcHVzLCBxY29tX3NjbV9jcHVfY29sZF9iaXRzKTsK PiArCXJldHVybiBxY29tX3NjbV9zZXRfYm9vdF9hZGRyKGVudHJ5LCBxY29tX3NjbV9jcHVfY29s ZF9iaXRzKTsKPiAgfQo+ICBFWFBPUlRfU1lNQk9MKHFjb21fc2NtX3NldF9jb2xkX2Jvb3RfYWRk cik7Cj4gIAo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L3Fjb21fc2NtLmggYi9pbmNsdWRl L2xpbnV4L3Fjb21fc2NtLmgKPiBpbmRleCA4MWNhZDllMWU0MTIuLjA0OGQwOWUxOTY1YiAxMDA2 NDQKPiAtLS0gYS9pbmNsdWRlL2xpbnV4L3Fjb21fc2NtLmgKPiArKysgYi9pbmNsdWRlL2xpbnV4 L3Fjb21fc2NtLmgKPiBAQCAtNjMsOCArNjMsOCBAQCBlbnVtIHFjb21fc2NtX2ljZV9jaXBoZXIg ewo+ICAKPiAgZXh0ZXJuIGJvb2wgcWNvbV9zY21faXNfYXZhaWxhYmxlKHZvaWQpOwo+ICAKPiAt ZXh0ZXJuIGludCBxY29tX3NjbV9zZXRfY29sZF9ib290X2FkZHIodm9pZCAqZW50cnksIGNvbnN0 IGNwdW1hc2tfdCAqY3B1cyk7Cj4gLWV4dGVybiBpbnQgcWNvbV9zY21fc2V0X3dhcm1fYm9vdF9h ZGRyKHZvaWQgKmVudHJ5LCBjb25zdCBjcHVtYXNrX3QgKmNwdXMpOwo+ICtleHRlcm4gaW50IHFj b21fc2NtX3NldF9jb2xkX2Jvb3RfYWRkcih2b2lkICplbnRyeSk7Cj4gK2V4dGVybiBpbnQgcWNv bV9zY21fc2V0X3dhcm1fYm9vdF9hZGRyKHZvaWQgKmVudHJ5KTsKPiAgZXh0ZXJuIHZvaWQgcWNv bV9zY21fY3B1X3Bvd2VyX2Rvd24odTMyIGZsYWdzKTsKPiAgZXh0ZXJuIGludCBxY29tX3NjbV9z ZXRfcmVtb3RlX3N0YXRlKHUzMiBzdGF0ZSwgdTMyIGlkKTsKPiAgCj4gCgoKLS0gCjxodHRwOi8v d3d3LmxpbmFyby5vcmcvPiBMaW5hcm8ub3JnIOKUgiBPcGVuIHNvdXJjZSBzb2Z0d2FyZSBmb3Ig QVJNIFNvQ3MKCkZvbGxvdyBMaW5hcm86ICA8aHR0cDovL3d3dy5mYWNlYm9vay5jb20vcGFnZXMv TGluYXJvPiBGYWNlYm9vayB8CjxodHRwOi8vdHdpdHRlci5jb20vIyEvbGluYXJvb3JnPiBUd2l0 dGVyIHwKPGh0dHA6Ly93d3cubGluYXJvLm9yZy9saW5hcm8tYmxvZy8+IEJsb2cKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK