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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 3CFF5C432BE for ; Fri, 30 Jul 2021 02:02:11 +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 12F80603E9 for ; Fri, 30 Jul 2021 02:02:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 12F80603E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CBAF46F38C; Fri, 30 Jul 2021 02:02:04 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E23A6EF2E; Fri, 30 Jul 2021 02:01:58 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10060"; a="200186039" X-IronPort-AV: E=Sophos;i="5.84,280,1620716400"; d="scan'208";a="200186039" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2021 19:01:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,280,1620716400"; d="scan'208";a="664637735" Received: from vbelgaum-ubuntu.fm.intel.com ([10.1.27.27]) by fmsmga006.fm.intel.com with ESMTP; 29 Jul 2021 19:01:57 -0700 From: Vinay Belgaumkar To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 13/14] drm/i915/guc/slpc: Add SLPC selftest Date: Thu, 29 Jul 2021 19:01:06 -0700 Message-Id: <20210730020107.31415-14-vinay.belgaumkar@intel.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20210730020107.31415-1-vinay.belgaumkar@intel.com> References: <20210730020107.31415-1-vinay.belgaumkar@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Vinay Belgaumkar Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Tests that exercise the SLPC get/set frequency interfaces. Clamp_max will set max frequency to multiple levels and check that SLPC requests frequency lower than or equal to it. Clamp_min will set min frequency to different levels and check if SLPC requests are higher or equal to those levels. v2: Address review comments (Michal W) v3: Checkpatch() corrections v4: Remove unnecessary header file (Matthew Brost) v5: checkpatch() and define const for 50/3 (Matthew Brost) Signed-off-by: Vinay Belgaumkar --- drivers/gpu/drm/i915/gt/intel_rps.c | 1 + drivers/gpu/drm/i915/gt/selftest_slpc.c | 314 ++++++++++++++++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + 3 files changed, 316 insertions(+) create mode 100644 drivers/gpu/drm/i915/gt/selftest_slpc.c diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c index 847c6313c1e7..1dabe82d67a6 100644 --- a/drivers/gpu/drm/i915/gt/intel_rps.c +++ b/drivers/gpu/drm/i915/gt/intel_rps.c @@ -2333,4 +2333,5 @@ EXPORT_SYMBOL_GPL(i915_gpu_turbo_disable); #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftest_rps.c" +#include "selftest_slpc.c" #endif diff --git a/drivers/gpu/drm/i915/gt/selftest_slpc.c b/drivers/gpu/drm/i915/gt/selftest_slpc.c new file mode 100644 index 000000000000..0d9f64461f5d --- /dev/null +++ b/drivers/gpu/drm/i915/gt/selftest_slpc.c @@ -0,0 +1,314 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2021 Intel Corporation + */ + +#define NUM_STEPS 5 +#define H2G_DELAY 50000 +#define delay_for_h2g() usleep_range(H2G_DELAY, H2G_DELAY + 10000) +#define FREQUENCY_REQ_UNIT DIV_ROUND_CLOSEST(GT_FREQUENCY_MULTIPLIER, \ + GEN9_FREQ_SCALER) + +int live_slpc_clamp_min(void *arg); +int live_slpc_clamp_max(void *arg); + +static int slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 freq) +{ + int ret; + + ret = intel_guc_slpc_set_min_freq(slpc, freq); + if (ret) + pr_err("Could not set min frequency to [%u]\n", freq); + else /* Delay to ensure h2g completes */ + delay_for_h2g(); + + return ret; +} + +static int slpc_set_max_freq(struct intel_guc_slpc *slpc, u32 freq) +{ + int ret; + + ret = intel_guc_slpc_set_max_freq(slpc, freq); + if (ret) + pr_err("Could not set maximum frequency [%u]\n", + freq); + else /* Delay to ensure h2g completes */ + delay_for_h2g(); + + return ret; +} + +int live_slpc_clamp_min(void *arg) +{ + struct drm_i915_private *i915 = arg; + struct intel_gt *gt = &i915->gt; + struct intel_guc_slpc *slpc = >->uc.guc.slpc; + struct intel_rps *rps = >->rps; + struct intel_engine_cs *engine; + enum intel_engine_id id; + struct igt_spinner spin; + u32 slpc_min_freq, slpc_max_freq; + int err = 0; + + if (!intel_uc_uses_guc_slpc(>->uc)) + return 0; + + if (igt_spinner_init(&spin, gt)) + return -ENOMEM; + + if (intel_guc_slpc_get_max_freq(slpc, &slpc_max_freq)) { + pr_err("Could not get SLPC max freq\n"); + return -EIO; + } + + if (intel_guc_slpc_get_min_freq(slpc, &slpc_min_freq)) { + pr_err("Could not get SLPC min freq\n"); + return -EIO; + } + + if (slpc_min_freq == slpc_max_freq) { + pr_err("Min/Max are fused to the same value\n"); + return -EINVAL; + } + + intel_gt_pm_wait_for_idle(gt); + intel_gt_pm_get(gt); + for_each_engine(engine, gt, id) { + struct i915_request *rq; + u32 step, min_freq, req_freq; + u32 act_freq, max_act_freq; + + if (!intel_engine_can_store_dword(engine)) + continue; + + /* Go from min to max in 5 steps */ + step = (slpc_max_freq - slpc_min_freq) / NUM_STEPS; + max_act_freq = slpc_min_freq; + for (min_freq = slpc_min_freq; min_freq < slpc_max_freq; + min_freq += step) { + err = slpc_set_min_freq(slpc, min_freq); + if (err) + break; + + st_engine_heartbeat_disable(engine); + + rq = igt_spinner_create_request(&spin, + engine->kernel_context, + MI_NOOP); + if (IS_ERR(rq)) { + err = PTR_ERR(rq); + st_engine_heartbeat_enable(engine); + break; + } + + i915_request_add(rq); + + if (!igt_wait_for_spinner(&spin, rq)) { + pr_err("%s: Spinner did not start\n", + engine->name); + igt_spinner_end(&spin); + st_engine_heartbeat_enable(engine); + intel_gt_set_wedged(engine->gt); + err = -EIO; + break; + } + + /* Wait for GuC to detect business and raise + * requested frequency if necessary. + */ + delay_for_h2g(); + + req_freq = intel_rps_read_punit_req_frequency(rps); + + /* GuC requests freq in multiples of 50/3 MHz */ + if (req_freq < (min_freq - FREQUENCY_REQ_UNIT)) { + pr_err("SWReq is %d, should be at least %d\n", req_freq, + min_freq - FREQUENCY_REQ_UNIT); + igt_spinner_end(&spin); + st_engine_heartbeat_enable(engine); + err = -EINVAL; + break; + } + + act_freq = intel_rps_read_actual_frequency(rps); + if (act_freq > max_act_freq) + max_act_freq = act_freq; + + igt_spinner_end(&spin); + st_engine_heartbeat_enable(engine); + } + + pr_info("Max actual frequency for %s was %d\n", + engine->name, max_act_freq); + + /* Actual frequency should rise above min */ + if (max_act_freq == slpc_min_freq) { + pr_err("Actual freq did not rise above min\n"); + err = -EINVAL; + } + + if (err) + break; + } + + /* Restore min/max frequencies */ + slpc_set_max_freq(slpc, slpc_max_freq); + slpc_set_min_freq(slpc, slpc_min_freq); + + if (igt_flush_test(gt->i915)) + err = -EIO; + + intel_gt_pm_put(gt); + igt_spinner_fini(&spin); + intel_gt_pm_wait_for_idle(gt); + + return err; +} + +int live_slpc_clamp_max(void *arg) +{ + struct drm_i915_private *i915 = arg; + struct intel_gt *gt = &i915->gt; + struct intel_guc_slpc *slpc; + struct intel_rps *rps; + struct intel_engine_cs *engine; + enum intel_engine_id id; + struct igt_spinner spin; + int err = 0; + u32 slpc_min_freq, slpc_max_freq; + + slpc = >->uc.guc.slpc; + rps = >->rps; + + if (!intel_uc_uses_guc_slpc(>->uc)) + return 0; + + if (igt_spinner_init(&spin, gt)) + return -ENOMEM; + + if (intel_guc_slpc_get_max_freq(slpc, &slpc_max_freq)) { + pr_err("Could not get SLPC max freq\n"); + return -EIO; + } + + if (intel_guc_slpc_get_min_freq(slpc, &slpc_min_freq)) { + pr_err("Could not get SLPC min freq\n"); + return -EIO; + } + + if (slpc_min_freq == slpc_max_freq) { + pr_err("Min/Max are fused to the same value\n"); + return -EINVAL; + } + + intel_gt_pm_wait_for_idle(gt); + intel_gt_pm_get(gt); + for_each_engine(engine, gt, id) { + struct i915_request *rq; + u32 max_freq, req_freq; + u32 act_freq, max_act_freq; + u32 step; + + if (!intel_engine_can_store_dword(engine)) + continue; + + /* Go from max to min in 5 steps */ + step = (slpc_max_freq - slpc_min_freq) / NUM_STEPS; + max_act_freq = slpc_min_freq; + for (max_freq = slpc_max_freq; max_freq > slpc_min_freq; + max_freq -= step) { + err = slpc_set_max_freq(slpc, max_freq); + if (err) + break; + + st_engine_heartbeat_disable(engine); + + rq = igt_spinner_create_request(&spin, + engine->kernel_context, + MI_NOOP); + if (IS_ERR(rq)) { + st_engine_heartbeat_enable(engine); + err = PTR_ERR(rq); + break; + } + + i915_request_add(rq); + + if (!igt_wait_for_spinner(&spin, rq)) { + pr_err("%s: SLPC spinner did not start\n", + engine->name); + igt_spinner_end(&spin); + st_engine_heartbeat_enable(engine); + intel_gt_set_wedged(engine->gt); + err = -EIO; + break; + } + + delay_for_h2g(); + + /* Verify that SWREQ indeed was set to specific value */ + req_freq = intel_rps_read_punit_req_frequency(rps); + + /* GuC requests freq in multiples of 50/3 MHz */ + if (req_freq > (max_freq + FREQUENCY_REQ_UNIT)) { + pr_err("SWReq is %d, should be at most %d\n", req_freq, + max_freq + FREQUENCY_REQ_UNIT); + igt_spinner_end(&spin); + st_engine_heartbeat_enable(engine); + err = -EINVAL; + break; + } + + act_freq = intel_rps_read_actual_frequency(rps); + if (act_freq > max_act_freq) + max_act_freq = act_freq; + + st_engine_heartbeat_enable(engine); + igt_spinner_end(&spin); + + if (err) + break; + } + + pr_info("Max actual frequency for %s was %d\n", + engine->name, max_act_freq); + + /* Actual frequency should rise above min */ + if (max_act_freq == slpc_min_freq) { + pr_err("Actual freq did not rise above min\n"); + err = -EINVAL; + } + + if (igt_flush_test(gt->i915)) { + err = -EIO; + break; + } + + if (err) + break; + } + + /* Restore min/max freq */ + slpc_set_max_freq(slpc, slpc_max_freq); + slpc_set_min_freq(slpc, slpc_min_freq); + + intel_gt_pm_put(gt); + igt_spinner_fini(&spin); + intel_gt_pm_wait_for_idle(gt); + + return err; +} + +int intel_slpc_live_selftests(struct drm_i915_private *i915) +{ + static const struct i915_subtest tests[] = { + SUBTEST(live_slpc_clamp_max), + SUBTEST(live_slpc_clamp_min), + }; + + if (intel_gt_is_wedged(&i915->gt)) + return 0; + + return i915_live_subtests(tests, i915); +} diff --git a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h index e2fd1b61af71..1746a56dda06 100644 --- a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h +++ b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h @@ -47,5 +47,6 @@ selftest(hangcheck, intel_hangcheck_live_selftests) selftest(execlists, intel_execlists_live_selftests) selftest(ring_submission, intel_ring_submission_live_selftests) selftest(perf, i915_perf_live_selftests) +selftest(slpc, intel_slpc_live_selftests) /* Here be dragons: keep last to run last! */ selftest(late_gt_pm, intel_gt_pm_late_selftests) -- 2.25.0 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 78696C432BE for ; Fri, 30 Jul 2021 02:02:22 +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 2DA1260F4B for ; Fri, 30 Jul 2021 02:02:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2DA1260F4B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BB6E6F383; Fri, 30 Jul 2021 02:02:21 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E23A6EF2E; Fri, 30 Jul 2021 02:01:58 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10060"; a="200186039" X-IronPort-AV: E=Sophos;i="5.84,280,1620716400"; d="scan'208";a="200186039" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2021 19:01:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,280,1620716400"; d="scan'208";a="664637735" Received: from vbelgaum-ubuntu.fm.intel.com ([10.1.27.27]) by fmsmga006.fm.intel.com with ESMTP; 29 Jul 2021 19:01:57 -0700 From: Vinay Belgaumkar To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Thu, 29 Jul 2021 19:01:06 -0700 Message-Id: <20210730020107.31415-14-vinay.belgaumkar@intel.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20210730020107.31415-1-vinay.belgaumkar@intel.com> References: <20210730020107.31415-1-vinay.belgaumkar@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 13/14] drm/i915/guc/slpc: Add SLPC selftest X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" VGVzdHMgdGhhdCBleGVyY2lzZSB0aGUgU0xQQyBnZXQvc2V0IGZyZXF1ZW5jeSBpbnRlcmZhY2Vz LgoKQ2xhbXBfbWF4IHdpbGwgc2V0IG1heCBmcmVxdWVuY3kgdG8gbXVsdGlwbGUgbGV2ZWxzIGFu ZCBjaGVjawp0aGF0IFNMUEMgcmVxdWVzdHMgZnJlcXVlbmN5IGxvd2VyIHRoYW4gb3IgZXF1YWwg dG8gaXQuCgpDbGFtcF9taW4gd2lsbCBzZXQgbWluIGZyZXF1ZW5jeSB0byBkaWZmZXJlbnQgbGV2 ZWxzIGFuZCBjaGVjawppZiBTTFBDIHJlcXVlc3RzIGFyZSBoaWdoZXIgb3IgZXF1YWwgdG8gdGhv c2UgbGV2ZWxzLgoKdjI6IEFkZHJlc3MgcmV2aWV3IGNvbW1lbnRzIChNaWNoYWwgVykKdjM6IENo ZWNrcGF0Y2goKSBjb3JyZWN0aW9ucwp2NDogUmVtb3ZlIHVubmVjZXNzYXJ5IGhlYWRlciBmaWxl IChNYXR0aGV3IEJyb3N0KQp2NTogY2hlY2twYXRjaCgpIGFuZCBkZWZpbmUgY29uc3QgZm9yIDUw LzMgKE1hdHRoZXcgQnJvc3QpCgpTaWduZWQtb2ZmLWJ5OiBWaW5heSBCZWxnYXVta2FyIDx2aW5h eS5iZWxnYXVta2FyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRl bF9ycHMuYyAgICAgICAgICAgfCAgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Qvc2VsZnRl c3Rfc2xwYy5jICAgICAgIHwgMzE0ICsrKysrKysrKysrKysrKysrKwogLi4uL2RybS9pOTE1L3Nl bGZ0ZXN0cy9pOTE1X2xpdmVfc2VsZnRlc3RzLmggIHwgICAxICsKIDMgZmlsZXMgY2hhbmdlZCwg MzE2IGluc2VydGlvbnMoKykKIGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9kcm0vaTkx NS9ndC9zZWxmdGVzdF9zbHBjLmMKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9n dC9pbnRlbF9ycHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3Jwcy5jCmluZGV4 IDg0N2M2MzEzYzFlNy4uMWRhYmU4MmQ2N2E2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9ndC9pbnRlbF9ycHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9y cHMuYwpAQCAtMjMzMyw0ICsyMzMzLDUgQEAgRVhQT1JUX1NZTUJPTF9HUEwoaTkxNV9ncHVfdHVy Ym9fZGlzYWJsZSk7CiAKICNpZiBJU19FTkFCTEVEKENPTkZJR19EUk1fSTkxNV9TRUxGVEVTVCkK ICNpbmNsdWRlICJzZWxmdGVzdF9ycHMuYyIKKyNpbmNsdWRlICJzZWxmdGVzdF9zbHBjLmMiCiAj ZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L3NlbGZ0ZXN0X3NscGMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L3NlbGZ0ZXN0X3NscGMuYwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjBkOWY2NDQ2MWY1ZAotLS0gL2Rldi9udWxsCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L3NlbGZ0ZXN0X3NscGMuYwpAQCAtMCwwICsxLDMx NCBAQAorLy8gU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IE1JVAorLyoKKyAqIENvcHlyaWdodCDC qSAyMDIxIEludGVsIENvcnBvcmF0aW9uCisgKi8KKworI2RlZmluZSBOVU1fU1RFUFMgNQorI2Rl ZmluZSBIMkdfREVMQVkgNTAwMDAKKyNkZWZpbmUgZGVsYXlfZm9yX2gyZygpIHVzbGVlcF9yYW5n ZShIMkdfREVMQVksIEgyR19ERUxBWSArIDEwMDAwKQorI2RlZmluZSBGUkVRVUVOQ1lfUkVRX1VO SVQJRElWX1JPVU5EX0NMT1NFU1QoR1RfRlJFUVVFTkNZX01VTFRJUExJRVIsIFwKKwkJCQkJCSAg R0VOOV9GUkVRX1NDQUxFUikKKworaW50IGxpdmVfc2xwY19jbGFtcF9taW4odm9pZCAqYXJnKTsK K2ludCBsaXZlX3NscGNfY2xhbXBfbWF4KHZvaWQgKmFyZyk7CisKK3N0YXRpYyBpbnQgc2xwY19z ZXRfbWluX2ZyZXEoc3RydWN0IGludGVsX2d1Y19zbHBjICpzbHBjLCB1MzIgZnJlcSkKK3sKKwlp bnQgcmV0OworCisJcmV0ID0gaW50ZWxfZ3VjX3NscGNfc2V0X21pbl9mcmVxKHNscGMsIGZyZXEp OworCWlmIChyZXQpCisJCXByX2VycigiQ291bGQgbm90IHNldCBtaW4gZnJlcXVlbmN5IHRvIFsl dV1cbiIsIGZyZXEpOworCWVsc2UgLyogRGVsYXkgdG8gZW5zdXJlIGgyZyBjb21wbGV0ZXMgKi8K KwkJZGVsYXlfZm9yX2gyZygpOworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIGludCBzbHBj X3NldF9tYXhfZnJlcShzdHJ1Y3QgaW50ZWxfZ3VjX3NscGMgKnNscGMsIHUzMiBmcmVxKQorewor CWludCByZXQ7CisKKwlyZXQgPSBpbnRlbF9ndWNfc2xwY19zZXRfbWF4X2ZyZXEoc2xwYywgZnJl cSk7CisJaWYgKHJldCkKKwkJcHJfZXJyKCJDb3VsZCBub3Qgc2V0IG1heGltdW0gZnJlcXVlbmN5 IFsldV1cbiIsCisJCSAgICAgICBmcmVxKTsKKwllbHNlIC8qIERlbGF5IHRvIGVuc3VyZSBoMmcg Y29tcGxldGVzICovCisJCWRlbGF5X2Zvcl9oMmcoKTsKKworCXJldHVybiByZXQ7Cit9CisKK2lu dCBsaXZlX3NscGNfY2xhbXBfbWluKHZvaWQgKmFyZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqaTkxNSA9IGFyZzsKKwlzdHJ1Y3QgaW50ZWxfZ3QgKmd0ID0gJmk5MTUtPmd0OworCXN0 cnVjdCBpbnRlbF9ndWNfc2xwYyAqc2xwYyA9ICZndC0+dWMuZ3VjLnNscGM7CisJc3RydWN0IGlu dGVsX3JwcyAqcnBzID0gJmd0LT5ycHM7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l OworCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOworCXN0cnVjdCBpZ3Rfc3Bpbm5lciBzcGluOwor CXUzMiBzbHBjX21pbl9mcmVxLCBzbHBjX21heF9mcmVxOworCWludCBlcnIgPSAwOworCisJaWYg KCFpbnRlbF91Y191c2VzX2d1Y19zbHBjKCZndC0+dWMpKQorCQlyZXR1cm4gMDsKKworCWlmIChp Z3Rfc3Bpbm5lcl9pbml0KCZzcGluLCBndCkpCisJCXJldHVybiAtRU5PTUVNOworCisJaWYgKGlu dGVsX2d1Y19zbHBjX2dldF9tYXhfZnJlcShzbHBjLCAmc2xwY19tYXhfZnJlcSkpIHsKKwkJcHJf ZXJyKCJDb3VsZCBub3QgZ2V0IFNMUEMgbWF4IGZyZXFcbiIpOworCQlyZXR1cm4gLUVJTzsKKwl9 CisKKwlpZiAoaW50ZWxfZ3VjX3NscGNfZ2V0X21pbl9mcmVxKHNscGMsICZzbHBjX21pbl9mcmVx KSkgeworCQlwcl9lcnIoIkNvdWxkIG5vdCBnZXQgU0xQQyBtaW4gZnJlcVxuIik7CisJCXJldHVy biAtRUlPOworCX0KKworCWlmIChzbHBjX21pbl9mcmVxID09IHNscGNfbWF4X2ZyZXEpIHsKKwkJ cHJfZXJyKCJNaW4vTWF4IGFyZSBmdXNlZCB0byB0aGUgc2FtZSB2YWx1ZVxuIik7CisJCXJldHVy biAtRUlOVkFMOworCX0KKworCWludGVsX2d0X3BtX3dhaXRfZm9yX2lkbGUoZ3QpOworCWludGVs X2d0X3BtX2dldChndCk7CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZ3QsIGlkKSB7CisJCXN0 cnVjdCBpOTE1X3JlcXVlc3QgKnJxOworCQl1MzIgc3RlcCwgbWluX2ZyZXEsIHJlcV9mcmVxOwor CQl1MzIgYWN0X2ZyZXEsIG1heF9hY3RfZnJlcTsKKworCQlpZiAoIWludGVsX2VuZ2luZV9jYW5f c3RvcmVfZHdvcmQoZW5naW5lKSkKKwkJCWNvbnRpbnVlOworCisJCS8qIEdvIGZyb20gbWluIHRv IG1heCBpbiA1IHN0ZXBzICovCisJCXN0ZXAgPSAoc2xwY19tYXhfZnJlcSAtIHNscGNfbWluX2Zy ZXEpIC8gTlVNX1NURVBTOworCQltYXhfYWN0X2ZyZXEgPSBzbHBjX21pbl9mcmVxOworCQlmb3Ig KG1pbl9mcmVxID0gc2xwY19taW5fZnJlcTsgbWluX2ZyZXEgPCBzbHBjX21heF9mcmVxOworCQkJ CQltaW5fZnJlcSArPSBzdGVwKSB7CisJCQllcnIgPSBzbHBjX3NldF9taW5fZnJlcShzbHBjLCBt aW5fZnJlcSk7CisJCQlpZiAoZXJyKQorCQkJCWJyZWFrOworCisJCQlzdF9lbmdpbmVfaGVhcnRi ZWF0X2Rpc2FibGUoZW5naW5lKTsKKworCQkJcnEgPSBpZ3Rfc3Bpbm5lcl9jcmVhdGVfcmVxdWVz dCgmc3BpbiwKKwkJCQkJCQllbmdpbmUtPmtlcm5lbF9jb250ZXh0LAorCQkJCQkJCU1JX05PT1Ap OworCQkJaWYgKElTX0VSUihycSkpIHsKKwkJCQllcnIgPSBQVFJfRVJSKHJxKTsKKwkJCQlzdF9l bmdpbmVfaGVhcnRiZWF0X2VuYWJsZShlbmdpbmUpOworCQkJCWJyZWFrOworCQkJfQorCisJCQlp OTE1X3JlcXVlc3RfYWRkKHJxKTsKKworCQkJaWYgKCFpZ3Rfd2FpdF9mb3Jfc3Bpbm5lcigmc3Bp biwgcnEpKSB7CisJCQkJcHJfZXJyKCIlczogU3Bpbm5lciBkaWQgbm90IHN0YXJ0XG4iLAorCQkJ CSAgICAgICBlbmdpbmUtPm5hbWUpOworCQkJCWlndF9zcGlubmVyX2VuZCgmc3Bpbik7CisJCQkJ c3RfZW5naW5lX2hlYXJ0YmVhdF9lbmFibGUoZW5naW5lKTsKKwkJCQlpbnRlbF9ndF9zZXRfd2Vk Z2VkKGVuZ2luZS0+Z3QpOworCQkJCWVyciA9IC1FSU87CisJCQkJYnJlYWs7CisJCQl9CisKKwkJ CS8qIFdhaXQgZm9yIEd1QyB0byBkZXRlY3QgYnVzaW5lc3MgYW5kIHJhaXNlCisJCQkgKiByZXF1 ZXN0ZWQgZnJlcXVlbmN5IGlmIG5lY2Vzc2FyeS4KKwkJCSAqLworCQkJZGVsYXlfZm9yX2gyZygp OworCisJCQlyZXFfZnJlcSA9IGludGVsX3Jwc19yZWFkX3B1bml0X3JlcV9mcmVxdWVuY3kocnBz KTsKKworCQkJLyogR3VDIHJlcXVlc3RzIGZyZXEgaW4gbXVsdGlwbGVzIG9mIDUwLzMgTUh6ICov CisJCQlpZiAocmVxX2ZyZXEgPCAobWluX2ZyZXEgLSBGUkVRVUVOQ1lfUkVRX1VOSVQpKSB7CisJ CQkJcHJfZXJyKCJTV1JlcSBpcyAlZCwgc2hvdWxkIGJlIGF0IGxlYXN0ICVkXG4iLCByZXFfZnJl cSwKKwkJCQkgICAgICAgbWluX2ZyZXEgLSBGUkVRVUVOQ1lfUkVRX1VOSVQpOworCQkJCWlndF9z cGlubmVyX2VuZCgmc3Bpbik7CisJCQkJc3RfZW5naW5lX2hlYXJ0YmVhdF9lbmFibGUoZW5naW5l KTsKKwkJCQllcnIgPSAtRUlOVkFMOworCQkJCWJyZWFrOworCQkJfQorCisJCQlhY3RfZnJlcSA9 ICBpbnRlbF9ycHNfcmVhZF9hY3R1YWxfZnJlcXVlbmN5KHJwcyk7CisJCQlpZiAoYWN0X2ZyZXEg PiBtYXhfYWN0X2ZyZXEpCisJCQkJbWF4X2FjdF9mcmVxID0gYWN0X2ZyZXE7CisKKwkJCWlndF9z cGlubmVyX2VuZCgmc3Bpbik7CisJCQlzdF9lbmdpbmVfaGVhcnRiZWF0X2VuYWJsZShlbmdpbmUp OworCQl9CisKKwkJcHJfaW5mbygiTWF4IGFjdHVhbCBmcmVxdWVuY3kgZm9yICVzIHdhcyAlZFxu IiwKKwkJCWVuZ2luZS0+bmFtZSwgbWF4X2FjdF9mcmVxKTsKKworCQkvKiBBY3R1YWwgZnJlcXVl bmN5IHNob3VsZCByaXNlIGFib3ZlIG1pbiAqLworCQlpZiAobWF4X2FjdF9mcmVxID09IHNscGNf bWluX2ZyZXEpIHsKKwkJCXByX2VycigiQWN0dWFsIGZyZXEgZGlkIG5vdCByaXNlIGFib3ZlIG1p blxuIik7CisJCQllcnIgPSAtRUlOVkFMOworCQl9CisKKwkJaWYgKGVycikKKwkJCWJyZWFrOwor CX0KKworCS8qIFJlc3RvcmUgbWluL21heCBmcmVxdWVuY2llcyAqLworCXNscGNfc2V0X21heF9m cmVxKHNscGMsIHNscGNfbWF4X2ZyZXEpOworCXNscGNfc2V0X21pbl9mcmVxKHNscGMsIHNscGNf bWluX2ZyZXEpOworCisJaWYgKGlndF9mbHVzaF90ZXN0KGd0LT5pOTE1KSkKKwkJZXJyID0gLUVJ TzsKKworCWludGVsX2d0X3BtX3B1dChndCk7CisJaWd0X3NwaW5uZXJfZmluaSgmc3Bpbik7CisJ aW50ZWxfZ3RfcG1fd2FpdF9mb3JfaWRsZShndCk7CisKKwlyZXR1cm4gZXJyOworfQorCitpbnQg bGl2ZV9zbHBjX2NsYW1wX21heCh2b2lkICphcmcpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUgPSBhcmc7CisJc3RydWN0IGludGVsX2d0ICpndCA9ICZpOTE1LT5ndDsKKwlzdHJ1 Y3QgaW50ZWxfZ3VjX3NscGMgKnNscGM7CisJc3RydWN0IGludGVsX3JwcyAqcnBzOworCXN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKKwllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKwlz dHJ1Y3QgaWd0X3NwaW5uZXIgc3BpbjsKKwlpbnQgZXJyID0gMDsKKwl1MzIgc2xwY19taW5fZnJl cSwgc2xwY19tYXhfZnJlcTsKKworCXNscGMgPSAmZ3QtPnVjLmd1Yy5zbHBjOworCXJwcyA9ICZn dC0+cnBzOworCisJaWYgKCFpbnRlbF91Y191c2VzX2d1Y19zbHBjKCZndC0+dWMpKQorCQlyZXR1 cm4gMDsKKworCWlmIChpZ3Rfc3Bpbm5lcl9pbml0KCZzcGluLCBndCkpCisJCXJldHVybiAtRU5P TUVNOworCisJaWYgKGludGVsX2d1Y19zbHBjX2dldF9tYXhfZnJlcShzbHBjLCAmc2xwY19tYXhf ZnJlcSkpIHsKKwkJcHJfZXJyKCJDb3VsZCBub3QgZ2V0IFNMUEMgbWF4IGZyZXFcbiIpOworCQly ZXR1cm4gLUVJTzsKKwl9CisKKwlpZiAoaW50ZWxfZ3VjX3NscGNfZ2V0X21pbl9mcmVxKHNscGMs ICZzbHBjX21pbl9mcmVxKSkgeworCQlwcl9lcnIoIkNvdWxkIG5vdCBnZXQgU0xQQyBtaW4gZnJl cVxuIik7CisJCXJldHVybiAtRUlPOworCX0KKworCWlmIChzbHBjX21pbl9mcmVxID09IHNscGNf bWF4X2ZyZXEpIHsKKwkJcHJfZXJyKCJNaW4vTWF4IGFyZSBmdXNlZCB0byB0aGUgc2FtZSB2YWx1 ZVxuIik7CisJCXJldHVybiAtRUlOVkFMOworCX0KKworCWludGVsX2d0X3BtX3dhaXRfZm9yX2lk bGUoZ3QpOworCWludGVsX2d0X3BtX2dldChndCk7CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg Z3QsIGlkKSB7CisJCXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxOworCQl1MzIgbWF4X2ZyZXEsIHJl cV9mcmVxOworCQl1MzIgYWN0X2ZyZXEsIG1heF9hY3RfZnJlcTsKKwkJdTMyIHN0ZXA7CisKKwkJ aWYgKCFpbnRlbF9lbmdpbmVfY2FuX3N0b3JlX2R3b3JkKGVuZ2luZSkpCisJCQljb250aW51ZTsK KworCQkvKiBHbyBmcm9tIG1heCB0byBtaW4gaW4gNSBzdGVwcyAqLworCQlzdGVwID0gKHNscGNf bWF4X2ZyZXEgLSBzbHBjX21pbl9mcmVxKSAvIE5VTV9TVEVQUzsKKwkJbWF4X2FjdF9mcmVxID0g c2xwY19taW5fZnJlcTsKKwkJZm9yIChtYXhfZnJlcSA9IHNscGNfbWF4X2ZyZXE7IG1heF9mcmVx ID4gc2xwY19taW5fZnJlcTsKKwkJCQkJbWF4X2ZyZXEgLT0gc3RlcCkgeworCQkJZXJyID0gc2xw Y19zZXRfbWF4X2ZyZXEoc2xwYywgbWF4X2ZyZXEpOworCQkJaWYgKGVycikKKwkJCQlicmVhazsK KworCQkJc3RfZW5naW5lX2hlYXJ0YmVhdF9kaXNhYmxlKGVuZ2luZSk7CisKKwkJCXJxID0gaWd0 X3NwaW5uZXJfY3JlYXRlX3JlcXVlc3QoJnNwaW4sCisJCQkJCQkJZW5naW5lLT5rZXJuZWxfY29u dGV4dCwKKwkJCQkJCQlNSV9OT09QKTsKKwkJCWlmIChJU19FUlIocnEpKSB7CisJCQkJc3RfZW5n aW5lX2hlYXJ0YmVhdF9lbmFibGUoZW5naW5lKTsKKwkJCQllcnIgPSBQVFJfRVJSKHJxKTsKKwkJ CQlicmVhazsKKwkJCX0KKworCQkJaTkxNV9yZXF1ZXN0X2FkZChycSk7CisKKwkJCWlmICghaWd0 X3dhaXRfZm9yX3NwaW5uZXIoJnNwaW4sIHJxKSkgeworCQkJCXByX2VycigiJXM6IFNMUEMgc3Bp bm5lciBkaWQgbm90IHN0YXJ0XG4iLAorCQkJCSAgICAgICBlbmdpbmUtPm5hbWUpOworCQkJCWln dF9zcGlubmVyX2VuZCgmc3Bpbik7CisJCQkJc3RfZW5naW5lX2hlYXJ0YmVhdF9lbmFibGUoZW5n aW5lKTsKKwkJCQlpbnRlbF9ndF9zZXRfd2VkZ2VkKGVuZ2luZS0+Z3QpOworCQkJCWVyciA9IC1F SU87CisJCQkJYnJlYWs7CisJCQl9CisKKwkJCWRlbGF5X2Zvcl9oMmcoKTsKKworCQkJLyogVmVy aWZ5IHRoYXQgU1dSRVEgaW5kZWVkIHdhcyBzZXQgdG8gc3BlY2lmaWMgdmFsdWUgKi8KKwkJCXJl cV9mcmVxID0gaW50ZWxfcnBzX3JlYWRfcHVuaXRfcmVxX2ZyZXF1ZW5jeShycHMpOworCisJCQkv KiBHdUMgcmVxdWVzdHMgZnJlcSBpbiBtdWx0aXBsZXMgb2YgNTAvMyBNSHogKi8KKwkJCWlmIChy ZXFfZnJlcSA+IChtYXhfZnJlcSArIEZSRVFVRU5DWV9SRVFfVU5JVCkpIHsKKwkJCQlwcl9lcnIo IlNXUmVxIGlzICVkLCBzaG91bGQgYmUgYXQgbW9zdCAlZFxuIiwgcmVxX2ZyZXEsCisJCQkJICAg ICAgIG1heF9mcmVxICsgRlJFUVVFTkNZX1JFUV9VTklUKTsKKwkJCQlpZ3Rfc3Bpbm5lcl9lbmQo JnNwaW4pOworCQkJCXN0X2VuZ2luZV9oZWFydGJlYXRfZW5hYmxlKGVuZ2luZSk7CisJCQkJZXJy ID0gLUVJTlZBTDsKKwkJCQlicmVhazsKKwkJCX0KKworCQkJYWN0X2ZyZXEgPSAgaW50ZWxfcnBz X3JlYWRfYWN0dWFsX2ZyZXF1ZW5jeShycHMpOworCQkJaWYgKGFjdF9mcmVxID4gbWF4X2FjdF9m cmVxKQorCQkJCW1heF9hY3RfZnJlcSA9IGFjdF9mcmVxOworCisJCQlzdF9lbmdpbmVfaGVhcnRi ZWF0X2VuYWJsZShlbmdpbmUpOworCQkJaWd0X3NwaW5uZXJfZW5kKCZzcGluKTsKKworCQkJaWYg KGVycikKKwkJCQlicmVhazsKKwkJfQorCisJCXByX2luZm8oIk1heCBhY3R1YWwgZnJlcXVlbmN5 IGZvciAlcyB3YXMgJWRcbiIsCisJCQllbmdpbmUtPm5hbWUsIG1heF9hY3RfZnJlcSk7CisKKwkJ LyogQWN0dWFsIGZyZXF1ZW5jeSBzaG91bGQgcmlzZSBhYm92ZSBtaW4gKi8KKwkJaWYgKG1heF9h Y3RfZnJlcSA9PSBzbHBjX21pbl9mcmVxKSB7CisJCQlwcl9lcnIoIkFjdHVhbCBmcmVxIGRpZCBu b3QgcmlzZSBhYm92ZSBtaW5cbiIpOworCQkJZXJyID0gLUVJTlZBTDsKKwkJfQorCisJCWlmIChp Z3RfZmx1c2hfdGVzdChndC0+aTkxNSkpIHsKKwkJCWVyciA9IC1FSU87CisJCQlicmVhazsKKwkJ fQorCisJCWlmIChlcnIpCisJCQlicmVhazsKKwl9CisKKwkvKiBSZXN0b3JlIG1pbi9tYXggZnJl cSAqLworCXNscGNfc2V0X21heF9mcmVxKHNscGMsIHNscGNfbWF4X2ZyZXEpOworCXNscGNfc2V0 X21pbl9mcmVxKHNscGMsIHNscGNfbWluX2ZyZXEpOworCisJaW50ZWxfZ3RfcG1fcHV0KGd0KTsK KwlpZ3Rfc3Bpbm5lcl9maW5pKCZzcGluKTsKKwlpbnRlbF9ndF9wbV93YWl0X2Zvcl9pZGxlKGd0 KTsKKworCXJldHVybiBlcnI7Cit9CisKK2ludCBpbnRlbF9zbHBjX2xpdmVfc2VsZnRlc3RzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQoreworCXN0YXRpYyBjb25zdCBzdHJ1Y3QgaTkx NV9zdWJ0ZXN0IHRlc3RzW10gPSB7CisJCVNVQlRFU1QobGl2ZV9zbHBjX2NsYW1wX21heCksCisJ CVNVQlRFU1QobGl2ZV9zbHBjX2NsYW1wX21pbiksCisJfTsKKworCWlmIChpbnRlbF9ndF9pc193 ZWRnZWQoJmk5MTUtPmd0KSkKKwkJcmV0dXJuIDA7CisKKwlyZXR1cm4gaTkxNV9saXZlX3N1YnRl c3RzKHRlc3RzLCBpOTE1KTsKK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9pOTE1X2xpdmVfc2VsZnRlc3RzLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxm dGVzdHMvaTkxNV9saXZlX3NlbGZ0ZXN0cy5oCmluZGV4IGUyZmQxYjYxYWY3MS4uMTc0NmE1NmRk YTA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9saXZl X3NlbGZ0ZXN0cy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2xp dmVfc2VsZnRlc3RzLmgKQEAgLTQ3LDUgKzQ3LDYgQEAgc2VsZnRlc3QoaGFuZ2NoZWNrLCBpbnRl bF9oYW5nY2hlY2tfbGl2ZV9zZWxmdGVzdHMpCiBzZWxmdGVzdChleGVjbGlzdHMsIGludGVsX2V4 ZWNsaXN0c19saXZlX3NlbGZ0ZXN0cykKIHNlbGZ0ZXN0KHJpbmdfc3VibWlzc2lvbiwgaW50ZWxf cmluZ19zdWJtaXNzaW9uX2xpdmVfc2VsZnRlc3RzKQogc2VsZnRlc3QocGVyZiwgaTkxNV9wZXJm X2xpdmVfc2VsZnRlc3RzKQorc2VsZnRlc3Qoc2xwYywgaW50ZWxfc2xwY19saXZlX3NlbGZ0ZXN0 cykKIC8qIEhlcmUgYmUgZHJhZ29uczoga2VlcCBsYXN0IHRvIHJ1biBsYXN0ISAqLwogc2VsZnRl c3QobGF0ZV9ndF9wbSwgaW50ZWxfZ3RfcG1fbGF0ZV9zZWxmdGVzdHMpCi0tIAoyLjI1LjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=