From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2B22F21945DC7 for ; Wed, 26 Jun 2019 05:27:55 -0700 (PDT) From: Christoph Hellwig Subject: [PATCH 07/25] mm: factor out a devm_request_free_mem_region helper Date: Wed, 26 Jun 2019 14:27:06 +0200 Message-Id: <20190626122724.13313-8-hch@lst.de> In-Reply-To: <20190626122724.13313-1-hch@lst.de> References: <20190626122724.13313-1-hch@lst.de> MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: John Hubbard , linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, nouveau@lists.freedesktop.org List-ID: Keep the physical address allocation that hmm_add_device does with the rest of the resource code, and allow future reuse of it without the hmm wrapper. Signed-off-by: Christoph Hellwig Reviewed-by: Jason Gunthorpe Reviewed-by: John Hubbard --- include/linux/ioport.h | 2 ++ kernel/resource.c | 39 +++++++++++++++++++++++++++++++++++++++ mm/hmm.c | 33 ++++----------------------------- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index dd961882bc74..a02b290ca08a 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -285,6 +285,8 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2) return (r1->start <= r2->end && r1->end >= r2->start); } +struct resource *devm_request_free_mem_region(struct device *dev, + struct resource *base, unsigned long size); #endif /* __ASSEMBLY__ */ #endif /* _LINUX_IOPORT_H */ diff --git a/kernel/resource.c b/kernel/resource.c index 158f04ec1d4f..d22423e85cf8 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1628,6 +1628,45 @@ void resource_list_free(struct list_head *head) } EXPORT_SYMBOL(resource_list_free); +#ifdef CONFIG_DEVICE_PRIVATE +/** + * devm_request_free_mem_region - find free region for device private memory + * + * @dev: device struct to bind the resource to + * @size: size in bytes of the device memory to add + * @base: resource tree to look in + * + * This function tries to find an empty range of physical address big enough to + * contain the new resource, so that it can later be hotplugged as ZONE_DEVICE + * memory, which in turn allocates struct pages. + */ +struct resource *devm_request_free_mem_region(struct device *dev, + struct resource *base, unsigned long size) +{ + resource_size_t end, addr; + struct resource *res; + + size = ALIGN(size, 1UL << PA_SECTION_SHIFT); + end = min_t(unsigned long, base->end, (1UL << MAX_PHYSMEM_BITS) - 1); + addr = end - size + 1UL; + + for (; addr > size && addr >= base->start; addr -= size) { + if (region_intersects(addr, size, 0, IORES_DESC_NONE) != + REGION_DISJOINT) + continue; + + res = devm_request_mem_region(dev, addr, size, dev_name(dev)); + if (!res) + return ERR_PTR(-ENOMEM); + res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY; + return res; + } + + return ERR_PTR(-ERANGE); +} +EXPORT_SYMBOL_GPL(devm_request_free_mem_region); +#endif /* CONFIG_DEVICE_PRIVATE */ + static int __init strict_iomem(char *str) { if (strstr(str, "relaxed")) diff --git a/mm/hmm.c b/mm/hmm.c index e7dd2ab8f9ab..48574f8485bb 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -25,8 +25,6 @@ #include #include -#define PA_SECTION_SIZE (1UL << PA_SECTION_SHIFT) - #if IS_ENABLED(CONFIG_HMM_MIRROR) static const struct mmu_notifier_ops hmm_mmu_notifier_ops; @@ -1408,7 +1406,6 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, unsigned long size) { struct hmm_devmem *devmem; - resource_size_t addr; void *result; int ret; @@ -1430,32 +1427,10 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, if (ret) return ERR_PTR(ret); - size = ALIGN(size, PA_SECTION_SIZE); - addr = min((unsigned long)iomem_resource.end, - (1UL << MAX_PHYSMEM_BITS) - 1); - addr = addr - size + 1UL; - - /* - * FIXME add a new helper to quickly walk resource tree and find free - * range - * - * FIXME what about ioport_resource resource ? - */ - for (; addr > size && addr >= iomem_resource.start; addr -= size) { - ret = region_intersects(addr, size, 0, IORES_DESC_NONE); - if (ret != REGION_DISJOINT) - continue; - - devmem->resource = devm_request_mem_region(device, addr, size, - dev_name(device)); - if (!devmem->resource) - return ERR_PTR(-ENOMEM); - break; - } - if (!devmem->resource) - return ERR_PTR(-ERANGE); - - devmem->resource->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY; + devmem->resource = devm_request_free_mem_region(device, &iomem_resource, + size); + if (IS_ERR(devmem->resource)) + return ERR_CAST(devmem->resource); devmem->pfn_first = devmem->resource->start >> PAGE_SHIFT; devmem->pfn_last = devmem->pfn_first + (resource_size(devmem->resource) >> PAGE_SHIFT); -- 2.20.1 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm 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=-8.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 38CFFC48BD3 for ; Wed, 26 Jun 2019 12:28:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 125F720B1F for ; Wed, 26 Jun 2019 12:28:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="nIyI1gI2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727562AbfFZM17 (ORCPT ); Wed, 26 Jun 2019 08:27:59 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:42774 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727537AbfFZM1z (ORCPT ); Wed, 26 Jun 2019 08:27:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=mt4+zc9IpSRPEzC4cMWHk/yq2yqrTYKLdoT+AMW6Qz8=; b=nIyI1gI2JcHVUXx+jXX71rKB3G /XpA3ZY5LzkiUTJN1oA3IOdt45tcLua2Uy9FyFVXuJC0c5X8BBMzJA41qG8Y99gIfd1C7GCe5DJJd Eh4lgGJ1X6o41RIhoOM0BBJxaETP/8Mj5RBgQ4DP+G9fpKqnG1rQdi0mwUTQbrIxb0bsPbFo13NwX 3xAPRn8oGEMHUyvDW6xdgV80ocjOn88UacI1mjEwcsiAmQWvtKLIFqBidgTpW2fUibEQblL5U/xpS usb6ODdl6HifjRKkjVSSirZqtJMju39OzLvmokEvgVxm3ops4idZHit93FdxRmcFIOpreUIAMWn0V 9GJBgs0A==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hg71e-0001MX-8g; Wed, 26 Jun 2019 12:27:46 +0000 From: Christoph Hellwig To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: linux-mm@kvack.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, John Hubbard Subject: [PATCH 07/25] mm: factor out a devm_request_free_mem_region helper Date: Wed, 26 Jun 2019 14:27:06 +0200 Message-Id: <20190626122724.13313-8-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190626122724.13313-1-hch@lst.de> References: <20190626122724.13313-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Keep the physical address allocation that hmm_add_device does with the rest of the resource code, and allow future reuse of it without the hmm wrapper. Signed-off-by: Christoph Hellwig Reviewed-by: Jason Gunthorpe Reviewed-by: John Hubbard --- include/linux/ioport.h | 2 ++ kernel/resource.c | 39 +++++++++++++++++++++++++++++++++++++++ mm/hmm.c | 33 ++++----------------------------- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index dd961882bc74..a02b290ca08a 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -285,6 +285,8 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2) return (r1->start <= r2->end && r1->end >= r2->start); } +struct resource *devm_request_free_mem_region(struct device *dev, + struct resource *base, unsigned long size); #endif /* __ASSEMBLY__ */ #endif /* _LINUX_IOPORT_H */ diff --git a/kernel/resource.c b/kernel/resource.c index 158f04ec1d4f..d22423e85cf8 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1628,6 +1628,45 @@ void resource_list_free(struct list_head *head) } EXPORT_SYMBOL(resource_list_free); +#ifdef CONFIG_DEVICE_PRIVATE +/** + * devm_request_free_mem_region - find free region for device private memory + * + * @dev: device struct to bind the resource to + * @size: size in bytes of the device memory to add + * @base: resource tree to look in + * + * This function tries to find an empty range of physical address big enough to + * contain the new resource, so that it can later be hotplugged as ZONE_DEVICE + * memory, which in turn allocates struct pages. + */ +struct resource *devm_request_free_mem_region(struct device *dev, + struct resource *base, unsigned long size) +{ + resource_size_t end, addr; + struct resource *res; + + size = ALIGN(size, 1UL << PA_SECTION_SHIFT); + end = min_t(unsigned long, base->end, (1UL << MAX_PHYSMEM_BITS) - 1); + addr = end - size + 1UL; + + for (; addr > size && addr >= base->start; addr -= size) { + if (region_intersects(addr, size, 0, IORES_DESC_NONE) != + REGION_DISJOINT) + continue; + + res = devm_request_mem_region(dev, addr, size, dev_name(dev)); + if (!res) + return ERR_PTR(-ENOMEM); + res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY; + return res; + } + + return ERR_PTR(-ERANGE); +} +EXPORT_SYMBOL_GPL(devm_request_free_mem_region); +#endif /* CONFIG_DEVICE_PRIVATE */ + static int __init strict_iomem(char *str) { if (strstr(str, "relaxed")) diff --git a/mm/hmm.c b/mm/hmm.c index e7dd2ab8f9ab..48574f8485bb 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -25,8 +25,6 @@ #include #include -#define PA_SECTION_SIZE (1UL << PA_SECTION_SHIFT) - #if IS_ENABLED(CONFIG_HMM_MIRROR) static const struct mmu_notifier_ops hmm_mmu_notifier_ops; @@ -1408,7 +1406,6 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, unsigned long size) { struct hmm_devmem *devmem; - resource_size_t addr; void *result; int ret; @@ -1430,32 +1427,10 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops, if (ret) return ERR_PTR(ret); - size = ALIGN(size, PA_SECTION_SIZE); - addr = min((unsigned long)iomem_resource.end, - (1UL << MAX_PHYSMEM_BITS) - 1); - addr = addr - size + 1UL; - - /* - * FIXME add a new helper to quickly walk resource tree and find free - * range - * - * FIXME what about ioport_resource resource ? - */ - for (; addr > size && addr >= iomem_resource.start; addr -= size) { - ret = region_intersects(addr, size, 0, IORES_DESC_NONE); - if (ret != REGION_DISJOINT) - continue; - - devmem->resource = devm_request_mem_region(device, addr, size, - dev_name(device)); - if (!devmem->resource) - return ERR_PTR(-ENOMEM); - break; - } - if (!devmem->resource) - return ERR_PTR(-ERANGE); - - devmem->resource->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY; + devmem->resource = devm_request_free_mem_region(device, &iomem_resource, + size); + if (IS_ERR(devmem->resource)) + return ERR_CAST(devmem->resource); devmem->pfn_first = devmem->resource->start >> PAGE_SHIFT; devmem->pfn_last = devmem->pfn_first + (resource_size(devmem->resource) >> PAGE_SHIFT); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 07/25] mm: factor out a devm_request_free_mem_region helper Date: Wed, 26 Jun 2019 14:27:06 +0200 Message-ID: <20190626122724.13313-8-hch@lst.de> References: <20190626122724.13313-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190626122724.13313-1-hch-jcswGhMUV9g@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org S2VlcCB0aGUgcGh5c2ljYWwgYWRkcmVzcyBhbGxvY2F0aW9uIHRoYXQgaG1tX2FkZF9kZXZpY2Ug ZG9lcyB3aXRoIHRoZQpyZXN0IG9mIHRoZSByZXNvdXJjZSBjb2RlLCBhbmQgYWxsb3cgZnV0dXJl IHJldXNlIG9mIGl0IHdpdGhvdXQgdGhlIGhtbQp3cmFwcGVyLgoKU2lnbmVkLW9mZi1ieTogQ2hy aXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+ClJldmlld2VkLWJ5OiBKYXNvbiBHdW50aG9ycGUg PGpnZ0BtZWxsYW5veC5jb20+ClJldmlld2VkLWJ5OiBKb2huIEh1YmJhcmQgPGpodWJiYXJkQG52 aWRpYS5jb20+Ci0tLQogaW5jbHVkZS9saW51eC9pb3BvcnQuaCB8ICAyICsrCiBrZXJuZWwvcmVz b3VyY2UuYyAgICAgIHwgMzkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr CiBtbS9obW0uYyAgICAgICAgICAgICAgIHwgMzMgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvaW9wb3J0LmggYi9pbmNsdWRlL2xpbnV4L2lv cG9ydC5oCmluZGV4IGRkOTYxODgyYmM3NC4uYTAyYjI5MGNhMDhhIDEwMDY0NAotLS0gYS9pbmNs dWRlL2xpbnV4L2lvcG9ydC5oCisrKyBiL2luY2x1ZGUvbGludXgvaW9wb3J0LmgKQEAgLTI4NSw2 ICsyODUsOCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgcmVzb3VyY2Vfb3ZlcmxhcHMoc3RydWN0IHJl c291cmNlICpyMSwgc3RydWN0IHJlc291cmNlICpyMikKICAgICAgICByZXR1cm4gKHIxLT5zdGFy dCA8PSByMi0+ZW5kICYmIHIxLT5lbmQgPj0gcjItPnN0YXJ0KTsKIH0KIAorc3RydWN0IHJlc291 cmNlICpkZXZtX3JlcXVlc3RfZnJlZV9tZW1fcmVnaW9uKHN0cnVjdCBkZXZpY2UgKmRldiwKKwkJ c3RydWN0IHJlc291cmNlICpiYXNlLCB1bnNpZ25lZCBsb25nIHNpemUpOwogCiAjZW5kaWYgLyog X19BU1NFTUJMWV9fICovCiAjZW5kaWYJLyogX0xJTlVYX0lPUE9SVF9IICovCmRpZmYgLS1naXQg YS9rZXJuZWwvcmVzb3VyY2UuYyBiL2tlcm5lbC9yZXNvdXJjZS5jCmluZGV4IDE1OGYwNGVjMWQ0 Zi4uZDIyNDIzZTg1Y2Y4IDEwMDY0NAotLS0gYS9rZXJuZWwvcmVzb3VyY2UuYworKysgYi9rZXJu ZWwvcmVzb3VyY2UuYwpAQCAtMTYyOCw2ICsxNjI4LDQ1IEBAIHZvaWQgcmVzb3VyY2VfbGlzdF9m cmVlKHN0cnVjdCBsaXN0X2hlYWQgKmhlYWQpCiB9CiBFWFBPUlRfU1lNQk9MKHJlc291cmNlX2xp c3RfZnJlZSk7CiAKKyNpZmRlZiBDT05GSUdfREVWSUNFX1BSSVZBVEUKKy8qKgorICogZGV2bV9y ZXF1ZXN0X2ZyZWVfbWVtX3JlZ2lvbiAtIGZpbmQgZnJlZSByZWdpb24gZm9yIGRldmljZSBwcml2 YXRlIG1lbW9yeQorICoKKyAqIEBkZXY6IGRldmljZSBzdHJ1Y3QgdG8gYmluZCB0aGUgcmVzb3Vy Y2UgdG8KKyAqIEBzaXplOiBzaXplIGluIGJ5dGVzIG9mIHRoZSBkZXZpY2UgbWVtb3J5IHRvIGFk ZAorICogQGJhc2U6IHJlc291cmNlIHRyZWUgdG8gbG9vayBpbgorICoKKyAqIFRoaXMgZnVuY3Rp b24gdHJpZXMgdG8gZmluZCBhbiBlbXB0eSByYW5nZSBvZiBwaHlzaWNhbCBhZGRyZXNzIGJpZyBl bm91Z2ggdG8KKyAqIGNvbnRhaW4gdGhlIG5ldyByZXNvdXJjZSwgc28gdGhhdCBpdCBjYW4gbGF0 ZXIgYmUgaG90cGx1Z2dlZCBhcyBaT05FX0RFVklDRQorICogbWVtb3J5LCB3aGljaCBpbiB0dXJu IGFsbG9jYXRlcyBzdHJ1Y3QgcGFnZXMuCisgKi8KK3N0cnVjdCByZXNvdXJjZSAqZGV2bV9yZXF1 ZXN0X2ZyZWVfbWVtX3JlZ2lvbihzdHJ1Y3QgZGV2aWNlICpkZXYsCisJCXN0cnVjdCByZXNvdXJj ZSAqYmFzZSwgdW5zaWduZWQgbG9uZyBzaXplKQoreworCXJlc291cmNlX3NpemVfdCBlbmQsIGFk ZHI7CisJc3RydWN0IHJlc291cmNlICpyZXM7CisKKwlzaXplID0gQUxJR04oc2l6ZSwgMVVMIDw8 IFBBX1NFQ1RJT05fU0hJRlQpOworCWVuZCA9IG1pbl90KHVuc2lnbmVkIGxvbmcsIGJhc2UtPmVu ZCwgKDFVTCA8PCBNQVhfUEhZU01FTV9CSVRTKSAtIDEpOworCWFkZHIgPSBlbmQgLSBzaXplICsg MVVMOworCisJZm9yICg7IGFkZHIgPiBzaXplICYmIGFkZHIgPj0gYmFzZS0+c3RhcnQ7IGFkZHIg LT0gc2l6ZSkgeworCQlpZiAocmVnaW9uX2ludGVyc2VjdHMoYWRkciwgc2l6ZSwgMCwgSU9SRVNf REVTQ19OT05FKSAhPQorCQkJCVJFR0lPTl9ESVNKT0lOVCkKKwkJCWNvbnRpbnVlOworCisJCXJl cyA9IGRldm1fcmVxdWVzdF9tZW1fcmVnaW9uKGRldiwgYWRkciwgc2l6ZSwgZGV2X25hbWUoZGV2 KSk7CisJCWlmICghcmVzKQorCQkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CisJCXJlcy0+ZGVz YyA9IElPUkVTX0RFU0NfREVWSUNFX1BSSVZBVEVfTUVNT1JZOworCQlyZXR1cm4gcmVzOworCX0K KworCXJldHVybiBFUlJfUFRSKC1FUkFOR0UpOworfQorRVhQT1JUX1NZTUJPTF9HUEwoZGV2bV9y ZXF1ZXN0X2ZyZWVfbWVtX3JlZ2lvbik7CisjZW5kaWYgLyogQ09ORklHX0RFVklDRV9QUklWQVRF ICovCisKIHN0YXRpYyBpbnQgX19pbml0IHN0cmljdF9pb21lbShjaGFyICpzdHIpCiB7CiAJaWYg KHN0cnN0cihzdHIsICJyZWxheGVkIikpCmRpZmYgLS1naXQgYS9tbS9obW0uYyBiL21tL2htbS5j CmluZGV4IGU3ZGQyYWI4ZjlhYi4uNDg1NzRmODQ4NWJiIDEwMDY0NAotLS0gYS9tbS9obW0uYwor KysgYi9tbS9obW0uYwpAQCAtMjUsOCArMjUsNiBAQAogI2luY2x1ZGUgPGxpbnV4L21tdV9ub3Rp Zmllci5oPgogI2luY2x1ZGUgPGxpbnV4L21lbW9yeV9ob3RwbHVnLmg+CiAKLSNkZWZpbmUgUEFf U0VDVElPTl9TSVpFICgxVUwgPDwgUEFfU0VDVElPTl9TSElGVCkKLQogI2lmIElTX0VOQUJMRUQo Q09ORklHX0hNTV9NSVJST1IpCiBzdGF0aWMgY29uc3Qgc3RydWN0IG1tdV9ub3RpZmllcl9vcHMg aG1tX21tdV9ub3RpZmllcl9vcHM7CiAKQEAgLTE0MDgsNyArMTQwNiw2IEBAIHN0cnVjdCBobW1f ZGV2bWVtICpobW1fZGV2bWVtX2FkZChjb25zdCBzdHJ1Y3QgaG1tX2Rldm1lbV9vcHMgKm9wcywK IAkJCQkgIHVuc2lnbmVkIGxvbmcgc2l6ZSkKIHsKIAlzdHJ1Y3QgaG1tX2Rldm1lbSAqZGV2bWVt OwotCXJlc291cmNlX3NpemVfdCBhZGRyOwogCXZvaWQgKnJlc3VsdDsKIAlpbnQgcmV0OwogCkBA IC0xNDMwLDMyICsxNDI3LDEwIEBAIHN0cnVjdCBobW1fZGV2bWVtICpobW1fZGV2bWVtX2FkZChj b25zdCBzdHJ1Y3QgaG1tX2Rldm1lbV9vcHMgKm9wcywKIAlpZiAocmV0KQogCQlyZXR1cm4gRVJS X1BUUihyZXQpOwogCi0Jc2l6ZSA9IEFMSUdOKHNpemUsIFBBX1NFQ1RJT05fU0laRSk7Ci0JYWRk ciA9IG1pbigodW5zaWduZWQgbG9uZylpb21lbV9yZXNvdXJjZS5lbmQsCi0JCSAgICgxVUwgPDwg TUFYX1BIWVNNRU1fQklUUykgLSAxKTsKLQlhZGRyID0gYWRkciAtIHNpemUgKyAxVUw7Ci0KLQkv KgotCSAqIEZJWE1FIGFkZCBhIG5ldyBoZWxwZXIgdG8gcXVpY2tseSB3YWxrIHJlc291cmNlIHRy ZWUgYW5kIGZpbmQgZnJlZQotCSAqIHJhbmdlCi0JICoKLQkgKiBGSVhNRSB3aGF0IGFib3V0IGlv cG9ydF9yZXNvdXJjZSByZXNvdXJjZSA/Ci0JICovCi0JZm9yICg7IGFkZHIgPiBzaXplICYmIGFk ZHIgPj0gaW9tZW1fcmVzb3VyY2Uuc3RhcnQ7IGFkZHIgLT0gc2l6ZSkgewotCQlyZXQgPSByZWdp b25faW50ZXJzZWN0cyhhZGRyLCBzaXplLCAwLCBJT1JFU19ERVNDX05PTkUpOwotCQlpZiAocmV0 ICE9IFJFR0lPTl9ESVNKT0lOVCkKLQkJCWNvbnRpbnVlOwotCi0JCWRldm1lbS0+cmVzb3VyY2Ug PSBkZXZtX3JlcXVlc3RfbWVtX3JlZ2lvbihkZXZpY2UsIGFkZHIsIHNpemUsCi0JCQkJCQkJICAg ZGV2X25hbWUoZGV2aWNlKSk7Ci0JCWlmICghZGV2bWVtLT5yZXNvdXJjZSkKLQkJCXJldHVybiBF UlJfUFRSKC1FTk9NRU0pOwotCQlicmVhazsKLQl9Ci0JaWYgKCFkZXZtZW0tPnJlc291cmNlKQot CQlyZXR1cm4gRVJSX1BUUigtRVJBTkdFKTsKLQotCWRldm1lbS0+cmVzb3VyY2UtPmRlc2MgPSBJ T1JFU19ERVNDX0RFVklDRV9QUklWQVRFX01FTU9SWTsKKwlkZXZtZW0tPnJlc291cmNlID0gZGV2 bV9yZXF1ZXN0X2ZyZWVfbWVtX3JlZ2lvbihkZXZpY2UsICZpb21lbV9yZXNvdXJjZSwKKwkJCXNp emUpOworCWlmIChJU19FUlIoZGV2bWVtLT5yZXNvdXJjZSkpCisJCXJldHVybiBFUlJfQ0FTVChk ZXZtZW0tPnJlc291cmNlKTsKIAlkZXZtZW0tPnBmbl9maXJzdCA9IGRldm1lbS0+cmVzb3VyY2Ut PnN0YXJ0ID4+IFBBR0VfU0hJRlQ7CiAJZGV2bWVtLT5wZm5fbGFzdCA9IGRldm1lbS0+cGZuX2Zp cnN0ICsKIAkJCSAgIChyZXNvdXJjZV9zaXplKGRldm1lbS0+cmVzb3VyY2UpID4+IFBBR0VfU0hJ RlQpOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXU=