From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 4/5] fbtft: Make use of device property API
Date: Wed, 20 Nov 2019 11:57:15 +0200
Message-ID: <20191120095716.26628-4-andriy.shevchenko@linux.intel.com>
References: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <driverdev-devel-bounces@linuxdriverproject.org>
In-Reply-To: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com>
List-Unsubscribe: <http://driverdev.linuxdriverproject.org/mailman/options/driverdev-devel>,
 <mailto:driverdev-devel-request@linuxdriverproject.org?subject=unsubscribe>
List-Archive: <http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/>
List-Post: <mailto:driverdev-devel@linuxdriverproject.org>
List-Help: <mailto:driverdev-devel-request@linuxdriverproject.org?subject=help>
List-Subscribe: <http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel>,
 <mailto:driverdev-devel-request@linuxdriverproject.org?subject=subscribe>
Errors-To: driverdev-devel-bounces@linuxdriverproject.org
Sender: "devel" <driverdev-devel-bounces@linuxdriverproject.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, dri-devel@lists.freedesktop.org, =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>, linux-fbdev@vger.kernel.org, Nishad Kamdar <nishadkamdar@gmail.com>, devel@driverdev.osuosl.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
List-Id: dri-devel@lists.freedesktop.org

Make use of device property API in this driver so that both OF based
system and ACPI based system can use this driver.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/staging/fbtft/fbtft-core.c | 105 ++++++++++++++++-------------
 1 file changed, 58 insertions(+), 47 deletions(-)

diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index ff8cb6670ea1..e87d839d86ac 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -22,8 +22,9 @@
 #include <linux/uaccess.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/spinlock.h>
-#include <linux/of.h>
+
 #include <video/mipi_display.h>
 
 #include "fbtft.h"
@@ -894,44 +895,53 @@ int fbtft_unregister_framebuffer(struct fb_info *fb_info)
 EXPORT_SYMBOL(fbtft_unregister_framebuffer);
 
 /**
- * fbtft_init_display_dt() - Device Tree init_display() function
+ * fbtft_init_display_from_property() - Device Tree init_display() function
  * @par: Driver data
  *
  * Return: 0 if successful, negative if error
  */
