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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 F1D11C433DF for ; Thu, 9 Jul 2020 14:04:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CDF1820772 for ; Thu, 9 Jul 2020 14:04:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CUBY/goh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728150AbgGIOEE (ORCPT ); Thu, 9 Jul 2020 10:04:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727949AbgGIODd (ORCPT ); Thu, 9 Jul 2020 10:03:33 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4FEDC08C5CE for ; Thu, 9 Jul 2020 07:03:33 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id a6so6347696wmm.0 for ; Thu, 09 Jul 2020 07:03:33 -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=ztEfvDOenwmzhW91KrXpwCBICtYWbElja0rQb72V3Pc=; b=CUBY/gohnMihUfeW7hYoZa4qRuiuQR6oligMzAnmkB6qyrwohT837xR+hdTJY71AuN vRGEetbFmM/z0UeTMsaZw5vbs1h/T1iTja3IZz3OP/WiG4AL9OuShqkElaI2f1YXBH8N 6XSr/k0UULPgkxEILbww2PnvUk0cDm4MNUDd3kDy63uMWlj8XQ+NflE4Tr3+csuMTxoH l8ylr0QVrmNAiZeWyxQMNGm8S0Nivf79M+AGDQF871Q9Bma1NQwIxANBmPBYsXqHAba1 fpLidTdFSDfa/od40aFvbL5kEI8A4z0PPCRZwzq892JpUlG9EDMMRE57RkC/ncskpI5O GmWw== 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=ztEfvDOenwmzhW91KrXpwCBICtYWbElja0rQb72V3Pc=; b=rsNGDDHtGWJ85Pd8M+nXDsA8t4ghYukj52DRPFQvFaB8dvE3IhWLlMJb2qFSVVE/Y5 Md8lgf8xGCyUPAoB1Ue0JO8o8r1RXXlp0afOJ87su965HUPEbeFRVq5X9gzMkBE7UYzB /E5fePOqdtuE4c6z51SI8KngKaU0yU/2YbeCOASR46MUxutzMDFa0jHwVaAFLyDNMoTn JdKyOQSDY8hinO/oaUbkwJWLxLq/lfvt9ycYSRjWmt/AO8db/HueKXoGXMTbCDzKyO7k RKYZtowj8kXWkPeTcgv6JHgLY3f7nm06brfvp+xDQm9pKSCd2RZmS7Fdnw/EU4WuthxP p1bQ== X-Gm-Message-State: AOAM5304nhEqSq1dqVtfUpFbToX/mcAYh6p3pDEYyERPqy9RqaPv2KpK ffj1lGQVPhyKmhUUSI6f4J0= X-Google-Smtp-Source: ABdhPJx/ayH+Q5ywOwP/RWCOz75bR/TbNDJfRCtUuCjaJiMQMCnozgskzfgigx+WYPDigoa5e69SWg== X-Received: by 2002:a1c:dfc5:: with SMTP id w188mr170663wmg.182.1594303412263; Thu, 09 Jul 2020 07:03:32 -0700 (PDT) Received: from clement-Latitude-7490.numericable.fr (213-245-241-245.rev.numericable.fr. [213.245.241.245]) by smtp.gmail.com with ESMTPSA id s8sm5545256wru.38.2020.07.09.07.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:03:31 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Rob Herring , Tomeu Vizoso , Steven Price , Alyssa Rosenzweig , Viresh Kumar , Nishanth Menon , Stephen Boyd , Maxime Ripard , Chen-Yu Tsai Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v3 05/14] drm/panfrost: use spinlock instead of atomic Date: Thu, 9 Jul 2020 16:03:13 +0200 Message-Id: <20200709140322.131320-6-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709140322.131320-1-peron.clem@gmail.com> References: <20200709140322.131320-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert busy_count to a simple int protected by spinlock. Reviewed-by: Steven Price Reviewed-by: Alyssa Rosenzweig Signed-off-by: Clément Péron --- drivers/gpu/drm/panfrost/panfrost_devfreq.c | 43 +++++++++++++++------ drivers/gpu/drm/panfrost/panfrost_devfreq.h | 9 ++++- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index 962550363391..78753cfb59fb 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -12,16 +12,12 @@ static void panfrost_devfreq_update_utilization(struct panfrost_devfreq *pfdevfreq) { - ktime_t now; - ktime_t last; - - if (!pfdevfreq->devfreq) - return; + ktime_t now, last; now = ktime_get(); last = pfdevfreq->time_last_update; - if (atomic_read(&pfdevfreq->busy_count) > 0) + if (pfdevfreq->busy_count > 0) pfdevfreq->busy_time += ktime_sub(now, last); else pfdevfreq->idle_time += ktime_sub(now, last); @@ -59,10 +55,14 @@ static int panfrost_devfreq_get_dev_status(struct device *dev, { struct panfrost_device *pfdev = dev_get_drvdata(dev); struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq; + unsigned long irqflags; + + status->current_frequency = clk_get_rate(pfdev->clock); + + spin_lock_irqsave(&pfdevfreq->lock, irqflags); panfrost_devfreq_update_utilization(pfdevfreq); - status->current_frequency = clk_get_rate(pfdev->clock); status->total_time = ktime_to_ns(ktime_add(pfdevfreq->busy_time, pfdevfreq->idle_time)); @@ -70,6 +70,8 @@ static int panfrost_devfreq_get_dev_status(struct device *dev, panfrost_devfreq_reset(pfdevfreq); + spin_unlock_irqrestore(&pfdevfreq->lock, irqflags); + dev_dbg(pfdev->dev, "busy %lu total %lu %lu %% freq %lu MHz\n", status->busy_time, status->total_time, status->busy_time / (status->total_time / 100), @@ -100,6 +102,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) else if (ret) return ret; + spin_lock_init(&pfdevfreq->lock); + panfrost_devfreq_reset(pfdevfreq); cur_freq = clk_get_rate(pfdev->clock); @@ -162,15 +166,32 @@ void panfrost_devfreq_suspend(struct panfrost_device *pfdev) void panfrost_devfreq_record_busy(struct panfrost_devfreq *pfdevfreq) { + unsigned long irqflags; + + if (!pfdevfreq->devfreq) + return; + + spin_lock_irqsave(&pfdevfreq->lock, irqflags); + panfrost_devfreq_update_utilization(pfdevfreq); - atomic_inc(&pfdevfreq->busy_count); + + pfdevfreq->busy_count++; + + spin_unlock_irqrestore(&pfdevfreq->lock, irqflags); } void panfrost_devfreq_record_idle(struct panfrost_devfreq *pfdevfreq) { - int count; + unsigned long irqflags; + + if (!pfdevfreq->devfreq) + return; + + spin_lock_irqsave(&pfdevfreq->lock, irqflags); panfrost_devfreq_update_utilization(pfdevfreq); - count = atomic_dec_if_positive(&pfdevfreq->busy_count); - WARN_ON(count < 0); + + WARN_ON(--pfdevfreq->busy_count < 0); + + spin_unlock_irqrestore(&pfdevfreq->lock, irqflags); } diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h index 0697f8d5aa34..3392df1020be 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h @@ -4,6 +4,7 @@ #ifndef __PANFROST_DEVFREQ_H__ #define __PANFROST_DEVFREQ_H__ +#include #include struct devfreq; @@ -14,10 +15,16 @@ struct panfrost_device; struct panfrost_devfreq { struct devfreq *devfreq; struct thermal_cooling_device *cooling; + ktime_t busy_time; ktime_t idle_time; ktime_t time_last_update; - atomic_t busy_count; + int busy_count; + /* + * Protect busy_time, idle_time, time_last_update and busy_count + * because these can be updated concurrently between multiple jobs. + */ + spinlock_t lock; }; int panfrost_devfreq_init(struct panfrost_device *pfdev); -- 2.25.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=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 0EDF2C433E0 for ; Fri, 10 Jul 2020 07:53:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 D558A2077D for ; Fri, 10 Jul 2020 07:53:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CUBY/goh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D558A2077D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 90B016EB7C; Fri, 10 Jul 2020 07:52:59 +0000 (UTC) Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id C211C6EA75 for ; Thu, 9 Jul 2020 14:03:33 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id f139so1929538wmf.5 for ; Thu, 09 Jul 2020 07:03:33 -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=ztEfvDOenwmzhW91KrXpwCBICtYWbElja0rQb72V3Pc=; b=CUBY/gohnMihUfeW7hYoZa4qRuiuQR6oligMzAnmkB6qyrwohT837xR+hdTJY71AuN vRGEetbFmM/z0UeTMsaZw5vbs1h/T1iTja3IZz3OP/WiG4AL9OuShqkElaI2f1YXBH8N 6XSr/k0UULPgkxEILbww2PnvUk0cDm4MNUDd3kDy63uMWlj8XQ+NflE4Tr3+csuMTxoH l8ylr0QVrmNAiZeWyxQMNGm8S0Nivf79M+AGDQF871Q9Bma1NQwIxANBmPBYsXqHAba1 fpLidTdFSDfa/od40aFvbL5kEI8A4z0PPCRZwzq892JpUlG9EDMMRE57RkC/ncskpI5O GmWw== 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=ztEfvDOenwmzhW91KrXpwCBICtYWbElja0rQb72V3Pc=; b=i7Il5aTn/ILrac+ZZjZpK6q1EFp3ai4GFGsiv2PEw6dvOqzXY1JvEr1KBQXP8jllnw p5jxjf8URBgf/kbDwI3E+2YeU0D2WP3KqDJ3lxd80hAFkiH1K800nYbCq04xgAMctDP3 5/jA2R6UyqumhiGCVfG3oQdAFWb1mWXmM2Cqalrd78/Dhu5mB1HspeloTGpFD6eEZZ+v 1dum2oP+7qyS85DrYRKy/4dDLpLeVonVsCk5uUKA71Hbp2pIjitqJ0JMGmBtH5wQMLwg ZU2RPqNOs8CwDhkZo3gHOwKxGUJg9UGLcws/00Re5Ckgm/qB18dNQTDo8p9qWMisfvA6 P11g== X-Gm-Message-State: AOAM533hRfkKAMU+j4k6QJpD1kD05GTEYrjHNZvcyXeIRhVE+W3WL7XU 6N0OumJOJ5eBwNYZZlOhZ1w= X-Google-Smtp-Source: ABdhPJx/ayH+Q5ywOwP/RWCOz75bR/TbNDJfRCtUuCjaJiMQMCnozgskzfgigx+WYPDigoa5e69SWg== X-Received: by 2002:a1c:dfc5:: with SMTP id w188mr170663wmg.182.1594303412263; Thu, 09 Jul 2020 07:03:32 -0700 (PDT) Received: from clement-Latitude-7490.numericable.fr (213-245-241-245.rev.numericable.fr. [213.245.241.245]) by smtp.gmail.com with ESMTPSA id s8sm5545256wru.38.2020.07.09.07.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:03:31 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Rob Herring , Tomeu Vizoso , Steven Price , Alyssa Rosenzweig , Viresh Kumar , Nishanth Menon , Stephen Boyd , Maxime Ripard , Chen-Yu Tsai Subject: [PATCH v3 05/14] drm/panfrost: use spinlock instead of atomic Date: Thu, 9 Jul 2020 16:03:13 +0200 Message-Id: <20200709140322.131320-6-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709140322.131320-1-peron.clem@gmail.com> References: <20200709140322.131320-1-peron.clem@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 10 Jul 2020 07:52:58 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Q29udmVydCBidXN5X2NvdW50IHRvIGEgc2ltcGxlIGludCBwcm90ZWN0ZWQgYnkgc3BpbmxvY2su CgpSZXZpZXdlZC1ieTogU3RldmVuIFByaWNlIDxzdGV2ZW4ucHJpY2VAYXJtLmNvbT4KUmV2aWV3 ZWQtYnk6IEFseXNzYSBSb3Nlbnp3ZWlnIDxhbHlzc2Eucm9zZW56d2VpZ0Bjb2xsYWJvcmEuY29t PgpTaWduZWQtb2ZmLWJ5OiBDbMOpbWVudCBQw6lyb24gPHBlcm9uLmNsZW1AZ21haWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9kZXZmcmVxLmMgfCA0MyArKysr KysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9kZXZm cmVxLmggfCAgOSArKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAxMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJv c3RfZGV2ZnJlcS5jIGIvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2RldmZyZXEu YwppbmRleCA5NjI1NTAzNjMzOTEuLjc4NzUzY2ZiNTlmYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2RldmZyZXEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v cGFuZnJvc3QvcGFuZnJvc3RfZGV2ZnJlcS5jCkBAIC0xMiwxNiArMTIsMTIgQEAKIAogc3RhdGlj IHZvaWQgcGFuZnJvc3RfZGV2ZnJlcV91cGRhdGVfdXRpbGl6YXRpb24oc3RydWN0IHBhbmZyb3N0 X2RldmZyZXEgKnBmZGV2ZnJlcSkKIHsKLQlrdGltZV90IG5vdzsKLQlrdGltZV90IGxhc3Q7Ci0K LQlpZiAoIXBmZGV2ZnJlcS0+ZGV2ZnJlcSkKLQkJcmV0dXJuOworCWt0aW1lX3Qgbm93LCBsYXN0 OwogCiAJbm93ID0ga3RpbWVfZ2V0KCk7CiAJbGFzdCA9IHBmZGV2ZnJlcS0+dGltZV9sYXN0X3Vw ZGF0ZTsKIAotCWlmIChhdG9taWNfcmVhZCgmcGZkZXZmcmVxLT5idXN5X2NvdW50KSA+IDApCisJ aWYgKHBmZGV2ZnJlcS0+YnVzeV9jb3VudCA+IDApCiAJCXBmZGV2ZnJlcS0+YnVzeV90aW1lICs9 IGt0aW1lX3N1Yihub3csIGxhc3QpOwogCWVsc2UKIAkJcGZkZXZmcmVxLT5pZGxlX3RpbWUgKz0g a3RpbWVfc3ViKG5vdywgbGFzdCk7CkBAIC01OSwxMCArNTUsMTQgQEAgc3RhdGljIGludCBwYW5m cm9zdF9kZXZmcmVxX2dldF9kZXZfc3RhdHVzKHN0cnVjdCBkZXZpY2UgKmRldiwKIHsKIAlzdHJ1 Y3QgcGFuZnJvc3RfZGV2aWNlICpwZmRldiA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwogCXN0cnVj dCBwYW5mcm9zdF9kZXZmcmVxICpwZmRldmZyZXEgPSAmcGZkZXYtPnBmZGV2ZnJlcTsKKwl1bnNp Z25lZCBsb25nIGlycWZsYWdzOworCisJc3RhdHVzLT5jdXJyZW50X2ZyZXF1ZW5jeSA9IGNsa19n ZXRfcmF0ZShwZmRldi0+Y2xvY2spOworCisJc3Bpbl9sb2NrX2lycXNhdmUoJnBmZGV2ZnJlcS0+ bG9jaywgaXJxZmxhZ3MpOwogCiAJcGFuZnJvc3RfZGV2ZnJlcV91cGRhdGVfdXRpbGl6YXRpb24o cGZkZXZmcmVxKTsKIAotCXN0YXR1cy0+Y3VycmVudF9mcmVxdWVuY3kgPSBjbGtfZ2V0X3JhdGUo cGZkZXYtPmNsb2NrKTsKIAlzdGF0dXMtPnRvdGFsX3RpbWUgPSBrdGltZV90b19ucyhrdGltZV9h ZGQocGZkZXZmcmVxLT5idXN5X3RpbWUsCiAJCQkJCQkgICBwZmRldmZyZXEtPmlkbGVfdGltZSkp OwogCkBAIC03MCw2ICs3MCw4IEBAIHN0YXRpYyBpbnQgcGFuZnJvc3RfZGV2ZnJlcV9nZXRfZGV2 X3N0YXR1cyhzdHJ1Y3QgZGV2aWNlICpkZXYsCiAKIAlwYW5mcm9zdF9kZXZmcmVxX3Jlc2V0KHBm ZGV2ZnJlcSk7CiAKKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZwZmRldmZyZXEtPmxvY2ssIGly cWZsYWdzKTsKKwogCWRldl9kYmcocGZkZXYtPmRldiwgImJ1c3kgJWx1IHRvdGFsICVsdSAlbHUg JSUgZnJlcSAlbHUgTUh6XG4iLAogCQlzdGF0dXMtPmJ1c3lfdGltZSwgc3RhdHVzLT50b3RhbF90 aW1lLAogCQlzdGF0dXMtPmJ1c3lfdGltZSAvIChzdGF0dXMtPnRvdGFsX3RpbWUgLyAxMDApLApA QCAtMTAwLDYgKzEwMiw4IEBAIGludCBwYW5mcm9zdF9kZXZmcmVxX2luaXQoc3RydWN0IHBhbmZy b3N0X2RldmljZSAqcGZkZXYpCiAJZWxzZSBpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCisJc3Bp bl9sb2NrX2luaXQoJnBmZGV2ZnJlcS0+bG9jayk7CisKIAlwYW5mcm9zdF9kZXZmcmVxX3Jlc2V0 KHBmZGV2ZnJlcSk7CiAKIAljdXJfZnJlcSA9IGNsa19nZXRfcmF0ZShwZmRldi0+Y2xvY2spOwpA QCAtMTYyLDE1ICsxNjYsMzIgQEAgdm9pZCBwYW5mcm9zdF9kZXZmcmVxX3N1c3BlbmQoc3RydWN0 IHBhbmZyb3N0X2RldmljZSAqcGZkZXYpCiAKIHZvaWQgcGFuZnJvc3RfZGV2ZnJlcV9yZWNvcmRf YnVzeShzdHJ1Y3QgcGFuZnJvc3RfZGV2ZnJlcSAqcGZkZXZmcmVxKQogeworCXVuc2lnbmVkIGxv bmcgaXJxZmxhZ3M7CisKKwlpZiAoIXBmZGV2ZnJlcS0+ZGV2ZnJlcSkKKwkJcmV0dXJuOworCisJ c3Bpbl9sb2NrX2lycXNhdmUoJnBmZGV2ZnJlcS0+bG9jaywgaXJxZmxhZ3MpOworCiAJcGFuZnJv c3RfZGV2ZnJlcV91cGRhdGVfdXRpbGl6YXRpb24ocGZkZXZmcmVxKTsKLQlhdG9taWNfaW5jKCZw ZmRldmZyZXEtPmJ1c3lfY291bnQpOworCisJcGZkZXZmcmVxLT5idXN5X2NvdW50Kys7CisKKwlz cGluX3VubG9ja19pcnFyZXN0b3JlKCZwZmRldmZyZXEtPmxvY2ssIGlycWZsYWdzKTsKIH0KIAog dm9pZCBwYW5mcm9zdF9kZXZmcmVxX3JlY29yZF9pZGxlKHN0cnVjdCBwYW5mcm9zdF9kZXZmcmVx ICpwZmRldmZyZXEpCiB7Ci0JaW50IGNvdW50OworCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CisK KwlpZiAoIXBmZGV2ZnJlcS0+ZGV2ZnJlcSkKKwkJcmV0dXJuOworCisJc3Bpbl9sb2NrX2lycXNh dmUoJnBmZGV2ZnJlcS0+bG9jaywgaXJxZmxhZ3MpOwogCiAJcGFuZnJvc3RfZGV2ZnJlcV91cGRh dGVfdXRpbGl6YXRpb24ocGZkZXZmcmVxKTsKLQljb3VudCA9IGF0b21pY19kZWNfaWZfcG9zaXRp dmUoJnBmZGV2ZnJlcS0+YnVzeV9jb3VudCk7Ci0JV0FSTl9PTihjb3VudCA8IDApOworCisJV0FS Tl9PTigtLXBmZGV2ZnJlcS0+YnVzeV9jb3VudCA8IDApOworCisJc3Bpbl91bmxvY2tfaXJxcmVz dG9yZSgmcGZkZXZmcmVxLT5sb2NrLCBpcnFmbGFncyk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZGV2ZnJlcS5oIGIvZHJpdmVycy9ncHUvZHJtL3Bh bmZyb3N0L3BhbmZyb3N0X2RldmZyZXEuaAppbmRleCAwNjk3ZjhkNWFhMzQuLjMzOTJkZjEwMjBi ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2RldmZyZXEu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZGV2ZnJlcS5oCkBAIC00 LDYgKzQsNyBAQAogI2lmbmRlZiBfX1BBTkZST1NUX0RFVkZSRVFfSF9fCiAjZGVmaW5lIF9fUEFO RlJPU1RfREVWRlJFUV9IX18KIAorI2luY2x1ZGUgPGxpbnV4L3NwaW5sb2NrLmg+CiAjaW5jbHVk ZSA8bGludXgva3RpbWUuaD4KIAogc3RydWN0IGRldmZyZXE7CkBAIC0xNCwxMCArMTUsMTYgQEAg c3RydWN0IHBhbmZyb3N0X2RldmljZTsKIHN0cnVjdCBwYW5mcm9zdF9kZXZmcmVxIHsKIAlzdHJ1 Y3QgZGV2ZnJlcSAqZGV2ZnJlcTsKIAlzdHJ1Y3QgdGhlcm1hbF9jb29saW5nX2RldmljZSAqY29v bGluZzsKKwogCWt0aW1lX3QgYnVzeV90aW1lOwogCWt0aW1lX3QgaWRsZV90aW1lOwogCWt0aW1l X3QgdGltZV9sYXN0X3VwZGF0ZTsKLQlhdG9taWNfdCBidXN5X2NvdW50OworCWludCBidXN5X2Nv dW50OworCS8qCisJICogUHJvdGVjdCBidXN5X3RpbWUsIGlkbGVfdGltZSwgdGltZV9sYXN0X3Vw ZGF0ZSBhbmQgYnVzeV9jb3VudAorCSAqIGJlY2F1c2UgdGhlc2UgY2FuIGJlIHVwZGF0ZWQgY29u Y3VycmVudGx5IGJldHdlZW4gbXVsdGlwbGUgam9icy4KKwkgKi8KKwlzcGlubG9ja190IGxvY2s7 CiB9OwogCiBpbnQgcGFuZnJvc3RfZGV2ZnJlcV9pbml0KHN0cnVjdCBwYW5mcm9zdF9kZXZpY2Ug KnBmZGV2KTsKLS0gCjIuMjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==