From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8C8A171099; Wed, 17 Apr 2024 17:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.176.79.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713373786; cv=none; b=erJaqkCShZE6pDJL4LqzqFa3php0USHU0CjmEbLvM0D3ID1rG6EuNLwf2iracYcBG7N5+zrW00MVLJtWT/CEqEsB+3kOcqdBysnMDU7hvzxwIWAy8993KtlMZPH9e83ytt5NMrg4uWXunoWESpysmgxHP1ffpCvpKM4JtZuNwtM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713373786; c=relaxed/simple; bh=+m06rCYAPCnO0+7KCmJp+ehYNcRXctuaIiOyfU5OYdI=; h=Date:From:To:CC:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Los+x95BylWVQsS464ajn682nHwg72dGFGwTEZ35u4WPbQ+UJaLbfTZVyuQnNKABPuskUMngW2MR+KZ/PLCA8CT4Mq70uK9XQFXS0ylxH3q37+A7vDiN2J3Qv7dTqflxcoe1ec0i52hdFbnMbEzED7ovKtwd7TwkF2/kRngJVXY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=185.176.79.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4VKS5S72hfz6JBKZ; Thu, 18 Apr 2024 01:07:40 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 53415140119; Thu, 18 Apr 2024 01:09:41 +0800 (CST) Received: from localhost (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 17 Apr 2024 18:09:40 +0100 Date: Wed, 17 Apr 2024 18:09:39 +0100 From: Jonathan Cameron To: "Rafael J. Wysocki" CC: Salil Mehta , Thomas Gleixner , Peter Zijlstra , "linux-pm@vger.kernel.org" , "loongarch@lists.linux.dev" , "linux-acpi@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "x86@kernel.org" , Russell King , Miguel Luis , James Morse , Jean-Philippe Brucker , Catalin Marinas , Will Deacon , Ingo Molnar , Borislav Petkov , Dave Hansen , Linuxarm , "justin.he@arm.com" , "jianyong.wu@arm.com" Subject: Re: [PATCH v6 06/16] ACPI: processor: Register deferred CPUs from acpi_processor_get_info() Message-ID: <20240417180939.00003db7@huawei.com> In-Reply-To: References: <20240417131909.7925-1-Jonathan.Cameron@huawei.com> <20240417131909.7925-7-Jonathan.Cameron@huawei.com> <22ace9b108ee488eb017f5b3e8facb8d@huawei.com> <20240417163842.0000415e@Huawei.com> Organization: Huawei Technologies R&D (UK) Ltd. X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.29; x86_64-w64-mingw32) Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: lhrpeml500005.china.huawei.com (7.191.163.240) To lhrpeml500005.china.huawei.com (7.191.163.240) On Wed, 17 Apr 2024 17:59:36 +0200 "Rafael J. Wysocki" wrote: > On Wed, Apr 17, 2024 at 5:38=E2=80=AFPM Jonathan Cameron > wrote: > > > > On Wed, 17 Apr 2024 16:03:51 +0100 > > Salil Mehta wrote: > > =20 > > > > From: Jonathan Cameron > > > > Sent: Wednesday, April 17, 2024 2:19 PM > > > > > > > > From: James Morse > > > > > > > > The arm64 specific arch_register_cpu() call may defer CPU registra= tion until > > > > the ACPI interpreter is available and the _STA method can be evalu= ated. > > > > > > > > If this occurs, then a second attempt is made in acpi_processor_ge= t_info(). > > > > Note that the arm64 specific call has not yet been added so for no= w this will > > > > be called for the original hotplug case. > > > > > > > > For architectures that do not defer until the ACPI Processor drive= r loads > > > > (e.g. x86), for initially present CPUs there will already be a CPU= device. If > > > > present do not try to register again. > > > > > > > > Systems can still be booted with 'acpi=3Doff', or not include an A= CPI > > > > description at all as in these cases arch_register_cpu() will not = have > > > > deferred registration when first called. > > > > > > > > This moves the CPU register logic back to a subsys_initcall(), whi= le the > > > > memory nodes will have been registered earlier. > > > > Note this is where the call was prior to the cleanup series so the= re should be > > > > no side effects of moving it back again for this specific case. > > > > > > > > [PATCH 00/21] Initial cleanups for vCPU HP. > > > > https://lore.kernel.org/all/ZVyz%2FVe5pPu8AWoA@shell.armlinux.org.= uk/ > > > > > > > > e.g. 5b95f94c3b9f ("x86/topology: Switch over to GENERIC_CPU_DEVIC= ES") > > > > > > > > Signed-off-by: James Morse > > > > Reviewed-by: Gavin Shan > > > > Tested-by: Miguel Luis > > > > Tested-by: Vishnu Pajjuri > > > > Tested-by: Jianyong Wu > > > > Signed-off-by: Russell King (Oracle) > > > > Co-developed-by: Jonathan Cameron > > > > Signed-off-by: Joanthan Cameron > > > > --- > > > > v6: Squash the two paths for conventional CPU Hotplug and arm64 > > > > vCPU HP. > > > > v5: Update commit message to make it clear this is moving the > > > > init back to where it was until very recently. > > > > > > > > No longer change the condition in the earlier registration poi= nt > > > > as that will be handled by the arm64 registration routine > > > > deferring until called again here. > > > > --- > > > > drivers/acpi/acpi_processor.c | 12 +++++++++++- > > > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_pro= cessor.c > > > > index 7ecb13775d7f..0cac77961020 100644 > > > > --- a/drivers/acpi/acpi_processor.c > > > > +++ b/drivers/acpi/acpi_processor.c > > > > @@ -356,8 +356,18 @@ static int acpi_processor_get_info(struct > > > > acpi_device *device) > > > > * > > > > * NOTE: Even if the processor has a cpuid, it may not be pres= ent > > > > * because cpuid <-> apicid mapping is persistent now. > > > > + * > > > > + * Note this allows 3 flows, it is up to the arch_register_cpu= () > > > > + * call to reject any that are not supported on a given archit= ecture. > > > > + * A) CPU becomes present. > > > > + * B) Previously invalid logical CPU ID (Same as becoming pres= ent) > > > > + * C) CPU already present and now being enabled (and wasn't > > > > registered > > > > + * early on an arch that doesn't defer to here) > > > > */ > > > > - if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id)) { > > > > + if ((!invalid_logical_cpuid(pr->id) && cpu_present(pr->id) && > > > > + !get_cpu_device(pr->id)) || > > > > + invalid_logical_cpuid(pr->id) || > > > > + !cpu_present(pr->id)) { =20 > > > > > > =20 > > Hi Salil, > > > > Thanks for quick review! > > =20 > > > Logic is clear but it is ugly. We should turn them into macro or inli= ne. =20 > > > > You've found the 'ugly' in this approach vs keeping them separate. > > > > For this version I wanted to keep it clear that indeed this condition > > is a complex mess of different things (and to let people compare > > it easily with the two paths in v5 to convinced themselves this > > is the same) > > > > It's also a little tricky to do, so will need some thought. > > > > I don't think a simple acpi_cpu_is_hotplug() condition is useful > > as it just moves the complexity away from where a reader is looking > > and it would only be used in this one case. > > > > It doesn't separate well into finer grained subconditions because > > (C) is a messy case of the vCPU HP case and a not done > > something else earlier. The disadvantage of only deferring for > > arm64 and not other architectures. > > > > The best I can quickly come up with is something like this: > > #define acpi_cpu_not_present(cpu) \ > > (invalid_logical_cpuid(cpu) || !cpu_present(cpu)) > > #define acpi_cpu_not_enabled(cpu) \ > > (!invalid_logical_cpuid(cpu) || cpu_present(cpu)) > > > > if ((apci_cpu_not_enabled(pr->id) && !get_cpu_device(pr->id) || > > acpi_cpu_not_present(pr->id)) > > > > Which would still need the same amount of documentation. The > > code still isn't enough for me to immediately be able to see > > what is going on. > > > > So maybe worth it... I'm not sure. Rafael, you get to keep this > > fun, what would you prefer? =20 >=20 > I would use a static inline function returning bool to carry out these > checks with comments explaining the different cases in which 'true' > needs to be returned. The following makes a subtle logic change (I'll retest tomorrow) but I think that get_cpu_device(cpu) can never succeed in a path where hotadd makes sense.=20 +/* + * Identify if the state transition indicates that hotadd_init + * should be called. + * + * For acpi_processor_add() to be called, the reported state must + * now be enabled and present. Conditions reflect prior state. + */ +static inline bool acpi_processor_should_hotadd_init(int cpu) +{ + /* Already register, initial registration was not deferred */ + if (get_cpu_device(cpu)) + return false; + + /* Processor has become present */ + if (!cpu_present(cpu)) + return true; + + /* Logical cpuid currently invalid indicates hotadd */ + if (invalid_logical_cpuid(cpu)) + return true; + + /* + * Previously present and the logical cpu id is valid. + * Deferred registration now _STA can be queries, or + * Hotadd due to enabled becoming true on an online capable + * CPU. + */ + if (cpu_present(cpu)) + return true; + + return false; +} + static int acpi_processor_get_info(struct acpi_device *device) { union acpi_object object =3D { 0 }; @@ -356,18 +388,8 @@ static int acpi_processor_get_info(struct acpi_device = *device) * * NOTE: Even if the processor has a cpuid, it may not be present * because cpuid <-> apicid mapping is persistent now. - * - * Note this allows 3 flows, it is up to the arch_register_cpu() - * call to reject any that are not supported on a given architectu= re. - * A) CPU becomes present. - * B) Previously invalid logical CPU ID (Same as becoming present) - * C) CPU already present and now being enabled (and wasn't regist= ered - * early on an arch that doesn't defer to here) */ - if ((!invalid_logical_cpuid(pr->id) && cpu_present(pr->id) && - !get_cpu_device(pr->id)) || - invalid_logical_cpuid(pr->id) || - !cpu_present(pr->id)) { + if (acpi_processor_should_hotadd_init(pr->id)) { ret =3D acpi_processor_hotadd_init(pr, device); 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 AF359C001CC for ; Wed, 17 Apr 2024 17:10:06 +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:MIME-Version:References:In-Reply-To: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t6X2v5GjBBBviErzTb9B9Xs93HD10B6DMuZvkh9WufM=; b=VCbdingUU6iyTf M4e0nMtGAjijoPngy34aJXDtrL1Iuq4a+8dWwA2ApLa6Au0jh1LApIraO1cEXQ8AGQPwtkdPPkTJy o1XbQWSDaY4y65dgAHiIzYvCABaOCwfR2Nbn4VanfXs0n78p1FF1JM9QAAYwsknD6rZgYgpqpXS7+ iXEzCt2XDvGV27K1mfLE4FvM4RfRtay8hl1wAUBTOGXQSl+6dCdMB8STZe8U0HzqUMAI1Q/i6phlW fyfnOynrIafYjpGCjSO9a2j4PmOzJj3xSp2ORgw858QoQR9pWID1LOYEKm3nArPPx6U7To8nO9/9z j+RKHEVsTKV9cxbd02+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rx8nC-0000000Gy3Q-1MRK; Wed, 17 Apr 2024 17:09:54 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rx8n6-0000000Gy0v-3qQa for linux-arm-kernel@lists.infradead.org; Wed, 17 Apr 2024 17:09:52 +0000 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4VKS5S72hfz6JBKZ; Thu, 18 Apr 2024 01:07:40 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 53415140119; Thu, 18 Apr 2024 01:09:41 +0800 (CST) Received: from localhost (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 17 Apr 2024 18:09:40 +0100 Date: Wed, 17 Apr 2024 18:09:39 +0100 From: Jonathan Cameron To: "Rafael J. Wysocki" CC: Salil Mehta , Thomas Gleixner , Peter Zijlstra , "linux-pm@vger.kernel.org" , "loongarch@lists.linux.dev" , "linux-acpi@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "x86@kernel.org" , Russell King , Miguel Luis , James Morse , Jean-Philippe Brucker , Catalin Marinas , Will Deacon , Ingo Molnar , Borislav Petkov , Dave Hansen , Linuxarm , "justin.he@arm.com" , "jianyong.wu@arm.com" Subject: Re: [PATCH v6 06/16] ACPI: processor: Register deferred CPUs from acpi_processor_get_info() Message-ID: <20240417180939.00003db7@huawei.com> In-Reply-To: References: <20240417131909.7925-1-Jonathan.Cameron@huawei.com> <20240417131909.7925-7-Jonathan.Cameron@huawei.com> <22ace9b108ee488eb017f5b3e8facb8d@huawei.com> <20240417163842.0000415e@Huawei.com> Organization: Huawei Technologies R&D (UK) Ltd. X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.29; x86_64-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.122.247.231] X-ClientProxiedBy: lhrpeml500005.china.huawei.com (7.191.163.240) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240417_100949_604554_167328A4 X-CRM114-Status: GOOD ( 59.40 ) 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 T24gV2VkLCAxNyBBcHIgMjAyNCAxNzo1OTozNiArMDIwMAoiUmFmYWVsIEouIFd5c29ja2kiIDxy YWZhZWxAa2VybmVsLm9yZz4gd3JvdGU6Cgo+IE9uIFdlZCwgQXByIDE3LCAyMDI0IGF0IDU6Mzji gK9QTSBKb25hdGhhbiBDYW1lcm9uCj4gPEpvbmF0aGFuLkNhbWVyb25AaHVhd2VpLmNvbT4gd3Jv dGU6Cj4gPgo+ID4gT24gV2VkLCAxNyBBcHIgMjAyNCAxNjowMzo1MSArMDEwMAo+ID4gU2FsaWwg TWVodGEgPHNhbGlsLm1laHRhQGh1YXdlaS5jb20+IHdyb3RlOgo+ID4gIAo+ID4gPiA+ICBGcm9t OiBKb25hdGhhbiBDYW1lcm9uIDxqb25hdGhhbi5jYW1lcm9uQGh1YXdlaS5jb20+Cj4gPiA+ID4g IFNlbnQ6IFdlZG5lc2RheSwgQXByaWwgMTcsIDIwMjQgMjoxOSBQTQo+ID4gPiA+Cj4gPiA+ID4g IEZyb206IEphbWVzIE1vcnNlIDxqYW1lcy5tb3JzZUBhcm0uY29tPgo+ID4gPiA+Cj4gPiA+ID4g IFRoZSBhcm02NCBzcGVjaWZpYyBhcmNoX3JlZ2lzdGVyX2NwdSgpIGNhbGwgbWF5IGRlZmVyIENQ VSByZWdpc3RyYXRpb24gdW50aWwKPiA+ID4gPiAgdGhlIEFDUEkgaW50ZXJwcmV0ZXIgaXMgYXZh aWxhYmxlIGFuZCB0aGUgX1NUQSBtZXRob2QgY2FuIGJlIGV2YWx1YXRlZC4KPiA+ID4gPgo+ID4g PiA+ICBJZiB0aGlzIG9jY3VycywgdGhlbiBhIHNlY29uZCBhdHRlbXB0IGlzIG1hZGUgaW4gYWNw aV9wcm9jZXNzb3JfZ2V0X2luZm8oKS4KPiA+ID4gPiAgTm90ZSB0aGF0IHRoZSBhcm02NCBzcGVj aWZpYyBjYWxsIGhhcyBub3QgeWV0IGJlZW4gYWRkZWQgc28gZm9yIG5vdyB0aGlzIHdpbGwKPiA+ ID4gPiAgYmUgY2FsbGVkIGZvciB0aGUgb3JpZ2luYWwgaG90cGx1ZyBjYXNlLgo+ID4gPiA+Cj4g PiA+ID4gIEZvciBhcmNoaXRlY3R1cmVzIHRoYXQgZG8gbm90IGRlZmVyIHVudGlsIHRoZSBBQ1BJ IFByb2Nlc3NvciBkcml2ZXIgbG9hZHMKPiA+ID4gPiAgKGUuZy4geDg2KSwgZm9yIGluaXRpYWxs eSBwcmVzZW50IENQVXMgdGhlcmUgd2lsbCBhbHJlYWR5IGJlIGEgQ1BVIGRldmljZS4gSWYKPiA+ ID4gPiAgcHJlc2VudCBkbyBub3QgdHJ5IHRvIHJlZ2lzdGVyIGFnYWluLgo+ID4gPiA+Cj4gPiA+ ID4gIFN5c3RlbXMgY2FuIHN0aWxsIGJlIGJvb3RlZCB3aXRoICdhY3BpPW9mZicsIG9yIG5vdCBp bmNsdWRlIGFuIEFDUEkKPiA+ID4gPiAgZGVzY3JpcHRpb24gYXQgYWxsIGFzIGluIHRoZXNlIGNh c2VzIGFyY2hfcmVnaXN0ZXJfY3B1KCkgd2lsbCBub3QgaGF2ZQo+ID4gPiA+ICBkZWZlcnJlZCBy ZWdpc3RyYXRpb24gd2hlbiBmaXJzdCBjYWxsZWQuCj4gPiA+ID4KPiA+ID4gPiAgVGhpcyBtb3Zl cyB0aGUgQ1BVIHJlZ2lzdGVyIGxvZ2ljIGJhY2sgdG8gYSBzdWJzeXNfaW5pdGNhbGwoKSwgd2hp bGUgdGhlCj4gPiA+ID4gIG1lbW9yeSBub2RlcyB3aWxsIGhhdmUgYmVlbiByZWdpc3RlcmVkIGVh cmxpZXIuCj4gPiA+ID4gIE5vdGUgdGhpcyBpcyB3aGVyZSB0aGUgY2FsbCB3YXMgcHJpb3IgdG8g dGhlIGNsZWFudXAgc2VyaWVzIHNvIHRoZXJlIHNob3VsZCBiZQo+ID4gPiA+ICBubyBzaWRlIGVm ZmVjdHMgb2YgbW92aW5nIGl0IGJhY2sgYWdhaW4gZm9yIHRoaXMgc3BlY2lmaWMgY2FzZS4KPiA+ ID4gPgo+ID4gPiA+ICBbUEFUQ0ggMDAvMjFdIEluaXRpYWwgY2xlYW51cHMgZm9yIHZDUFUgSFAu Cj4gPiA+ID4gIGh0dHBzOi8vbG9yZS5rZXJuZWwub3JnL2FsbC9aVnl6JTJGVmU1cFB1OEFXb0FA c2hlbGwuYXJtbGludXgub3JnLnVrLwo+ID4gPiA+Cj4gPiA+ID4gIGUuZy4gNWI5NWY5NGMzYjlm ICgieDg2L3RvcG9sb2d5OiBTd2l0Y2ggb3ZlciB0byBHRU5FUklDX0NQVV9ERVZJQ0VTIikKPiA+ ID4gPgo+ID4gPiA+ICBTaWduZWQtb2ZmLWJ5OiBKYW1lcyBNb3JzZSA8amFtZXMubW9yc2VAYXJt LmNvbT4KPiA+ID4gPiAgUmV2aWV3ZWQtYnk6IEdhdmluIFNoYW4gPGdzaGFuQHJlZGhhdC5jb20+ Cj4gPiA+ID4gIFRlc3RlZC1ieTogTWlndWVsIEx1aXMgPG1pZ3VlbC5sdWlzQG9yYWNsZS5jb20+ Cj4gPiA+ID4gIFRlc3RlZC1ieTogVmlzaG51IFBhamp1cmkgPHZpc2hudUBvcy5hbXBlcmVjb21w dXRpbmcuY29tPgo+ID4gPiA+ICBUZXN0ZWQtYnk6IEppYW55b25nIFd1IDxqaWFueW9uZy53dUBh cm0uY29tPgo+ID4gPiA+ICBTaWduZWQtb2ZmLWJ5OiBSdXNzZWxsIEtpbmcgKE9yYWNsZSkgPHJt aytrZXJuZWxAYXJtbGludXgub3JnLnVrPgo+ID4gPiA+ICBDby1kZXZlbG9wZWQtYnk6IEpvbmF0 aGFuIENhbWVyb24gPEpvbmF0aGFuLkNhbWVyb25AaHVhd2VpLmNvbT4KPiA+ID4gPiAgU2lnbmVk LW9mZi1ieTogSm9hbnRoYW4gQ2FtZXJvbiA8Sm9uYXRoYW4uQ2FtZXJvbkBodWF3ZWkuY29tPgo+ ID4gPiA+ICAtLS0KPiA+ID4gPiAgdjY6IFNxdWFzaCB0aGUgdHdvIHBhdGhzIGZvciBjb252ZW50 aW9uYWwgQ1BVIEhvdHBsdWcgYW5kIGFybTY0Cj4gPiA+ID4gICAgICB2Q1BVIEhQLgo+ID4gPiA+ ICB2NTogVXBkYXRlIGNvbW1pdCBtZXNzYWdlIHRvIG1ha2UgaXQgY2xlYXIgdGhpcyBpcyBtb3Zp bmcgdGhlCj4gPiA+ID4gICAgICBpbml0IGJhY2sgdG8gd2hlcmUgaXQgd2FzIHVudGlsIHZlcnkg cmVjZW50bHkuCj4gPiA+ID4KPiA+ID4gPiAgICAgIE5vIGxvbmdlciBjaGFuZ2UgdGhlIGNvbmRp dGlvbiBpbiB0aGUgZWFybGllciByZWdpc3RyYXRpb24gcG9pbnQKPiA+ID4gPiAgICAgIGFzIHRo YXQgd2lsbCBiZSBoYW5kbGVkIGJ5IHRoZSBhcm02NCByZWdpc3RyYXRpb24gcm91dGluZQo+ID4g PiA+ICAgICAgZGVmZXJyaW5nIHVudGlsIGNhbGxlZCBhZ2FpbiBoZXJlLgo+ID4gPiA+ICAtLS0K PiA+ID4gPiAgIGRyaXZlcnMvYWNwaS9hY3BpX3Byb2Nlc3Nvci5jIHwgMTIgKysrKysrKysrKyst Cj4gPiA+ID4gICAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQo+ID4gPiA+Cj4gPiA+ID4gIGRpZmYgLS1naXQgYS9kcml2ZXJzL2FjcGkvYWNwaV9wcm9jZXNz b3IuYyBiL2RyaXZlcnMvYWNwaS9hY3BpX3Byb2Nlc3Nvci5jCj4gPiA+ID4gIGluZGV4IDdlY2Ix Mzc3NWQ3Zi4uMGNhYzc3OTYxMDIwIDEwMDY0NAo+ID4gPiA+ICAtLS0gYS9kcml2ZXJzL2FjcGkv YWNwaV9wcm9jZXNzb3IuYwo+ID4gPiA+ICArKysgYi9kcml2ZXJzL2FjcGkvYWNwaV9wcm9jZXNz b3IuYwo+ID4gPiA+ICBAQCAtMzU2LDggKzM1NiwxOCBAQCBzdGF0aWMgaW50IGFjcGlfcHJvY2Vz c29yX2dldF9pbmZvKHN0cnVjdAo+ID4gPiA+ICBhY3BpX2RldmljZSAqZGV2aWNlKQo+ID4gPiA+ ICAgICAgKgo+ID4gPiA+ICAgICAgKiAgTk9URTogRXZlbiBpZiB0aGUgcHJvY2Vzc29yIGhhcyBh IGNwdWlkLCBpdCBtYXkgbm90IGJlIHByZXNlbnQKPiA+ID4gPiAgICAgICogIGJlY2F1c2UgY3B1 aWQgPC0+IGFwaWNpZCBtYXBwaW5nIGlzIHBlcnNpc3RlbnQgbm93Lgo+ID4gPiA+ICArICAgKgo+ ID4gPiA+ICArICAgKiAgTm90ZSB0aGlzIGFsbG93cyAzIGZsb3dzLCBpdCBpcyB1cCB0byB0aGUg YXJjaF9yZWdpc3Rlcl9jcHUoKQo+ID4gPiA+ICArICAgKiAgY2FsbCB0byByZWplY3QgYW55IHRo YXQgYXJlIG5vdCBzdXBwb3J0ZWQgb24gYSBnaXZlbiBhcmNoaXRlY3R1cmUuCj4gPiA+ID4gICsg ICAqICBBKSBDUFUgYmVjb21lcyBwcmVzZW50Lgo+ID4gPiA+ICArICAgKiAgQikgUHJldmlvdXNs eSBpbnZhbGlkIGxvZ2ljYWwgQ1BVIElEIChTYW1lIGFzIGJlY29taW5nIHByZXNlbnQpCj4gPiA+ ID4gICsgICAqICBDKSBDUFUgYWxyZWFkeSBwcmVzZW50IGFuZCBub3cgYmVpbmcgZW5hYmxlZCAo YW5kIHdhc24ndAo+ID4gPiA+ICByZWdpc3RlcmVkCj4gPiA+ID4gICsgICAqICAgICBlYXJseSBv biBhbiBhcmNoIHRoYXQgZG9lc24ndCBkZWZlciB0byBoZXJlKQo+ID4gPiA+ICAgICAgKi8KPiA+ ID4gPiAgLSAgaWYgKGludmFsaWRfbG9naWNhbF9jcHVpZChwci0+aWQpIHx8ICFjcHVfcHJlc2Vu dChwci0+aWQpKSB7Cj4gPiA+ID4gICsgIGlmICgoIWludmFsaWRfbG9naWNhbF9jcHVpZChwci0+ aWQpICYmIGNwdV9wcmVzZW50KHByLT5pZCkgJiYKPiA+ID4gPiAgKyAgICAgICAhZ2V0X2NwdV9k ZXZpY2UocHItPmlkKSkgfHwKPiA+ID4gPiAgKyAgICAgIGludmFsaWRfbG9naWNhbF9jcHVpZChw ci0+aWQpIHx8Cj4gPiA+ID4gICsgICAgICAhY3B1X3ByZXNlbnQocHItPmlkKSkgeyAgCj4gPiA+ Cj4gPiA+ICAKPiA+IEhpIFNhbGlsLAo+ID4KPiA+IFRoYW5rcyBmb3IgcXVpY2sgcmV2aWV3IQo+ ID4gIAo+ID4gPiBMb2dpYyBpcyBjbGVhciBidXQgaXQgaXMgdWdseS4gV2Ugc2hvdWxkIHR1cm4g dGhlbSBpbnRvIG1hY3JvIG9yIGlubGluZS4gIAo+ID4KPiA+IFlvdSd2ZSBmb3VuZCB0aGUgJ3Vn bHknIGluIHRoaXMgYXBwcm9hY2ggdnMga2VlcGluZyB0aGVtIHNlcGFyYXRlLgo+ID4KPiA+IEZv ciB0aGlzIHZlcnNpb24gSSB3YW50ZWQgdG8ga2VlcCBpdCBjbGVhciB0aGF0IGluZGVlZCB0aGlz IGNvbmRpdGlvbgo+ID4gaXMgYSBjb21wbGV4IG1lc3Mgb2YgZGlmZmVyZW50IHRoaW5ncyAoYW5k IHRvIGxldCBwZW9wbGUgY29tcGFyZQo+ID4gaXQgZWFzaWx5IHdpdGggdGhlIHR3byBwYXRocyBp biB2NSB0byBjb252aW5jZWQgdGhlbXNlbHZlcyB0aGlzCj4gPiBpcyB0aGUgc2FtZSkKPiA+Cj4g PiBJdCdzIGFsc28gYSBsaXR0bGUgdHJpY2t5IHRvIGRvLCBzbyB3aWxsIG5lZWQgc29tZSB0aG91 Z2h0Lgo+ID4KPiA+IEkgZG9uJ3QgdGhpbmsgYSBzaW1wbGUgYWNwaV9jcHVfaXNfaG90cGx1Zygp IGNvbmRpdGlvbiBpcyB1c2VmdWwKPiA+IGFzIGl0IGp1c3QgbW92ZXMgdGhlIGNvbXBsZXhpdHkg YXdheSBmcm9tIHdoZXJlIGEgcmVhZGVyIGlzIGxvb2tpbmcKPiA+IGFuZCBpdCB3b3VsZCBvbmx5 IGJlIHVzZWQgaW4gdGhpcyBvbmUgY2FzZS4KPiA+Cj4gPiBJdCBkb2Vzbid0IHNlcGFyYXRlIHdl bGwgaW50byBmaW5lciBncmFpbmVkIHN1YmNvbmRpdGlvbnMgYmVjYXVzZQo+ID4gKEMpIGlzIGEg bWVzc3kgY2FzZSBvZiB0aGUgdkNQVSBIUCBjYXNlIGFuZCBhIG5vdCBkb25lCj4gPiBzb21ldGhp bmcgZWxzZSBlYXJsaWVyLiAgVGhlIGRpc2FkdmFudGFnZSBvZiBvbmx5IGRlZmVycmluZyBmb3IK PiA+IGFybTY0IGFuZCBub3Qgb3RoZXIgYXJjaGl0ZWN0dXJlcy4KPiA+Cj4gPiBUaGUgYmVzdCBJ IGNhbiBxdWlja2x5IGNvbWUgdXAgd2l0aCBpcyBzb21ldGhpbmcgbGlrZSB0aGlzOgo+ID4gI2Rl ZmluZSBhY3BpX2NwdV9ub3RfcHJlc2VudChjcHUpIFwKPiA+ICAgICAgICAgKGludmFsaWRfbG9n aWNhbF9jcHVpZChjcHUpIHx8ICFjcHVfcHJlc2VudChjcHUpKQo+ID4gI2RlZmluZSBhY3BpX2Nw dV9ub3RfZW5hYmxlZChjcHUpIFwKPiA+ICAgICAgICAgKCFpbnZhbGlkX2xvZ2ljYWxfY3B1aWQo Y3B1KSB8fCBjcHVfcHJlc2VudChjcHUpKQo+ID4KPiA+ICAgICAgICAgaWYgKChhcGNpX2NwdV9u b3RfZW5hYmxlZChwci0+aWQpICYmICFnZXRfY3B1X2RldmljZShwci0+aWQpIHx8Cj4gPiAgICAg ICAgICAgICBhY3BpX2NwdV9ub3RfcHJlc2VudChwci0+aWQpKQo+ID4KPiA+IFdoaWNoIHdvdWxk IHN0aWxsIG5lZWQgdGhlIHNhbWUgYW1vdW50IG9mIGRvY3VtZW50YXRpb24uIFRoZQo+ID4gY29k ZSBzdGlsbCBpc24ndCBlbm91Z2ggZm9yIG1lIHRvIGltbWVkaWF0ZWx5IGJlIGFibGUgdG8gc2Vl Cj4gPiB3aGF0IGlzIGdvaW5nIG9uLgo+ID4KPiA+IFNvIG1heWJlIHdvcnRoIGl0Li4uIEknbSBu b3Qgc3VyZS4gIFJhZmFlbCwgeW91IGdldCB0byBrZWVwIHRoaXMKPiA+IGZ1biwgd2hhdCB3b3Vs ZCB5b3UgcHJlZmVyPyAgCj4gCj4gSSB3b3VsZCB1c2UgYSBzdGF0aWMgaW5saW5lIGZ1bmN0aW9u IHJldHVybmluZyBib29sIHRvIGNhcnJ5IG91dCB0aGVzZQo+IGNoZWNrcyB3aXRoIGNvbW1lbnRz IGV4cGxhaW5pbmcgdGhlIGRpZmZlcmVudCBjYXNlcyBpbiB3aGljaCAndHJ1ZScKPiBuZWVkcyB0 byBiZSByZXR1cm5lZC4KClRoZSBmb2xsb3dpbmcgbWFrZXMgYSBzdWJ0bGUgbG9naWMgY2hhbmdl IChJJ2xsIHJldGVzdCB0b21vcnJvdykgYnV0CkkgdGhpbmsgdGhhdCBnZXRfY3B1X2RldmljZShj cHUpIGNhbiBuZXZlciBzdWNjZWVkIGluIGEgcGF0aCB3aGVyZQpob3RhZGQgbWFrZXMgc2Vuc2Uu IAoKKy8qCisgKiBJZGVudGlmeSBpZiB0aGUgc3RhdGUgdHJhbnNpdGlvbiBpbmRpY2F0ZXMgdGhh dCBob3RhZGRfaW5pdAorICogc2hvdWxkIGJlIGNhbGxlZC4KKyAqCisgKiBGb3IgYWNwaV9wcm9j ZXNzb3JfYWRkKCkgdG8gYmUgY2FsbGVkLCB0aGUgcmVwb3J0ZWQgc3RhdGUgbXVzdAorICogbm93 IGJlIGVuYWJsZWQgYW5kIHByZXNlbnQuIENvbmRpdGlvbnMgcmVmbGVjdCBwcmlvciBzdGF0ZS4K KyAqLworc3RhdGljIGlubGluZSBib29sIGFjcGlfcHJvY2Vzc29yX3Nob3VsZF9ob3RhZGRfaW5p dChpbnQgY3B1KQoreworICAgICAgIC8qIEFscmVhZHkgcmVnaXN0ZXIsIGluaXRpYWwgcmVnaXN0 cmF0aW9uIHdhcyBub3QgZGVmZXJyZWQgKi8KKyAgICAgICBpZiAoZ2V0X2NwdV9kZXZpY2UoY3B1 KSkKKyAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgIC8qIFByb2Nlc3NvciBo YXMgYmVjb21lIHByZXNlbnQgKi8KKyAgICAgICBpZiAoIWNwdV9wcmVzZW50KGNwdSkpCisgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgIC8qIExvZ2ljYWwgY3B1aWQgY3VycmVu dGx5IGludmFsaWQgaW5kaWNhdGVzIGhvdGFkZCAqLworICAgICAgIGlmIChpbnZhbGlkX2xvZ2lj YWxfY3B1aWQoY3B1KSkKKyAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworCisgICAgICAgLyoK KyAgICAgICAgKiBQcmV2aW91c2x5IHByZXNlbnQgYW5kIHRoZSBsb2dpY2FsIGNwdSBpZCBpcyB2 YWxpZC4KKwkgKiBEZWZlcnJlZCByZWdpc3RyYXRpb24gbm93IF9TVEEgY2FuIGJlIHF1ZXJpZXMs IG9yCisgICAgICAgICogSG90YWRkIGR1ZSB0byBlbmFibGVkIGJlY29taW5nIHRydWUgb24gYW4g b25saW5lIGNhcGFibGUKKyAgICAgICAgKiBDUFUuCisgICAgICAgICovCisgICAgICAgaWYgKGNw dV9wcmVzZW50KGNwdSkpCisgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgIHJl dHVybiBmYWxzZTsKK30KKwogc3RhdGljIGludCBhY3BpX3Byb2Nlc3Nvcl9nZXRfaW5mbyhzdHJ1 Y3QgYWNwaV9kZXZpY2UgKmRldmljZSkKIHsKICAgICAgICB1bmlvbiBhY3BpX29iamVjdCBvYmpl Y3QgPSB7IDAgfTsKQEAgLTM1NiwxOCArMzg4LDggQEAgc3RhdGljIGludCBhY3BpX3Byb2Nlc3Nv cl9nZXRfaW5mbyhzdHJ1Y3QgYWNwaV9kZXZpY2UgKmRldmljZSkKICAgICAgICAgKgogICAgICAg ICAqICBOT1RFOiBFdmVuIGlmIHRoZSBwcm9jZXNzb3IgaGFzIGEgY3B1aWQsIGl0IG1heSBub3Qg YmUgcHJlc2VudAogICAgICAgICAqICBiZWNhdXNlIGNwdWlkIDwtPiBhcGljaWQgbWFwcGluZyBp cyBwZXJzaXN0ZW50IG5vdy4KLSAgICAgICAgKgotICAgICAgICAqICBOb3RlIHRoaXMgYWxsb3dz IDMgZmxvd3MsIGl0IGlzIHVwIHRvIHRoZSBhcmNoX3JlZ2lzdGVyX2NwdSgpCi0gICAgICAgICog IGNhbGwgdG8gcmVqZWN0IGFueSB0aGF0IGFyZSBub3Qgc3VwcG9ydGVkIG9uIGEgZ2l2ZW4gYXJj aGl0ZWN0dXJlLgotICAgICAgICAqICBBKSBDUFUgYmVjb21lcyBwcmVzZW50LgotICAgICAgICAq ICBCKSBQcmV2aW91c2x5IGludmFsaWQgbG9naWNhbCBDUFUgSUQgKFNhbWUgYXMgYmVjb21pbmcg cHJlc2VudCkKLSAgICAgICAgKiAgQykgQ1BVIGFscmVhZHkgcHJlc2VudCBhbmQgbm93IGJlaW5n IGVuYWJsZWQgKGFuZCB3YXNuJ3QgcmVnaXN0ZXJlZAotICAgICAgICAqICAgICBlYXJseSBvbiBh biBhcmNoIHRoYXQgZG9lc24ndCBkZWZlciB0byBoZXJlKQogICAgICAgICAqLwotICAgICAgIGlm ICgoIWludmFsaWRfbG9naWNhbF9jcHVpZChwci0+aWQpICYmIGNwdV9wcmVzZW50KHByLT5pZCkg JiYKLSAgICAgICAgICAgICFnZXRfY3B1X2RldmljZShwci0+aWQpKSB8fAotICAgICAgICAgICBp bnZhbGlkX2xvZ2ljYWxfY3B1aWQocHItPmlkKSB8fAotICAgICAgICAgICAhY3B1X3ByZXNlbnQo cHItPmlkKSkgeworICAgICAgIGlmIChhY3BpX3Byb2Nlc3Nvcl9zaG91bGRfaG90YWRkX2luaXQo cHItPmlkKSkgewogICAgICAgICAgICAgICAgcmV0ID0gYWNwaV9wcm9jZXNzb3JfaG90YWRkX2lu aXQocHIsIGRldmljZSk7CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxp c3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0 aW5mby9saW51eC1hcm0ta2VybmVsCg==