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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 4C6A5C4708D for ; Thu, 27 May 2021 14:47:42 +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 0D66460D07 for ; Thu, 27 May 2021 14:47:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D66460D07 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 0484A6F3D0; Thu, 27 May 2021 14:47:37 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 655766F3C9; Thu, 27 May 2021 14:47:33 +0000 (UTC) IronPort-SDR: jv6WnqqD1GpOElS6cEnVqi5z1WNJF+elR/7RppEkd00rEdZ90PjSpPVcutQ3iYcQ/RiR2JnfOU MnbSzRIympQg== X-IronPort-AV: E=McAfee;i="6200,9189,9996"; a="202515588" X-IronPort-AV: E=Sophos;i="5.82,334,1613462400"; d="scan'208";a="202515588" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2021 07:47:33 -0700 IronPort-SDR: deYEeBZBAWitHHWqA8qoAeYRTquEQ31/wv5juHuz9VuLJCqLH+sOa+DAUzGcC9OkGXo1rBZU9S I6ESIiaru4vA== X-IronPort-AV: E=Sophos;i="5.82,334,1613462400"; d="scan'208";a="443597902" Received: from ibanaga-mobl.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.58]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2021 07:47:31 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH v5 06/15] drm/ttm: Add a generic TTM memcpy move for page-based iomem Date: Thu, 27 May 2021 16:47:01 +0200 Message-Id: <20210527144710.1975553-7-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527144710.1975553-1-thomas.hellstrom@linux.intel.com> References: <20210527144710.1975553-1-thomas.hellstrom@linux.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: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , =?UTF-8?q?Christian=20K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The internal ttm_bo_util memcpy uses ioremap functionality, and while it probably might be possible to use it for copying in- and out of sglist represented io memory, using io_mem_reserve() / io_mem_free() callbacks, that would cause problems with fault(). Instead, implement a method mapping page-by-page using kmap_local() semantics. As an additional benefit we then avoid the occasional global TLB flushes of ioremap() and consuming ioremap space, elimination of a critical point of failure and with a slight change of semantics we could also push the memcpy out async for testing and async driver development purposes. A special linear iomem iterator is introduced internally to mimic the old ioremap behaviour for code-paths that can't immediately be ported over. This adds to the code size and should be considered a temporary solution. Looking at the code we have a lot of checks for iomap tagged pointers. Ideally we should extend the core memremap functions to also accept uncached memory and kmap_local functionality. Then we could strip a lot of code. Cc: Christian König Signed-off-by: Thomas Hellström --- v3: - Split up in various TTM files and addressed review comments by Christian König. Tested and fixed legacy iomap memcpy path on i915. v4: - Fix an uninitialized variable Reported by: kernel test robot Reported by: Dan Carpenter - Minor change to the ttm_move_memcpy() interface. - Gracefully handle lack of memremap() support on memcpy (Reported by Matthew Auld) - Minor style fix (Reported by Matthew Auld) --- drivers/gpu/drm/ttm/ttm_bo_util.c | 280 ++++++++++------------------- drivers/gpu/drm/ttm/ttm_module.c | 35 ++++ drivers/gpu/drm/ttm/ttm_resource.c | 193 ++++++++++++++++++++ drivers/gpu/drm/ttm/ttm_tt.c | 42 +++++ include/drm/ttm/ttm_bo_driver.h | 28 +++ include/drm/ttm/ttm_caching.h | 2 + include/drm/ttm/ttm_kmap_iter.h | 61 +++++++ include/drm/ttm/ttm_resource.h | 61 +++++++ include/drm/ttm/ttm_tt.h | 16 ++ 9 files changed, 536 insertions(+), 182 deletions(-) create mode 100644 include/drm/ttm/ttm_kmap_iter.h diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index ae8b61460724..6ac7744a1a5c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -72,190 +72,126 @@ void ttm_mem_io_free(struct ttm_device *bdev, mem->bus.addr = NULL; } -static int ttm_resource_ioremap(struct ttm_device *bdev, - struct ttm_resource *mem, - void **virtual) +/** + * ttm_move_memcpy - Helper to perform a memcpy ttm move operation. + * @bo: The struct ttm_buffer_object. + * @new_mem: The struct ttm_resource we're moving to (copy destination). + * @new_iter: A struct ttm_kmap_iter representing the destination resource. + * @src_iter: A struct ttm_kmap_iter representing the source resource. + * + * This function is intended to be able to move out async under a + * dma-fence if desired. + */ +void ttm_move_memcpy(struct ttm_buffer_object *bo, + pgoff_t num_pages, + struct ttm_kmap_iter *dst_iter, + struct ttm_kmap_iter *src_iter) { - int ret; - void *addr; - - *virtual = NULL; - ret = ttm_mem_io_reserve(bdev, mem); - if (ret || !mem->bus.is_iomem) - return ret; + const struct ttm_kmap_iter_ops *dst_ops = dst_iter->ops; + const struct ttm_kmap_iter_ops *src_ops = src_iter->ops; + struct ttm_tt *ttm = bo->ttm; + struct dma_buf_map src_map, dst_map; + pgoff_t i; - if (mem->bus.addr) { - addr = mem->bus.addr; - } else { - size_t bus_size = (size_t)mem->num_pages << PAGE_SHIFT; + /* Single TTM move. NOP */ + if (dst_ops->maps_tt && src_ops->maps_tt) + return; - if (mem->bus.caching == ttm_write_combined) - addr = ioremap_wc(mem->bus.offset, bus_size); -#ifdef CONFIG_X86 - else if (mem->bus.caching == ttm_cached) - addr = ioremap_cache(mem->bus.offset, bus_size); -#endif - else - addr = ioremap(mem->bus.offset, bus_size); - if (!addr) { - ttm_mem_io_free(bdev, mem); - return -ENOMEM; + /* Don't move nonexistent data. Clear destination instead. */ + if (src_ops->maps_tt && (!ttm || !ttm_tt_is_populated(ttm))) { + if (ttm && !(ttm->page_flags & TTM_PAGE_FLAG_ZERO_ALLOC)) + return; + + for (i = 0; i < num_pages; ++i) { + dst_ops->map_local(dst_iter, &dst_map, i); + if (dst_map.is_iomem) + memset_io(dst_map.vaddr_iomem, 0, PAGE_SIZE); + else + memset(dst_map.vaddr, 0, PAGE_SIZE); + if (dst_ops->unmap_local) + dst_ops->unmap_local(dst_iter, &dst_map); } + return; } - *virtual = addr; - return 0; -} - -static void ttm_resource_iounmap(struct ttm_device *bdev, - struct ttm_resource *mem, - void *virtual) -{ - if (virtual && mem->bus.addr == NULL) - iounmap(virtual); - ttm_mem_io_free(bdev, mem); -} - -static int ttm_copy_io_page(void *dst, void *src, unsigned long page) -{ - uint32_t *dstP = - (uint32_t *) ((unsigned long)dst + (page << PAGE_SHIFT)); - uint32_t *srcP = - (uint32_t *) ((unsigned long)src + (page << PAGE_SHIFT)); - - int i; - for (i = 0; i < PAGE_SIZE / sizeof(uint32_t); ++i) - iowrite32(ioread32(srcP++), dstP++); - return 0; -} - -static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src, - unsigned long page, - pgprot_t prot) -{ - struct page *d = ttm->pages[page]; - void *dst; - - if (!d) - return -ENOMEM; - - src = (void *)((unsigned long)src + (page << PAGE_SHIFT)); - dst = kmap_atomic_prot(d, prot); - if (!dst) - return -ENOMEM; - - memcpy_fromio(dst, src, PAGE_SIZE); - - kunmap_atomic(dst); - - return 0; -} - -static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst, - unsigned long page, - pgprot_t prot) -{ - struct page *s = ttm->pages[page]; - void *src; - if (!s) - return -ENOMEM; - - dst = (void *)((unsigned long)dst + (page << PAGE_SHIFT)); - src = kmap_atomic_prot(s, prot); - if (!src) - return -ENOMEM; - - memcpy_toio(dst, src, PAGE_SIZE); - - kunmap_atomic(src); + for (i = 0; i < num_pages; ++i) { + dst_ops->map_local(dst_iter, &dst_map, i); + src_ops->map_local(src_iter, &src_map, i); + + if (!src_map.is_iomem && !dst_map.is_iomem) { + memcpy(dst_map.vaddr, src_map.vaddr, PAGE_SIZE); + } else if (!src_map.is_iomem) { + dma_buf_map_memcpy_to(&dst_map, src_map.vaddr, + PAGE_SIZE); + } else if (!dst_map.is_iomem) { + memcpy_fromio(dst_map.vaddr, src_map.vaddr_iomem, + PAGE_SIZE); + } else { + int j; + u32 __iomem *src = src_map.vaddr_iomem; + u32 __iomem *dst = dst_map.vaddr_iomem; - return 0; + for (j = 0; j < (PAGE_SIZE / sizeof(u32)); ++j) + iowrite32(ioread32(src++), dst++); + } + if (src_ops->unmap_local) + src_ops->unmap_local(src_iter, &src_map); + if (dst_ops->unmap_local) + dst_ops->unmap_local(dst_iter, &dst_map); + } } +EXPORT_SYMBOL(ttm_move_memcpy); int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, - struct ttm_resource *new_mem) + struct ttm_resource *dst_mem) { struct ttm_device *bdev = bo->bdev; - struct ttm_resource_manager *man = ttm_manager_type(bdev, new_mem->mem_type); + struct ttm_resource_manager *dst_man = + ttm_manager_type(bo->bdev, dst_mem->mem_type); struct ttm_tt *ttm = bo->ttm; - struct ttm_resource *old_mem = &bo->mem; - struct ttm_resource old_copy = *old_mem; - void *old_iomap; - void *new_iomap; - int ret; - unsigned long i; - - ret = ttm_bo_wait_ctx(bo, ctx); - if (ret) - return ret; - - ret = ttm_resource_ioremap(bdev, old_mem, &old_iomap); - if (ret) - return ret; - ret = ttm_resource_ioremap(bdev, new_mem, &new_iomap); - if (ret) - goto out; - - /* - * Single TTM move. NOP. - */ - if (old_iomap == NULL && new_iomap == NULL) - goto out2; - - /* - * Don't move nonexistent data. Clear destination instead. - */ - if (old_iomap == NULL && - (ttm == NULL || (!ttm_tt_is_populated(ttm) && - !(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)))) { - memset_io(new_iomap, 0, new_mem->num_pages*PAGE_SIZE); - goto out2; - } + struct ttm_resource *src_mem = &bo->mem; + struct ttm_resource_manager *src_man = + ttm_manager_type(bdev, src_mem->mem_type); + struct ttm_resource src_copy = *src_mem; + union { + struct ttm_kmap_iter_tt tt; + struct ttm_kmap_iter_linear_io io; + } _dst_iter, _src_iter; + struct ttm_kmap_iter *dst_iter, *src_iter; + int ret = 0; - /* - * TTM might be null for moves within the same region. - */ - if (ttm) { + if (ttm && ((ttm->page_flags & TTM_PAGE_FLAG_SWAPPED) || + dst_man->use_tt)) { ret = ttm_tt_populate(bdev, ttm, ctx); if (ret) - goto out1; + return ret; } - for (i = 0; i < new_mem->num_pages; ++i) { - if (old_iomap == NULL) { - pgprot_t prot = ttm_io_prot(bo, old_mem, PAGE_KERNEL); - ret = ttm_copy_ttm_io_page(ttm, new_iomap, i, - prot); - } else if (new_iomap == NULL) { - pgprot_t prot = ttm_io_prot(bo, new_mem, PAGE_KERNEL); - ret = ttm_copy_io_ttm_page(ttm, old_iomap, i, - prot); - } else { - ret = ttm_copy_io_page(new_iomap, old_iomap, i); - } - if (ret) - goto out1; + dst_iter = ttm_kmap_iter_linear_io_init(&_dst_iter.io, bdev, dst_mem); + if (PTR_ERR(dst_iter) == -EINVAL && dst_man->use_tt) + dst_iter = ttm_kmap_iter_tt_init(&_dst_iter.tt, bo->ttm); + if (IS_ERR(dst_iter)) + return PTR_ERR(dst_iter); + + src_iter = ttm_kmap_iter_linear_io_init(&_src_iter.io, bdev, src_mem); + if (PTR_ERR(src_iter) == -EINVAL && src_man->use_tt) + src_iter = ttm_kmap_iter_tt_init(&_src_iter.tt, bo->ttm); + if (IS_ERR(src_iter)) { + ret = PTR_ERR(src_iter); + goto out_src_iter; } - mb(); -out2: - old_copy = *old_mem; - ttm_bo_assign_mem(bo, new_mem); - - if (!man->use_tt) - ttm_bo_tt_destroy(bo); + ttm_move_memcpy(bo, dst_mem->num_pages, dst_iter, src_iter); + src_copy = *src_mem; + ttm_bo_move_sync_cleanup(bo, dst_mem); -out1: - ttm_resource_iounmap(bdev, old_mem, new_iomap); -out: - ttm_resource_iounmap(bdev, &old_copy, old_iomap); + if (!src_iter->ops->maps_tt) + ttm_kmap_iter_linear_io_fini(&_src_iter.io, bdev, &src_copy); +out_src_iter: + if (!dst_iter->ops->maps_tt) + ttm_kmap_iter_linear_io_fini(&_dst_iter.io, bdev, dst_mem); - /* - * On error, keep the mm node! - */ - if (!ret) - ttm_resource_free(bo, &old_copy); return ret; } EXPORT_SYMBOL(ttm_bo_move_memcpy); @@ -336,27 +272,7 @@ pgprot_t ttm_io_prot(struct ttm_buffer_object *bo, struct ttm_resource *res, man = ttm_manager_type(bo->bdev, res->mem_type); caching = man->use_tt ? bo->ttm->caching : res->bus.caching; - /* Cached mappings need no adjustment */ - if (caching == ttm_cached) - return tmp; - -#if defined(__i386__) || defined(__x86_64__) - if (caching == ttm_write_combined) - tmp = pgprot_writecombine(tmp); - else if (boot_cpu_data.x86 > 3) - tmp = pgprot_noncached(tmp); -#endif -#if defined(__ia64__) || defined(__arm__) || defined(__aarch64__) || \ - defined(__powerpc__) || defined(__mips__) - if (caching == ttm_write_combined) - tmp = pgprot_writecombine(tmp); - else - tmp = pgprot_noncached(tmp); -#endif -#if defined(__sparc__) - tmp = pgprot_noncached(tmp); -#endif - return tmp; + return ttm_prot_from_caching(caching, tmp); } EXPORT_SYMBOL(ttm_io_prot); diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c index 56b0efdba1a9..997c458f68a9 100644 --- a/drivers/gpu/drm/ttm/ttm_module.c +++ b/drivers/gpu/drm/ttm/ttm_module.c @@ -31,12 +31,47 @@ */ #include #include +#include #include #include #include +#include #include "ttm_module.h" +/** + * ttm_prot_from_caching - Modify the page protection according to the + * ttm cacing mode + * @caching: The ttm caching mode + * @tmp: The original page protection + * + * Return: The modified page protection + */ +pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp) +{ + /* Cached mappings need no adjustment */ + if (caching == ttm_cached) + return tmp; + +#if defined(__i386__) || defined(__x86_64__) + if (caching == ttm_write_combined) + tmp = pgprot_writecombine(tmp); + else if (boot_cpu_data.x86 > 3) + tmp = pgprot_noncached(tmp); +#endif +#if defined(__ia64__) || defined(__arm__) || defined(__aarch64__) || \ + defined(__powerpc__) || defined(__mips__) + if (caching == ttm_write_combined) + tmp = pgprot_writecombine(tmp); + else + tmp = pgprot_noncached(tmp); +#endif +#if defined(__sparc__) + tmp = pgprot_noncached(tmp); +#endif + return tmp; +} + struct dentry *ttm_debugfs_root; static int __init ttm_init(void) diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c index 59e2b7157e41..931bcd1a9b9b 100644 --- a/drivers/gpu/drm/ttm/ttm_resource.c +++ b/drivers/gpu/drm/ttm/ttm_resource.c @@ -22,6 +22,10 @@ * Authors: Christian König */ +#include +#include +#include + #include #include @@ -147,3 +151,192 @@ void ttm_resource_manager_debug(struct ttm_resource_manager *man, man->func->debug(man, p); } EXPORT_SYMBOL(ttm_resource_manager_debug); + +static void ttm_kmap_iter_iomap_map_local(struct ttm_kmap_iter *iter, + struct dma_buf_map *dmap, + pgoff_t i) +{ + struct ttm_kmap_iter_iomap *iter_io = + container_of(iter, typeof(*iter_io), base); + void __iomem *addr; + +retry: + while (i >= iter_io->cache.end) { + iter_io->cache.sg = iter_io->cache.sg ? + sg_next(iter_io->cache.sg) : iter_io->st->sgl; + iter_io->cache.i = iter_io->cache.end; + iter_io->cache.end += sg_dma_len(iter_io->cache.sg) >> + PAGE_SHIFT; + iter_io->cache.offs = sg_dma_address(iter_io->cache.sg) - + iter_io->start; + } + + if (i < iter_io->cache.i) { + iter_io->cache.end = 0; + iter_io->cache.sg = NULL; + goto retry; + } + + addr = io_mapping_map_local_wc(iter_io->iomap, iter_io->cache.offs + + (((resource_size_t)i - iter_io->cache.i) + << PAGE_SHIFT)); + dma_buf_map_set_vaddr_iomem(dmap, addr); +} + +static void ttm_kmap_iter_iomap_unmap_local(struct ttm_kmap_iter *iter, + struct dma_buf_map *map) +{ + io_mapping_unmap_local(map->vaddr_iomem); +} + +static const struct ttm_kmap_iter_ops ttm_kmap_iter_io_ops = { + .map_local = ttm_kmap_iter_iomap_map_local, + .unmap_local = ttm_kmap_iter_iomap_unmap_local, + .maps_tt = false, +}; + +/** + * ttm_kmap_iter_iomap_init - Initialize a struct ttm_kmap_iter_iomap + * @iter_io: The struct ttm_kmap_iter_iomap to initialize. + * @iomap: The struct io_mapping representing the underlying linear io_memory. + * @st: sg_table into @iomap, representing the memory of the struct + * ttm_resource. + * @start: Offset that needs to be subtracted from @st to make + * sg_dma_address(st->sgl) - @start == 0 for @iomap start. + * + * Return: Pointer to the embedded struct ttm_kmap_iter. + */ +struct ttm_kmap_iter * +ttm_kmap_iter_iomap_init(struct ttm_kmap_iter_iomap *iter_io, + struct io_mapping *iomap, + struct sg_table *st, + resource_size_t start) +{ + iter_io->base.ops = &ttm_kmap_iter_io_ops; + iter_io->iomap = iomap; + iter_io->st = st; + iter_io->start = start; + memset(&iter_io->cache, 0, sizeof(iter_io->cache)); + + return &iter_io->base; +} +EXPORT_SYMBOL(ttm_kmap_iter_iomap_init); + +/** + * DOC: Linear io iterator + * + * This code should die in the not too near future. Best would be if we could + * make io-mapping use memremap for all io memory, and have memremap + * implement a kmap_local functionality. We could then strip a huge amount of + * code. These linear io iterators are implemented to mimic old functionality, + * and they don't use kmap_local semantics at all internally. Rather ioremap or + * friends, and at least on 32-bit they add global TLB flushes and points + * of failure. + */ + +static void ttm_kmap_iter_linear_io_map_local(struct ttm_kmap_iter *iter, + struct dma_buf_map *dmap, + pgoff_t i) +{ + struct ttm_kmap_iter_linear_io *iter_io = + container_of(iter, typeof(*iter_io), base); + + *dmap = iter_io->dmap; + dma_buf_map_incr(dmap, i * PAGE_SIZE); +} + +static const struct ttm_kmap_iter_ops ttm_kmap_iter_linear_io_ops = { + .map_local = ttm_kmap_iter_linear_io_map_local, + .maps_tt = false, +}; + +/** + * ttm_kmap_iter_linear_io_init - Initialize an iterator for linear io memory + * @iter_io: The iterator to initialize + * @bdev: The TTM device + * @mem: The ttm resource representing the iomap. + * + * This function is for internal TTM use only. It sets up a memcpy kmap iterator + * pointing at a linear chunk of io memory. + * + * Return: A pointer to the embedded struct ttm_kmap_iter or error pointer on + * failure. + */ +struct ttm_kmap_iter * +ttm_kmap_iter_linear_io_init(struct ttm_kmap_iter_linear_io *iter_io, + struct ttm_device *bdev, + struct ttm_resource *mem) +{ + int ret; + + ret = ttm_mem_io_reserve(bdev, mem); + if (ret) + goto out_err; + if (!mem->bus.is_iomem) { + ret = -EINVAL; + goto out_io_free; + } + + if (mem->bus.addr) { + dma_buf_map_set_vaddr(&iter_io->dmap, mem->bus.addr); + iter_io->needs_unmap = false; + } else { + size_t bus_size = (size_t)mem->num_pages << PAGE_SHIFT; + + iter_io->needs_unmap = true; + memset(&iter_io->dmap, 0, sizeof(iter_io->dmap)); + if (mem->bus.caching == ttm_write_combined) + dma_buf_map_set_vaddr_iomem(&iter_io->dmap, + ioremap_wc(mem->bus.offset, + bus_size)); + else if (mem->bus.caching == ttm_cached) + dma_buf_map_set_vaddr(&iter_io->dmap, + memremap(mem->bus.offset, bus_size, + MEMREMAP_WB | + MEMREMAP_WT | + MEMREMAP_WC)); + + /* If uncached requested or if mapping cached or wc failed */ + if (dma_buf_map_is_null(&iter_io->dmap)) + dma_buf_map_set_vaddr_iomem(&iter_io->dmap, + ioremap(mem->bus.offset, + bus_size)); + + if (dma_buf_map_is_null(&iter_io->dmap)) { + ret = -ENOMEM; + goto out_io_free; + } + } + + iter_io->base.ops = &ttm_kmap_iter_linear_io_ops; + return &iter_io->base; + +out_io_free: + ttm_mem_io_free(bdev, mem); +out_err: + return ERR_PTR(ret); +} + +/** + * ttm_kmap_iter_linear_io_fini - Clean up an iterator for linear io memory + * @iter_io: The iterator to initialize + * @bdev: The TTM device + * @mem: The ttm resource representing the iomap. + * + * This function is for internal TTM use only. It cleans up a memcpy kmap + * iterator initialized by ttm_kmap_iter_linear_io_init. + */ +void +ttm_kmap_iter_linear_io_fini(struct ttm_kmap_iter_linear_io *iter_io, + struct ttm_device *bdev, + struct ttm_resource *mem) +{ + if (iter_io->needs_unmap && dma_buf_map_is_set(&iter_io->dmap)) { + if (iter_io->dmap.is_iomem) + iounmap(iter_io->dmap.vaddr_iomem); + else + memunmap(iter_io->dmap.vaddr); + } + + ttm_mem_io_free(bdev, mem); +} diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 539e0232cb3b..0e41227116b1 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -433,3 +433,45 @@ void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages) if (!ttm_dma32_pages_limit) ttm_dma32_pages_limit = num_dma32_pages; } + +static void ttm_kmap_iter_tt_map_local(struct ttm_kmap_iter *iter, + struct dma_buf_map *dmap, + pgoff_t i) +{ + struct ttm_kmap_iter_tt *iter_tt = + container_of(iter, typeof(*iter_tt), base); + + dma_buf_map_set_vaddr(dmap, kmap_local_page_prot(iter_tt->tt->pages[i], + iter_tt->prot)); +} + +static void ttm_kmap_iter_tt_unmap_local(struct ttm_kmap_iter *iter, + struct dma_buf_map *map) +{ + kunmap_local(map->vaddr); +} + +static const struct ttm_kmap_iter_ops ttm_kmap_iter_tt_ops = { + .map_local = ttm_kmap_iter_tt_map_local, + .unmap_local = ttm_kmap_iter_tt_unmap_local, + .maps_tt = true, +}; + +/** + * ttm_kmap_iter_tt_init - Initialize a struct ttm_kmap_iter_tt + * @iter_tt: The struct ttm_kmap_iter_tt to initialize. + * @tt: Struct ttm_tt holding page pointers of the struct ttm_resource. + * + * Return: Pointer to the embedded struct ttm_kmap_iter. + */ +struct ttm_kmap_iter * +ttm_kmap_iter_tt_init(struct ttm_kmap_iter_tt *iter_tt, + struct ttm_tt *tt) +{ + iter_tt->base.ops = &ttm_kmap_iter_tt_ops; + iter_tt->tt = tt; + iter_tt->prot = ttm_prot_from_caching(tt->caching, PAGE_KERNEL); + + return &iter_tt->base; +} +EXPORT_SYMBOL(ttm_kmap_iter_tt_init); diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index dbccac957f8f..fdbeac78c236 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -40,6 +40,7 @@ #include #include "ttm_bo_api.h" +#include "ttm_kmap_iter.h" #include "ttm_placement.h" #include "ttm_tt.h" #include "ttm_pool.h" @@ -272,6 +273,23 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, bool pipeline, struct ttm_resource *new_mem); +/** + * ttm_bo_move_accel_cleanup. + * + * @bo: A pointer to a struct ttm_buffer_object. + * @new_mem: struct ttm_resource indicating where to move. + * + * Special case of ttm_bo_move_accel_cleanup where the bo is guaranteed + * by the caller to be idle. Typically used after memcpy buffer moves. + */ +static inline void ttm_bo_move_sync_cleanup(struct ttm_buffer_object *bo, + struct ttm_resource *new_mem) +{ + int ret = ttm_bo_move_accel_cleanup(bo, NULL, true, false, new_mem); + + WARN_ON(ret); +} + /** * ttm_bo_pipeline_gutting. * @@ -332,4 +350,14 @@ int ttm_range_man_init(struct ttm_device *bdev, int ttm_range_man_fini(struct ttm_device *bdev, unsigned type); +void ttm_move_memcpy(struct ttm_buffer_object *bo, + pgoff_t num_pages, + struct ttm_kmap_iter *dst_iter, + struct ttm_kmap_iter *src_iter); + +struct ttm_kmap_iter * +ttm_kmap_iter_iomap_init(struct ttm_kmap_iter_iomap *iter_io, + struct io_mapping *iomap, + struct sg_table *st, + resource_size_t start); #endif diff --git a/include/drm/ttm/ttm_caching.h b/include/drm/ttm/ttm_caching.h index a0b4a49fa432..3c9dd65f5aaf 100644 --- a/include/drm/ttm/ttm_caching.h +++ b/include/drm/ttm/ttm_caching.h @@ -33,4 +33,6 @@ enum ttm_caching { ttm_cached }; +pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp); + #endif diff --git a/include/drm/ttm/ttm_kmap_iter.h b/include/drm/ttm/ttm_kmap_iter.h new file mode 100644 index 000000000000..8bb00fd39d6c --- /dev/null +++ b/include/drm/ttm/ttm_kmap_iter.h @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2021 Intel Corporation + */ +#ifndef __TTM_KMAP_ITER_H__ +#define __TTM_KMAP_ITER_H__ + +#include + +struct ttm_kmap_iter; +struct dma_buf_map; + +/** + * struct ttm_kmap_iter_ops - Ops structure for a struct + * ttm_kmap_iter. + * @maps_tt: Whether the iterator maps TT memory directly, as opposed + * mapping a TT through an aperture. Both these modes have + * struct ttm_resource_manager::use_tt set, but the latter typically + * returns is_iomem == true from ttm_mem_io_reserve. + */ +struct ttm_kmap_iter_ops { + /** + * kmap_local() - Map a PAGE_SIZE part of the resource using + * kmap_local semantics. + * @res_iter: Pointer to the struct ttm_kmap_iter representing + * the resource. + * @dmap: The struct dma_buf_map holding the virtual address after + * the operation. + * @i: The location within the resource to map. PAGE_SIZE granularity. + */ + void (*map_local)(struct ttm_kmap_iter *res_iter, + struct dma_buf_map *dmap, pgoff_t i); + /** + * unmap_local() - Unmap a PAGE_SIZE part of the resource previously + * mapped using kmap_local. + * @res_iter: Pointer to the struct ttm_kmap_iter representing + * the resource. + * @dmap: The struct dma_buf_map holding the virtual address after + * the operation. + */ + void (*unmap_local)(struct ttm_kmap_iter *res_iter, + struct dma_buf_map *dmap); + bool maps_tt; +}; + +/** + * struct ttm_kmap_iter - Iterator for kmap_local type operations on a + * resource. + * @ops: Pointer to the operations struct. + * + * This struct is intended to be embedded in a resource-specific specialization + * implementing operations for the resource. + * + * Nothing stops us from extending the operations to vmap, vmap_pfn etc, + * replacing some or parts of the ttm_bo_util. cpu-map functionality. + */ +struct ttm_kmap_iter { + const struct ttm_kmap_iter_ops *ops; +}; + +#endif /* __TTM_KMAP_ITER_H__ */ diff --git a/include/drm/ttm/ttm_resource.h b/include/drm/ttm/ttm_resource.h index 890b9d369519..b8dc0bdb0da5 100644 --- a/include/drm/ttm/ttm_resource.h +++ b/include/drm/ttm/ttm_resource.h @@ -27,9 +27,11 @@ #include #include +#include #include #include #include +#include #define TTM_MAX_BO_PRIORITY 4U @@ -38,6 +40,10 @@ struct ttm_resource_manager; struct ttm_resource; struct ttm_place; struct ttm_buffer_object; +struct dma_buf_map; +struct io_mapping; +struct sg_table; +struct scatterlist; struct ttm_resource_manager_func { /** @@ -176,6 +182,45 @@ struct ttm_resource { struct ttm_bus_placement bus; }; +/** + * struct ttm_kmap_iter_iomap - Specialization for a struct io_mapping + + * struct sg_table backed struct ttm_resource. + * @base: Embedded struct ttm_kmap_iter providing the usage interface. + * @iomap: struct io_mapping representing the underlying linear io_memory. + * @st: sg_table into @iomap, representing the memory of the struct ttm_resource. + * @start: Offset that needs to be subtracted from @st to make + * sg_dma_address(st->sgl) - @start == 0 for @iomap start. + * @cache: Scatterlist traversal cache for fast lookups. + * @cache.sg: Pointer to the currently cached scatterlist segment. + * @cache.i: First index of @sg. PAGE_SIZE granularity. + * @cache.end: Last index + 1 of @sg. PAGE_SIZE granularity. + * @cache.offs: First offset into @iomap of @sg. PAGE_SIZE granularity. + */ +struct ttm_kmap_iter_iomap { + struct ttm_kmap_iter base; + struct io_mapping *iomap; + struct sg_table *st; + resource_size_t start; + struct { + struct scatterlist *sg; + pgoff_t i; + pgoff_t end; + pgoff_t offs; + } cache; +}; + +/** + * struct ttm_kmap_iter_linear_io - Iterator specialization for linear io + * @base: The base iterator + * @dmap: Points to the starting address of the region + * @needs_unmap: Whether we need to unmap on fini + */ +struct ttm_kmap_iter_linear_io { + struct ttm_kmap_iter base; + struct dma_buf_map dmap; + bool needs_unmap; +}; + /** * ttm_resource_manager_set_used * @@ -237,4 +282,20 @@ int ttm_resource_manager_evict_all(struct ttm_device *bdev, void ttm_resource_manager_debug(struct ttm_resource_manager *man, struct drm_printer *p); +struct ttm_kmap_iter * +ttm_kmap_iter_iomap_init(struct ttm_kmap_iter_iomap *iter_io, + struct io_mapping *iomap, + struct sg_table *st, + resource_size_t start); + +struct ttm_kmap_iter_linear_io; + +struct ttm_kmap_iter * +ttm_kmap_iter_linear_io_init(struct ttm_kmap_iter_linear_io *iter_io, + struct ttm_device *bdev, + struct ttm_resource *mem); + +void ttm_kmap_iter_linear_io_fini(struct ttm_kmap_iter_linear_io *iter_io, + struct ttm_device *bdev, + struct ttm_resource *mem); #endif diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 134d09ef7766..3102059db726 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -29,6 +29,7 @@ #include #include +#include struct ttm_bo_device; struct ttm_tt; @@ -69,6 +70,18 @@ struct ttm_tt { enum ttm_caching caching; }; +/** + * struct ttm_kmap_iter_tt - Specialization of a mappig iterator for a tt. + * @base: Embedded struct ttm_kmap_iter providing the usage interface + * @tt: Cached struct ttm_tt. + * @prot: Cached page protection for mapping. + */ +struct ttm_kmap_iter_tt { + struct ttm_kmap_iter base; + struct ttm_tt *tt; + pgprot_t prot; +}; + static inline bool ttm_tt_is_populated(struct ttm_tt *tt) { return tt->page_flags & TTM_PAGE_FLAG_PRIV_POPULATED; @@ -159,6 +172,9 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm); void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages); +struct ttm_kmap_iter *ttm_kmap_iter_tt_init(struct ttm_kmap_iter_tt *iter_tt, + struct ttm_tt *tt); + #if IS_ENABLED(CONFIG_AGP) #include -- 2.31.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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 8BC66C4708A for ; Thu, 27 May 2021 14:47:39 +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 52C3760D07 for ; Thu, 27 May 2021 14:47:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52C3760D07 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=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96BD16F3D6; Thu, 27 May 2021 14:47:35 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 655766F3C9; Thu, 27 May 2021 14:47:33 +0000 (UTC) IronPort-SDR: jv6WnqqD1GpOElS6cEnVqi5z1WNJF+elR/7RppEkd00rEdZ90PjSpPVcutQ3iYcQ/RiR2JnfOU MnbSzRIympQg== X-IronPort-AV: E=McAfee;i="6200,9189,9996"; a="202515588" X-IronPort-AV: E=Sophos;i="5.82,334,1613462400"; d="scan'208";a="202515588" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2021 07:47:33 -0700 IronPort-SDR: deYEeBZBAWitHHWqA8qoAeYRTquEQ31/wv5juHuz9VuLJCqLH+sOa+DAUzGcC9OkGXo1rBZU9S I6ESIiaru4vA== X-IronPort-AV: E=Sophos;i="5.82,334,1613462400"; d="scan'208";a="443597902" Received: from ibanaga-mobl.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.58]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2021 07:47:31 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Thu, 27 May 2021 16:47:01 +0200 Message-Id: <20210527144710.1975553-7-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527144710.1975553-1-thomas.hellstrom@linux.intel.com> References: <20210527144710.1975553-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v5 06/15] drm/ttm: Add a generic TTM memcpy move for page-based iomem 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: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , =?UTF-8?q?Christian=20K=C3=B6nig?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" VGhlIGludGVybmFsIHR0bV9ib191dGlsIG1lbWNweSB1c2VzIGlvcmVtYXAgZnVuY3Rpb25hbGl0 eSwgYW5kIHdoaWxlIGl0CnByb2JhYmx5IG1pZ2h0IGJlIHBvc3NpYmxlIHRvIHVzZSBpdCBmb3Ig Y29weWluZyBpbi0gYW5kIG91dCBvZgpzZ2xpc3QgcmVwcmVzZW50ZWQgaW8gbWVtb3J5LCB1c2lu ZyBpb19tZW1fcmVzZXJ2ZSgpIC8gaW9fbWVtX2ZyZWUoKQpjYWxsYmFja3MsIHRoYXQgd291bGQg Y2F1c2UgcHJvYmxlbXMgd2l0aCBmYXVsdCgpLgpJbnN0ZWFkLCBpbXBsZW1lbnQgYSBtZXRob2Qg bWFwcGluZyBwYWdlLWJ5LXBhZ2UgdXNpbmcga21hcF9sb2NhbCgpCnNlbWFudGljcy4gQXMgYW4g YWRkaXRpb25hbCBiZW5lZml0IHdlIHRoZW4gYXZvaWQgdGhlIG9jY2FzaW9uYWwgZ2xvYmFsClRM QiBmbHVzaGVzIG9mIGlvcmVtYXAoKSBhbmQgY29uc3VtaW5nIGlvcmVtYXAgc3BhY2UsIGVsaW1p bmF0aW9uIG9mIGEKY3JpdGljYWwgcG9pbnQgb2YgZmFpbHVyZSBhbmQgd2l0aCBhIHNsaWdodCBj aGFuZ2Ugb2Ygc2VtYW50aWNzIHdlIGNvdWxkCmFsc28gcHVzaCB0aGUgbWVtY3B5IG91dCBhc3lu YyBmb3IgdGVzdGluZyBhbmQgYXN5bmMgZHJpdmVyIGRldmVsb3BtZW50CnB1cnBvc2VzLgoKQSBz cGVjaWFsIGxpbmVhciBpb21lbSBpdGVyYXRvciBpcyBpbnRyb2R1Y2VkIGludGVybmFsbHkgdG8g bWltaWMgdGhlCm9sZCBpb3JlbWFwIGJlaGF2aW91ciBmb3IgY29kZS1wYXRocyB0aGF0IGNhbid0 IGltbWVkaWF0ZWx5IGJlIHBvcnRlZApvdmVyLiBUaGlzIGFkZHMgdG8gdGhlIGNvZGUgc2l6ZSBh bmQgc2hvdWxkIGJlIGNvbnNpZGVyZWQgYSB0ZW1wb3JhcnkKc29sdXRpb24uCgpMb29raW5nIGF0 IHRoZSBjb2RlIHdlIGhhdmUgYSBsb3Qgb2YgY2hlY2tzIGZvciBpb21hcCB0YWdnZWQgcG9pbnRl cnMuCklkZWFsbHkgd2Ugc2hvdWxkIGV4dGVuZCB0aGUgY29yZSBtZW1yZW1hcCBmdW5jdGlvbnMg dG8gYWxzbyBhY2NlcHQKdW5jYWNoZWQgbWVtb3J5IGFuZCBrbWFwX2xvY2FsIGZ1bmN0aW9uYWxp dHkuIFRoZW4gd2UgY291bGQgc3RyaXAgYQpsb3Qgb2YgY29kZS4KCkNjOiBDaHJpc3RpYW4gS8O2 bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFRob21hcyBIZWxs c3Ryw7ZtIDx0aG9tYXMuaGVsbHN0cm9tQGxpbnV4LmludGVsLmNvbT4KLS0tCnYzOgotIFNwbGl0 IHVwIGluIHZhcmlvdXMgVFRNIGZpbGVzIGFuZCBhZGRyZXNzZWQgcmV2aWV3IGNvbW1lbnRzIGJ5 CiAgQ2hyaXN0aWFuIEvDtm5pZy4gVGVzdGVkIGFuZCBmaXhlZCBsZWdhY3kgaW9tYXAgbWVtY3B5 IHBhdGggb24gaTkxNS4KdjQ6Ci0gRml4IGFuIHVuaW5pdGlhbGl6ZWQgdmFyaWFibGUKICBSZXBv cnRlZCBieToga2VybmVsIHRlc3Qgcm9ib3QgPGxrcEBpbnRlbC5jb20+CiAgUmVwb3J0ZWQgYnk6 IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KLSBNaW5vciBjaGFuZ2Ug dG8gdGhlIHR0bV9tb3ZlX21lbWNweSgpIGludGVyZmFjZS4KLSBHcmFjZWZ1bGx5IGhhbmRsZSBs YWNrIG9mIG1lbXJlbWFwKCkgc3VwcG9ydCBvbiBtZW1jcHkKICAoUmVwb3J0ZWQgYnkgTWF0dGhl dyBBdWxkKQotIE1pbm9yIHN0eWxlIGZpeCAoUmVwb3J0ZWQgYnkgTWF0dGhldyBBdWxkKQotLS0K IGRyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvX3V0aWwuYyAgfCAyODAgKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS90dG0vdHRtX21vZHVsZS5jICAgfCAgMzUg KysrKwogZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fcmVzb3VyY2UuYyB8IDE5MyArKysrKysrKysr KysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fdHQuYyAgICAgICB8ICA0MiArKysr KwogaW5jbHVkZS9kcm0vdHRtL3R0bV9ib19kcml2ZXIuaCAgICB8ICAyOCArKysKIGluY2x1ZGUv ZHJtL3R0bS90dG1fY2FjaGluZy5oICAgICAgfCAgIDIgKwogaW5jbHVkZS9kcm0vdHRtL3R0bV9r bWFwX2l0ZXIuaCAgICB8ICA2MSArKysrKysrCiBpbmNsdWRlL2RybS90dG0vdHRtX3Jlc291cmNl LmggICAgIHwgIDYxICsrKysrKysKIGluY2x1ZGUvZHJtL3R0bS90dG1fdHQuaCAgICAgICAgICAg fCAgMTYgKysKIDkgZmlsZXMgY2hhbmdlZCwgNTM2IGluc2VydGlvbnMoKyksIDE4MiBkZWxldGlv bnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL2RybS90dG0vdHRtX2ttYXBfaXRlci5o CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm9fdXRpbC5jIGIvZHJpdmVy cy9ncHUvZHJtL3R0bS90dG1fYm9fdXRpbC5jCmluZGV4IGFlOGI2MTQ2MDcyNC4uNmFjNzc0NGEx YTVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9ib191dGlsLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm9fdXRpbC5jCkBAIC03MiwxOTAgKzcyLDEyNiBAQCB2 b2lkIHR0bV9tZW1faW9fZnJlZShzdHJ1Y3QgdHRtX2RldmljZSAqYmRldiwKIAltZW0tPmJ1cy5h ZGRyID0gTlVMTDsKIH0KIAotc3RhdGljIGludCB0dG1fcmVzb3VyY2VfaW9yZW1hcChzdHJ1Y3Qg dHRtX2RldmljZSAqYmRldiwKLQkJCSAgICAgICBzdHJ1Y3QgdHRtX3Jlc291cmNlICptZW0sCi0J CQkgICAgICAgdm9pZCAqKnZpcnR1YWwpCisvKioKKyAqIHR0bV9tb3ZlX21lbWNweSAtIEhlbHBl ciB0byBwZXJmb3JtIGEgbWVtY3B5IHR0bSBtb3ZlIG9wZXJhdGlvbi4KKyAqIEBibzogVGhlIHN0 cnVjdCB0dG1fYnVmZmVyX29iamVjdC4KKyAqIEBuZXdfbWVtOiBUaGUgc3RydWN0IHR0bV9yZXNv dXJjZSB3ZSdyZSBtb3ZpbmcgdG8gKGNvcHkgZGVzdGluYXRpb24pLgorICogQG5ld19pdGVyOiBB IHN0cnVjdCB0dG1fa21hcF9pdGVyIHJlcHJlc2VudGluZyB0aGUgZGVzdGluYXRpb24gcmVzb3Vy Y2UuCisgKiBAc3JjX2l0ZXI6IEEgc3RydWN0IHR0bV9rbWFwX2l0ZXIgcmVwcmVzZW50aW5nIHRo ZSBzb3VyY2UgcmVzb3VyY2UuCisgKgorICogVGhpcyBmdW5jdGlvbiBpcyBpbnRlbmRlZCB0byBi ZSBhYmxlIHRvIG1vdmUgb3V0IGFzeW5jIHVuZGVyIGEKKyAqIGRtYS1mZW5jZSBpZiBkZXNpcmVk LgorICovCit2b2lkIHR0bV9tb3ZlX21lbWNweShzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJv LAorCQkgICAgIHBnb2ZmX3QgbnVtX3BhZ2VzLAorCQkgICAgIHN0cnVjdCB0dG1fa21hcF9pdGVy ICpkc3RfaXRlciwKKwkJICAgICBzdHJ1Y3QgdHRtX2ttYXBfaXRlciAqc3JjX2l0ZXIpCiB7Ci0J aW50IHJldDsKLQl2b2lkICphZGRyOwotCi0JKnZpcnR1YWwgPSBOVUxMOwotCXJldCA9IHR0bV9t ZW1faW9fcmVzZXJ2ZShiZGV2LCBtZW0pOwotCWlmIChyZXQgfHwgIW1lbS0+YnVzLmlzX2lvbWVt KQotCQlyZXR1cm4gcmV0OworCWNvbnN0IHN0cnVjdCB0dG1fa21hcF9pdGVyX29wcyAqZHN0X29w cyA9IGRzdF9pdGVyLT5vcHM7CisJY29uc3Qgc3RydWN0IHR0bV9rbWFwX2l0ZXJfb3BzICpzcmNf b3BzID0gc3JjX2l0ZXItPm9wczsKKwlzdHJ1Y3QgdHRtX3R0ICp0dG0gPSBiby0+dHRtOworCXN0 cnVjdCBkbWFfYnVmX21hcCBzcmNfbWFwLCBkc3RfbWFwOworCXBnb2ZmX3QgaTsKIAotCWlmICht ZW0tPmJ1cy5hZGRyKSB7Ci0JCWFkZHIgPSBtZW0tPmJ1cy5hZGRyOwotCX0gZWxzZSB7Ci0JCXNp emVfdCBidXNfc2l6ZSA9IChzaXplX3QpbWVtLT5udW1fcGFnZXMgPDwgUEFHRV9TSElGVDsKKwkv KiBTaW5nbGUgVFRNIG1vdmUuIE5PUCAqLworCWlmIChkc3Rfb3BzLT5tYXBzX3R0ICYmIHNyY19v cHMtPm1hcHNfdHQpCisJCXJldHVybjsKIAotCQlpZiAobWVtLT5idXMuY2FjaGluZyA9PSB0dG1f d3JpdGVfY29tYmluZWQpCi0JCQlhZGRyID0gaW9yZW1hcF93YyhtZW0tPmJ1cy5vZmZzZXQsIGJ1 c19zaXplKTsKLSNpZmRlZiBDT05GSUdfWDg2Ci0JCWVsc2UgaWYgKG1lbS0+YnVzLmNhY2hpbmcg PT0gdHRtX2NhY2hlZCkKLQkJCWFkZHIgPSBpb3JlbWFwX2NhY2hlKG1lbS0+YnVzLm9mZnNldCwg YnVzX3NpemUpOwotI2VuZGlmCi0JCWVsc2UKLQkJCWFkZHIgPSBpb3JlbWFwKG1lbS0+YnVzLm9m ZnNldCwgYnVzX3NpemUpOwotCQlpZiAoIWFkZHIpIHsKLQkJCXR0bV9tZW1faW9fZnJlZShiZGV2 LCBtZW0pOwotCQkJcmV0dXJuIC1FTk9NRU07CisJLyogRG9uJ3QgbW92ZSBub25leGlzdGVudCBk YXRhLiBDbGVhciBkZXN0aW5hdGlvbiBpbnN0ZWFkLiAqLworCWlmIChzcmNfb3BzLT5tYXBzX3R0 ICYmICghdHRtIHx8ICF0dG1fdHRfaXNfcG9wdWxhdGVkKHR0bSkpKSB7CisJCWlmICh0dG0gJiYg ISh0dG0tPnBhZ2VfZmxhZ3MgJiBUVE1fUEFHRV9GTEFHX1pFUk9fQUxMT0MpKQorCQkJcmV0dXJu OworCisJCWZvciAoaSA9IDA7IGkgPCBudW1fcGFnZXM7ICsraSkgeworCQkJZHN0X29wcy0+bWFw X2xvY2FsKGRzdF9pdGVyLCAmZHN0X21hcCwgaSk7CisJCQlpZiAoZHN0X21hcC5pc19pb21lbSkK KwkJCQltZW1zZXRfaW8oZHN0X21hcC52YWRkcl9pb21lbSwgMCwgUEFHRV9TSVpFKTsKKwkJCWVs c2UKKwkJCQltZW1zZXQoZHN0X21hcC52YWRkciwgMCwgUEFHRV9TSVpFKTsKKwkJCWlmIChkc3Rf b3BzLT51bm1hcF9sb2NhbCkKKwkJCQlkc3Rfb3BzLT51bm1hcF9sb2NhbChkc3RfaXRlciwgJmRz dF9tYXApOwogCQl9CisJCXJldHVybjsKIAl9Ci0JKnZpcnR1YWwgPSBhZGRyOwotCXJldHVybiAw OwotfQotCi1zdGF0aWMgdm9pZCB0dG1fcmVzb3VyY2VfaW91bm1hcChzdHJ1Y3QgdHRtX2Rldmlj ZSAqYmRldiwKLQkJCQlzdHJ1Y3QgdHRtX3Jlc291cmNlICptZW0sCi0JCQkJdm9pZCAqdmlydHVh bCkKLXsKLQlpZiAodmlydHVhbCAmJiBtZW0tPmJ1cy5hZGRyID09IE5VTEwpCi0JCWlvdW5tYXAo dmlydHVhbCk7Ci0JdHRtX21lbV9pb19mcmVlKGJkZXYsIG1lbSk7Ci19Ci0KLXN0YXRpYyBpbnQg dHRtX2NvcHlfaW9fcGFnZSh2b2lkICpkc3QsIHZvaWQgKnNyYywgdW5zaWduZWQgbG9uZyBwYWdl KQotewotCXVpbnQzMl90ICpkc3RQID0KLQkgICAgKHVpbnQzMl90ICopICgodW5zaWduZWQgbG9u Zylkc3QgKyAocGFnZSA8PCBQQUdFX1NISUZUKSk7Ci0JdWludDMyX3QgKnNyY1AgPQotCSAgICAo dWludDMyX3QgKikgKCh1bnNpZ25lZCBsb25nKXNyYyArIChwYWdlIDw8IFBBR0VfU0hJRlQpKTsK LQotCWludCBpOwotCWZvciAoaSA9IDA7IGkgPCBQQUdFX1NJWkUgLyBzaXplb2YodWludDMyX3Qp OyArK2kpCi0JCWlvd3JpdGUzMihpb3JlYWQzMihzcmNQKyspLCBkc3RQKyspOwotCXJldHVybiAw OwotfQotCi1zdGF0aWMgaW50IHR0bV9jb3B5X2lvX3R0bV9wYWdlKHN0cnVjdCB0dG1fdHQgKnR0 bSwgdm9pZCAqc3JjLAotCQkJCXVuc2lnbmVkIGxvbmcgcGFnZSwKLQkJCQlwZ3Byb3RfdCBwcm90 KQotewotCXN0cnVjdCBwYWdlICpkID0gdHRtLT5wYWdlc1twYWdlXTsKLQl2b2lkICpkc3Q7Ci0K LQlpZiAoIWQpCi0JCXJldHVybiAtRU5PTUVNOwotCi0Jc3JjID0gKHZvaWQgKikoKHVuc2lnbmVk IGxvbmcpc3JjICsgKHBhZ2UgPDwgUEFHRV9TSElGVCkpOwotCWRzdCA9IGttYXBfYXRvbWljX3By b3QoZCwgcHJvdCk7Ci0JaWYgKCFkc3QpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JbWVtY3B5X2Zy b21pbyhkc3QsIHNyYywgUEFHRV9TSVpFKTsKLQotCWt1bm1hcF9hdG9taWMoZHN0KTsKLQotCXJl dHVybiAwOwotfQotCi1zdGF0aWMgaW50IHR0bV9jb3B5X3R0bV9pb19wYWdlKHN0cnVjdCB0dG1f dHQgKnR0bSwgdm9pZCAqZHN0LAotCQkJCXVuc2lnbmVkIGxvbmcgcGFnZSwKLQkJCQlwZ3Byb3Rf dCBwcm90KQotewotCXN0cnVjdCBwYWdlICpzID0gdHRtLT5wYWdlc1twYWdlXTsKLQl2b2lkICpz cmM7CiAKLQlpZiAoIXMpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JZHN0ID0gKHZvaWQgKikoKHVu c2lnbmVkIGxvbmcpZHN0ICsgKHBhZ2UgPDwgUEFHRV9TSElGVCkpOwotCXNyYyA9IGttYXBfYXRv bWljX3Byb3QocywgcHJvdCk7Ci0JaWYgKCFzcmMpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JbWVt Y3B5X3RvaW8oZHN0LCBzcmMsIFBBR0VfU0laRSk7Ci0KLQlrdW5tYXBfYXRvbWljKHNyYyk7CisJ Zm9yIChpID0gMDsgaSA8IG51bV9wYWdlczsgKytpKSB7CisJCWRzdF9vcHMtPm1hcF9sb2NhbChk c3RfaXRlciwgJmRzdF9tYXAsIGkpOworCQlzcmNfb3BzLT5tYXBfbG9jYWwoc3JjX2l0ZXIsICZz cmNfbWFwLCBpKTsKKworCQlpZiAoIXNyY19tYXAuaXNfaW9tZW0gJiYgIWRzdF9tYXAuaXNfaW9t ZW0pIHsKKwkJCW1lbWNweShkc3RfbWFwLnZhZGRyLCBzcmNfbWFwLnZhZGRyLCBQQUdFX1NJWkUp OworCQl9IGVsc2UgaWYgKCFzcmNfbWFwLmlzX2lvbWVtKSB7CisJCQlkbWFfYnVmX21hcF9tZW1j cHlfdG8oJmRzdF9tYXAsIHNyY19tYXAudmFkZHIsCisJCQkJCSAgICAgIFBBR0VfU0laRSk7CisJ CX0gZWxzZSBpZiAoIWRzdF9tYXAuaXNfaW9tZW0pIHsKKwkJCW1lbWNweV9mcm9taW8oZHN0X21h cC52YWRkciwgc3JjX21hcC52YWRkcl9pb21lbSwKKwkJCQkgICAgICBQQUdFX1NJWkUpOworCQl9 IGVsc2UgeworCQkJaW50IGo7CisJCQl1MzIgX19pb21lbSAqc3JjID0gc3JjX21hcC52YWRkcl9p b21lbTsKKwkJCXUzMiBfX2lvbWVtICpkc3QgPSBkc3RfbWFwLnZhZGRyX2lvbWVtOwogCi0JcmV0 dXJuIDA7CisJCQlmb3IgKGogPSAwOyBqIDwgKFBBR0VfU0laRSAvIHNpemVvZih1MzIpKTsgKytq KQorCQkJCWlvd3JpdGUzMihpb3JlYWQzMihzcmMrKyksIGRzdCsrKTsKKwkJfQorCQlpZiAoc3Jj X29wcy0+dW5tYXBfbG9jYWwpCisJCQlzcmNfb3BzLT51bm1hcF9sb2NhbChzcmNfaXRlciwgJnNy Y19tYXApOworCQlpZiAoZHN0X29wcy0+dW5tYXBfbG9jYWwpCisJCQlkc3Rfb3BzLT51bm1hcF9s b2NhbChkc3RfaXRlciwgJmRzdF9tYXApOworCX0KIH0KK0VYUE9SVF9TWU1CT0wodHRtX21vdmVf bWVtY3B5KTsKIAogaW50IHR0bV9ib19tb3ZlX21lbWNweShzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmpl Y3QgKmJvLAogCQkgICAgICAgc3RydWN0IHR0bV9vcGVyYXRpb25fY3R4ICpjdHgsCi0JCSAgICAg ICBzdHJ1Y3QgdHRtX3Jlc291cmNlICpuZXdfbWVtKQorCQkgICAgICAgc3RydWN0IHR0bV9yZXNv dXJjZSAqZHN0X21lbSkKIHsKIAlzdHJ1Y3QgdHRtX2RldmljZSAqYmRldiA9IGJvLT5iZGV2Owot CXN0cnVjdCB0dG1fcmVzb3VyY2VfbWFuYWdlciAqbWFuID0gdHRtX21hbmFnZXJfdHlwZShiZGV2 LCBuZXdfbWVtLT5tZW1fdHlwZSk7CisJc3RydWN0IHR0bV9yZXNvdXJjZV9tYW5hZ2VyICpkc3Rf bWFuID0KKwkJdHRtX21hbmFnZXJfdHlwZShiby0+YmRldiwgZHN0X21lbS0+bWVtX3R5cGUpOwog CXN0cnVjdCB0dG1fdHQgKnR0bSA9IGJvLT50dG07Ci0Jc3RydWN0IHR0bV9yZXNvdXJjZSAqb2xk X21lbSA9ICZiby0+bWVtOwotCXN0cnVjdCB0dG1fcmVzb3VyY2Ugb2xkX2NvcHkgPSAqb2xkX21l bTsKLQl2b2lkICpvbGRfaW9tYXA7Ci0Jdm9pZCAqbmV3X2lvbWFwOwotCWludCByZXQ7Ci0JdW5z aWduZWQgbG9uZyBpOwotCi0JcmV0ID0gdHRtX2JvX3dhaXRfY3R4KGJvLCBjdHgpOwotCWlmIChy ZXQpCi0JCXJldHVybiByZXQ7Ci0KLQlyZXQgPSB0dG1fcmVzb3VyY2VfaW9yZW1hcChiZGV2LCBv bGRfbWVtLCAmb2xkX2lvbWFwKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCXJldCA9IHR0 bV9yZXNvdXJjZV9pb3JlbWFwKGJkZXYsIG5ld19tZW0sICZuZXdfaW9tYXApOwotCWlmIChyZXQp Ci0JCWdvdG8gb3V0OwotCi0JLyoKLQkgKiBTaW5nbGUgVFRNIG1vdmUuIE5PUC4KLQkgKi8KLQlp ZiAob2xkX2lvbWFwID09IE5VTEwgJiYgbmV3X2lvbWFwID09IE5VTEwpCi0JCWdvdG8gb3V0MjsK LQotCS8qCi0JICogRG9uJ3QgbW92ZSBub25leGlzdGVudCBkYXRhLiBDbGVhciBkZXN0aW5hdGlv biBpbnN0ZWFkLgotCSAqLwotCWlmIChvbGRfaW9tYXAgPT0gTlVMTCAmJgotCSAgICAodHRtID09 IE5VTEwgfHwgKCF0dG1fdHRfaXNfcG9wdWxhdGVkKHR0bSkgJiYKLQkJCSAgICAgISh0dG0tPnBh Z2VfZmxhZ3MgJiBUVE1fUEFHRV9GTEFHX1NXQVBQRUQpKSkpIHsKLQkJbWVtc2V0X2lvKG5ld19p b21hcCwgMCwgbmV3X21lbS0+bnVtX3BhZ2VzKlBBR0VfU0laRSk7Ci0JCWdvdG8gb3V0MjsKLQl9 CisJc3RydWN0IHR0bV9yZXNvdXJjZSAqc3JjX21lbSA9ICZiby0+bWVtOworCXN0cnVjdCB0dG1f cmVzb3VyY2VfbWFuYWdlciAqc3JjX21hbiA9CisJCXR0bV9tYW5hZ2VyX3R5cGUoYmRldiwgc3Jj X21lbS0+bWVtX3R5cGUpOworCXN0cnVjdCB0dG1fcmVzb3VyY2Ugc3JjX2NvcHkgPSAqc3JjX21l bTsKKwl1bmlvbiB7CisJCXN0cnVjdCB0dG1fa21hcF9pdGVyX3R0IHR0OworCQlzdHJ1Y3QgdHRt X2ttYXBfaXRlcl9saW5lYXJfaW8gaW87CisJfSBfZHN0X2l0ZXIsIF9zcmNfaXRlcjsKKwlzdHJ1 Y3QgdHRtX2ttYXBfaXRlciAqZHN0X2l0ZXIsICpzcmNfaXRlcjsKKwlpbnQgcmV0ID0gMDsKIAot CS8qCi0JICogVFRNIG1pZ2h0IGJlIG51bGwgZm9yIG1vdmVzIHdpdGhpbiB0aGUgc2FtZSByZWdp b24uCi0JICovCi0JaWYgKHR0bSkgeworCWlmICh0dG0gJiYgKCh0dG0tPnBhZ2VfZmxhZ3MgJiBU VE1fUEFHRV9GTEFHX1NXQVBQRUQpIHx8CisJCSAgICBkc3RfbWFuLT51c2VfdHQpKSB7CiAJCXJl dCA9IHR0bV90dF9wb3B1bGF0ZShiZGV2LCB0dG0sIGN0eCk7CiAJCWlmIChyZXQpCi0JCQlnb3Rv IG91dDE7CisJCQlyZXR1cm4gcmV0OwogCX0KIAotCWZvciAoaSA9IDA7IGkgPCBuZXdfbWVtLT5u dW1fcGFnZXM7ICsraSkgewotCQlpZiAob2xkX2lvbWFwID09IE5VTEwpIHsKLQkJCXBncHJvdF90 IHByb3QgPSB0dG1faW9fcHJvdChibywgb2xkX21lbSwgUEFHRV9LRVJORUwpOwotCQkJcmV0ID0g dHRtX2NvcHlfdHRtX2lvX3BhZ2UodHRtLCBuZXdfaW9tYXAsIGksCi0JCQkJCQkgICBwcm90KTsK LQkJfSBlbHNlIGlmIChuZXdfaW9tYXAgPT0gTlVMTCkgewotCQkJcGdwcm90X3QgcHJvdCA9IHR0 bV9pb19wcm90KGJvLCBuZXdfbWVtLCBQQUdFX0tFUk5FTCk7Ci0JCQlyZXQgPSB0dG1fY29weV9p b190dG1fcGFnZSh0dG0sIG9sZF9pb21hcCwgaSwKLQkJCQkJCSAgIHByb3QpOwotCQl9IGVsc2Ug ewotCQkJcmV0ID0gdHRtX2NvcHlfaW9fcGFnZShuZXdfaW9tYXAsIG9sZF9pb21hcCwgaSk7Ci0J CX0KLQkJaWYgKHJldCkKLQkJCWdvdG8gb3V0MTsKKwlkc3RfaXRlciA9IHR0bV9rbWFwX2l0ZXJf bGluZWFyX2lvX2luaXQoJl9kc3RfaXRlci5pbywgYmRldiwgZHN0X21lbSk7CisJaWYgKFBUUl9F UlIoZHN0X2l0ZXIpID09IC1FSU5WQUwgJiYgZHN0X21hbi0+dXNlX3R0KQorCQlkc3RfaXRlciA9 IHR0bV9rbWFwX2l0ZXJfdHRfaW5pdCgmX2RzdF9pdGVyLnR0LCBiby0+dHRtKTsKKwlpZiAoSVNf RVJSKGRzdF9pdGVyKSkKKwkJcmV0dXJuIFBUUl9FUlIoZHN0X2l0ZXIpOworCisJc3JjX2l0ZXIg PSB0dG1fa21hcF9pdGVyX2xpbmVhcl9pb19pbml0KCZfc3JjX2l0ZXIuaW8sIGJkZXYsIHNyY19t ZW0pOworCWlmIChQVFJfRVJSKHNyY19pdGVyKSA9PSAtRUlOVkFMICYmIHNyY19tYW4tPnVzZV90 dCkKKwkJc3JjX2l0ZXIgPSB0dG1fa21hcF9pdGVyX3R0X2luaXQoJl9zcmNfaXRlci50dCwgYm8t PnR0bSk7CisJaWYgKElTX0VSUihzcmNfaXRlcikpIHsKKwkJcmV0ID0gUFRSX0VSUihzcmNfaXRl cik7CisJCWdvdG8gb3V0X3NyY19pdGVyOwogCX0KLQltYigpOwotb3V0MjoKLQlvbGRfY29weSA9 ICpvbGRfbWVtOwogCi0JdHRtX2JvX2Fzc2lnbl9tZW0oYm8sIG5ld19tZW0pOwotCi0JaWYgKCFt YW4tPnVzZV90dCkKLQkJdHRtX2JvX3R0X2Rlc3Ryb3koYm8pOworCXR0bV9tb3ZlX21lbWNweShi bywgZHN0X21lbS0+bnVtX3BhZ2VzLCBkc3RfaXRlciwgc3JjX2l0ZXIpOworCXNyY19jb3B5ID0g KnNyY19tZW07CisJdHRtX2JvX21vdmVfc3luY19jbGVhbnVwKGJvLCBkc3RfbWVtKTsKIAotb3V0 MToKLQl0dG1fcmVzb3VyY2VfaW91bm1hcChiZGV2LCBvbGRfbWVtLCBuZXdfaW9tYXApOwotb3V0 OgotCXR0bV9yZXNvdXJjZV9pb3VubWFwKGJkZXYsICZvbGRfY29weSwgb2xkX2lvbWFwKTsKKwlp ZiAoIXNyY19pdGVyLT5vcHMtPm1hcHNfdHQpCisJCXR0bV9rbWFwX2l0ZXJfbGluZWFyX2lvX2Zp bmkoJl9zcmNfaXRlci5pbywgYmRldiwgJnNyY19jb3B5KTsKK291dF9zcmNfaXRlcjoKKwlpZiAo IWRzdF9pdGVyLT5vcHMtPm1hcHNfdHQpCisJCXR0bV9rbWFwX2l0ZXJfbGluZWFyX2lvX2Zpbmko Jl9kc3RfaXRlci5pbywgYmRldiwgZHN0X21lbSk7CiAKLQkvKgotCSAqIE9uIGVycm9yLCBrZWVw IHRoZSBtbSBub2RlIQotCSAqLwotCWlmICghcmV0KQotCQl0dG1fcmVzb3VyY2VfZnJlZShibywg Jm9sZF9jb3B5KTsKIAlyZXR1cm4gcmV0OwogfQogRVhQT1JUX1NZTUJPTCh0dG1fYm9fbW92ZV9t ZW1jcHkpOwpAQCAtMzM2LDI3ICsyNzIsNyBAQCBwZ3Byb3RfdCB0dG1faW9fcHJvdChzdHJ1Y3Qg dHRtX2J1ZmZlcl9vYmplY3QgKmJvLCBzdHJ1Y3QgdHRtX3Jlc291cmNlICpyZXMsCiAJbWFuID0g dHRtX21hbmFnZXJfdHlwZShiby0+YmRldiwgcmVzLT5tZW1fdHlwZSk7CiAJY2FjaGluZyA9IG1h bi0+dXNlX3R0ID8gYm8tPnR0bS0+Y2FjaGluZyA6IHJlcy0+YnVzLmNhY2hpbmc7CiAKLQkvKiBD YWNoZWQgbWFwcGluZ3MgbmVlZCBubyBhZGp1c3RtZW50ICovCi0JaWYgKGNhY2hpbmcgPT0gdHRt X2NhY2hlZCkKLQkJcmV0dXJuIHRtcDsKLQotI2lmIGRlZmluZWQoX19pMzg2X18pIHx8IGRlZmlu ZWQoX194ODZfNjRfXykKLQlpZiAoY2FjaGluZyA9PSB0dG1fd3JpdGVfY29tYmluZWQpCi0JCXRt cCA9IHBncHJvdF93cml0ZWNvbWJpbmUodG1wKTsKLQllbHNlIGlmIChib290X2NwdV9kYXRhLng4 NiA+IDMpCi0JCXRtcCA9IHBncHJvdF9ub25jYWNoZWQodG1wKTsKLSNlbmRpZgotI2lmIGRlZmlu ZWQoX19pYTY0X18pIHx8IGRlZmluZWQoX19hcm1fXykgfHwgZGVmaW5lZChfX2FhcmNoNjRfXykg fHwgXAotICAgIGRlZmluZWQoX19wb3dlcnBjX18pIHx8IGRlZmluZWQoX19taXBzX18pCi0JaWYg KGNhY2hpbmcgPT0gdHRtX3dyaXRlX2NvbWJpbmVkKQotCQl0bXAgPSBwZ3Byb3Rfd3JpdGVjb21i aW5lKHRtcCk7Ci0JZWxzZQotCQl0bXAgPSBwZ3Byb3Rfbm9uY2FjaGVkKHRtcCk7Ci0jZW5kaWYK LSNpZiBkZWZpbmVkKF9fc3BhcmNfXykKLQl0bXAgPSBwZ3Byb3Rfbm9uY2FjaGVkKHRtcCk7Ci0j ZW5kaWYKLQlyZXR1cm4gdG1wOworCXJldHVybiB0dG1fcHJvdF9mcm9tX2NhY2hpbmcoY2FjaGlu ZywgdG1wKTsKIH0KIEVYUE9SVF9TWU1CT0wodHRtX2lvX3Byb3QpOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9tb2R1bGUuYyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRt X21vZHVsZS5jCmluZGV4IDU2YjBlZmRiYTFhOS4uOTk3YzQ1OGY2OGE5IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9tb2R1bGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdHRt L3R0bV9tb2R1bGUuYwpAQCAtMzEsMTIgKzMxLDQ3IEBACiAgKi8KICNpbmNsdWRlIDxsaW51eC9t b2R1bGUuaD4KICNpbmNsdWRlIDxsaW51eC9kZXZpY2UuaD4KKyNpbmNsdWRlIDxsaW51eC9wZ3Rh YmxlLmg+CiAjaW5jbHVkZSA8bGludXgvc2NoZWQuaD4KICNpbmNsdWRlIDxsaW51eC9kZWJ1Z2Zz Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9zeXNmcy5oPgorI2luY2x1ZGUgPGRybS90dG0vdHRtX2Nh Y2hpbmcuaD4KIAogI2luY2x1ZGUgInR0bV9tb2R1bGUuaCIKIAorLyoqCisgKiB0dG1fcHJvdF9m cm9tX2NhY2hpbmcgLSBNb2RpZnkgdGhlIHBhZ2UgcHJvdGVjdGlvbiBhY2NvcmRpbmcgdG8gdGhl CisgKiB0dG0gY2FjaW5nIG1vZGUKKyAqIEBjYWNoaW5nOiBUaGUgdHRtIGNhY2hpbmcgbW9kZQor ICogQHRtcDogVGhlIG9yaWdpbmFsIHBhZ2UgcHJvdGVjdGlvbgorICoKKyAqIFJldHVybjogVGhl IG1vZGlmaWVkIHBhZ2UgcHJvdGVjdGlvbgorICovCitwZ3Byb3RfdCB0dG1fcHJvdF9mcm9tX2Nh Y2hpbmcoZW51bSB0dG1fY2FjaGluZyBjYWNoaW5nLCBwZ3Byb3RfdCB0bXApCit7CisJLyogQ2Fj aGVkIG1hcHBpbmdzIG5lZWQgbm8gYWRqdXN0bWVudCAqLworCWlmIChjYWNoaW5nID09IHR0bV9j YWNoZWQpCisJCXJldHVybiB0bXA7CisKKyNpZiBkZWZpbmVkKF9faTM4Nl9fKSB8fCBkZWZpbmVk KF9feDg2XzY0X18pCisJaWYgKGNhY2hpbmcgPT0gdHRtX3dyaXRlX2NvbWJpbmVkKQorCQl0bXAg PSBwZ3Byb3Rfd3JpdGVjb21iaW5lKHRtcCk7CisJZWxzZSBpZiAoYm9vdF9jcHVfZGF0YS54ODYg PiAzKQorCQl0bXAgPSBwZ3Byb3Rfbm9uY2FjaGVkKHRtcCk7CisjZW5kaWYKKyNpZiBkZWZpbmVk KF9faWE2NF9fKSB8fCBkZWZpbmVkKF9fYXJtX18pIHx8IGRlZmluZWQoX19hYXJjaDY0X18pIHx8 IFwKKwlkZWZpbmVkKF9fcG93ZXJwY19fKSB8fCBkZWZpbmVkKF9fbWlwc19fKQorCWlmIChjYWNo aW5nID09IHR0bV93cml0ZV9jb21iaW5lZCkKKwkJdG1wID0gcGdwcm90X3dyaXRlY29tYmluZSh0 bXApOworCWVsc2UKKwkJdG1wID0gcGdwcm90X25vbmNhY2hlZCh0bXApOworI2VuZGlmCisjaWYg ZGVmaW5lZChfX3NwYXJjX18pCisJdG1wID0gcGdwcm90X25vbmNhY2hlZCh0bXApOworI2VuZGlm CisJcmV0dXJuIHRtcDsKK30KKwogc3RydWN0IGRlbnRyeSAqdHRtX2RlYnVnZnNfcm9vdDsKIAog c3RhdGljIGludCBfX2luaXQgdHRtX2luaXQodm9pZCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS90dG0vdHRtX3Jlc291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9yZXNvdXJj ZS5jCmluZGV4IDU5ZTJiNzE1N2U0MS4uOTMxYmNkMWE5YjliIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vdHRtL3R0bV9yZXNvdXJjZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRt X3Jlc291cmNlLmMKQEAgLTIyLDYgKzIyLDEwIEBACiAgKiBBdXRob3JzOiBDaHJpc3RpYW4gS8O2 bmlnCiAgKi8KIAorI2luY2x1ZGUgPGxpbnV4L2RtYS1idWYtbWFwLmg+CisjaW5jbHVkZSA8bGlu dXgvaW8tbWFwcGluZy5oPgorI2luY2x1ZGUgPGxpbnV4L3NjYXR0ZXJsaXN0Lmg+CisKICNpbmNs dWRlIDxkcm0vdHRtL3R0bV9yZXNvdXJjZS5oPgogI2luY2x1ZGUgPGRybS90dG0vdHRtX2JvX2Ry aXZlci5oPgogCkBAIC0xNDcsMyArMTUxLDE5MiBAQCB2b2lkIHR0bV9yZXNvdXJjZV9tYW5hZ2Vy X2RlYnVnKHN0cnVjdCB0dG1fcmVzb3VyY2VfbWFuYWdlciAqbWFuLAogCQltYW4tPmZ1bmMtPmRl YnVnKG1hbiwgcCk7CiB9CiBFWFBPUlRfU1lNQk9MKHR0bV9yZXNvdXJjZV9tYW5hZ2VyX2RlYnVn KTsKKworc3RhdGljIHZvaWQgdHRtX2ttYXBfaXRlcl9pb21hcF9tYXBfbG9jYWwoc3RydWN0IHR0 bV9rbWFwX2l0ZXIgKml0ZXIsCisJCQkJCSAgc3RydWN0IGRtYV9idWZfbWFwICpkbWFwLAorCQkJ CQkgIHBnb2ZmX3QgaSkKK3sKKwlzdHJ1Y3QgdHRtX2ttYXBfaXRlcl9pb21hcCAqaXRlcl9pbyA9 CisJCWNvbnRhaW5lcl9vZihpdGVyLCB0eXBlb2YoKml0ZXJfaW8pLCBiYXNlKTsKKwl2b2lkIF9f aW9tZW0gKmFkZHI7CisKK3JldHJ5OgorCXdoaWxlIChpID49IGl0ZXJfaW8tPmNhY2hlLmVuZCkg eworCQlpdGVyX2lvLT5jYWNoZS5zZyA9IGl0ZXJfaW8tPmNhY2hlLnNnID8KKwkJCXNnX25leHQo aXRlcl9pby0+Y2FjaGUuc2cpIDogaXRlcl9pby0+c3QtPnNnbDsKKwkJaXRlcl9pby0+Y2FjaGUu aSA9IGl0ZXJfaW8tPmNhY2hlLmVuZDsKKwkJaXRlcl9pby0+Y2FjaGUuZW5kICs9IHNnX2RtYV9s ZW4oaXRlcl9pby0+Y2FjaGUuc2cpID4+CisJCQlQQUdFX1NISUZUOworCQlpdGVyX2lvLT5jYWNo ZS5vZmZzID0gc2dfZG1hX2FkZHJlc3MoaXRlcl9pby0+Y2FjaGUuc2cpIC0KKwkJCWl0ZXJfaW8t PnN0YXJ0OworCX0KKworCWlmIChpIDwgaXRlcl9pby0+Y2FjaGUuaSkgeworCQlpdGVyX2lvLT5j YWNoZS5lbmQgPSAwOworCQlpdGVyX2lvLT5jYWNoZS5zZyA9IE5VTEw7CisJCWdvdG8gcmV0cnk7 CisJfQorCisJYWRkciA9IGlvX21hcHBpbmdfbWFwX2xvY2FsX3djKGl0ZXJfaW8tPmlvbWFwLCBp dGVyX2lvLT5jYWNoZS5vZmZzICsKKwkJCQkgICAgICAgKCgocmVzb3VyY2Vfc2l6ZV90KWkgLSBp dGVyX2lvLT5jYWNoZS5pKQorCQkJCQk8PCBQQUdFX1NISUZUKSk7CisJZG1hX2J1Zl9tYXBfc2V0 X3ZhZGRyX2lvbWVtKGRtYXAsIGFkZHIpOworfQorCitzdGF0aWMgdm9pZCB0dG1fa21hcF9pdGVy X2lvbWFwX3VubWFwX2xvY2FsKHN0cnVjdCB0dG1fa21hcF9pdGVyICppdGVyLAorCQkJCQkgICAg c3RydWN0IGRtYV9idWZfbWFwICptYXApCit7CisJaW9fbWFwcGluZ191bm1hcF9sb2NhbChtYXAt PnZhZGRyX2lvbWVtKTsKK30KKworc3RhdGljIGNvbnN0IHN0cnVjdCB0dG1fa21hcF9pdGVyX29w cyB0dG1fa21hcF9pdGVyX2lvX29wcyA9IHsKKwkubWFwX2xvY2FsID0gIHR0bV9rbWFwX2l0ZXJf aW9tYXBfbWFwX2xvY2FsLAorCS51bm1hcF9sb2NhbCA9IHR0bV9rbWFwX2l0ZXJfaW9tYXBfdW5t YXBfbG9jYWwsCisJLm1hcHNfdHQgPSBmYWxzZSwKK307CisKKy8qKgorICogdHRtX2ttYXBfaXRl cl9pb21hcF9pbml0IC0gSW5pdGlhbGl6ZSBhIHN0cnVjdCB0dG1fa21hcF9pdGVyX2lvbWFwCisg KiBAaXRlcl9pbzogVGhlIHN0cnVjdCB0dG1fa21hcF9pdGVyX2lvbWFwIHRvIGluaXRpYWxpemUu CisgKiBAaW9tYXA6IFRoZSBzdHJ1Y3QgaW9fbWFwcGluZyByZXByZXNlbnRpbmcgdGhlIHVuZGVy bHlpbmcgbGluZWFyIGlvX21lbW9yeS4KKyAqIEBzdDogc2dfdGFibGUgaW50byBAaW9tYXAsIHJl cHJlc2VudGluZyB0aGUgbWVtb3J5IG9mIHRoZSBzdHJ1Y3QKKyAqIHR0bV9yZXNvdXJjZS4KKyAq IEBzdGFydDogT2Zmc2V0IHRoYXQgbmVlZHMgdG8gYmUgc3VidHJhY3RlZCBmcm9tIEBzdCB0byBt YWtlCisgKiBzZ19kbWFfYWRkcmVzcyhzdC0+c2dsKSAtIEBzdGFydCA9PSAwIGZvciBAaW9tYXAg c3RhcnQuCisgKgorICogUmV0dXJuOiBQb2ludGVyIHRvIHRoZSBlbWJlZGRlZCBzdHJ1Y3QgdHRt X2ttYXBfaXRlci4KKyAqLworc3RydWN0IHR0bV9rbWFwX2l0ZXIgKgordHRtX2ttYXBfaXRlcl9p b21hcF9pbml0KHN0cnVjdCB0dG1fa21hcF9pdGVyX2lvbWFwICppdGVyX2lvLAorCQkJIHN0cnVj dCBpb19tYXBwaW5nICppb21hcCwKKwkJCSBzdHJ1Y3Qgc2dfdGFibGUgKnN0LAorCQkJIHJlc291 cmNlX3NpemVfdCBzdGFydCkKK3sKKwlpdGVyX2lvLT5iYXNlLm9wcyA9ICZ0dG1fa21hcF9pdGVy X2lvX29wczsKKwlpdGVyX2lvLT5pb21hcCA9IGlvbWFwOworCWl0ZXJfaW8tPnN0ID0gc3Q7CisJ aXRlcl9pby0+c3RhcnQgPSBzdGFydDsKKwltZW1zZXQoJml0ZXJfaW8tPmNhY2hlLCAwLCBzaXpl b2YoaXRlcl9pby0+Y2FjaGUpKTsKKworCXJldHVybiAmaXRlcl9pby0+YmFzZTsKK30KK0VYUE9S VF9TWU1CT0wodHRtX2ttYXBfaXRlcl9pb21hcF9pbml0KTsKKworLyoqCisgKiBET0M6IExpbmVh ciBpbyBpdGVyYXRvcgorICoKKyAqIFRoaXMgY29kZSBzaG91bGQgZGllIGluIHRoZSBub3QgdG9v IG5lYXIgZnV0dXJlLiBCZXN0IHdvdWxkIGJlIGlmIHdlIGNvdWxkCisgKiBtYWtlIGlvLW1hcHBp bmcgdXNlIG1lbXJlbWFwIGZvciBhbGwgaW8gbWVtb3J5LCBhbmQgaGF2ZSBtZW1yZW1hcAorICog aW1wbGVtZW50IGEga21hcF9sb2NhbCBmdW5jdGlvbmFsaXR5LiBXZSBjb3VsZCB0aGVuIHN0cmlw IGEgaHVnZSBhbW91bnQgb2YKKyAqIGNvZGUuIFRoZXNlIGxpbmVhciBpbyBpdGVyYXRvcnMgYXJl IGltcGxlbWVudGVkIHRvIG1pbWljIG9sZCBmdW5jdGlvbmFsaXR5LAorICogYW5kIHRoZXkgZG9u J3QgdXNlIGttYXBfbG9jYWwgc2VtYW50aWNzIGF0IGFsbCBpbnRlcm5hbGx5LiBSYXRoZXIgaW9y ZW1hcCBvcgorICogZnJpZW5kcywgYW5kIGF0IGxlYXN0IG9uIDMyLWJpdCB0aGV5IGFkZCBnbG9i YWwgVExCIGZsdXNoZXMgYW5kIHBvaW50cworICogb2YgZmFpbHVyZS4KKyAqLworCitzdGF0aWMg dm9pZCB0dG1fa21hcF9pdGVyX2xpbmVhcl9pb19tYXBfbG9jYWwoc3RydWN0IHR0bV9rbWFwX2l0 ZXIgKml0ZXIsCisJCQkJCSAgICAgIHN0cnVjdCBkbWFfYnVmX21hcCAqZG1hcCwKKwkJCQkJICAg ICAgcGdvZmZfdCBpKQoreworCXN0cnVjdCB0dG1fa21hcF9pdGVyX2xpbmVhcl9pbyAqaXRlcl9p byA9CisJCWNvbnRhaW5lcl9vZihpdGVyLCB0eXBlb2YoKml0ZXJfaW8pLCBiYXNlKTsKKworCSpk bWFwID0gaXRlcl9pby0+ZG1hcDsKKwlkbWFfYnVmX21hcF9pbmNyKGRtYXAsIGkgKiBQQUdFX1NJ WkUpOworfQorCitzdGF0aWMgY29uc3Qgc3RydWN0IHR0bV9rbWFwX2l0ZXJfb3BzIHR0bV9rbWFw X2l0ZXJfbGluZWFyX2lvX29wcyA9IHsKKwkubWFwX2xvY2FsID0gIHR0bV9rbWFwX2l0ZXJfbGlu ZWFyX2lvX21hcF9sb2NhbCwKKwkubWFwc190dCA9IGZhbHNlLAorfTsKKworLyoqCisgKiB0dG1f a21hcF9pdGVyX2xpbmVhcl9pb19pbml0IC0gSW5pdGlhbGl6ZSBhbiBpdGVyYXRvciBmb3IgbGlu ZWFyIGlvIG1lbW9yeQorICogQGl0ZXJfaW86IFRoZSBpdGVyYXRvciB0byBpbml0aWFsaXplCisg KiBAYmRldjogVGhlIFRUTSBkZXZpY2UKKyAqIEBtZW06IFRoZSB0dG0gcmVzb3VyY2UgcmVwcmVz ZW50aW5nIHRoZSBpb21hcC4KKyAqCisgKiBUaGlzIGZ1bmN0aW9uIGlzIGZvciBpbnRlcm5hbCBU VE0gdXNlIG9ubHkuIEl0IHNldHMgdXAgYSBtZW1jcHkga21hcCBpdGVyYXRvcgorICogcG9pbnRp bmcgYXQgYSBsaW5lYXIgY2h1bmsgb2YgaW8gbWVtb3J5LgorICoKKyAqIFJldHVybjogQSBwb2lu dGVyIHRvIHRoZSBlbWJlZGRlZCBzdHJ1Y3QgdHRtX2ttYXBfaXRlciBvciBlcnJvciBwb2ludGVy IG9uCisgKiBmYWlsdXJlLgorICovCitzdHJ1Y3QgdHRtX2ttYXBfaXRlciAqCit0dG1fa21hcF9p dGVyX2xpbmVhcl9pb19pbml0KHN0cnVjdCB0dG1fa21hcF9pdGVyX2xpbmVhcl9pbyAqaXRlcl9p bywKKwkJCSAgICAgc3RydWN0IHR0bV9kZXZpY2UgKmJkZXYsCisJCQkgICAgIHN0cnVjdCB0dG1f cmVzb3VyY2UgKm1lbSkKK3sKKwlpbnQgcmV0OworCisJcmV0ID0gdHRtX21lbV9pb19yZXNlcnZl KGJkZXYsIG1lbSk7CisJaWYgKHJldCkKKwkJZ290byBvdXRfZXJyOworCWlmICghbWVtLT5idXMu aXNfaW9tZW0pIHsKKwkJcmV0ID0gLUVJTlZBTDsKKwkJZ290byBvdXRfaW9fZnJlZTsKKwl9CisK KwlpZiAobWVtLT5idXMuYWRkcikgeworCQlkbWFfYnVmX21hcF9zZXRfdmFkZHIoJml0ZXJfaW8t PmRtYXAsIG1lbS0+YnVzLmFkZHIpOworCQlpdGVyX2lvLT5uZWVkc191bm1hcCA9IGZhbHNlOwor CX0gZWxzZSB7CisJCXNpemVfdCBidXNfc2l6ZSA9IChzaXplX3QpbWVtLT5udW1fcGFnZXMgPDwg UEFHRV9TSElGVDsKKworCQlpdGVyX2lvLT5uZWVkc191bm1hcCA9IHRydWU7CisJCW1lbXNldCgm aXRlcl9pby0+ZG1hcCwgMCwgc2l6ZW9mKGl0ZXJfaW8tPmRtYXApKTsKKwkJaWYgKG1lbS0+YnVz LmNhY2hpbmcgPT0gdHRtX3dyaXRlX2NvbWJpbmVkKQorCQkJZG1hX2J1Zl9tYXBfc2V0X3ZhZGRy X2lvbWVtKCZpdGVyX2lvLT5kbWFwLAorCQkJCQkJICAgIGlvcmVtYXBfd2MobWVtLT5idXMub2Zm c2V0LAorCQkJCQkJCSAgICAgICBidXNfc2l6ZSkpOworCQllbHNlIGlmIChtZW0tPmJ1cy5jYWNo aW5nID09IHR0bV9jYWNoZWQpCisJCQlkbWFfYnVmX21hcF9zZXRfdmFkZHIoJml0ZXJfaW8tPmRt YXAsCisJCQkJCSAgICAgIG1lbXJlbWFwKG1lbS0+YnVzLm9mZnNldCwgYnVzX3NpemUsCisJCQkJ CQkgICAgICAgTUVNUkVNQVBfV0IgfAorCQkJCQkJICAgICAgIE1FTVJFTUFQX1dUIHwKKwkJCQkJ CSAgICAgICBNRU1SRU1BUF9XQykpOworCisJCS8qIElmIHVuY2FjaGVkIHJlcXVlc3RlZCBvciBp ZiBtYXBwaW5nIGNhY2hlZCBvciB3YyBmYWlsZWQgKi8KKwkJaWYgKGRtYV9idWZfbWFwX2lzX251 bGwoJml0ZXJfaW8tPmRtYXApKQorCQkJZG1hX2J1Zl9tYXBfc2V0X3ZhZGRyX2lvbWVtKCZpdGVy X2lvLT5kbWFwLAorCQkJCQkJICAgIGlvcmVtYXAobWVtLT5idXMub2Zmc2V0LAorCQkJCQkJCSAg ICBidXNfc2l6ZSkpOworCisJCWlmIChkbWFfYnVmX21hcF9pc19udWxsKCZpdGVyX2lvLT5kbWFw KSkgeworCQkJcmV0ID0gLUVOT01FTTsKKwkJCWdvdG8gb3V0X2lvX2ZyZWU7CisJCX0KKwl9CisK KwlpdGVyX2lvLT5iYXNlLm9wcyA9ICZ0dG1fa21hcF9pdGVyX2xpbmVhcl9pb19vcHM7CisJcmV0 dXJuICZpdGVyX2lvLT5iYXNlOworCitvdXRfaW9fZnJlZToKKwl0dG1fbWVtX2lvX2ZyZWUoYmRl diwgbWVtKTsKK291dF9lcnI6CisJcmV0dXJuIEVSUl9QVFIocmV0KTsKK30KKworLyoqCisgKiB0 dG1fa21hcF9pdGVyX2xpbmVhcl9pb19maW5pIC0gQ2xlYW4gdXAgYW4gaXRlcmF0b3IgZm9yIGxp bmVhciBpbyBtZW1vcnkKKyAqIEBpdGVyX2lvOiBUaGUgaXRlcmF0b3IgdG8gaW5pdGlhbGl6ZQor ICogQGJkZXY6IFRoZSBUVE0gZGV2aWNlCisgKiBAbWVtOiBUaGUgdHRtIHJlc291cmNlIHJlcHJl c2VudGluZyB0aGUgaW9tYXAuCisgKgorICogVGhpcyBmdW5jdGlvbiBpcyBmb3IgaW50ZXJuYWwg VFRNIHVzZSBvbmx5LiBJdCBjbGVhbnMgdXAgYSBtZW1jcHkga21hcAorICogaXRlcmF0b3IgaW5p dGlhbGl6ZWQgYnkgdHRtX2ttYXBfaXRlcl9saW5lYXJfaW9faW5pdC4KKyAqLwordm9pZAordHRt X2ttYXBfaXRlcl9saW5lYXJfaW9fZmluaShzdHJ1Y3QgdHRtX2ttYXBfaXRlcl9saW5lYXJfaW8g Kml0ZXJfaW8sCisJCQkgICAgIHN0cnVjdCB0dG1fZGV2aWNlICpiZGV2LAorCQkJICAgICBzdHJ1 Y3QgdHRtX3Jlc291cmNlICptZW0pCit7CisJaWYgKGl0ZXJfaW8tPm5lZWRzX3VubWFwICYmIGRt YV9idWZfbWFwX2lzX3NldCgmaXRlcl9pby0+ZG1hcCkpIHsKKwkJaWYgKGl0ZXJfaW8tPmRtYXAu aXNfaW9tZW0pCisJCQlpb3VubWFwKGl0ZXJfaW8tPmRtYXAudmFkZHJfaW9tZW0pOworCQllbHNl CisJCQltZW11bm1hcChpdGVyX2lvLT5kbWFwLnZhZGRyKTsKKwl9CisKKwl0dG1fbWVtX2lvX2Zy ZWUoYmRldiwgbWVtKTsKK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3R0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV90dC5jCmluZGV4IDUzOWUwMjMyY2IzYi4uMGU0 MTIyNzExNmIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV90dC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3R0LmMKQEAgLTQzMywzICs0MzMsNDUgQEAgdm9pZCB0 dG1fdHRfbWdyX2luaXQodW5zaWduZWQgbG9uZyBudW1fcGFnZXMsIHVuc2lnbmVkIGxvbmcgbnVt X2RtYTMyX3BhZ2VzKQogCWlmICghdHRtX2RtYTMyX3BhZ2VzX2xpbWl0KQogCQl0dG1fZG1hMzJf cGFnZXNfbGltaXQgPSBudW1fZG1hMzJfcGFnZXM7CiB9CisKK3N0YXRpYyB2b2lkIHR0bV9rbWFw X2l0ZXJfdHRfbWFwX2xvY2FsKHN0cnVjdCB0dG1fa21hcF9pdGVyICppdGVyLAorCQkJCSAgICAg ICBzdHJ1Y3QgZG1hX2J1Zl9tYXAgKmRtYXAsCisJCQkJICAgICAgIHBnb2ZmX3QgaSkKK3sKKwlz dHJ1Y3QgdHRtX2ttYXBfaXRlcl90dCAqaXRlcl90dCA9CisJCWNvbnRhaW5lcl9vZihpdGVyLCB0 eXBlb2YoKml0ZXJfdHQpLCBiYXNlKTsKKworCWRtYV9idWZfbWFwX3NldF92YWRkcihkbWFwLCBr bWFwX2xvY2FsX3BhZ2VfcHJvdChpdGVyX3R0LT50dC0+cGFnZXNbaV0sCisJCQkJCQkJIGl0ZXJf dHQtPnByb3QpKTsKK30KKworc3RhdGljIHZvaWQgdHRtX2ttYXBfaXRlcl90dF91bm1hcF9sb2Nh bChzdHJ1Y3QgdHRtX2ttYXBfaXRlciAqaXRlciwKKwkJCQkJIHN0cnVjdCBkbWFfYnVmX21hcCAq bWFwKQoreworCWt1bm1hcF9sb2NhbChtYXAtPnZhZGRyKTsKK30KKworc3RhdGljIGNvbnN0IHN0 cnVjdCB0dG1fa21hcF9pdGVyX29wcyB0dG1fa21hcF9pdGVyX3R0X29wcyA9IHsKKwkubWFwX2xv Y2FsID0gdHRtX2ttYXBfaXRlcl90dF9tYXBfbG9jYWwsCisJLnVubWFwX2xvY2FsID0gdHRtX2tt YXBfaXRlcl90dF91bm1hcF9sb2NhbCwKKwkubWFwc190dCA9IHRydWUsCit9OworCisvKioKKyAq IHR0bV9rbWFwX2l0ZXJfdHRfaW5pdCAtIEluaXRpYWxpemUgYSBzdHJ1Y3QgdHRtX2ttYXBfaXRl cl90dAorICogQGl0ZXJfdHQ6IFRoZSBzdHJ1Y3QgdHRtX2ttYXBfaXRlcl90dCB0byBpbml0aWFs aXplLgorICogQHR0OiBTdHJ1Y3QgdHRtX3R0IGhvbGRpbmcgcGFnZSBwb2ludGVycyBvZiB0aGUg c3RydWN0IHR0bV9yZXNvdXJjZS4KKyAqCisgKiBSZXR1cm46IFBvaW50ZXIgdG8gdGhlIGVtYmVk ZGVkIHN0cnVjdCB0dG1fa21hcF9pdGVyLgorICovCitzdHJ1Y3QgdHRtX2ttYXBfaXRlciAqCit0 dG1fa21hcF9pdGVyX3R0X2luaXQoc3RydWN0IHR0bV9rbWFwX2l0ZXJfdHQgKml0ZXJfdHQsCisJ CSAgICAgIHN0cnVjdCB0dG1fdHQgKnR0KQoreworCWl0ZXJfdHQtPmJhc2Uub3BzID0gJnR0bV9r bWFwX2l0ZXJfdHRfb3BzOworCWl0ZXJfdHQtPnR0ID0gdHQ7CisJaXRlcl90dC0+cHJvdCA9IHR0 bV9wcm90X2Zyb21fY2FjaGluZyh0dC0+Y2FjaGluZywgUEFHRV9LRVJORUwpOworCisJcmV0dXJu ICZpdGVyX3R0LT5iYXNlOworfQorRVhQT1JUX1NZTUJPTCh0dG1fa21hcF9pdGVyX3R0X2luaXQp OwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vdHRtL3R0bV9ib19kcml2ZXIuaCBiL2luY2x1ZGUv ZHJtL3R0bS90dG1fYm9fZHJpdmVyLmgKaW5kZXggZGJjY2FjOTU3ZjhmLi5mZGJlYWM3OGMyMzYg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL3R0bS90dG1fYm9fZHJpdmVyLmgKKysrIGIvaW5jbHVk ZS9kcm0vdHRtL3R0bV9ib19kcml2ZXIuaApAQCAtNDAsNiArNDAsNyBAQAogI2luY2x1ZGUgPGRy bS90dG0vdHRtX2RldmljZS5oPgogCiAjaW5jbHVkZSAidHRtX2JvX2FwaS5oIgorI2luY2x1ZGUg InR0bV9rbWFwX2l0ZXIuaCIKICNpbmNsdWRlICJ0dG1fcGxhY2VtZW50LmgiCiAjaW5jbHVkZSAi dHRtX3R0LmgiCiAjaW5jbHVkZSAidHRtX3Bvb2wuaCIKQEAgLTI3Miw2ICsyNzMsMjMgQEAgaW50 IHR0bV9ib19tb3ZlX2FjY2VsX2NsZWFudXAoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywK IAkJCSAgICAgIGJvb2wgcGlwZWxpbmUsCiAJCQkgICAgICBzdHJ1Y3QgdHRtX3Jlc291cmNlICpu ZXdfbWVtKTsKIAorLyoqCisgKiB0dG1fYm9fbW92ZV9hY2NlbF9jbGVhbnVwLgorICoKKyAqIEBi bzogQSBwb2ludGVyIHRvIGEgc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0LgorICogQG5ld19tZW06 IHN0cnVjdCB0dG1fcmVzb3VyY2UgaW5kaWNhdGluZyB3aGVyZSB0byBtb3ZlLgorICoKKyAqIFNw ZWNpYWwgY2FzZSBvZiB0dG1fYm9fbW92ZV9hY2NlbF9jbGVhbnVwIHdoZXJlIHRoZSBibyBpcyBn dWFyYW50ZWVkCisgKiBieSB0aGUgY2FsbGVyIHRvIGJlIGlkbGUuIFR5cGljYWxseSB1c2VkIGFm dGVyIG1lbWNweSBidWZmZXIgbW92ZXMuCisgKi8KK3N0YXRpYyBpbmxpbmUgdm9pZCB0dG1fYm9f bW92ZV9zeW5jX2NsZWFudXAoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKKwkJCQkJICAg IHN0cnVjdCB0dG1fcmVzb3VyY2UgKm5ld19tZW0pCit7CisJaW50IHJldCA9IHR0bV9ib19tb3Zl X2FjY2VsX2NsZWFudXAoYm8sIE5VTEwsIHRydWUsIGZhbHNlLCBuZXdfbWVtKTsKKworCVdBUk5f T04ocmV0KTsKK30KKwogLyoqCiAgKiB0dG1fYm9fcGlwZWxpbmVfZ3V0dGluZy4KICAqCkBAIC0z MzIsNCArMzUwLDE0IEBAIGludCB0dG1fcmFuZ2VfbWFuX2luaXQoc3RydWN0IHR0bV9kZXZpY2Ug KmJkZXYsCiBpbnQgdHRtX3JhbmdlX21hbl9maW5pKHN0cnVjdCB0dG1fZGV2aWNlICpiZGV2LAog CQkgICAgICAgdW5zaWduZWQgdHlwZSk7CiAKK3ZvaWQgdHRtX21vdmVfbWVtY3B5KHN0cnVjdCB0 dG1fYnVmZmVyX29iamVjdCAqYm8sCisJCSAgICAgcGdvZmZfdCBudW1fcGFnZXMsCisJCSAgICAg c3RydWN0IHR0bV9rbWFwX2l0ZXIgKmRzdF9pdGVyLAorCQkgICAgIHN0cnVjdCB0dG1fa21hcF9p dGVyICpzcmNfaXRlcik7CisKK3N0cnVjdCB0dG1fa21hcF9pdGVyICoKK3R0bV9rbWFwX2l0ZXJf aW9tYXBfaW5pdChzdHJ1Y3QgdHRtX2ttYXBfaXRlcl9pb21hcCAqaXRlcl9pbywKKwkJCSBzdHJ1 Y3QgaW9fbWFwcGluZyAqaW9tYXAsCisJCQkgc3RydWN0IHNnX3RhYmxlICpzdCwKKwkJCSByZXNv dXJjZV9zaXplX3Qgc3RhcnQpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS90dG0v dHRtX2NhY2hpbmcuaCBiL2luY2x1ZGUvZHJtL3R0bS90dG1fY2FjaGluZy5oCmluZGV4IGEwYjRh NDlmYTQzMi4uM2M5ZGQ2NWY1YWFmIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS90dG0vdHRtX2Nh Y2hpbmcuaAorKysgYi9pbmNsdWRlL2RybS90dG0vdHRtX2NhY2hpbmcuaApAQCAtMzMsNCArMzMs NiBAQCBlbnVtIHR0bV9jYWNoaW5nIHsKIAl0dG1fY2FjaGVkCiB9OwogCitwZ3Byb3RfdCB0dG1f cHJvdF9mcm9tX2NhY2hpbmcoZW51bSB0dG1fY2FjaGluZyBjYWNoaW5nLCBwZ3Byb3RfdCB0bXAp OworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL3R0bS90dG1fa21hcF9pdGVyLmgg Yi9pbmNsdWRlL2RybS90dG0vdHRtX2ttYXBfaXRlci5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMC4uOGJiMDBmZDM5ZDZjCi0tLSAvZGV2L251bGwKKysrIGIvaW5jbHVk ZS9kcm0vdHRtL3R0bV9rbWFwX2l0ZXIuaApAQCAtMCwwICsxLDYxIEBACisvKiBTUERYLUxpY2Vu c2UtSWRlbnRpZmllcjogTUlUICovCisvKgorICogQ29weXJpZ2h0IMKpIDIwMjEgSW50ZWwgQ29y cG9yYXRpb24KKyAqLworI2lmbmRlZiBfX1RUTV9LTUFQX0lURVJfSF9fCisjZGVmaW5lIF9fVFRN X0tNQVBfSVRFUl9IX18KKworI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+CisKK3N0cnVjdCB0dG1f a21hcF9pdGVyOworc3RydWN0IGRtYV9idWZfbWFwOworCisvKioKKyAqIHN0cnVjdCB0dG1fa21h cF9pdGVyX29wcyAtIE9wcyBzdHJ1Y3R1cmUgZm9yIGEgc3RydWN0CisgKiB0dG1fa21hcF9pdGVy LgorICogQG1hcHNfdHQ6IFdoZXRoZXIgdGhlIGl0ZXJhdG9yIG1hcHMgVFQgbWVtb3J5IGRpcmVj dGx5LCBhcyBvcHBvc2VkCisgKiBtYXBwaW5nIGEgVFQgdGhyb3VnaCBhbiBhcGVydHVyZS4gQm90 aCB0aGVzZSBtb2RlcyBoYXZlCisgKiBzdHJ1Y3QgdHRtX3Jlc291cmNlX21hbmFnZXI6OnVzZV90 dCBzZXQsIGJ1dCB0aGUgbGF0dGVyIHR5cGljYWxseQorICogcmV0dXJucyBpc19pb21lbSA9PSB0 cnVlIGZyb20gdHRtX21lbV9pb19yZXNlcnZlLgorICovCitzdHJ1Y3QgdHRtX2ttYXBfaXRlcl9v cHMgeworCS8qKgorCSAqIGttYXBfbG9jYWwoKSAtIE1hcCBhIFBBR0VfU0laRSBwYXJ0IG9mIHRo ZSByZXNvdXJjZSB1c2luZworCSAqIGttYXBfbG9jYWwgc2VtYW50aWNzLgorCSAqIEByZXNfaXRl cjogUG9pbnRlciB0byB0aGUgc3RydWN0IHR0bV9rbWFwX2l0ZXIgcmVwcmVzZW50aW5nCisJICog dGhlIHJlc291cmNlLgorCSAqIEBkbWFwOiBUaGUgc3RydWN0IGRtYV9idWZfbWFwIGhvbGRpbmcg dGhlIHZpcnR1YWwgYWRkcmVzcyBhZnRlcgorCSAqIHRoZSBvcGVyYXRpb24uCisJICogQGk6IFRo ZSBsb2NhdGlvbiB3aXRoaW4gdGhlIHJlc291cmNlIHRvIG1hcC4gUEFHRV9TSVpFIGdyYW51bGFy aXR5LgorCSAqLworCXZvaWQgKCptYXBfbG9jYWwpKHN0cnVjdCB0dG1fa21hcF9pdGVyICpyZXNf aXRlciwKKwkJCSAgc3RydWN0IGRtYV9idWZfbWFwICpkbWFwLCBwZ29mZl90IGkpOworCS8qKgor CSAqIHVubWFwX2xvY2FsKCkgLSBVbm1hcCBhIFBBR0VfU0laRSBwYXJ0IG9mIHRoZSByZXNvdXJj ZSBwcmV2aW91c2x5CisJICogbWFwcGVkIHVzaW5nIGttYXBfbG9jYWwuCisJICogQHJlc19pdGVy OiBQb2ludGVyIHRvIHRoZSBzdHJ1Y3QgdHRtX2ttYXBfaXRlciByZXByZXNlbnRpbmcKKwkgKiB0 aGUgcmVzb3VyY2UuCisJICogQGRtYXA6IFRoZSBzdHJ1Y3QgZG1hX2J1Zl9tYXAgaG9sZGluZyB0 aGUgdmlydHVhbCBhZGRyZXNzIGFmdGVyCisJICogdGhlIG9wZXJhdGlvbi4KKwkgKi8KKwl2b2lk ICgqdW5tYXBfbG9jYWwpKHN0cnVjdCB0dG1fa21hcF9pdGVyICpyZXNfaXRlciwKKwkJCSAgICBz dHJ1Y3QgZG1hX2J1Zl9tYXAgKmRtYXApOworCWJvb2wgbWFwc190dDsKK307CisKKy8qKgorICog c3RydWN0IHR0bV9rbWFwX2l0ZXIgLSBJdGVyYXRvciBmb3Iga21hcF9sb2NhbCB0eXBlIG9wZXJh dGlvbnMgb24gYQorICogcmVzb3VyY2UuCisgKiBAb3BzOiBQb2ludGVyIHRvIHRoZSBvcGVyYXRp b25zIHN0cnVjdC4KKyAqCisgKiBUaGlzIHN0cnVjdCBpcyBpbnRlbmRlZCB0byBiZSBlbWJlZGRl ZCBpbiBhIHJlc291cmNlLXNwZWNpZmljIHNwZWNpYWxpemF0aW9uCisgKiBpbXBsZW1lbnRpbmcg b3BlcmF0aW9ucyBmb3IgdGhlIHJlc291cmNlLgorICoKKyAqIE5vdGhpbmcgc3RvcHMgdXMgZnJv bSBleHRlbmRpbmcgdGhlIG9wZXJhdGlvbnMgdG8gdm1hcCwgdm1hcF9wZm4gZXRjLAorICogcmVw bGFjaW5nIHNvbWUgb3IgcGFydHMgb2YgdGhlIHR0bV9ib191dGlsLiBjcHUtbWFwIGZ1bmN0aW9u YWxpdHkuCisgKi8KK3N0cnVjdCB0dG1fa21hcF9pdGVyIHsKKwljb25zdCBzdHJ1Y3QgdHRtX2tt YXBfaXRlcl9vcHMgKm9wczsKK307CisKKyNlbmRpZiAvKiBfX1RUTV9LTUFQX0lURVJfSF9fICov CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS90dG0vdHRtX3Jlc291cmNlLmggYi9pbmNsdWRlL2Ry bS90dG0vdHRtX3Jlc291cmNlLmgKaW5kZXggODkwYjlkMzY5NTE5Li5iOGRjMGJkYjBkYTUgMTAw NjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL3R0bS90dG1fcmVzb3VyY2UuaAorKysgYi9pbmNsdWRlL2Ry bS90dG0vdHRtX3Jlc291cmNlLmgKQEAgLTI3LDkgKzI3LDExIEBACiAKICNpbmNsdWRlIDxsaW51 eC90eXBlcy5oPgogI2luY2x1ZGUgPGxpbnV4L211dGV4Lmg+CisjaW5jbHVkZSA8bGludXgvZG1h LWJ1Zi1tYXAuaD4KICNpbmNsdWRlIDxsaW51eC9kbWEtZmVuY2UuaD4KICNpbmNsdWRlIDxkcm0v ZHJtX3ByaW50Lmg+CiAjaW5jbHVkZSA8ZHJtL3R0bS90dG1fY2FjaGluZy5oPgorI2luY2x1ZGUg PGRybS90dG0vdHRtX2ttYXBfaXRlci5oPgogCiAjZGVmaW5lIFRUTV9NQVhfQk9fUFJJT1JJVFkJ NFUKIApAQCAtMzgsNiArNDAsMTAgQEAgc3RydWN0IHR0bV9yZXNvdXJjZV9tYW5hZ2VyOwogc3Ry dWN0IHR0bV9yZXNvdXJjZTsKIHN0cnVjdCB0dG1fcGxhY2U7CiBzdHJ1Y3QgdHRtX2J1ZmZlcl9v YmplY3Q7CitzdHJ1Y3QgZG1hX2J1Zl9tYXA7CitzdHJ1Y3QgaW9fbWFwcGluZzsKK3N0cnVjdCBz Z190YWJsZTsKK3N0cnVjdCBzY2F0dGVybGlzdDsKIAogc3RydWN0IHR0bV9yZXNvdXJjZV9tYW5h Z2VyX2Z1bmMgewogCS8qKgpAQCAtMTc2LDYgKzE4Miw0NSBAQCBzdHJ1Y3QgdHRtX3Jlc291cmNl IHsKIAlzdHJ1Y3QgdHRtX2J1c19wbGFjZW1lbnQgYnVzOwogfTsKIAorLyoqCisgKiBzdHJ1Y3Qg dHRtX2ttYXBfaXRlcl9pb21hcCAtIFNwZWNpYWxpemF0aW9uIGZvciBhIHN0cnVjdCBpb19tYXBw aW5nICsKKyAqIHN0cnVjdCBzZ190YWJsZSBiYWNrZWQgc3RydWN0IHR0bV9yZXNvdXJjZS4KKyAq IEBiYXNlOiBFbWJlZGRlZCBzdHJ1Y3QgdHRtX2ttYXBfaXRlciBwcm92aWRpbmcgdGhlIHVzYWdl IGludGVyZmFjZS4KKyAqIEBpb21hcDogc3RydWN0IGlvX21hcHBpbmcgcmVwcmVzZW50aW5nIHRo ZSB1bmRlcmx5aW5nIGxpbmVhciBpb19tZW1vcnkuCisgKiBAc3Q6IHNnX3RhYmxlIGludG8gQGlv bWFwLCByZXByZXNlbnRpbmcgdGhlIG1lbW9yeSBvZiB0aGUgc3RydWN0IHR0bV9yZXNvdXJjZS4K KyAqIEBzdGFydDogT2Zmc2V0IHRoYXQgbmVlZHMgdG8gYmUgc3VidHJhY3RlZCBmcm9tIEBzdCB0 byBtYWtlCisgKiBzZ19kbWFfYWRkcmVzcyhzdC0+c2dsKSAtIEBzdGFydCA9PSAwIGZvciBAaW9t YXAgc3RhcnQuCisgKiBAY2FjaGU6IFNjYXR0ZXJsaXN0IHRyYXZlcnNhbCBjYWNoZSBmb3IgZmFz dCBsb29rdXBzLgorICogQGNhY2hlLnNnOiBQb2ludGVyIHRvIHRoZSBjdXJyZW50bHkgY2FjaGVk IHNjYXR0ZXJsaXN0IHNlZ21lbnQuCisgKiBAY2FjaGUuaTogRmlyc3QgaW5kZXggb2YgQHNnLiBQ QUdFX1NJWkUgZ3JhbnVsYXJpdHkuCisgKiBAY2FjaGUuZW5kOiBMYXN0IGluZGV4ICsgMSBvZiBA c2cuIFBBR0VfU0laRSBncmFudWxhcml0eS4KKyAqIEBjYWNoZS5vZmZzOiBGaXJzdCBvZmZzZXQg aW50byBAaW9tYXAgb2YgQHNnLiBQQUdFX1NJWkUgZ3JhbnVsYXJpdHkuCisgKi8KK3N0cnVjdCB0 dG1fa21hcF9pdGVyX2lvbWFwIHsKKwlzdHJ1Y3QgdHRtX2ttYXBfaXRlciBiYXNlOworCXN0cnVj dCBpb19tYXBwaW5nICppb21hcDsKKwlzdHJ1Y3Qgc2dfdGFibGUgKnN0OworCXJlc291cmNlX3Np emVfdCBzdGFydDsKKwlzdHJ1Y3QgeworCQlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOworCQlwZ29m Zl90IGk7CisJCXBnb2ZmX3QgZW5kOworCQlwZ29mZl90IG9mZnM7CisJfSBjYWNoZTsKK307CisK Ky8qKgorICogc3RydWN0IHR0bV9rbWFwX2l0ZXJfbGluZWFyX2lvIC0gSXRlcmF0b3Igc3BlY2lh bGl6YXRpb24gZm9yIGxpbmVhciBpbworICogQGJhc2U6IFRoZSBiYXNlIGl0ZXJhdG9yCisgKiBA ZG1hcDogUG9pbnRzIHRvIHRoZSBzdGFydGluZyBhZGRyZXNzIG9mIHRoZSByZWdpb24KKyAqIEBu ZWVkc191bm1hcDogV2hldGhlciB3ZSBuZWVkIHRvIHVubWFwIG9uIGZpbmkKKyAqLworc3RydWN0 IHR0bV9rbWFwX2l0ZXJfbGluZWFyX2lvIHsKKwlzdHJ1Y3QgdHRtX2ttYXBfaXRlciBiYXNlOwor CXN0cnVjdCBkbWFfYnVmX21hcCBkbWFwOworCWJvb2wgbmVlZHNfdW5tYXA7Cit9OworCiAvKioK ICAqIHR0bV9yZXNvdXJjZV9tYW5hZ2VyX3NldF91c2VkCiAgKgpAQCAtMjM3LDQgKzI4MiwyMCBA QCBpbnQgdHRtX3Jlc291cmNlX21hbmFnZXJfZXZpY3RfYWxsKHN0cnVjdCB0dG1fZGV2aWNlICpi ZGV2LAogdm9pZCB0dG1fcmVzb3VyY2VfbWFuYWdlcl9kZWJ1ZyhzdHJ1Y3QgdHRtX3Jlc291cmNl X21hbmFnZXIgKm1hbiwKIAkJCQlzdHJ1Y3QgZHJtX3ByaW50ZXIgKnApOwogCitzdHJ1Y3QgdHRt X2ttYXBfaXRlciAqCit0dG1fa21hcF9pdGVyX2lvbWFwX2luaXQoc3RydWN0IHR0bV9rbWFwX2l0 ZXJfaW9tYXAgKml0ZXJfaW8sCisJCQkgc3RydWN0IGlvX21hcHBpbmcgKmlvbWFwLAorCQkJIHN0 cnVjdCBzZ190YWJsZSAqc3QsCisJCQkgcmVzb3VyY2Vfc2l6ZV90IHN0YXJ0KTsKKworc3RydWN0 IHR0bV9rbWFwX2l0ZXJfbGluZWFyX2lvOworCitzdHJ1Y3QgdHRtX2ttYXBfaXRlciAqCit0dG1f a21hcF9pdGVyX2xpbmVhcl9pb19pbml0KHN0cnVjdCB0dG1fa21hcF9pdGVyX2xpbmVhcl9pbyAq aXRlcl9pbywKKwkJCSAgICAgc3RydWN0IHR0bV9kZXZpY2UgKmJkZXYsCisJCQkgICAgIHN0cnVj dCB0dG1fcmVzb3VyY2UgKm1lbSk7CisKK3ZvaWQgdHRtX2ttYXBfaXRlcl9saW5lYXJfaW9fZmlu aShzdHJ1Y3QgdHRtX2ttYXBfaXRlcl9saW5lYXJfaW8gKml0ZXJfaW8sCisJCQkJICBzdHJ1Y3Qg dHRtX2RldmljZSAqYmRldiwKKwkJCQkgIHN0cnVjdCB0dG1fcmVzb3VyY2UgKm1lbSk7CiAjZW5k aWYKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL3R0bS90dG1fdHQuaCBiL2luY2x1ZGUvZHJtL3R0 bS90dG1fdHQuaAppbmRleCAxMzRkMDllZjc3NjYuLjMxMDIwNTlkYjcyNiAxMDA2NDQKLS0tIGEv aW5jbHVkZS9kcm0vdHRtL3R0bV90dC5oCisrKyBiL2luY2x1ZGUvZHJtL3R0bS90dG1fdHQuaApA QCAtMjksNiArMjksNyBAQAogCiAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KICNpbmNsdWRlIDxk cm0vdHRtL3R0bV9jYWNoaW5nLmg+CisjaW5jbHVkZSA8ZHJtL3R0bS90dG1fa21hcF9pdGVyLmg+ CiAKIHN0cnVjdCB0dG1fYm9fZGV2aWNlOwogc3RydWN0IHR0bV90dDsKQEAgLTY5LDYgKzcwLDE4 IEBAIHN0cnVjdCB0dG1fdHQgewogCWVudW0gdHRtX2NhY2hpbmcgY2FjaGluZzsKIH07CiAKKy8q KgorICogc3RydWN0IHR0bV9rbWFwX2l0ZXJfdHQgLSBTcGVjaWFsaXphdGlvbiBvZiBhIG1hcHBp ZyBpdGVyYXRvciBmb3IgYSB0dC4KKyAqIEBiYXNlOiBFbWJlZGRlZCBzdHJ1Y3QgdHRtX2ttYXBf aXRlciBwcm92aWRpbmcgdGhlIHVzYWdlIGludGVyZmFjZQorICogQHR0OiBDYWNoZWQgc3RydWN0 IHR0bV90dC4KKyAqIEBwcm90OiBDYWNoZWQgcGFnZSBwcm90ZWN0aW9uIGZvciBtYXBwaW5nLgor ICovCitzdHJ1Y3QgdHRtX2ttYXBfaXRlcl90dCB7CisJc3RydWN0IHR0bV9rbWFwX2l0ZXIgYmFz ZTsKKwlzdHJ1Y3QgdHRtX3R0ICp0dDsKKwlwZ3Byb3RfdCBwcm90OworfTsKKwogc3RhdGljIGlu bGluZSBib29sIHR0bV90dF9pc19wb3B1bGF0ZWQoc3RydWN0IHR0bV90dCAqdHQpCiB7CiAJcmV0 dXJuIHR0LT5wYWdlX2ZsYWdzICYgVFRNX1BBR0VfRkxBR19QUklWX1BPUFVMQVRFRDsKQEAgLTE1 OSw2ICsxNzIsOSBAQCB2b2lkIHR0bV90dF91bnBvcHVsYXRlKHN0cnVjdCB0dG1fZGV2aWNlICpi ZGV2LCBzdHJ1Y3QgdHRtX3R0ICp0dG0pOwogCiB2b2lkIHR0bV90dF9tZ3JfaW5pdCh1bnNpZ25l ZCBsb25nIG51bV9wYWdlcywgdW5zaWduZWQgbG9uZyBudW1fZG1hMzJfcGFnZXMpOwogCitzdHJ1 Y3QgdHRtX2ttYXBfaXRlciAqdHRtX2ttYXBfaXRlcl90dF9pbml0KHN0cnVjdCB0dG1fa21hcF9p dGVyX3R0ICppdGVyX3R0LAorCQkJCQkgICAgc3RydWN0IHR0bV90dCAqdHQpOworCiAjaWYgSVNf RU5BQkxFRChDT05GSUdfQUdQKQogI2luY2x1ZGUgPGxpbnV4L2FncF9iYWNrZW5kLmg+CiAKLS0g CjIuMzEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==