-static int fbtft_init_display_dt(struct fbtft_par *par)
+static int fbtft_init_display_from_property(struct fbtft_par *par)
 {
-	struct device_node *node = par->info->device->of_node;
-	struct property *prop;
-	const __be32 *p;
+	struct device *dev = par->info->device;
+	int buf[64], count, index, i, j, ret;
+	u32 *values;
 	u32 val;
-	int buf[64], i, j;
 
-	if (!node)
+	count = device_property_count_u32(dev, "init");
+	if (count < 0)
+		return count;
+	if (count == 0)
 		return -EINVAL;
 
-	prop = of_find_property(node, "init", NULL);
-	p = of_prop_next_u32(prop, NULL, &val);
-	if (!p)
-		return -EINVAL;
+	values = kmalloc_array(count, sizeof(*values), GFP_KERNEL);
+	if (!values)
+		return -ENOMEM;
+
+	ret = device_property_read_u32_array(dev, "init", values, count);
+	if (ret)
+		goto out_free;
 
 	par->fbtftops.reset(par);
 	if (par->gpio.cs)
 		gpiod_set_value(par->gpio.cs, 0);  /* Activate chip */
 
-	while (p) {
+	index = -1;
+	while (index < count) {
+		val = values[++index];
+
 		if (val & FBTFT_OF_INIT_CMD) {
 			val &= 0xFFFF;
 			i = 0;
-			while (p && !(val & 0xFFFF0000)) {
+			while ((index < count) && !(val & 0xFFFF0000)) {
 				if (i > 63) {
-					dev_err(par->info->device,
+					dev_err(dev,
 						"%s: Maximum register values exceeded\n",
 						__func__);
-					return -EINVAL;
+					ret = -EINVAL;
+					goto out_free;
 				}
 				buf[i++] = val;
-				p = of_prop_next_u32(prop, p, &val);
+				val = values[++index];
 			}
 			/* make debug message */
 			fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
@@ -961,15 +971,17 @@ static int fbtft_init_display_dt(struct fbtft_par *par)
 			fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
 				      "init: msleep(%u)\n", val & 0xFFFF);
 			msleep(val & 0xFFFF);
-			p = of_prop_next_u32(prop, p, &val);
+			val = values[++index];
 		} else {
-			dev_err(par->info->device, "illegal init value 0x%X\n",
-				val);
-			return -EINVAL;
+			dev_err(dev, "illegal init value 0x%X\n", val);
+			ret = -EINVAL;
+			goto out_free;
 		}
 	}
 
-	return 0;
+out_free:
+	kfree(values);
+	return ret;
 }
 
 /**
@@ -1132,25 +1144,24 @@ static int fbtft_verify_gpios(struct fbtft_par *par)
 }
 
 /* returns 0 if the property is not present */
-static u32 fbtft_of_value(struct device_node *node, const char *propname)
+static u32 fbtft_property_value(struct device *dev, const char *propname)
 {
 	int ret;
 	u32 val = 0;
 
-	ret = of_property_read_u32(node, propname, &val);
+	ret = device_property_read_u32(dev, propname, &val);
 	if (ret == 0)
-		pr_info("%s: %s = %u\n", __func__, propname, val);
+		dev_info(dev, "%s: %s = %u\n", __func__, propname, val);
 
 	return val;
 }
 
-static struct fbtft_platform_data *fbtft_probe_dt(struct device *dev)
+static struct fbtft_platform_data *fbtft_properties_read(struct device *dev)
 {
-	struct device_node *node = dev->of_node;
 	struct fbtft_platform_data *pdata;
 
-	if (!node) {
-		dev_err(dev, "Missing platform data or DT\n");
+	if (!dev_fwnode(dev)) {
+		dev_err(dev, "Missing platform data or properties\n");
 		return ERR_PTR(-EINVAL);
 	}
 
@@ -1158,24 +1169,24 @@ static struct fbtft_platform_data *fbtft_probe_dt(struct device *dev)
 	if (!pdata)
 		return ERR_PTR(-ENOMEM);
 
-	pdata->display.width = fbtft_of_value(node, "width");
-	pdata->display.height = fbtft_of_value(node, "height");
-	pdata->display.regwidth = fbtft_of_value(node, "regwidth");
-	pdata->display.buswidth = fbtft_of_value(node, "buswidth");
-	pdata->display.backlight = fbtft_of_value(node, "backlight");
-	pdata->display.bpp = fbtft_of_value(node, "bpp");
-	pdata->display.debug = fbtft_of_value(node, "debug");
-	pdata->rotate = fbtft_of_value(node, "rotate");
-	pdata->bgr = of_property_read_bool(node, "bgr");
-	pdata->fps = fbtft_of_value(node, "fps");
-	pdata->txbuflen = fbtft_of_value(node, "txbuflen");
-	pdata->startbyte = fbtft_of_value(node, "startbyte");
-	of_property_read_string(node, "gamma", (const char **)&pdata->gamma);
-
-	if (of_find_property(node, "led-gpios", NULL))
+	pdata->display.width = fbtft_property_value(dev, "width");
+	pdata->display.height = fbtft_property_value(dev, "height");
+	pdata->display.regwidth = fbtft_property_value(dev, "regwidth");
+	pdata->display.buswidth = fbtft_property_value(dev, "buswidth");
+	pdata->display.backlight = fbtft_property_value(dev, "backlight");
+	pdata->display.bpp = fbtft_property_value(dev, "bpp");
+	pdata->display.debug = fbtft_property_value(dev, "debug");
+	pdata->rotate = fbtft_property_value(dev, "rotate");
+	pdata->bgr = device_property_read_bool(dev, "bgr");
+	pdata->fps = fbtft_property_value(dev, "fps");
+	pdata->txbuflen = fbtft_property_value(dev, "txbuflen");
+	pdata->startbyte = fbtft_property_value(dev, "startbyte");
+	device_property_read_string(dev, "gamma", (const char **)&pdata->gamma);
+
+	if (device_property_present(dev, "led-gpios"))
 		pdata->display.backlight = 1;
-	if (of_find_property(node, "init", NULL))
-		pdata->display.fbtftops.init_display = fbtft_init_display_dt;
+	if (device_property_present(dev, "init"))
+		pdata->display.fbtftops.init_display = fbtft_init_display_from_property;
 	pdata->display.fbtftops.request_gpios = fbtft_request_gpios;
 
 	return pdata;
@@ -1213,7 +1224,7 @@ int fbtft_probe_common(struct fbtft_display *display,
 
 	pdata = dev->platform_data;
 	if (!pdata) {
-		pdata = fbtft_probe_dt(dev);
+		pdata = fbtft_properties_read(dev);
 		if (IS_ERR(pdata))
 			return PTR_ERR(pdata);
 	}
-- 
2.24.0

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=XxKu=ZN=lists.freedesktop.org=dri-devel-bounces@kernel.org>
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=HEADER_FROM_DIFFERENT_DOMAINS,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,
	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 8952FC432C0
	for <dri-devel@archiver.kernel.org>; Thu, 21 Nov 2019 07:59:32 +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 5E59C20872
	for <dri-devel@archiver.kernel.org>; Thu, 21 Nov 2019 07:59:32 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E59C20872
Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.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 EB8D86EB58;
	Thu, 21 Nov 2019 07:59:21 +0000 (UTC)
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 242816E117
 for <dri-devel@lists.freedesktop.org>; Wed, 20 Nov 2019 09:57:21 +0000 (UTC)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga005.jf.intel.com ([10.7.209.41])
 by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 20 Nov 2019 01:57:20 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.69,221,1571727600"; d="scan'208";a="381309592"
Received: from black.fi.intel.com ([10.237.72.28])
 by orsmga005.jf.intel.com with ESMTP; 20 Nov 2019 01:57:18 -0800
Received: by black.fi.intel.com (Postfix, from userid 1003)
 id 9FF7F299; Wed, 20 Nov 2019 11:57:17 +0200 (EET)
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
 dri-devel@lists.freedesktop.org,
 =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>,
 linux-fbdev@vger.kernel.org, Nishad Kamdar <nishadkamdar@gmail.com>,
 devel@driverdev.osuosl.org
Subject: [PATCH v1 4/5] fbtft: Make use of device property API
Date: Wed, 20 Nov 2019 11:57:15 +0200
Message-Id: <20191120095716.26628-4-andriy.shevchenko@linux.intel.com>
X-Mailer: git-send-email 2.24.0
In-Reply-To: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com>
References: <20191120095716.26628-1-andriy.shevchenko@linux.intel.com>
MIME-Version: 1.0
X-Mailman-Approved-At: Thu, 21 Nov 2019 07:59:20 +0000
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
 <dri-devel.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Message-ID: <20191120095715.a825uM3EioKxzsciV9LKjgkJd7QJHdPE0AbQojmfPvE@z>

TWFrZSB1c2Ugb2YgZGV2aWNlIHByb3BlcnR5IEFQSSBpbiB0aGlzIGRyaXZlciBzbyB0aGF0IGJv
dGggT0YgYmFzZWQKc3lzdGVtIGFuZCBBQ1BJIGJhc2VkIHN5c3RlbSBjYW4gdXNlIHRoaXMgZHJp
dmVyLgoKU2lnbmVkLW9mZi1ieTogQW5keSBTaGV2Y2hlbmtvIDxhbmRyaXkuc2hldmNoZW5rb0Bs
aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9zdGFnaW5nL2ZidGZ0L2ZidGZ0LWNvcmUuYyB8
IDEwNSArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDU4IGlu
c2VydGlvbnMoKyksIDQ3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2lu
Zy9mYnRmdC9mYnRmdC1jb3JlLmMgYi9kcml2ZXJzL3N0YWdpbmcvZmJ0ZnQvZmJ0ZnQtY29yZS5j
CmluZGV4IGZmOGNiNjY3MGVhMS4uZTg3ZDgzOWQ4NmFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0
YWdpbmcvZmJ0ZnQvZmJ0ZnQtY29yZS5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9mYnRmdC9mYnRm
dC1jb3JlLmMKQEAgLTIyLDggKzIyLDkgQEAKICNpbmNsdWRlIDxsaW51eC91YWNjZXNzLmg+CiAj
aW5jbHVkZSA8bGludXgvYmFja2xpZ2h0Lmg+CiAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2
aWNlLmg+CisjaW5jbHVkZSA8bGludXgvcHJvcGVydHkuaD4KICNpbmNsdWRlIDxsaW51eC9zcGlu
bG9jay5oPgotI2luY2x1ZGUgPGxpbnV4L29mLmg+CisKICNpbmNsdWRlIDx2aWRlby9taXBpX2Rp
c3BsYXkuaD4KIAogI2luY2x1ZGUgImZidGZ0LmgiCkBAIC04OTQsNDQgKzg5NSw1MyBAQCBpbnQg
ZmJ0ZnRfdW5yZWdpc3Rlcl9mcmFtZWJ1ZmZlcihzdHJ1Y3QgZmJfaW5mbyAqZmJfaW5mbykKIEVY
UE9SVF9TWU1CT0woZmJ0ZnRfdW5yZWdpc3Rlcl9mcmFtZWJ1ZmZlcik7CiAKIC8qKgotICogZmJ0
ZnRfaW5pdF9kaXNwbGF5X2R0KCkgLSBEZXZpY2UgVHJlZSBpbml0X2Rpc3BsYXkoKSBmdW5jdGlv
bgorICogZmJ0ZnRfaW5pdF9kaXNwbGF5X2Zyb21fcHJvcGVydHkoKSAtIERldmljZSBUcmVlIGlu
aXRfZGlzcGxheSgpIGZ1bmN0aW9uCiAgKiBAcGFyOiBEcml2ZXIgZGF0YQogICoKICAqIFJldHVy
bjogMCBpZiBzdWNjZXNzZnVsLCBuZWdhdGl2ZSBpZiBlcnJvcgogICovCi1zdGF0aWMgaW50IGZi
dGZ0X2luaXRfZGlzcGxheV9kdChzdHJ1Y3QgZmJ0ZnRfcGFyICpwYXIpCitzdGF0aWMgaW50IGZi
dGZ0X2luaXRfZGlzcGxheV9mcm9tX3Byb3BlcnR5KHN0cnVjdCBmYnRmdF9wYXIgKnBhcikKIHsK
LQlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5vZGUgPSBwYXItPmluZm8tPmRldmljZS0+b2Zfbm9kZTsK
LQlzdHJ1Y3QgcHJvcGVydHkgKnByb3A7Ci0JY29uc3QgX19iZTMyICpwOworCXN0cnVjdCBkZXZp
Y2UgKmRldiA9IHBhci0+aW5mby0+ZGV2aWNlOworCWludCBidWZbNjRdLCBjb3VudCwgaW5kZXgs
IGksIGosIHJldDsKKwl1MzIgKnZhbHVlczsKIAl1MzIgdmFsOwotCWludCBidWZbNjRdLCBpLCBq
OwogCi0JaWYgKCFub2RlKQorCWNvdW50ID0gZGV2aWNlX3Byb3BlcnR5X2NvdW50X3UzMihkZXYs
ICJpbml0Iik7CisJaWYgKGNvdW50IDwgMCkKKwkJcmV0dXJuIGNvdW50OworCWlmIChjb3VudCA9
PSAwKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCXByb3AgPSBvZl9maW5kX3Byb3BlcnR5KG5vZGUs
ICJpbml0IiwgTlVMTCk7Ci0JcCA9IG9mX3Byb3BfbmV4dF91MzIocHJvcCwgTlVMTCwgJnZhbCk7
Ci0JaWYgKCFwKQotCQlyZXR1cm4gLUVJTlZBTDsKKwl2YWx1ZXMgPSBrbWFsbG9jX2FycmF5KGNv
dW50LCBzaXplb2YoKnZhbHVlcyksIEdGUF9LRVJORUwpOworCWlmICghdmFsdWVzKQorCQlyZXR1
cm4gLUVOT01FTTsKKworCXJldCA9IGRldmljZV9wcm9wZXJ0eV9yZWFkX3UzMl9hcnJheShkZXYs
ICJpbml0IiwgdmFsdWVzLCBjb3VudCk7CisJaWYgKHJldCkKKwkJZ290byBvdXRfZnJlZTsKIAog
CXBhci0+ZmJ0ZnRvcHMucmVzZXQocGFyKTsKIAlpZiAocGFyLT5ncGlvLmNzKQogCQlncGlvZF9z
ZXRfdmFsdWUocGFyLT5ncGlvLmNzLCAwKTsgIC8qIEFjdGl2YXRlIGNoaXAgKi8KIAotCXdoaWxl
IChwKSB7CisJaW5kZXggPSAtMTsKKwl3aGlsZSAoaW5kZXggPCBjb3VudCkgeworCQl2YWwgPSB2
YWx1ZXNbKytpbmRleF07CisKIAkJaWYgKHZhbCAmIEZCVEZUX09GX0lOSVRfQ01EKSB7CiAJCQl2
YWwgJj0gMHhGRkZGOwogCQkJaSA9IDA7Ci0JCQl3aGlsZSAocCAmJiAhKHZhbCAmIDB4RkZGRjAw
MDApKSB7CisJCQl3aGlsZSAoKGluZGV4IDwgY291bnQpICYmICEodmFsICYgMHhGRkZGMDAwMCkp
IHsKIAkJCQlpZiAoaSA+IDYzKSB7Ci0JCQkJCWRldl9lcnIocGFyLT5pbmZvLT5kZXZpY2UsCisJ
CQkJCWRldl9lcnIoZGV2LAogCQkJCQkJIiVzOiBNYXhpbXVtIHJlZ2lzdGVyIHZhbHVlcyBleGNl
ZWRlZFxuIiwKIAkJCQkJCV9fZnVuY19fKTsKLQkJCQkJcmV0dXJuIC1FSU5WQUw7CisJCQkJCXJl
dCA9IC1FSU5WQUw7CisJCQkJCWdvdG8gb3V0X2ZyZWU7CiAJCQkJfQogCQkJCWJ1ZltpKytdID0g
dmFsOwotCQkJCXAgPSBvZl9wcm9wX25leHRfdTMyKHByb3AsIHAsICZ2YWwpOworCQkJCXZhbCA9
IHZhbHVlc1srK2luZGV4XTsKIAkJCX0KIAkJCS8qIG1ha2UgZGVidWcgbWVzc2FnZSAqLwogCQkJ
ZmJ0ZnRfcGFyX2RiZyhERUJVR19JTklUX0RJU1BMQVksIHBhciwKQEAgLTk2MSwxNSArOTcxLDE3
IEBAIHN0YXRpYyBpbnQgZmJ0ZnRfaW5pdF9kaXNwbGF5X2R0KHN0cnVjdCBmYnRmdF9wYXIgKnBh
cikKIAkJCWZidGZ0X3Bhcl9kYmcoREVCVUdfSU5JVF9ESVNQTEFZLCBwYXIsCiAJCQkJICAgICAg
ImluaXQ6IG1zbGVlcCgldSlcbiIsIHZhbCAmIDB4RkZGRik7CiAJCQltc2xlZXAodmFsICYgMHhG
RkZGKTsKLQkJCXAgPSBvZl9wcm9wX25leHRfdTMyKHByb3AsIHAsICZ2YWwpOworCQkJdmFsID0g
dmFsdWVzWysraW5kZXhdOwogCQl9IGVsc2UgewotCQkJZGV2X2VycihwYXItPmluZm8tPmRldmlj
ZSwgImlsbGVnYWwgaW5pdCB2YWx1ZSAweCVYXG4iLAotCQkJCXZhbCk7Ci0JCQlyZXR1cm4gLUVJ
TlZBTDsKKwkJCWRldl9lcnIoZGV2LCAiaWxsZWdhbCBpbml0IHZhbHVlIDB4JVhcbiIsIHZhbCk7
CisJCQlyZXQgPSAtRUlOVkFMOworCQkJZ290byBvdXRfZnJlZTsKIAkJfQogCX0KIAotCXJldHVy
biAwOworb3V0X2ZyZWU6CisJa2ZyZWUodmFsdWVzKTsKKwlyZXR1cm4gcmV0OwogfQogCiAvKioK
QEAgLTExMzIsMjUgKzExNDQsMjQgQEAgc3RhdGljIGludCBmYnRmdF92ZXJpZnlfZ3Bpb3Moc3Ry
dWN0IGZidGZ0X3BhciAqcGFyKQogfQogCiAvKiByZXR1cm5zIDAgaWYgdGhlIHByb3BlcnR5IGlz
IG5vdCBwcmVzZW50ICovCi1zdGF0aWMgdTMyIGZidGZ0X29mX3ZhbHVlKHN0cnVjdCBkZXZpY2Vf
bm9kZSAqbm9kZSwgY29uc3QgY2hhciAqcHJvcG5hbWUpCitzdGF0aWMgdTMyIGZidGZ0X3Byb3Bl
cnR5X3ZhbHVlKHN0cnVjdCBkZXZpY2UgKmRldiwgY29uc3QgY2hhciAqcHJvcG5hbWUpCiB7CiAJ
aW50IHJldDsKIAl1MzIgdmFsID0gMDsKIAotCXJldCA9IG9mX3Byb3BlcnR5X3JlYWRfdTMyKG5v
ZGUsIHByb3BuYW1lLCAmdmFsKTsKKwlyZXQgPSBkZXZpY2VfcHJvcGVydHlfcmVhZF91MzIoZGV2
LCBwcm9wbmFtZSwgJnZhbCk7CiAJaWYgKHJldCA9PSAwKQotCQlwcl9pbmZvKCIlczogJXMgPSAl
dVxuIiwgX19mdW5jX18sIHByb3BuYW1lLCB2YWwpOworCQlkZXZfaW5mbyhkZXYsICIlczogJXMg
PSAldVxuIiwgX19mdW5jX18sIHByb3BuYW1lLCB2YWwpOwogCiAJcmV0dXJuIHZhbDsKIH0KIAot
c3RhdGljIHN0cnVjdCBmYnRmdF9wbGF0Zm9ybV9kYXRhICpmYnRmdF9wcm9iZV9kdChzdHJ1Y3Qg
ZGV2aWNlICpkZXYpCitzdGF0aWMgc3RydWN0IGZidGZ0X3BsYXRmb3JtX2RhdGEgKmZidGZ0X3By
b3BlcnRpZXNfcmVhZChzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7Ci0Jc3RydWN0IGRldmljZV9ub2Rl
ICpub2RlID0gZGV2LT5vZl9ub2RlOwogCXN0cnVjdCBmYnRmdF9wbGF0Zm9ybV9kYXRhICpwZGF0
YTsKIAotCWlmICghbm9kZSkgewotCQlkZXZfZXJyKGRldiwgIk1pc3NpbmcgcGxhdGZvcm0gZGF0
YSBvciBEVFxuIik7CisJaWYgKCFkZXZfZndub2RlKGRldikpIHsKKwkJZGV2X2VycihkZXYsICJN
aXNzaW5nIHBsYXRmb3JtIGRhdGEgb3IgcHJvcGVydGllc1xuIik7CiAJCXJldHVybiBFUlJfUFRS
KC1FSU5WQUwpOwogCX0KIApAQCAtMTE1OCwyNCArMTE2OSwyNCBAQCBzdGF0aWMgc3RydWN0IGZi
dGZ0X3BsYXRmb3JtX2RhdGEgKmZidGZ0X3Byb2JlX2R0KHN0cnVjdCBkZXZpY2UgKmRldikKIAlp
ZiAoIXBkYXRhKQogCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKIAotCXBkYXRhLT5kaXNwbGF5
LndpZHRoID0gZmJ0ZnRfb2ZfdmFsdWUobm9kZSwgIndpZHRoIik7Ci0JcGRhdGEtPmRpc3BsYXku
aGVpZ2h0ID0gZmJ0ZnRfb2ZfdmFsdWUobm9kZSwgImhlaWdodCIpOwotCXBkYXRhLT5kaXNwbGF5
LnJlZ3dpZHRoID0gZmJ0ZnRfb2ZfdmFsdWUobm9kZSwgInJlZ3dpZHRoIik7Ci0JcGRhdGEtPmRp
c3BsYXkuYnVzd2lkdGggPSBmYnRmdF9vZl92YWx1ZShub2RlLCAiYnVzd2lkdGgiKTsKLQlwZGF0
YS0+ZGlzcGxheS5iYWNrbGlnaHQgPSBmYnRmdF9vZl92YWx1ZShub2RlLCAiYmFja2xpZ2h0Iik7
Ci0JcGRhdGEtPmRpc3BsYXkuYnBwID0gZmJ0ZnRfb2ZfdmFsdWUobm9kZSwgImJwcCIpOwotCXBk
YXRhLT5kaXNwbGF5LmRlYnVnID0gZmJ0ZnRfb2ZfdmFsdWUobm9kZSwgImRlYnVnIik7Ci0JcGRh
dGEtPnJvdGF0ZSA9IGZidGZ0X29mX3ZhbHVlKG5vZGUsICJyb3RhdGUiKTsKLQlwZGF0YS0+Ymdy
ID0gb2ZfcHJvcGVydHlfcmVhZF9ib29sKG5vZGUsICJiZ3IiKTsKLQlwZGF0YS0+ZnBzID0gZmJ0
ZnRfb2ZfdmFsdWUobm9kZSwgImZwcyIpOwotCXBkYXRhLT50eGJ1ZmxlbiA9IGZidGZ0X29mX3Zh
bHVlKG5vZGUsICJ0eGJ1ZmxlbiIpOwotCXBkYXRhLT5zdGFydGJ5dGUgPSBmYnRmdF9vZl92YWx1
ZShub2RlLCAic3RhcnRieXRlIik7Ci0Jb2ZfcHJvcGVydHlfcmVhZF9zdHJpbmcobm9kZSwgImdh
bW1hIiwgKGNvbnN0IGNoYXIgKiopJnBkYXRhLT5nYW1tYSk7Ci0KLQlpZiAob2ZfZmluZF9wcm9w
ZXJ0eShub2RlLCAibGVkLWdwaW9zIiwgTlVMTCkpCisJcGRhdGEtPmRpc3BsYXkud2lkdGggPSBm
YnRmdF9wcm9wZXJ0eV92YWx1ZShkZXYsICJ3aWR0aCIpOworCXBkYXRhLT5kaXNwbGF5LmhlaWdo
dCA9IGZidGZ0X3Byb3BlcnR5X3ZhbHVlKGRldiwgImhlaWdodCIpOworCXBkYXRhLT5kaXNwbGF5
LnJlZ3dpZHRoID0gZmJ0ZnRfcHJvcGVydHlfdmFsdWUoZGV2LCAicmVnd2lkdGgiKTsKKwlwZGF0
YS0+ZGlzcGxheS5idXN3aWR0aCA9IGZidGZ0X3Byb3BlcnR5X3ZhbHVlKGRldiwgImJ1c3dpZHRo
Iik7CisJcGRhdGEtPmRpc3BsYXkuYmFja2xpZ2h0ID0gZmJ0ZnRfcHJvcGVydHlfdmFsdWUoZGV2
LCAiYmFja2xpZ2h0Iik7CisJcGRhdGEtPmRpc3BsYXkuYnBwID0gZmJ0ZnRfcHJvcGVydHlfdmFs
dWUoZGV2LCAiYnBwIik7CisJcGRhdGEtPmRpc3BsYXkuZGVidWcgPSBmYnRmdF9wcm9wZXJ0eV92
YWx1ZShkZXYsICJkZWJ1ZyIpOworCXBkYXRhLT5yb3RhdGUgPSBmYnRmdF9wcm9wZXJ0eV92YWx1
ZShkZXYsICJyb3RhdGUiKTsKKwlwZGF0YS0+YmdyID0gZGV2aWNlX3Byb3BlcnR5X3JlYWRfYm9v
bChkZXYsICJiZ3IiKTsKKwlwZGF0YS0+ZnBzID0gZmJ0ZnRfcHJvcGVydHlfdmFsdWUoZGV2LCAi
ZnBzIik7CisJcGRhdGEtPnR4YnVmbGVuID0gZmJ0ZnRfcHJvcGVydHlfdmFsdWUoZGV2LCAidHhi
dWZsZW4iKTsKKwlwZGF0YS0+c3RhcnRieXRlID0gZmJ0ZnRfcHJvcGVydHlfdmFsdWUoZGV2LCAi
c3RhcnRieXRlIik7CisJZGV2aWNlX3Byb3BlcnR5X3JlYWRfc3RyaW5nKGRldiwgImdhbW1hIiwg
KGNvbnN0IGNoYXIgKiopJnBkYXRhLT5nYW1tYSk7CisKKwlpZiAoZGV2aWNlX3Byb3BlcnR5X3By
ZXNlbnQoZGV2LCAibGVkLWdwaW9zIikpCiAJCXBkYXRhLT5kaXNwbGF5LmJhY2tsaWdodCA9IDE7
Ci0JaWYgKG9mX2ZpbmRfcHJvcGVydHkobm9kZSwgImluaXQiLCBOVUxMKSkKLQkJcGRhdGEtPmRp
c3BsYXkuZmJ0ZnRvcHMuaW5pdF9kaXNwbGF5ID0gZmJ0ZnRfaW5pdF9kaXNwbGF5X2R0OworCWlm
IChkZXZpY2VfcHJvcGVydHlfcHJlc2VudChkZXYsICJpbml0IikpCisJCXBkYXRhLT5kaXNwbGF5
LmZidGZ0b3BzLmluaXRfZGlzcGxheSA9IGZidGZ0X2luaXRfZGlzcGxheV9mcm9tX3Byb3BlcnR5
OwogCXBkYXRhLT5kaXNwbGF5LmZidGZ0b3BzLnJlcXVlc3RfZ3Bpb3MgPSBmYnRmdF9yZXF1ZXN0
X2dwaW9zOwogCiAJcmV0dXJuIHBkYXRhOwpAQCAtMTIxMyw3ICsxMjI0LDcgQEAgaW50IGZidGZ0
X3Byb2JlX2NvbW1vbihzdHJ1Y3QgZmJ0ZnRfZGlzcGxheSAqZGlzcGxheSwKIAogCXBkYXRhID0g
ZGV2LT5wbGF0Zm9ybV9kYXRhOwogCWlmICghcGRhdGEpIHsKLQkJcGRhdGEgPSBmYnRmdF9wcm9i
ZV9kdChkZXYpOworCQlwZGF0YSA9IGZidGZ0X3Byb3BlcnRpZXNfcmVhZChkZXYpOwogCQlpZiAo
SVNfRVJSKHBkYXRhKSkKIAkJCXJldHVybiBQVFJfRVJSKHBkYXRhKTsKIAl9Ci0tIAoyLjI0LjAK
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl
bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp
c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==