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 DFF21EB64D9 for ; Thu, 15 Jun 2023 11:55:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344719AbjFOLzr (ORCPT ); Thu, 15 Jun 2023 07:55:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344934AbjFOLz2 (ORCPT ); Thu, 15 Jun 2023 07:55:28 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E734D4C22 for ; Thu, 15 Jun 2023 04:50:08 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f8d61cb36cso17604845e9.1 for ; Thu, 15 Jun 2023 04:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686829731; x=1689421731; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Ru2kY8wr09+4ygjN8vpjUnmo2WcmrcVqvM+LC/LqClo=; b=RJs4tRfh991y8kou8camFaZ8Te5e7Ipcz8pfRaCmjrIxrJDwRazj4F1lQUQH+LR7p/ Cdat8ROquOeFdYXojuI2CIqdM32JaicSA4kfXkDfziwogTDA9rh0BLZsKidMdMzcERdv DN/7aLCTgeDxKNEhUNME0Qcc4Ukuf4X8Z1LWBeIFXEFSGKyJTNcliqc0o2VFDacR84GH jtemaLtSC3JNpJK13/FfCDJMRkpyYm8yTW7Auq1sZFnSRihZpWwOskktwPel6qCAaKvO c/XOszDSztEywNwMGUB1oRUGLujbS2xXax0AMGDAgYv9ZrRkXG7JWnAUGDkHDQBMpf7E KevA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686829731; x=1689421731; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ru2kY8wr09+4ygjN8vpjUnmo2WcmrcVqvM+LC/LqClo=; b=C3d9JJf2N6xSVhw43FTt95aElLtp664Y+Ki1tfaN/ONBwHYGk8EqaZJv0y3c6y2j+k LxL6AQlAL9zq+hA7SmCojn8M3m+Iw/0KpVImADmr5DJ2/scWWsz5OHuns8gXeWaK0ni/ w5ZTlxnJlI0DJFgj0Z++70Gtjk1GZLi2d610OQ8gIp8fK0v/vkPVQgKUT2WSnNYiNPMV LDdbzotdqQydzkmn9XEqidaoup9GiyjKwFyksA0V7WsQarzmQecqZcLv04gu3CIk+0jS V61i7G9MvhDJpA4GusVk1u9Ilu4wbvX9DUpnAFl19TZMMzUe2Mr3Vc6KANvCZmSGJ7RH JnPw== X-Gm-Message-State: AC+VfDy/5i4o0j6ftj2/L20jBF2xLK1Es9cIOaukXzqNs5s6hjcycCGp 9rb4/jKAx3zm8wr/XwsxImTrHax8GWk6QkHOaYY= X-Google-Smtp-Source: ACHHUZ6V61eGA9Jko2/8as5sLv4OlzdY23zKd022ouq6CVLScfCWucl7Nj0Cufly2/p7KJ8VPw/BEg== X-Received: by 2002:a7b:c391:0:b0:3f6:e42:8f85 with SMTP id s17-20020a7bc391000000b003f60e428f85mr14647676wmj.37.1686829730963; Thu, 15 Jun 2023 04:48:50 -0700 (PDT) Received: from ?IPV6:2a05:6e02:1041:c10:331d:4ff0:1778:3425? ([2a05:6e02:1041:c10:331d:4ff0:1778:3425]) by smtp.googlemail.com with ESMTPSA id y10-20020a1c4b0a000000b003f5ffba9ae1sm20395228wma.24.2023.06.15.04.48.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jun 2023 04:48:50 -0700 (PDT) Message-ID: <3e397cf5-0ca3-fa10-b5d8-bbc7b1038a37@linaro.org> Date: Thu, 15 Jun 2023 13:48:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH 2/3] thermal: qoriq_thermal: only enable supported sensors To: Peng Fan , Sebastian Krzyszkowiak , Peng Fan , "rafael@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" Cc: "amitk@kernel.org" , "rui.zhang@intel.com" , "andrew.smirnov@gmail.com" , "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "kernel@pengutronix.de" , "festevam@gmail.com" , dl-linux-imx , "linux-arm-kernel@lists.infradead.org" , Alice Guo References: <20230516083746.63436-1-peng.fan@oss.nxp.com> <507b5daa-73e7-8d21-4f73-c56f88c6bf77@linaro.org> <2e57d14a-214e-c3e0-e011-e804ce8c9b39@oss.nxp.com> <4844567.31r3eYUQgx@pliszka> <3518a2e7-806d-ad46-a439-ff4a57ed8158@oss.nxp.com> Content-Language: en-US From: Daniel Lezcano In-Reply-To: <3518a2e7-806d-ad46-a439-ff4a57ed8158@oss.nxp.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On 15/06/2023 06:04, Peng Fan wrote: > > > On 6/15/2023 10:53 AM, Sebastian Krzyszkowiak wrote: >> Caution: This is an external email. Please take care when clicking >> links or opening attachments. When in doubt, report the message using >> the 'Report this email' button >> >> >> On czwartek, 15 czerwca 2023 04:29:01 CEST Peng Fan wrote: >>> On 6/8/2023 3:10 AM, Daniel Lezcano wrote: >>>> >>>> [...] >>>> >>>> Ok, I misunderstood. I thought that was for failing registered thermal >>>> zone. >>>> >>>> Would enabling the site in ops->change_mode do the trick ? >>> >>> No. ops->change_mode not able to do the trick. >>> >>> devm_thermal_of_zone_register->thermal_zone_device_enable >>> ->thermal_zone_device_set_mode->__thermal_zone_device_update.part.0 >>> ->__thermal_zone_get_temp >>> >>> The thermal_zone_device_set_mode will call change_mode, if return >>> fail here, the thermal zone will fail to be registered. >>> >>> Thanks, >>> Peng. >> >> I think the idea is not to return a failure in ops->change_mode, but >> to move >> enabling the site in REGS_TMR/REGS_V2_TMSR register from >> qoriq_tmu_register_tmu_zone to ops->change_mode. > > But qoriq_tmu_register_tmu_zone will finally call ops->change_mode. > > And it is per zone, so we not able to enable TMR_ME here. > > This way the site will be >> enabled only for actually existing thermal zones, since those not >> described in >> the device tree won't reach thermal_zone_device_enable. > > No. The TMR_ME is the gate for all sites. What about the following change on top of your series: diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index c710449b0c50..ecf88bf13762 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -107,8 +107,6 @@ static int tmu_get_temp(struct thermal_zone_device *tz, int *temp) */ regmap_read(qdata->regmap, REGS_TMR, &val); - if (!(val & TMR_ME)) - return -EAGAIN; if (regmap_read_poll_timeout(qdata->regmap, REGS_TRITSR(qsensor->id), @@ -131,14 +129,40 @@ static int tmu_get_temp(struct thermal_zone_device *tz, int *temp) return 0; } +static int qoriq_tmu_change_mode(struct thermal_zone_device *tz, + enum thermal_device_mode mode) +{ + struct qoriq_sensor *qsensor = thermal_zone_device_priv(tz); + struct qoriq_tmu_data *qdata = qoriq_sensor_to_data(qsensor); + unsigned int site; + unsigned int value; + unsigned int mask; + + if (qdata->ver == TMU_VER1) { + site = BIT(15 - qsensor->id); + mask = TMR_ME | TMR_ALPF | site; + value = mode == THERMAL_DEVICE_ENABLED ? mask : mask & ~site; + regmap_update_bits(qdata->regmap, REGS_TMR, mask, value); + } else { + site = BIT(qsensor->id); + mask = TMR_ME | TMR_ALPF_V2 | site; + value = mode == THERMAL_DEVICE_ENABLED ? mask : mask & ~site; + regmap_update_bits(qdata->regmap, REGS_V2_TMSR, mask, value); + regmap_write(qdata->regmap, REGS_TMR, TMR_ME | TMR_ALPF_V2); + } + + return 0; +} + static const struct thermal_zone_device_ops tmu_tz_ops = { .get_temp = tmu_get_temp, + .change_mode = qoriq_tmu_change_mode, }; static int qoriq_tmu_register_tmu_zone(struct device *dev, struct qoriq_tmu_data *qdata) { - int id, sites = 0; + int id; for (id = 0; id < SITES_MAX; id++) { struct thermal_zone_device *tzd; @@ -158,25 +182,11 @@ static int qoriq_tmu_register_tmu_zone(struct device *dev, return ret; } - if (qdata->ver == TMU_VER1) - sites |= 0x1 << (15 - id); - else - sites |= 0x1 << id; - if (devm_thermal_add_hwmon_sysfs(dev, tzd)) dev_warn(dev, "Failed to add hwmon sysfs attributes\n"); } - if (sites) { - if (qdata->ver == TMU_VER1) { - regmap_write(qdata->regmap, REGS_TMR, TMR_ME | TMR_ALPF | sites); - } else { - regmap_write(qdata->regmap, REGS_V2_TMSR, sites); - regmap_write(qdata->regmap, REGS_TMR, TMR_ME | TMR_ALPF_V2); - } - } - return 0; } -- 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 B6471EB64DB for ; Thu, 15 Jun 2023 11:49:17 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kbvA9izoqjJurHqT2EDF8TIimV46erPcvrpNfCMIwfU=; b=eigXz1SAx0FQPz MAjHr+LtrTEXBt+e6urCZ9Rmd4mGPZWAd3K1sDd+N9Ljldp+EnhBhKAe1dj9unkOcgrv6HY5Lr4FW jaitjKxo3kShg/Uh9bm9nhlm1+76xtmigRopuRZPjKft6eFEUHdY78tJbxeF0xQ1hZ0eRIjpb1mXx /1uXltukF8BcdMZhePkE7Z+LNqRG80CncDe3ukr6MeB2oTPTh/qwnsyhemIZGBa+cOruCOX32bzQO jD61ddusnL4DVQVqgotczXV7iX8r5V6THlQAGyLx+GOPWdfgGdNKXUddROdEl4Qp67TI9+JinH5kq MDm4KlcIEigAwfWFD84A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q9lTE-00ElxZ-1s; Thu, 15 Jun 2023 11:48:56 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q9lTB-00Elvj-1X for linux-arm-kernel@lists.infradead.org; Thu, 15 Jun 2023 11:48:55 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f7ebb2b82cso17539555e9.2 for ; Thu, 15 Jun 2023 04:48:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686829731; x=1689421731; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Ru2kY8wr09+4ygjN8vpjUnmo2WcmrcVqvM+LC/LqClo=; b=RJs4tRfh991y8kou8camFaZ8Te5e7Ipcz8pfRaCmjrIxrJDwRazj4F1lQUQH+LR7p/ Cdat8ROquOeFdYXojuI2CIqdM32JaicSA4kfXkDfziwogTDA9rh0BLZsKidMdMzcERdv DN/7aLCTgeDxKNEhUNME0Qcc4Ukuf4X8Z1LWBeIFXEFSGKyJTNcliqc0o2VFDacR84GH jtemaLtSC3JNpJK13/FfCDJMRkpyYm8yTW7Auq1sZFnSRihZpWwOskktwPel6qCAaKvO c/XOszDSztEywNwMGUB1oRUGLujbS2xXax0AMGDAgYv9ZrRkXG7JWnAUGDkHDQBMpf7E KevA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686829731; x=1689421731; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ru2kY8wr09+4ygjN8vpjUnmo2WcmrcVqvM+LC/LqClo=; b=WdmPRQNtB1t7rJ82a3nmP06jNNz424eyO1a7bLnA21Sk72TJiXh57LhD0FgdYsiGCi yWVEw3EOBgW/BvGPIPZmGV84BGhfIsQ2UilbEnN+XIue/UTyaWRlwiS5metRkiqztqXc 5nOLlOnbemeWYnxeRTLBUh77LVRIh6qS92PzsTnfp9rBLBki6jwSmYHG6uO34hNntd+M VDcU+E9Vzs4jFnMXbiRy7hNv5QKWWKjnnanMkYLd96kFOIZVDjDytBKK4N3vXPfvYG3G 7wywsvy+13SBUenYh3MA03QHvhKJaLi697dqe+ooO6esjPSemm+gy2LlNtBzLkBAkiHi eZ2Q== X-Gm-Message-State: AC+VfDwwvyBixvz3VBOFe1hSJd5ygSemDwnpQGAe1IIpzIOUlsRASOq4 hT4M54xtYYaOa1ddlS60FITq9A== X-Google-Smtp-Source: ACHHUZ6V61eGA9Jko2/8as5sLv4OlzdY23zKd022ouq6CVLScfCWucl7Nj0Cufly2/p7KJ8VPw/BEg== X-Received: by 2002:a7b:c391:0:b0:3f6:e42:8f85 with SMTP id s17-20020a7bc391000000b003f60e428f85mr14647676wmj.37.1686829730963; Thu, 15 Jun 2023 04:48:50 -0700 (PDT) Received: from ?IPV6:2a05:6e02:1041:c10:331d:4ff0:1778:3425? ([2a05:6e02:1041:c10:331d:4ff0:1778:3425]) by smtp.googlemail.com with ESMTPSA id y10-20020a1c4b0a000000b003f5ffba9ae1sm20395228wma.24.2023.06.15.04.48.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jun 2023 04:48:50 -0700 (PDT) Message-ID: <3e397cf5-0ca3-fa10-b5d8-bbc7b1038a37@linaro.org> Date: Thu, 15 Jun 2023 13:48:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH 2/3] thermal: qoriq_thermal: only enable supported sensors To: Peng Fan , Sebastian Krzyszkowiak , Peng Fan , "rafael@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" Cc: "amitk@kernel.org" , "rui.zhang@intel.com" , "andrew.smirnov@gmail.com" , "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "kernel@pengutronix.de" , "festevam@gmail.com" , dl-linux-imx , "linux-arm-kernel@lists.infradead.org" , Alice Guo References: <20230516083746.63436-1-peng.fan@oss.nxp.com> <507b5daa-73e7-8d21-4f73-c56f88c6bf77@linaro.org> <2e57d14a-214e-c3e0-e011-e804ce8c9b39@oss.nxp.com> <4844567.31r3eYUQgx@pliszka> <3518a2e7-806d-ad46-a439-ff4a57ed8158@oss.nxp.com> Content-Language: en-US From: Daniel Lezcano In-Reply-To: <3518a2e7-806d-ad46-a439-ff4a57ed8158@oss.nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230615_044853_532411_7AC7C8B4 X-CRM114-Status: GOOD ( 25.04 ) 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-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gMTUvMDYvMjAyMyAwNjowNCwgUGVuZyBGYW4gd3JvdGU6Cj4gCj4gCj4gT24gNi8xNS8yMDIz IDEwOjUzIEFNLCBTZWJhc3RpYW4gS3J6eXN6a293aWFrIHdyb3RlOgo+PiBDYXV0aW9uOiBUaGlz IGlzIGFuIGV4dGVybmFsIGVtYWlsLiBQbGVhc2UgdGFrZSBjYXJlIHdoZW4gY2xpY2tpbmcgCj4+ IGxpbmtzIG9yIG9wZW5pbmcgYXR0YWNobWVudHMuIFdoZW4gaW4gZG91YnQsIHJlcG9ydCB0aGUg bWVzc2FnZSB1c2luZyAKPj4gdGhlICdSZXBvcnQgdGhpcyBlbWFpbCcgYnV0dG9uCj4+Cj4+Cj4+ IE9uIGN6d2FydGVrLCAxNSBjemVyd2NhIDIwMjMgMDQ6Mjk6MDEgQ0VTVCBQZW5nIEZhbiB3cm90 ZToKPj4+IE9uIDYvOC8yMDIzIDM6MTAgQU0sIERhbmllbCBMZXpjYW5vIHdyb3RlOgo+Pj4+Cj4+ Pj4gWy4uLl0KPj4+Pgo+Pj4+IE9rLCBJIG1pc3VuZGVyc3Rvb2QuIEkgdGhvdWdodCB0aGF0IHdh cyBmb3IgZmFpbGluZyByZWdpc3RlcmVkIHRoZXJtYWwKPj4+PiB6b25lLgo+Pj4+Cj4+Pj4gV291 bGQgZW5hYmxpbmcgdGhlIHNpdGUgaW4gb3BzLT5jaGFuZ2VfbW9kZSBkbyB0aGUgdHJpY2sgPwo+ Pj4KPj4+IE5vLiBvcHMtPmNoYW5nZV9tb2RlIG5vdCBhYmxlIHRvIGRvIHRoZSB0cmljay4KPj4+ Cj4+PiBkZXZtX3RoZXJtYWxfb2Zfem9uZV9yZWdpc3Rlci0+dGhlcm1hbF96b25lX2RldmljZV9l bmFibGUKPj4+IC0+dGhlcm1hbF96b25lX2RldmljZV9zZXRfbW9kZS0+X190aGVybWFsX3pvbmVf ZGV2aWNlX3VwZGF0ZS5wYXJ0LjAKPj4+IC0+X190aGVybWFsX3pvbmVfZ2V0X3RlbXAKPj4+Cj4+ PiBUaGUgdGhlcm1hbF96b25lX2RldmljZV9zZXRfbW9kZSB3aWxsIGNhbGwgY2hhbmdlX21vZGUs IGlmIHJldHVybgo+Pj4gZmFpbCBoZXJlLCB0aGUgdGhlcm1hbCB6b25lIHdpbGwgZmFpbCB0byBi ZSByZWdpc3RlcmVkLgo+Pj4KPj4+IFRoYW5rcywKPj4+IFBlbmcuCj4+Cj4+IEkgdGhpbmsgdGhl IGlkZWEgaXMgbm90IHRvIHJldHVybiBhIGZhaWx1cmUgaW4gb3BzLT5jaGFuZ2VfbW9kZSwgYnV0 IAo+PiB0byBtb3ZlCj4+IGVuYWJsaW5nIHRoZSBzaXRlIGluIFJFR1NfVE1SL1JFR1NfVjJfVE1T UiByZWdpc3RlciBmcm9tCj4+IHFvcmlxX3RtdV9yZWdpc3Rlcl90bXVfem9uZSB0byBvcHMtPmNo YW5nZV9tb2RlLiAKPiAKPiBCdXQgcW9yaXFfdG11X3JlZ2lzdGVyX3RtdV96b25lIHdpbGwgZmlu YWxseSBjYWxsIG9wcy0+Y2hhbmdlX21vZGUuCj4gCj4gQW5kIGl0IGlzIHBlciB6b25lLCBzbyB3 ZSBub3QgYWJsZSB0byBlbmFibGUgVE1SX01FIGhlcmUuCj4gCj4gVGhpcyB3YXkgdGhlIHNpdGUg d2lsbCBiZQo+PiBlbmFibGVkIG9ubHkgZm9yIGFjdHVhbGx5IGV4aXN0aW5nIHRoZXJtYWwgem9u ZXMsIHNpbmNlIHRob3NlIG5vdCAKPj4gZGVzY3JpYmVkIGluCj4+IHRoZSBkZXZpY2UgdHJlZSB3 b24ndCByZWFjaCB0aGVybWFsX3pvbmVfZGV2aWNlX2VuYWJsZS4KPiAKPiBOby4gVGhlIFRNUl9N RSBpcyB0aGUgZ2F0ZSBmb3IgYWxsIHNpdGVzLgoKV2hhdCBhYm91dCB0aGUgZm9sbG93aW5nIGNo YW5nZSBvbiB0b3Agb2YgeW91ciBzZXJpZXM6CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy90aGVybWFs L3FvcmlxX3RoZXJtYWwuYyAKYi9kcml2ZXJzL3RoZXJtYWwvcW9yaXFfdGhlcm1hbC5jCmluZGV4 IGM3MTA0NDliMGM1MC4uZWNmODhiZjEzNzYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3RoZXJtYWwv cW9yaXFfdGhlcm1hbC5jCisrKyBiL2RyaXZlcnMvdGhlcm1hbC9xb3JpcV90aGVybWFsLmMKQEAg LTEwNyw4ICsxMDcsNiBAQCBzdGF0aWMgaW50IHRtdV9nZXRfdGVtcChzdHJ1Y3QgdGhlcm1hbF96 b25lX2RldmljZSAKKnR6LCBpbnQgKnRlbXApCiAgCSAqLwoKICAJcmVnbWFwX3JlYWQocWRhdGEt PnJlZ21hcCwgUkVHU19UTVIsICZ2YWwpOwotCWlmICghKHZhbCAmIFRNUl9NRSkpCi0JCXJldHVy biAtRUFHQUlOOwoKICAJaWYgKHJlZ21hcF9yZWFkX3BvbGxfdGltZW91dChxZGF0YS0+cmVnbWFw LAogIAkJCQkgICAgIFJFR1NfVFJJVFNSKHFzZW5zb3ItPmlkKSwKQEAgLTEzMSwxNCArMTI5LDQw IEBAIHN0YXRpYyBpbnQgdG11X2dldF90ZW1wKHN0cnVjdCB0aGVybWFsX3pvbmVfZGV2aWNlIAoq dHosIGludCAqdGVtcCkKICAJcmV0dXJuIDA7CiAgfQoKK3N0YXRpYyBpbnQgcW9yaXFfdG11X2No YW5nZV9tb2RlKHN0cnVjdCB0aGVybWFsX3pvbmVfZGV2aWNlICp0eiwKKwkJCQkgZW51bSB0aGVy bWFsX2RldmljZV9tb2RlIG1vZGUpCit7CisJc3RydWN0IHFvcmlxX3NlbnNvciAqcXNlbnNvciA9 IHRoZXJtYWxfem9uZV9kZXZpY2VfcHJpdih0eik7CisJc3RydWN0IHFvcmlxX3RtdV9kYXRhICpx ZGF0YSA9IHFvcmlxX3NlbnNvcl90b19kYXRhKHFzZW5zb3IpOworCXVuc2lnbmVkIGludCBzaXRl OworCXVuc2lnbmVkIGludCB2YWx1ZTsKKwl1bnNpZ25lZCBpbnQgbWFzazsKKworCWlmIChxZGF0 YS0+dmVyID09IFRNVV9WRVIxKSB7CisJCXNpdGUgPSBCSVQoMTUgLSBxc2Vuc29yLT5pZCk7CisJ CW1hc2sgPSBUTVJfTUUgfCBUTVJfQUxQRiB8IHNpdGU7CisJCXZhbHVlID0gbW9kZSA9PSBUSEVS TUFMX0RFVklDRV9FTkFCTEVEID8gbWFzayA6IG1hc2sgJiB+c2l0ZTsKKwkJcmVnbWFwX3VwZGF0 ZV9iaXRzKHFkYXRhLT5yZWdtYXAsIFJFR1NfVE1SLCBtYXNrLCB2YWx1ZSk7CisJfSBlbHNlIHsK KwkJc2l0ZSA9IEJJVChxc2Vuc29yLT5pZCk7CisJCW1hc2sgPSBUTVJfTUUgfCBUTVJfQUxQRl9W MiB8IHNpdGU7CisJCXZhbHVlID0gbW9kZSA9PSBUSEVSTUFMX0RFVklDRV9FTkFCTEVEID8gbWFz ayA6IG1hc2sgJiB+c2l0ZTsKKwkJcmVnbWFwX3VwZGF0ZV9iaXRzKHFkYXRhLT5yZWdtYXAsIFJF R1NfVjJfVE1TUiwgbWFzaywgdmFsdWUpOworCQlyZWdtYXBfd3JpdGUocWRhdGEtPnJlZ21hcCwg UkVHU19UTVIsIFRNUl9NRSB8IFRNUl9BTFBGX1YyKTsKKwl9CisKKwlyZXR1cm4gMDsKK30KKwog IHN0YXRpYyBjb25zdCBzdHJ1Y3QgdGhlcm1hbF96b25lX2RldmljZV9vcHMgdG11X3R6X29wcyA9 IHsKICAJLmdldF90ZW1wID0gdG11X2dldF90ZW1wLAorCS5jaGFuZ2VfbW9kZSA9IHFvcmlxX3Rt dV9jaGFuZ2VfbW9kZSwKICB9OwoKICBzdGF0aWMgaW50IHFvcmlxX3RtdV9yZWdpc3Rlcl90bXVf em9uZShzdHJ1Y3QgZGV2aWNlICpkZXYsCiAgCQkJCSAgICAgICBzdHJ1Y3QgcW9yaXFfdG11X2Rh dGEgKnFkYXRhKQogIHsKLQlpbnQgaWQsIHNpdGVzID0gMDsKKwlpbnQgaWQ7CgogIAlmb3IgKGlk ID0gMDsgaWQgPCBTSVRFU19NQVg7IGlkKyspIHsKICAJCXN0cnVjdCB0aGVybWFsX3pvbmVfZGV2 aWNlICp0emQ7CkBAIC0xNTgsMjUgKzE4MiwxMSBAQCBzdGF0aWMgaW50IHFvcmlxX3RtdV9yZWdp c3Rlcl90bXVfem9uZShzdHJ1Y3QgCmRldmljZSAqZGV2LAogIAkJCXJldHVybiByZXQ7CiAgCQl9 CgotCQlpZiAocWRhdGEtPnZlciA9PSBUTVVfVkVSMSkKLQkJCXNpdGVzIHw9IDB4MSA8PCAoMTUg LSBpZCk7Ci0JCWVsc2UKLQkJCXNpdGVzIHw9IDB4MSA8PCBpZDsKLQogIAkJaWYgKGRldm1fdGhl cm1hbF9hZGRfaHdtb25fc3lzZnMoZGV2LCB0emQpKQogIAkJCWRldl93YXJuKGRldiwKICAJCQkJ ICJGYWlsZWQgdG8gYWRkIGh3bW9uIHN5c2ZzIGF0dHJpYnV0ZXNcbiIpOwogIAl9CgotCWlmIChz aXRlcykgewotCQlpZiAocWRhdGEtPnZlciA9PSBUTVVfVkVSMSkgewotCQkJcmVnbWFwX3dyaXRl KHFkYXRhLT5yZWdtYXAsIFJFR1NfVE1SLCBUTVJfTUUgfCBUTVJfQUxQRiB8IHNpdGVzKTsKLQkJ fSBlbHNlIHsKLQkJCXJlZ21hcF93cml0ZShxZGF0YS0+cmVnbWFwLCBSRUdTX1YyX1RNU1IsIHNp dGVzKTsKLQkJCXJlZ21hcF93cml0ZShxZGF0YS0+cmVnbWFwLCBSRUdTX1RNUiwgVE1SX01FIHwg VE1SX0FMUEZfVjIpOwotCQl9Ci0JfQotCiAgCXJldHVybiAwOwogIH0KCgotLSAKPGh0dHA6Ly93 d3cubGluYXJvLm9yZy8+IExpbmFyby5vcmcg4pSCIE9wZW4gc291cmNlIHNvZnR3YXJlIGZvciBB Uk0gU29DcwoKRm9sbG93IExpbmFybzogIDxodHRwOi8vd3d3LmZhY2Vib29rLmNvbS9wYWdlcy9M aW5hcm8+IEZhY2Vib29rIHwKPGh0dHA6Ly90d2l0dGVyLmNvbS8jIS9saW5hcm9vcmc+IFR3aXR0 ZXIgfAo8aHR0cDovL3d3dy5saW5hcm8ub3JnL2xpbmFyby1ibG9nLz4gQmxvZwoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwg bWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8v bGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK