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 E384DC6FA82 for ; Tue, 27 Sep 2022 14:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233130AbiI0Oet (ORCPT ); Tue, 27 Sep 2022 10:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232763AbiI0Od3 (ORCPT ); Tue, 27 Sep 2022 10:33:29 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F0DD1B8C99 for ; Tue, 27 Sep 2022 07:33:22 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id o20-20020a05600c4fd400b003b4a516c479so5561722wmq.1 for ; Tue, 27 Sep 2022 07:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=xYvlHjUzJ1gAdl8KtmAH0mCHcP29B+tCMOTUThwt7jg=; b=QX9BzKfcBASFxtQ4MW5JxvOb+wYygM//84qzelToOCwnFzzj5bbXwqEbU1/NYlvJQM AkUkDeVCAjOfvJFh0MU4OAb/VBRo+Mn4K436Cf4fjxdcMaiZRHR07mMOT5fVeTQP2RNx 5OZXidycwCa6+zVEESgHCwQVfozCwhI9/Pn0aFLIxG1JUT/azmAceWiGedcdFeMLUoIp nyUGrEwyg/nH35MK783BDU/DR+uvwJuONcQ7kYaIuI6opC0/QAhx05Vof1nL1841SU4d 197lQvxGO4vyx8fzToCi7urGRKs8IGQewhXPHh2rrWlBsgcpGz6ZcvJjYFhQrT95Rpx1 97IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=xYvlHjUzJ1gAdl8KtmAH0mCHcP29B+tCMOTUThwt7jg=; b=bPl64TFJlRlkZZSayBQCUffMZytXMu7msd+wf3QGJi2DEGa/8yk0nWnV865wlbe/SZ NvHQnzV3BEgjRu/E8ffcYrI0lcXjwQNbJB4jF+/JHiEP8URDFRcJNN81qQMrNLbeRwl4 851C0HWXdY/GEnizsdt3b37ZoriCHNzKFgNMrrj0Wpx6twGAoQOdeUPjtb9snzJkiFH1 za6w6w8KiYjQ3Fx3pNhy/Eh3yFEEfjpa3HpcbaQxdHmgT+oKzytdMhrmLThkolJHp5xw DcB6LKsyvtSBpgLeBRQqif/6HM2TW2z6sr6iPzVDmf1EYoDxoa/XTHc5/qNK5OYEXhON JN2A== X-Gm-Message-State: ACrzQf0j6KhfoAZLy6lC8hldDJvEpGocuDEtwUdj2DkH7Hz6yMM9VBKW rEzq1DD9CdlnIH9e19xz1wlqDMzHz1Yi4g== X-Google-Smtp-Source: AMsMyM5PXZObBCto2bbeZ7EKxHpVSI3muQpkTPAKmWgm51HjCxxYbGeavBFlT+95vPLqtdq0dPdL2g== X-Received: by 2002:a05:600c:1e13:b0:3b4:74c3:620b with SMTP id ay19-20020a05600c1e1300b003b474c3620bmr3027122wmb.168.1664289200324; Tue, 27 Sep 2022 07:33:20 -0700 (PDT) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id l6-20020a05600c4f0600b003b4924493bfsm17518371wmq.9.2022.09.27.07.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 07:33:19 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, rui.zhang@intel.com, Amit Kucheria , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCH v6 21/29] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Date: Tue, 27 Sep 2022 16:32:31 +0200 Message-Id: <20220927143239.376737-22-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927143239.376737-1-daniel.lezcano@linaro.org> References: <20220927143239.376737-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed. Convert ops content logic into generic trip points and register them with the thermal zone. Signed-off-by: Daniel Lezcano --- drivers/thermal/imx_thermal.c | 72 +++++++++++++---------------------- 1 file changed, 27 insertions(+), 45 deletions(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 16663373b682..fb0d5cab70af 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -76,7 +76,6 @@ enum imx_thermal_trip { IMX_TRIP_PASSIVE, IMX_TRIP_CRITICAL, - IMX_TRIP_NUM, }; #define IMX_POLLING_DELAY 2000 /* millisecond */ @@ -115,6 +114,11 @@ struct thermal_soc_data { u32 low_alarm_shift; }; +static struct thermal_trip trips[] = { + [IMX_TRIP_PASSIVE] = { .type = THERMAL_TRIP_PASSIVE }, + [IMX_TRIP_CRITICAL] = { .type = THERMAL_TRIP_CRITICAL }, +}; + static struct thermal_soc_data thermal_imx6q_data = { .version = TEMPMON_IMX6Q, @@ -201,8 +205,6 @@ struct imx_thermal_data { struct thermal_cooling_device *cdev; struct regmap *tempmon; u32 c1, c2; /* See formula in imx_init_calib() */ - int temp_passive; - int temp_critical; int temp_max; int alarm_temp; int last_temp; @@ -279,12 +281,12 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp) /* Update alarm value to next higher trip point for TEMPMON_IMX6Q */ if (data->socdata->version == TEMPMON_IMX6Q) { - if (data->alarm_temp == data->temp_passive && - *temp >= data->temp_passive) - imx_set_alarm_temp(data, data->temp_critical); - if (data->alarm_temp == data->temp_critical && - *temp < data->temp_passive) { - imx_set_alarm_temp(data, data->temp_passive); + if (data->alarm_temp == trips[IMX_TRIP_PASSIVE].temperature && + *temp >= trips[IMX_TRIP_PASSIVE].temperature) + imx_set_alarm_temp(data, trips[IMX_TRIP_CRITICAL].temperature); + if (data->alarm_temp == trips[IMX_TRIP_CRITICAL].temperature && + *temp < trips[IMX_TRIP_PASSIVE].temperature) { + imx_set_alarm_temp(data, trips[IMX_TRIP_PASSIVE].temperature); dev_dbg(&tz->device, "thermal alarm off: T < %d\n", data->alarm_temp / 1000); } @@ -330,29 +332,10 @@ static int imx_change_mode(struct thermal_zone_device *tz, return 0; } -static int imx_get_trip_type(struct thermal_zone_device *tz, int trip, - enum thermal_trip_type *type) -{ - *type = (trip == IMX_TRIP_PASSIVE) ? THERMAL_TRIP_PASSIVE : - THERMAL_TRIP_CRITICAL; - return 0; -} - static int imx_get_crit_temp(struct thermal_zone_device *tz, int *temp) { - struct imx_thermal_data *data = tz->devdata; - - *temp = data->temp_critical; - return 0; -} - -static int imx_get_trip_temp(struct thermal_zone_device *tz, int trip, - int *temp) -{ - struct imx_thermal_data *data = tz->devdata; + *temp = trips[IMX_TRIP_CRITICAL].temperature; - *temp = (trip == IMX_TRIP_PASSIVE) ? data->temp_passive : - data->temp_critical; return 0; } @@ -371,10 +354,10 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip, return -EPERM; /* do not allow passive to be set higher than critical */ - if (temp < 0 || temp > data->temp_critical) + if (temp < 0 || temp > trips[IMX_TRIP_CRITICAL].temperature) return -EINVAL; - data->temp_passive = temp; + trips[IMX_TRIP_PASSIVE].temperature = temp; imx_set_alarm_temp(data, temp); @@ -423,8 +406,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .unbind = imx_unbind, .get_temp = imx_get_temp, .change_mode = imx_change_mode, - .get_trip_type = imx_get_trip_type, - .get_trip_temp = imx_get_trip_temp, .get_crit_temp = imx_get_crit_temp, .set_trip_temp = imx_set_trip_temp, }; @@ -507,8 +488,8 @@ static void imx_init_temp_grade(struct platform_device *pdev, u32 ocotp_mem0) * Set the critical trip point at 5 °C under max * Set the passive trip point at 10 °C under max (changeable via sysfs) */ - data->temp_critical = data->temp_max - (1000 * 5); - data->temp_passive = data->temp_max - (1000 * 10); + trips[IMX_TRIP_PASSIVE].temperature = data->temp_max - (1000 * 10); + trips[IMX_TRIP_CRITICAL].temperature = data->temp_max - (1000 * 5); } static int imx_init_from_tempmon_data(struct platform_device *pdev) @@ -743,12 +724,13 @@ static int imx_thermal_probe(struct platform_device *pdev) goto legacy_cleanup; } - data->tz = thermal_zone_device_register("imx_thermal_zone", - IMX_TRIP_NUM, - BIT(IMX_TRIP_PASSIVE), data, - &imx_tz_ops, NULL, - IMX_PASSIVE_DELAY, - IMX_POLLING_DELAY); + data->tz = thermal_zone_device_register_with_trips("imx_thermal_zone", + trips, + ARRAY_SIZE(trips), + BIT(IMX_TRIP_PASSIVE), data, + &imx_tz_ops, NULL, + IMX_PASSIVE_DELAY, + IMX_POLLING_DELAY); if (IS_ERR(data->tz)) { ret = PTR_ERR(data->tz); dev_err(&pdev->dev, @@ -758,8 +740,8 @@ static int imx_thermal_probe(struct platform_device *pdev) dev_info(&pdev->dev, "%s CPU temperature grade - max:%dC" " critical:%dC passive:%dC\n", data->temp_grade, - data->temp_max / 1000, data->temp_critical / 1000, - data->temp_passive / 1000); + data->temp_max / 1000, trips[IMX_TRIP_CRITICAL].temperature / 1000, + trips[IMX_TRIP_PASSIVE].temperature / 1000); /* Enable measurements at ~ 10 Hz */ regmap_write(map, data->socdata->measure_freq_ctrl + REG_CLR, @@ -767,10 +749,10 @@ static int imx_thermal_probe(struct platform_device *pdev) measure_freq = DIV_ROUND_UP(32768, 10); /* 10 Hz */ regmap_write(map, data->socdata->measure_freq_ctrl + REG_SET, measure_freq << data->socdata->measure_freq_shift); - imx_set_alarm_temp(data, data->temp_passive); + imx_set_alarm_temp(data, trips[IMX_TRIP_PASSIVE].temperature); if (data->socdata->version == TEMPMON_IMX6SX) - imx_set_panic_temp(data, data->temp_critical); + imx_set_panic_temp(data, trips[IMX_TRIP_CRITICAL].temperature); regmap_write(map, data->socdata->sensor_ctrl + REG_CLR, data->socdata->power_down_mask); -- 2.34.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 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 19D22C6FA93 for ; Tue, 27 Sep 2022 14:35:12 +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:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rC7VzmfyDg/a3jsZFMqHdzRbAMSkSiO4XK0b52m8aL0=; b=Y4dXtUsaeISHm+ LA030BLrLu5/OT0vdqQV2FQs97E/nncj2OqtO8LueldY69o+nNif+Vy05geaAw5OJS2tf19qdWbF9 gfsHP/tjkmQcP0wlngLQFF8Zt5bJvH5T5B9zbK4FjtbZbZIvXY4cO+e7aVu4vfsndFx+nz5P6leIo 8rZGYOgS4KpClAHSozzh7OyThlexZ4H22b/Wmb7gLXxyHXV+zOh4NAaryaLFsx2HfrSX5a+TJC3aQ z7IVLbNKgNWlcBb0OM17oM5HZhoyk0A0Cd3DfdrHkGpU6hgLwG5+xZQtkYQn1ovuTzX0wIqfqznqv BNEAhQro6a8LvO7GSzGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1odBer-00BGIu-7T; Tue, 27 Sep 2022 14:34:01 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1odBeG-00BG3Q-SZ for linux-arm-kernel@lists.infradead.org; Tue, 27 Sep 2022 14:33:26 +0000 Received: by mail-wm1-x331.google.com with SMTP id k3-20020a05600c1c8300b003b4fa1a85f8so5549253wms.3 for ; Tue, 27 Sep 2022 07:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=xYvlHjUzJ1gAdl8KtmAH0mCHcP29B+tCMOTUThwt7jg=; b=QX9BzKfcBASFxtQ4MW5JxvOb+wYygM//84qzelToOCwnFzzj5bbXwqEbU1/NYlvJQM AkUkDeVCAjOfvJFh0MU4OAb/VBRo+Mn4K436Cf4fjxdcMaiZRHR07mMOT5fVeTQP2RNx 5OZXidycwCa6+zVEESgHCwQVfozCwhI9/Pn0aFLIxG1JUT/azmAceWiGedcdFeMLUoIp nyUGrEwyg/nH35MK783BDU/DR+uvwJuONcQ7kYaIuI6opC0/QAhx05Vof1nL1841SU4d 197lQvxGO4vyx8fzToCi7urGRKs8IGQewhXPHh2rrWlBsgcpGz6ZcvJjYFhQrT95Rpx1 97IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=xYvlHjUzJ1gAdl8KtmAH0mCHcP29B+tCMOTUThwt7jg=; b=Xh7NMAnB5dZsw179SihD/zul7lC0mxIaZgPTuTnq8N51CxYKECz56M8d/GzdLLqdIR rNiSPMxXJTRCvhLJ9xlDzeqqETVFBH5h143EOpsgevxBrK7vV4UOCgW9O0mGtfD7yS/y Q5rNY1pqcVRI811vGykXxAnVpQ3uFlPpPtaxBl7jq2K1OwNrWvsZyor2FQIUn2sQRywI X/cVorgU51RzhjInrakFF+kr/ArvRwgHGLmk0NXE9wTnWXA42PV34HRgMiOkPsxxRFeS 0NwbN9Gwq4erAyDX+76K4YPdCXVZk0YDRVqOQ84JjAuB2t7Kt1r70myzFhqnoRicCO2l Kniw== X-Gm-Message-State: ACrzQf3MYgxe8S9hE2d5d0ZRcAbgb76FjMcXHU1ZTNjGS7D4HjVGsA2V HuTKbKaYSI//wuqtDPyFJ1dH7A== X-Google-Smtp-Source: AMsMyM5PXZObBCto2bbeZ7EKxHpVSI3muQpkTPAKmWgm51HjCxxYbGeavBFlT+95vPLqtdq0dPdL2g== X-Received: by 2002:a05:600c:1e13:b0:3b4:74c3:620b with SMTP id ay19-20020a05600c1e1300b003b474c3620bmr3027122wmb.168.1664289200324; Tue, 27 Sep 2022 07:33:20 -0700 (PDT) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id l6-20020a05600c4f0600b003b4924493bfsm17518371wmq.9.2022.09.27.07.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Sep 2022 07:33:19 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, rui.zhang@intel.com, Amit Kucheria , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCH v6 21/29] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Date: Tue, 27 Sep 2022 16:32:31 +0200 Message-Id: <20220927143239.376737-22-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220927143239.376737-1-daniel.lezcano@linaro.org> References: <20220927143239.376737-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220927_073324_954079_93C114BF X-CRM114-Status: GOOD ( 18.60 ) 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 VGhlIHRoZXJtYWwgZnJhbWV3b3JrIGdpdmVzIHRoZSBwb3NzaWJpbGl0eSB0byByZWdpc3RlciB0 aGUgdHJpcApwb2ludHMgd2l0aCB0aGUgdGhlcm1hbCB6b25lLiBXaGVuIHRoYXQgaXMgZG9uZSwg bm8gZ2V0X3RyaXBfKiBvcHMgYXJlCm5lZWRlZCBhbmQgdGhleSBjYW4gYmUgcmVtb3ZlZC4KCkNv bnZlcnQgb3BzIGNvbnRlbnQgbG9naWMgaW50byBnZW5lcmljIHRyaXAgcG9pbnRzIGFuZCByZWdp c3RlciB0aGVtIHdpdGggdGhlCnRoZXJtYWwgem9uZS4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBM ZXpjYW5vIDxkYW5pZWwubGV6Y2Fub0BsaW5hcm8ub3JnPgotLS0KIGRyaXZlcnMvdGhlcm1hbC9p bXhfdGhlcm1hbC5jIHwgNzIgKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCA0NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL3RoZXJtYWwvaW14X3RoZXJtYWwuYyBiL2RyaXZlcnMvdGhlcm1hbC9pbXhf dGhlcm1hbC5jCmluZGV4IDE2NjYzMzczYjY4Mi4uZmIwZDVjYWI3MGFmIDEwMDY0NAotLS0gYS9k cml2ZXJzL3RoZXJtYWwvaW14X3RoZXJtYWwuYworKysgYi9kcml2ZXJzL3RoZXJtYWwvaW14X3Ro ZXJtYWwuYwpAQCAtNzYsNyArNzYsNiBAQAogZW51bSBpbXhfdGhlcm1hbF90cmlwIHsKIAlJTVhf VFJJUF9QQVNTSVZFLAogCUlNWF9UUklQX0NSSVRJQ0FMLAotCUlNWF9UUklQX05VTSwKIH07CiAK ICNkZWZpbmUgSU1YX1BPTExJTkdfREVMQVkJCTIwMDAgLyogbWlsbGlzZWNvbmQgKi8KQEAgLTEx NSw2ICsxMTQsMTEgQEAgc3RydWN0IHRoZXJtYWxfc29jX2RhdGEgewogCXUzMiBsb3dfYWxhcm1f c2hpZnQ7CiB9OwogCitzdGF0aWMgc3RydWN0IHRoZXJtYWxfdHJpcCB0cmlwc1tdID0geworCVtJ TVhfVFJJUF9QQVNTSVZFXSAgPSB7IC50eXBlID0gVEhFUk1BTF9UUklQX1BBU1NJVkUgIH0sCisJ W0lNWF9UUklQX0NSSVRJQ0FMXSA9IHsgLnR5cGUgPSBUSEVSTUFMX1RSSVBfQ1JJVElDQUwgfSwK K307CisKIHN0YXRpYyBzdHJ1Y3QgdGhlcm1hbF9zb2NfZGF0YSB0aGVybWFsX2lteDZxX2RhdGEg PSB7CiAJLnZlcnNpb24gPSBURU1QTU9OX0lNWDZRLAogCkBAIC0yMDEsOCArMjA1LDYgQEAgc3Ry dWN0IGlteF90aGVybWFsX2RhdGEgewogCXN0cnVjdCB0aGVybWFsX2Nvb2xpbmdfZGV2aWNlICpj ZGV2OwogCXN0cnVjdCByZWdtYXAgKnRlbXBtb247CiAJdTMyIGMxLCBjMjsgLyogU2VlIGZvcm11 bGEgaW4gaW14X2luaXRfY2FsaWIoKSAqLwotCWludCB0ZW1wX3Bhc3NpdmU7Ci0JaW50IHRlbXBf Y3JpdGljYWw7CiAJaW50IHRlbXBfbWF4OwogCWludCBhbGFybV90ZW1wOwogCWludCBsYXN0X3Rl bXA7CkBAIC0yNzksMTIgKzI4MSwxMiBAQCBzdGF0aWMgaW50IGlteF9nZXRfdGVtcChzdHJ1Y3Qg dGhlcm1hbF96b25lX2RldmljZSAqdHosIGludCAqdGVtcCkKIAogCS8qIFVwZGF0ZSBhbGFybSB2 YWx1ZSB0byBuZXh0IGhpZ2hlciB0cmlwIHBvaW50IGZvciBURU1QTU9OX0lNWDZRICovCiAJaWYg KGRhdGEtPnNvY2RhdGEtPnZlcnNpb24gPT0gVEVNUE1PTl9JTVg2USkgewotCQlpZiAoZGF0YS0+ YWxhcm1fdGVtcCA9PSBkYXRhLT50ZW1wX3Bhc3NpdmUgJiYKLQkJCSp0ZW1wID49IGRhdGEtPnRl bXBfcGFzc2l2ZSkKLQkJCWlteF9zZXRfYWxhcm1fdGVtcChkYXRhLCBkYXRhLT50ZW1wX2NyaXRp Y2FsKTsKLQkJaWYgKGRhdGEtPmFsYXJtX3RlbXAgPT0gZGF0YS0+dGVtcF9jcml0aWNhbCAmJgot CQkJKnRlbXAgPCBkYXRhLT50ZW1wX3Bhc3NpdmUpIHsKLQkJCWlteF9zZXRfYWxhcm1fdGVtcChk YXRhLCBkYXRhLT50ZW1wX3Bhc3NpdmUpOworCQlpZiAoZGF0YS0+YWxhcm1fdGVtcCA9PSB0cmlw c1tJTVhfVFJJUF9QQVNTSVZFXS50ZW1wZXJhdHVyZSAmJgorCQkJKnRlbXAgPj0gdHJpcHNbSU1Y X1RSSVBfUEFTU0lWRV0udGVtcGVyYXR1cmUpCisJCQlpbXhfc2V0X2FsYXJtX3RlbXAoZGF0YSwg dHJpcHNbSU1YX1RSSVBfQ1JJVElDQUxdLnRlbXBlcmF0dXJlKTsKKwkJaWYgKGRhdGEtPmFsYXJt X3RlbXAgPT0gdHJpcHNbSU1YX1RSSVBfQ1JJVElDQUxdLnRlbXBlcmF0dXJlICYmCisJCQkqdGVt cCA8IHRyaXBzW0lNWF9UUklQX1BBU1NJVkVdLnRlbXBlcmF0dXJlKSB7CisJCQlpbXhfc2V0X2Fs YXJtX3RlbXAoZGF0YSwgdHJpcHNbSU1YX1RSSVBfUEFTU0lWRV0udGVtcGVyYXR1cmUpOwogCQkJ ZGV2X2RiZygmdHotPmRldmljZSwgInRoZXJtYWwgYWxhcm0gb2ZmOiBUIDwgJWRcbiIsCiAJCQkJ ZGF0YS0+YWxhcm1fdGVtcCAvIDEwMDApOwogCQl9CkBAIC0zMzAsMjkgKzMzMiwxMCBAQCBzdGF0 aWMgaW50IGlteF9jaGFuZ2VfbW9kZShzdHJ1Y3QgdGhlcm1hbF96b25lX2RldmljZSAqdHosCiAJ cmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaW14X2dldF90cmlwX3R5cGUoc3RydWN0IHRoZXJt YWxfem9uZV9kZXZpY2UgKnR6LCBpbnQgdHJpcCwKLQkJCSAgICAgZW51bSB0aGVybWFsX3RyaXBf dHlwZSAqdHlwZSkKLXsKLQkqdHlwZSA9ICh0cmlwID09IElNWF9UUklQX1BBU1NJVkUpID8gVEhF Uk1BTF9UUklQX1BBU1NJVkUgOgotCQkJCQkgICAgIFRIRVJNQUxfVFJJUF9DUklUSUNBTDsKLQly ZXR1cm4gMDsKLX0KLQogc3RhdGljIGludCBpbXhfZ2V0X2NyaXRfdGVtcChzdHJ1Y3QgdGhlcm1h bF96b25lX2RldmljZSAqdHosIGludCAqdGVtcCkKIHsKLQlzdHJ1Y3QgaW14X3RoZXJtYWxfZGF0 YSAqZGF0YSA9IHR6LT5kZXZkYXRhOwotCi0JKnRlbXAgPSBkYXRhLT50ZW1wX2NyaXRpY2FsOwot CXJldHVybiAwOwotfQotCi1zdGF0aWMgaW50IGlteF9nZXRfdHJpcF90ZW1wKHN0cnVjdCB0aGVy bWFsX3pvbmVfZGV2aWNlICp0eiwgaW50IHRyaXAsCi0JCQkgICAgIGludCAqdGVtcCkKLXsKLQlz dHJ1Y3QgaW14X3RoZXJtYWxfZGF0YSAqZGF0YSA9IHR6LT5kZXZkYXRhOworCSp0ZW1wID0gdHJp cHNbSU1YX1RSSVBfQ1JJVElDQUxdLnRlbXBlcmF0dXJlOwogCi0JKnRlbXAgPSAodHJpcCA9PSBJ TVhfVFJJUF9QQVNTSVZFKSA/IGRhdGEtPnRlbXBfcGFzc2l2ZSA6Ci0JCQkJCSAgICAgZGF0YS0+ dGVtcF9jcml0aWNhbDsKIAlyZXR1cm4gMDsKIH0KIApAQCAtMzcxLDEwICszNTQsMTAgQEAgc3Rh dGljIGludCBpbXhfc2V0X3RyaXBfdGVtcChzdHJ1Y3QgdGhlcm1hbF96b25lX2RldmljZSAqdHos IGludCB0cmlwLAogCQlyZXR1cm4gLUVQRVJNOwogCiAJLyogZG8gbm90IGFsbG93IHBhc3NpdmUg dG8gYmUgc2V0IGhpZ2hlciB0aGFuIGNyaXRpY2FsICovCi0JaWYgKHRlbXAgPCAwIHx8IHRlbXAg PiBkYXRhLT50ZW1wX2NyaXRpY2FsKQorCWlmICh0ZW1wIDwgMCB8fCB0ZW1wID4gdHJpcHNbSU1Y X1RSSVBfQ1JJVElDQUxdLnRlbXBlcmF0dXJlKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWRhdGEt PnRlbXBfcGFzc2l2ZSA9IHRlbXA7CisJdHJpcHNbSU1YX1RSSVBfUEFTU0lWRV0udGVtcGVyYXR1 cmUgPSB0ZW1wOwogCiAJaW14X3NldF9hbGFybV90ZW1wKGRhdGEsIHRlbXApOwogCkBAIC00MjMs OCArNDA2LDYgQEAgc3RhdGljIHN0cnVjdCB0aGVybWFsX3pvbmVfZGV2aWNlX29wcyBpbXhfdHpf b3BzID0gewogCS51bmJpbmQgPSBpbXhfdW5iaW5kLAogCS5nZXRfdGVtcCA9IGlteF9nZXRfdGVt cCwKIAkuY2hhbmdlX21vZGUgPSBpbXhfY2hhbmdlX21vZGUsCi0JLmdldF90cmlwX3R5cGUgPSBp bXhfZ2V0X3RyaXBfdHlwZSwKLQkuZ2V0X3RyaXBfdGVtcCA9IGlteF9nZXRfdHJpcF90ZW1wLAog CS5nZXRfY3JpdF90ZW1wID0gaW14X2dldF9jcml0X3RlbXAsCiAJLnNldF90cmlwX3RlbXAgPSBp bXhfc2V0X3RyaXBfdGVtcCwKIH07CkBAIC01MDcsOCArNDg4LDggQEAgc3RhdGljIHZvaWQgaW14 X2luaXRfdGVtcF9ncmFkZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LCB1MzIgb2NvdHBf bWVtMCkKIAkgKiBTZXQgdGhlIGNyaXRpY2FsIHRyaXAgcG9pbnQgYXQgNSDCsEMgdW5kZXIgbWF4 CiAJICogU2V0IHRoZSBwYXNzaXZlIHRyaXAgcG9pbnQgYXQgMTAgwrBDIHVuZGVyIG1heCAoY2hh bmdlYWJsZSB2aWEgc3lzZnMpCiAJICovCi0JZGF0YS0+dGVtcF9jcml0aWNhbCA9IGRhdGEtPnRl bXBfbWF4IC0gKDEwMDAgKiA1KTsKLQlkYXRhLT50ZW1wX3Bhc3NpdmUgPSBkYXRhLT50ZW1wX21h eCAtICgxMDAwICogMTApOworCXRyaXBzW0lNWF9UUklQX1BBU1NJVkVdLnRlbXBlcmF0dXJlID0g ZGF0YS0+dGVtcF9tYXggLSAoMTAwMCAqIDEwKTsKKwl0cmlwc1tJTVhfVFJJUF9DUklUSUNBTF0u dGVtcGVyYXR1cmUgPSBkYXRhLT50ZW1wX21heCAtICgxMDAwICogNSk7CiB9CiAKIHN0YXRpYyBp bnQgaW14X2luaXRfZnJvbV90ZW1wbW9uX2RhdGEoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl dikKQEAgLTc0MywxMiArNzI0LDEzIEBAIHN0YXRpYyBpbnQgaW14X3RoZXJtYWxfcHJvYmUoc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJZ290byBsZWdhY3lfY2xlYW51cDsKIAl9CiAK LQlkYXRhLT50eiA9IHRoZXJtYWxfem9uZV9kZXZpY2VfcmVnaXN0ZXIoImlteF90aGVybWFsX3pv bmUiLAotCQkJCQkJSU1YX1RSSVBfTlVNLAotCQkJCQkJQklUKElNWF9UUklQX1BBU1NJVkUpLCBk YXRhLAotCQkJCQkJJmlteF90el9vcHMsIE5VTEwsCi0JCQkJCQlJTVhfUEFTU0lWRV9ERUxBWSwK LQkJCQkJCUlNWF9QT0xMSU5HX0RFTEFZKTsKKwlkYXRhLT50eiA9IHRoZXJtYWxfem9uZV9kZXZp Y2VfcmVnaXN0ZXJfd2l0aF90cmlwcygiaW14X3RoZXJtYWxfem9uZSIsCisJCQkJCQkJICAgdHJp cHMsCisJCQkJCQkJICAgQVJSQVlfU0laRSh0cmlwcyksCisJCQkJCQkJICAgQklUKElNWF9UUklQ X1BBU1NJVkUpLCBkYXRhLAorCQkJCQkJCSAgICZpbXhfdHpfb3BzLCBOVUxMLAorCQkJCQkJCSAg IElNWF9QQVNTSVZFX0RFTEFZLAorCQkJCQkJCSAgIElNWF9QT0xMSU5HX0RFTEFZKTsKIAlpZiAo SVNfRVJSKGRhdGEtPnR6KSkgewogCQlyZXQgPSBQVFJfRVJSKGRhdGEtPnR6KTsKIAkJZGV2X2Vy cigmcGRldi0+ZGV2LApAQCAtNzU4LDggKzc0MCw4IEBAIHN0YXRpYyBpbnQgaW14X3RoZXJtYWxf cHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAogCWRldl9pbmZvKCZwZGV2LT5k ZXYsICIlcyBDUFUgdGVtcGVyYXR1cmUgZ3JhZGUgLSBtYXg6JWRDIgogCQkgIiBjcml0aWNhbDol ZEMgcGFzc2l2ZTolZENcbiIsIGRhdGEtPnRlbXBfZ3JhZGUsCi0JCSBkYXRhLT50ZW1wX21heCAv IDEwMDAsIGRhdGEtPnRlbXBfY3JpdGljYWwgLyAxMDAwLAotCQkgZGF0YS0+dGVtcF9wYXNzaXZl IC8gMTAwMCk7CisJCSBkYXRhLT50ZW1wX21heCAvIDEwMDAsIHRyaXBzW0lNWF9UUklQX0NSSVRJ Q0FMXS50ZW1wZXJhdHVyZSAvIDEwMDAsCisJCSB0cmlwc1tJTVhfVFJJUF9QQVNTSVZFXS50ZW1w ZXJhdHVyZSAvIDEwMDApOwogCiAJLyogRW5hYmxlIG1lYXN1cmVtZW50cyBhdCB+IDEwIEh6ICov CiAJcmVnbWFwX3dyaXRlKG1hcCwgZGF0YS0+c29jZGF0YS0+bWVhc3VyZV9mcmVxX2N0cmwgKyBS RUdfQ0xSLApAQCAtNzY3LDEwICs3NDksMTAgQEAgc3RhdGljIGludCBpbXhfdGhlcm1hbF9wcm9i ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCW1lYXN1cmVfZnJlcSA9IERJVl9ST1VO RF9VUCgzMjc2OCwgMTApOyAvKiAxMCBIeiAqLwogCXJlZ21hcF93cml0ZShtYXAsIGRhdGEtPnNv Y2RhdGEtPm1lYXN1cmVfZnJlcV9jdHJsICsgUkVHX1NFVCwKIAkJICAgICBtZWFzdXJlX2ZyZXEg PDwgZGF0YS0+c29jZGF0YS0+bWVhc3VyZV9mcmVxX3NoaWZ0KTsKLQlpbXhfc2V0X2FsYXJtX3Rl bXAoZGF0YSwgZGF0YS0+dGVtcF9wYXNzaXZlKTsKKwlpbXhfc2V0X2FsYXJtX3RlbXAoZGF0YSwg dHJpcHNbSU1YX1RSSVBfUEFTU0lWRV0udGVtcGVyYXR1cmUpOwogCiAJaWYgKGRhdGEtPnNvY2Rh dGEtPnZlcnNpb24gPT0gVEVNUE1PTl9JTVg2U1gpCi0JCWlteF9zZXRfcGFuaWNfdGVtcChkYXRh LCBkYXRhLT50ZW1wX2NyaXRpY2FsKTsKKwkJaW14X3NldF9wYW5pY190ZW1wKGRhdGEsIHRyaXBz W0lNWF9UUklQX0NSSVRJQ0FMXS50ZW1wZXJhdHVyZSk7CiAKIAlyZWdtYXBfd3JpdGUobWFwLCBk YXRhLT5zb2NkYXRhLT5zZW5zb3JfY3RybCArIFJFR19DTFIsCiAJCSAgICAgZGF0YS0+c29jZGF0 YS0+cG93ZXJfZG93bl9tYXNrKTsKLS0gCjIuMzQuMQoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0Cmxp bnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFk Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK