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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 35893C55178 for ; Fri, 30 Oct 2020 10:10:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CABBC21734 for ; Fri, 30 Oct 2020 10:10:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="jVoJqWq4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726284AbgJ3KKo (ORCPT ); Fri, 30 Oct 2020 06:10:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726310AbgJ3KIn (ORCPT ); Fri, 30 Oct 2020 06:08:43 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE4C9C0613CF for ; Fri, 30 Oct 2020 03:08:42 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id n15so5828237wrq.2 for ; Fri, 30 Oct 2020 03:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LviVmALlSgblFMBLYwpV18ifgqJQyTuRFngxF2ueWqY=; b=jVoJqWq4DFPoCMIuDC/TTFq838TwJoryu1vDg2f8eECd5NB93hIuiebO6nwtiPqJk2 PBNDqRZzpjAVPcXrmwI57kn0rzxUQFLXxtp1+7PALigEN2sBiDtyTHMwyCrgzu1jbMP7 ZEkSAoP/BL/ISsqH2EgmRIPYA3UlrbRAKUUGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LviVmALlSgblFMBLYwpV18ifgqJQyTuRFngxF2ueWqY=; b=n95ULPyQnKdo1JFJ/KXWgMwV3gm/bKTBptEPAOASXJny2lmfs1MYqx/EX5fUS4EZ2x 8DPy8lgHRPR9cW0UP1QFAo5LEJLGMgFhmcsUBnHTSK0kL9SprbB4uCC9GRz7sve/8s5D j9q4MDcdWNb1OhK6C8yYtAyMUWgppbE3PlHrtioRFfOIGmbTbOHhcG0MAfrvr/1mcSTx j4xAQIRWWlum6PI0QrdbX8VGR+BL9GKJtR3X+jy8OFo2XartUZvGlqAebnnZAHdksnhp Y30+jCWMra4HkCP+1lfe6O2ztS46c7MoIUr1MyoEAjgaZUAYEM++k2YEoQPYM35pm5eO yFTg== X-Gm-Message-State: AOAM530MmkYaJl+Lvex2+sj6RKjNQGZ8FRTx44XyhrYRRea9+H1MlgjY Ev87r7zbu9MrxrevLvw4LV+YCw== X-Google-Smtp-Source: ABdhPJy80j36pVqL/FfPCmR4vFg8BYnMcSH66PK+Yxy9tBdWcTRFmNrh1EyMMQmo3IueEFvjyMOgnw== X-Received: by 2002:adf:80cb:: with SMTP id 69mr2023146wrl.325.1604052521488; Fri, 30 Oct 2020 03:08:41 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id v189sm4430947wmg.14.2020.10.30.03.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 03:08:40 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Cc: kvm@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org, Daniel Vetter , John Hubbard , Daniel Vetter , Jason Gunthorpe , Andrew Morton , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jan Kara , Dan Williams , Oded Gabbay , Omer Shpigelman , Ofir Bitton , Tomer Tayar , Moti Haimovski , Greg Kroah-Hartman , Pawel Piskorski Subject: [PATCH v5 03/15] misc/habana: Stop using frame_vector helpers Date: Fri, 30 Oct 2020 11:08:03 +0100 Message-Id: <20201030100815.2269-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030100815.2269-1-daniel.vetter@ffwll.ch> References: <20201030100815.2269-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All we need are a pages array, pin_user_pages_fast can give us that directly. Plus this avoids the entire raw pfn side of get_vaddr_frames. Reviewed-by: John Hubbard Signed-off-by: Daniel Vetter Cc: Jason Gunthorpe Cc: Andrew Morton Cc: John Hubbard Cc: Jérôme Glisse Cc: Jan Kara Cc: Dan Williams Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: Oded Gabbay Cc: Omer Shpigelman Cc: Ofir Bitton Cc: Tomer Tayar Cc: Moti Haimovski Cc: Daniel Vetter Cc: Greg Kroah-Hartman Cc: Pawel Piskorski Signed-off-by: Daniel Vetter -- v2: Use unpin_user_pages_dirty_lock (John) v3: Update kerneldoc (Oded) --- drivers/misc/habanalabs/Kconfig | 1 - drivers/misc/habanalabs/common/habanalabs.h | 6 ++- drivers/misc/habanalabs/common/memory.c | 49 ++++++++------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/drivers/misc/habanalabs/Kconfig b/drivers/misc/habanalabs/Kconfig index 1640340d3e62..293d79811372 100644 --- a/drivers/misc/habanalabs/Kconfig +++ b/drivers/misc/habanalabs/Kconfig @@ -6,7 +6,6 @@ config HABANA_AI tristate "HabanaAI accelerators (habanalabs)" depends on PCI && HAS_IOMEM - select FRAME_VECTOR select GENERIC_ALLOCATOR select HWMON help diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h index 80d4d7385ffe..272aa3f29200 100644 --- a/drivers/misc/habanalabs/common/habanalabs.h +++ b/drivers/misc/habanalabs/common/habanalabs.h @@ -921,7 +921,8 @@ struct hl_ctx_mgr { * struct hl_userptr - memory mapping chunk information * @vm_type: type of the VM. * @job_node: linked-list node for hanging the object on the Job's list. - * @vec: pointer to the frame vector. + * @pages: pointer to struct page array + * @npages: size of @pages array * @sgt: pointer to the scatter-gather table that holds the pages. * @dir: for DMA unmapping, the direction must be supplied, so save it. * @debugfs_list: node in debugfs list of command submissions. @@ -932,7 +933,8 @@ struct hl_ctx_mgr { struct hl_userptr { enum vm_type_t vm_type; /* must be first */ struct list_head job_node; - struct frame_vector *vec; + struct page **pages; + unsigned int npages; struct sg_table *sgt; enum dma_data_direction dir; struct list_head debugfs_list; diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c index 84227819e4d1..0b220221873d 100644 --- a/drivers/misc/habanalabs/common/memory.c +++ b/drivers/misc/habanalabs/common/memory.c @@ -1291,45 +1291,41 @@ static int get_user_memory(struct hl_device *hdev, u64 addr, u64 size, return -EFAULT; } - userptr->vec = frame_vector_create(npages); - if (!userptr->vec) { + userptr->pages = kvmalloc_array(npages, sizeof(*userptr->pages), + GFP_KERNEL); + if (!userptr->pages) { dev_err(hdev->dev, "Failed to create frame vector\n"); return -ENOMEM; } - rc = get_vaddr_frames(start, npages, FOLL_FORCE | FOLL_WRITE, - userptr->vec); + rc = pin_user_pages_fast(start, npages, FOLL_FORCE | FOLL_WRITE, + userptr->pages); if (rc != npages) { dev_err(hdev->dev, "Failed to map host memory, user ptr probably wrong\n"); if (rc < 0) - goto destroy_framevec; + goto destroy_pages; + npages = rc; rc = -EFAULT; - goto put_framevec; - } - - if (frame_vector_to_pages(userptr->vec) < 0) { - dev_err(hdev->dev, - "Failed to translate frame vector to pages\n"); - rc = -EFAULT; - goto put_framevec; + goto put_pages; } + userptr->npages = npages; rc = sg_alloc_table_from_pages(userptr->sgt, - frame_vector_pages(userptr->vec), - npages, offset, size, GFP_ATOMIC); + userptr->pages, + npages, offset, size, GFP_ATOMIC); if (rc < 0) { dev_err(hdev->dev, "failed to create SG table from pages\n"); - goto put_framevec; + goto put_pages; } return 0; -put_framevec: - put_vaddr_frames(userptr->vec); -destroy_framevec: - frame_vector_destroy(userptr->vec); +put_pages: + unpin_user_pages(userptr->pages, npages); +destroy_pages: + kvfree(userptr->pages); return rc; } @@ -1415,8 +1411,6 @@ int hl_pin_host_memory(struct hl_device *hdev, u64 addr, u64 size, */ void hl_unpin_host_memory(struct hl_device *hdev, struct hl_userptr *userptr) { - struct page **pages; - hl_debugfs_remove_userptr(hdev, userptr); if (userptr->dma_mapped) @@ -1424,15 +1418,8 @@ void hl_unpin_host_memory(struct hl_device *hdev, struct hl_userptr *userptr) userptr->sgt->nents, userptr->dir); - pages = frame_vector_pages(userptr->vec); - if (!IS_ERR(pages)) { - int i; - - for (i = 0; i < frame_vector_count(userptr->vec); i++) - set_page_dirty_lock(pages[i]); - } - put_vaddr_frames(userptr->vec); - frame_vector_destroy(userptr->vec); + unpin_user_pages_dirty_lock(userptr->pages, userptr->npages, true); + kvfree(userptr->pages); list_del(&userptr->job_node); -- 2.28.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 77913C6379D for ; Fri, 30 Oct 2020 10:10:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 F00A4221FA for ; Fri, 30 Oct 2020 10:10:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eMgE2xP0"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="jVoJqWq4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F00A4221FA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zSxtUtCpVfR64RFdRjw9SuQevfEaXN0lxvcqYOankTE=; b=eMgE2xP0QhqDt1mgjdPWmMG/f vLhE1fn5mTZe6Wg5BcoDZO7FqGJTn7So2xLTYzf0JiyMkKF4N7TvIP+AUXVhLoaXU7hFzymx4lFmn wH1LN1XWD67+0+18rXRI/KUoelom4w9O+UwKYMZWl8n9lI13cqNWX4Y1BQVNKpbSz5bKy00YKso9j Dcq8EGr8OLGtyRAIHT4c+n4d/HfO5/6XA9w0lGai/IZuiBi6YHtlzjL+HkNp9SseL6B1inVKc9DFf DZ5ozlBwC1+Ez96MpwYVvXMovCFvQUUSOuA393qpNTarPKpQe9XcVnviKqcg5K8J2gEzqPoMHH+6U 8HeKbf4pg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYRMB-0007v1-ET; Fri, 30 Oct 2020 10:10:03 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYRKs-0007Ng-Ir for linux-arm-kernel@lists.infradead.org; Fri, 30 Oct 2020 10:08:50 +0000 Received: by mail-wr1-x443.google.com with SMTP id s9so5780260wro.8 for ; Fri, 30 Oct 2020 03:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LviVmALlSgblFMBLYwpV18ifgqJQyTuRFngxF2ueWqY=; b=jVoJqWq4DFPoCMIuDC/TTFq838TwJoryu1vDg2f8eECd5NB93hIuiebO6nwtiPqJk2 PBNDqRZzpjAVPcXrmwI57kn0rzxUQFLXxtp1+7PALigEN2sBiDtyTHMwyCrgzu1jbMP7 ZEkSAoP/BL/ISsqH2EgmRIPYA3UlrbRAKUUGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LviVmALlSgblFMBLYwpV18ifgqJQyTuRFngxF2ueWqY=; b=ePeRNhdVefZ2cV07vm5JW2glht1XaHgHPtUQVtMXgbns34O7vgTo8jru8lgWtpP2Kw 0d9Sdz8YE7iofWo2ZoD1+0/a24knN8DQi1vg9lBVtz/Vzi2E2o1PJ5EajlSCQK0/YkRX F14EfUcuYeRcwntMiMRrCzy7lCTnT1RxdrjdIahVvK9bVt+Nk2jYus9427g9e1iIeya+ 8WYWQWJscMYvquXlsxHQihVs7KjIkDA35nhcfWxwmIB4DY6U9hKSfFG1JKVa4BbU1p6i OTIrpZvTX5rNcJUnSrKx/GZOjQKX8H/xqY1BYVa1VNopsi6VNathoPsfAauInZoJLxIG 959Q== X-Gm-Message-State: AOAM530OmroUqlZrIXdl5QOpH9xXeFghg2WCP/MRRcAzaAJOMmc7rhkE JCa8+8z6cfQJbERMdnHY3e+kMA== X-Google-Smtp-Source: ABdhPJy80j36pVqL/FfPCmR4vFg8BYnMcSH66PK+Yxy9tBdWcTRFmNrh1EyMMQmo3IueEFvjyMOgnw== X-Received: by 2002:adf:80cb:: with SMTP id 69mr2023146wrl.325.1604052521488; Fri, 30 Oct 2020 03:08:41 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id v189sm4430947wmg.14.2020.10.30.03.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 03:08:40 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v5 03/15] misc/habana: Stop using frame_vector helpers Date: Fri, 30 Oct 2020 11:08:03 +0100 Message-Id: <20201030100815.2269-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030100815.2269-1-daniel.vetter@ffwll.ch> References: <20201030100815.2269-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201030_060842_839341_5719A9BC X-CRM114-Status: GOOD ( 22.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oded Gabbay , linux-samsung-soc@vger.kernel.org, Jan Kara , kvm@vger.kernel.org, Jason Gunthorpe , Pawel Piskorski , Daniel Vetter , Greg Kroah-Hartman , Ofir Bitton , linux-mm@kvack.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Tomer Tayar , Omer Shpigelman , John Hubbard , Daniel Vetter , Andrew Morton , Moti Haimovski , Dan Williams , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org QWxsIHdlIG5lZWQgYXJlIGEgcGFnZXMgYXJyYXksIHBpbl91c2VyX3BhZ2VzX2Zhc3QgY2FuIGdp dmUgdXMgdGhhdApkaXJlY3RseS4gUGx1cyB0aGlzIGF2b2lkcyB0aGUgZW50aXJlIHJhdyBwZm4g c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHViYmFyZCA8amh1 YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5jYT4KQ2M6IEFu ZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQg PGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0 LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5q LndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzogbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtl cm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogT2RlZCBHYWJiYXkg PG9kZWQuZ2FiYmF5QGdtYWlsLmNvbT4KQ2M6IE9tZXIgU2hwaWdlbG1hbiA8b3NocGlnZWxtYW5A aGFiYW5hLmFpPgpDYzogT2ZpciBCaXR0b24gPG9iaXR0b25AaGFiYW5hLmFpPgpDYzogVG9tZXIg VGF5YXIgPHR0YXlhckBoYWJhbmEuYWk+CkNjOiBNb3RpIEhhaW1vdnNraSA8bWhhaW1vdnNraUBo YWJhbmEuYWk+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzog R3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KQ2M6IFBhd2Vs IFBpc2tvcnNraSA8cHBpc2tvcnNraUBoYWJhbmEuYWk+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBW ZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tCnYyOiBVc2UgdW5waW5fdXNlcl9wYWdl c19kaXJ0eV9sb2NrIChKb2huKQp2MzogVXBkYXRlIGtlcm5lbGRvYyAoT2RlZCkKLS0tCiBkcml2 ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnICAgICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9t aXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaCB8ICA2ICsrLQogZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jICAgICB8IDQ5ICsrKysrKysrLS0tLS0tLS0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvS2NvbmZpZwppbmRleCAxNjQwMzQwZDNlNjIuLjI5M2Q3OTgxMTM3MiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21p c2MvaGFiYW5hbGFicy9LY29uZmlnCkBAIC02LDcgKzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQog CXRyaXN0YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRvcnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMg b24gUENJICYmIEhBU19JT01FTQotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAlzZWxlY3QgR0VORVJJ Q19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KIAloZWxwCmRpZmYgLS1naXQgYS9kcml2ZXJzL21p c2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oIGIvZHJpdmVycy9taXNjL2hhYmFuYWxh YnMvY29tbW9uL2hhYmFuYWxhYnMuaAppbmRleCA4MGQ0ZDczODVmZmUuLjI3MmFhM2YyOTIwMCAx MDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAor KysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCkBAIC05MjEs NyArOTIxLDggQEAgc3RydWN0IGhsX2N0eF9tZ3IgewogICogc3RydWN0IGhsX3VzZXJwdHIgLSBt ZW1vcnkgbWFwcGluZyBjaHVuayBpbmZvcm1hdGlvbgogICogQHZtX3R5cGU6IHR5cGUgb2YgdGhl IFZNLgogICogQGpvYl9ub2RlOiBsaW5rZWQtbGlzdCBub2RlIGZvciBoYW5naW5nIHRoZSBvYmpl Y3Qgb24gdGhlIEpvYidzIGxpc3QuCi0gKiBAdmVjOiBwb2ludGVyIHRvIHRoZSBmcmFtZSB2ZWN0 b3IuCisgKiBAcGFnZXM6IHBvaW50ZXIgdG8gc3RydWN0IHBhZ2UgYXJyYXkKKyAqIEBucGFnZXM6 IHNpemUgb2YgQHBhZ2VzIGFycmF5CiAgKiBAc2d0OiBwb2ludGVyIHRvIHRoZSBzY2F0dGVyLWdh dGhlciB0YWJsZSB0aGF0IGhvbGRzIHRoZSBwYWdlcy4KICAqIEBkaXI6IGZvciBETUEgdW5tYXBw aW5nLCB0aGUgZGlyZWN0aW9uIG11c3QgYmUgc3VwcGxpZWQsIHNvIHNhdmUgaXQuCiAgKiBAZGVi dWdmc19saXN0OiBub2RlIGluIGRlYnVnZnMgbGlzdCBvZiBjb21tYW5kIHN1Ym1pc3Npb25zLgpA QCAtOTMyLDcgKzkzMyw4IEBAIHN0cnVjdCBobF9jdHhfbWdyIHsKIHN0cnVjdCBobF91c2VycHRy IHsKIAllbnVtIHZtX3R5cGVfdAkJdm1fdHlwZTsgLyogbXVzdCBiZSBmaXJzdCAqLwogCXN0cnVj dCBsaXN0X2hlYWQJam9iX25vZGU7Ci0Jc3RydWN0IGZyYW1lX3ZlY3RvcgkqdmVjOworCXN0cnVj dCBwYWdlCQkqKnBhZ2VzOworCXVuc2lnbmVkIGludAkJbnBhZ2VzOwogCXN0cnVjdCBzZ190YWJs ZQkJKnNndDsKIAllbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXI7CiAJc3RydWN0IGxpc3RfaGVh ZAlkZWJ1Z2ZzX2xpc3Q7CmRpZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21t b24vbWVtb3J5LmMgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMKaW5k ZXggODQyMjc4MTllNGQxLi4wYjIyMDIyMTg3M2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWlzYy9o YWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYworKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vbWVtb3J5LmMKQEAgLTEyOTEsNDUgKzEyOTEsNDEgQEAgc3RhdGljIGludCBnZXRfdXNl cl9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgdTY0IGFkZHIsIHU2NCBzaXplLAogCQly ZXR1cm4gLUVGQVVMVDsKIAl9CiAKLQl1c2VycHRyLT52ZWMgPSBmcmFtZV92ZWN0b3JfY3JlYXRl KG5wYWdlcyk7Ci0JaWYgKCF1c2VycHRyLT52ZWMpIHsKKwl1c2VycHRyLT5wYWdlcyA9IGt2bWFs bG9jX2FycmF5KG5wYWdlcywgc2l6ZW9mKCp1c2VycHRyLT5wYWdlcyksCisJCQkJCUdGUF9LRVJO RUwpOworCWlmICghdXNlcnB0ci0+cGFnZXMpIHsKIAkJZGV2X2VycihoZGV2LT5kZXYsICJGYWls ZWQgdG8gY3JlYXRlIGZyYW1lIHZlY3RvclxuIik7CiAJCXJldHVybiAtRU5PTUVNOwogCX0KIAot CXJjID0gZ2V0X3ZhZGRyX2ZyYW1lcyhzdGFydCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9MTF9X UklURSwKLQkJCQl1c2VycHRyLT52ZWMpOworCXJjID0gcGluX3VzZXJfcGFnZXNfZmFzdChzdGFy dCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9MTF9XUklURSwKKwkJCQkgdXNlcnB0ci0+cGFnZXMp OwogCiAJaWYgKHJjICE9IG5wYWdlcykgewogCQlkZXZfZXJyKGhkZXYtPmRldiwKIAkJCSJGYWls ZWQgdG8gbWFwIGhvc3QgbWVtb3J5LCB1c2VyIHB0ciBwcm9iYWJseSB3cm9uZ1xuIik7CiAJCWlm IChyYyA8IDApCi0JCQlnb3RvIGRlc3Ryb3lfZnJhbWV2ZWM7CisJCQlnb3RvIGRlc3Ryb3lfcGFn ZXM7CisJCW5wYWdlcyA9IHJjOwogCQlyYyA9IC1FRkFVTFQ7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVj OwotCX0KLQotCWlmIChmcmFtZV92ZWN0b3JfdG9fcGFnZXModXNlcnB0ci0+dmVjKSA8IDApIHsK LQkJZGV2X2VycihoZGV2LT5kZXYsCi0JCQkiRmFpbGVkIHRvIHRyYW5zbGF0ZSBmcmFtZSB2ZWN0 b3IgdG8gcGFnZXNcbiIpOwotCQlyYyA9IC1FRkFVTFQ7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOwor CQlnb3RvIHB1dF9wYWdlczsKIAl9CisJdXNlcnB0ci0+bnBhZ2VzID0gbnBhZ2VzOwogCiAJcmMg PSBzZ19hbGxvY190YWJsZV9mcm9tX3BhZ2VzKHVzZXJwdHItPnNndCwKLQkJCQkJZnJhbWVfdmVj dG9yX3BhZ2VzKHVzZXJwdHItPnZlYyksCi0JCQkJCW5wYWdlcywgb2Zmc2V0LCBzaXplLCBHRlBf QVRPTUlDKTsKKwkJCQkgICAgICAgdXNlcnB0ci0+cGFnZXMsCisJCQkJICAgICAgIG5wYWdlcywg b2Zmc2V0LCBzaXplLCBHRlBfQVRPTUlDKTsKIAlpZiAocmMgPCAwKSB7CiAJCWRldl9lcnIoaGRl di0+ZGV2LCAiZmFpbGVkIHRvIGNyZWF0ZSBTRyB0YWJsZSBmcm9tIHBhZ2VzXG4iKTsKLQkJZ290 byBwdXRfZnJhbWV2ZWM7CisJCWdvdG8gcHV0X3BhZ2VzOwogCX0KIAogCXJldHVybiAwOwogCi1w dXRfZnJhbWV2ZWM6Ci0JcHV0X3ZhZGRyX2ZyYW1lcyh1c2VycHRyLT52ZWMpOwotZGVzdHJveV9m cmFtZXZlYzoKLQlmcmFtZV92ZWN0b3JfZGVzdHJveSh1c2VycHRyLT52ZWMpOworcHV0X3BhZ2Vz OgorCXVucGluX3VzZXJfcGFnZXModXNlcnB0ci0+cGFnZXMsIG5wYWdlcyk7CitkZXN0cm95X3Bh Z2VzOgorCWt2ZnJlZSh1c2VycHRyLT5wYWdlcyk7CiAJcmV0dXJuIHJjOwogfQogCkBAIC0xNDE1 LDggKzE0MTEsNiBAQCBpbnQgaGxfcGluX2hvc3RfbWVtb3J5KHN0cnVjdCBobF9kZXZpY2UgKmhk ZXYsIHU2NCBhZGRyLCB1NjQgc2l6ZSwKICAqLwogdm9pZCBobF91bnBpbl9ob3N0X21lbW9yeShz dHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3QgaGxfdXNlcnB0ciAqdXNlcnB0cikKIHsKLQlz dHJ1Y3QgcGFnZSAqKnBhZ2VzOwotCiAJaGxfZGVidWdmc19yZW1vdmVfdXNlcnB0cihoZGV2LCB1 c2VycHRyKTsKIAogCWlmICh1c2VycHRyLT5kbWFfbWFwcGVkKQpAQCAtMTQyNCwxNSArMTQxOCw4 IEBAIHZvaWQgaGxfdW5waW5faG9zdF9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgc3Ry dWN0IGhsX3VzZXJwdHIgKnVzZXJwdHIpCiAJCQkJCQkJdXNlcnB0ci0+c2d0LT5uZW50cywKIAkJ CQkJCQl1c2VycHRyLT5kaXIpOwogCi0JcGFnZXMgPSBmcmFtZV92ZWN0b3JfcGFnZXModXNlcnB0 ci0+dmVjKTsKLQlpZiAoIUlTX0VSUihwYWdlcykpIHsKLQkJaW50IGk7Ci0KLQkJZm9yIChpID0g MDsgaSA8IGZyYW1lX3ZlY3Rvcl9jb3VudCh1c2VycHRyLT52ZWMpOyBpKyspCi0JCQlzZXRfcGFn ZV9kaXJ0eV9sb2NrKHBhZ2VzW2ldKTsKLQl9Ci0JcHV0X3ZhZGRyX2ZyYW1lcyh1c2VycHRyLT52 ZWMpOwotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95KHVzZXJwdHItPnZlYyk7CisJdW5waW5fdXNlcl9w YWdlc19kaXJ0eV9sb2NrKHVzZXJwdHItPnBhZ2VzLCB1c2VycHRyLT5ucGFnZXMsIHRydWUpOwor CWt2ZnJlZSh1c2VycHRyLT5wYWdlcyk7CiAKIAlsaXN0X2RlbCgmdXNlcnB0ci0+am9iX25vZGUp OwogCi0tIAoyLjI4LjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxp c3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0 aW5mby9saW51eC1hcm0ta2VybmVsCg== 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=-12.5 required=3.0 tests=BAYES_00,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 4041BC63697 for ; Fri, 30 Oct 2020 10:08:50 +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 B9DEF20825 for ; Fri, 30 Oct 2020 10:08:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="jVoJqWq4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9DEF20825 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 87C366ED83; Fri, 30 Oct 2020 10:08:48 +0000 (UTC) Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07B2C6ED80 for ; Fri, 30 Oct 2020 10:08:43 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id n18so5790363wrs.5 for ; Fri, 30 Oct 2020 03:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LviVmALlSgblFMBLYwpV18ifgqJQyTuRFngxF2ueWqY=; b=jVoJqWq4DFPoCMIuDC/TTFq838TwJoryu1vDg2f8eECd5NB93hIuiebO6nwtiPqJk2 PBNDqRZzpjAVPcXrmwI57kn0rzxUQFLXxtp1+7PALigEN2sBiDtyTHMwyCrgzu1jbMP7 ZEkSAoP/BL/ISsqH2EgmRIPYA3UlrbRAKUUGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LviVmALlSgblFMBLYwpV18ifgqJQyTuRFngxF2ueWqY=; b=SEgolRheLj7OkZ5vu0fSstTmCQOnVi+BDOzQiQUvrwbnYN/LRTV4Glny3YeemdKL2H qFgf4x+K6kIl/k0fKo1LiBQuRvPMB/qfFh3JkMF30BXuH9Fcynp96TKL+xzP8JIwBJW6 aAAquarw2Yk8trzBGT4VmYJdY176xrSkpZxSeM5usQSN0R9z8IpGwv8wzyv8VxYmEkJT oHLDtOPZbbYy53GkoceRkMzhdvJTCIrne5cCBj9gdlsQkKzfUOJpUqC1ykn4YRC9ePnn 56Fco4XKL3MBn60jtBVLGfbtU0KJIbBeM+fPR8Z0rF22dvS4E+bEVs7rNDpIXFRDPN3Q ekEQ== X-Gm-Message-State: AOAM530MX8mKBiMkFG9VA6pDbigExjMzgF59QIW/+ej0lrF+gFRPT3Hr 2wo7jD3iR9aQnjzm4g/V5TUW+8AREDEe9W2I X-Google-Smtp-Source: ABdhPJy80j36pVqL/FfPCmR4vFg8BYnMcSH66PK+Yxy9tBdWcTRFmNrh1EyMMQmo3IueEFvjyMOgnw== X-Received: by 2002:adf:80cb:: with SMTP id 69mr2023146wrl.325.1604052521488; Fri, 30 Oct 2020 03:08:41 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id v189sm4430947wmg.14.2020.10.30.03.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 03:08:40 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v5 03/15] misc/habana: Stop using frame_vector helpers Date: Fri, 30 Oct 2020 11:08:03 +0100 Message-Id: <20201030100815.2269-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030100815.2269-1-daniel.vetter@ffwll.ch> References: <20201030100815.2269-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 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: linux-samsung-soc@vger.kernel.org, Jan Kara , kvm@vger.kernel.org, Jason Gunthorpe , Pawel Piskorski , Daniel Vetter , Greg Kroah-Hartman , Ofir Bitton , linux-mm@kvack.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Tomer Tayar , Omer Shpigelman , John Hubbard , Daniel Vetter , Andrew Morton , Moti Haimovski , Dan Williams , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" QWxsIHdlIG5lZWQgYXJlIGEgcGFnZXMgYXJyYXksIHBpbl91c2VyX3BhZ2VzX2Zhc3QgY2FuIGdp dmUgdXMgdGhhdApkaXJlY3RseS4gUGx1cyB0aGlzIGF2b2lkcyB0aGUgZW50aXJlIHJhdyBwZm4g c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHViYmFyZCA8amh1 YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5jYT4KQ2M6IEFu ZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQg PGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0 LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5q LndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzogbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtl cm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogT2RlZCBHYWJiYXkg PG9kZWQuZ2FiYmF5QGdtYWlsLmNvbT4KQ2M6IE9tZXIgU2hwaWdlbG1hbiA8b3NocGlnZWxtYW5A aGFiYW5hLmFpPgpDYzogT2ZpciBCaXR0b24gPG9iaXR0b25AaGFiYW5hLmFpPgpDYzogVG9tZXIg VGF5YXIgPHR0YXlhckBoYWJhbmEuYWk+CkNjOiBNb3RpIEhhaW1vdnNraSA8bWhhaW1vdnNraUBo YWJhbmEuYWk+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzog R3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KQ2M6IFBhd2Vs IFBpc2tvcnNraSA8cHBpc2tvcnNraUBoYWJhbmEuYWk+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBW ZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tCnYyOiBVc2UgdW5waW5fdXNlcl9wYWdl c19kaXJ0eV9sb2NrIChKb2huKQp2MzogVXBkYXRlIGtlcm5lbGRvYyAoT2RlZCkKLS0tCiBkcml2 ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnICAgICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9t aXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaCB8ICA2ICsrLQogZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jICAgICB8IDQ5ICsrKysrKysrLS0tLS0tLS0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvS2NvbmZpZwppbmRleCAxNjQwMzQwZDNlNjIuLjI5M2Q3OTgxMTM3MiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21p c2MvaGFiYW5hbGFicy9LY29uZmlnCkBAIC02LDcgKzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQog CXRyaXN0YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRvcnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMg b24gUENJICYmIEhBU19JT01FTQotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAlzZWxlY3QgR0VORVJJ Q19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KIAloZWxwCmRpZmYgLS1naXQgYS9kcml2ZXJzL21p c2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oIGIvZHJpdmVycy9taXNjL2hhYmFuYWxh YnMvY29tbW9uL2hhYmFuYWxhYnMuaAppbmRleCA4MGQ0ZDczODVmZmUuLjI3MmFhM2YyOTIwMCAx MDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAor KysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCkBAIC05MjEs NyArOTIxLDggQEAgc3RydWN0IGhsX2N0eF9tZ3IgewogICogc3RydWN0IGhsX3VzZXJwdHIgLSBt ZW1vcnkgbWFwcGluZyBjaHVuayBpbmZvcm1hdGlvbgogICogQHZtX3R5cGU6IHR5cGUgb2YgdGhl IFZNLgogICogQGpvYl9ub2RlOiBsaW5rZWQtbGlzdCBub2RlIGZvciBoYW5naW5nIHRoZSBvYmpl Y3Qgb24gdGhlIEpvYidzIGxpc3QuCi0gKiBAdmVjOiBwb2ludGVyIHRvIHRoZSBmcmFtZSB2ZWN0 b3IuCisgKiBAcGFnZXM6IHBvaW50ZXIgdG8gc3RydWN0IHBhZ2UgYXJyYXkKKyAqIEBucGFnZXM6 IHNpemUgb2YgQHBhZ2VzIGFycmF5CiAgKiBAc2d0OiBwb2ludGVyIHRvIHRoZSBzY2F0dGVyLWdh dGhlciB0YWJsZSB0aGF0IGhvbGRzIHRoZSBwYWdlcy4KICAqIEBkaXI6IGZvciBETUEgdW5tYXBw aW5nLCB0aGUgZGlyZWN0aW9uIG11c3QgYmUgc3VwcGxpZWQsIHNvIHNhdmUgaXQuCiAgKiBAZGVi dWdmc19saXN0OiBub2RlIGluIGRlYnVnZnMgbGlzdCBvZiBjb21tYW5kIHN1Ym1pc3Npb25zLgpA QCAtOTMyLDcgKzkzMyw4IEBAIHN0cnVjdCBobF9jdHhfbWdyIHsKIHN0cnVjdCBobF91c2VycHRy IHsKIAllbnVtIHZtX3R5cGVfdAkJdm1fdHlwZTsgLyogbXVzdCBiZSBmaXJzdCAqLwogCXN0cnVj dCBsaXN0X2hlYWQJam9iX25vZGU7Ci0Jc3RydWN0IGZyYW1lX3ZlY3RvcgkqdmVjOworCXN0cnVj dCBwYWdlCQkqKnBhZ2VzOworCXVuc2lnbmVkIGludAkJbnBhZ2VzOwogCXN0cnVjdCBzZ190YWJs ZQkJKnNndDsKIAllbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXI7CiAJc3RydWN0IGxpc3RfaGVh ZAlkZWJ1Z2ZzX2xpc3Q7CmRpZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21t b24vbWVtb3J5LmMgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMKaW5k ZXggODQyMjc4MTllNGQxLi4wYjIyMDIyMTg3M2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWlzYy9o YWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYworKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vbWVtb3J5LmMKQEAgLTEyOTEsNDUgKzEyOTEsNDEgQEAgc3RhdGljIGludCBnZXRfdXNl cl9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgdTY0IGFkZHIsIHU2NCBzaXplLAogCQly ZXR1cm4gLUVGQVVMVDsKIAl9CiAKLQl1c2VycHRyLT52ZWMgPSBmcmFtZV92ZWN0b3JfY3JlYXRl KG5wYWdlcyk7Ci0JaWYgKCF1c2VycHRyLT52ZWMpIHsKKwl1c2VycHRyLT5wYWdlcyA9IGt2bWFs bG9jX2FycmF5KG5wYWdlcywgc2l6ZW9mKCp1c2VycHRyLT5wYWdlcyksCisJCQkJCUdGUF9LRVJO RUwpOworCWlmICghdXNlcnB0ci0+cGFnZXMpIHsKIAkJZGV2X2VycihoZGV2LT5kZXYsICJGYWls ZWQgdG8gY3JlYXRlIGZyYW1lIHZlY3RvclxuIik7CiAJCXJldHVybiAtRU5PTUVNOwogCX0KIAot CXJjID0gZ2V0X3ZhZGRyX2ZyYW1lcyhzdGFydCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9MTF9X UklURSwKLQkJCQl1c2VycHRyLT52ZWMpOworCXJjID0gcGluX3VzZXJfcGFnZXNfZmFzdChzdGFy dCwgbnBhZ2VzLCBGT0xMX0ZPUkNFIHwgRk9MTF9XUklURSwKKwkJCQkgdXNlcnB0ci0+cGFnZXMp OwogCiAJaWYgKHJjICE9IG5wYWdlcykgewogCQlkZXZfZXJyKGhkZXYtPmRldiwKIAkJCSJGYWls ZWQgdG8gbWFwIGhvc3QgbWVtb3J5LCB1c2VyIHB0ciBwcm9iYWJseSB3cm9uZ1xuIik7CiAJCWlm IChyYyA8IDApCi0JCQlnb3RvIGRlc3Ryb3lfZnJhbWV2ZWM7CisJCQlnb3RvIGRlc3Ryb3lfcGFn ZXM7CisJCW5wYWdlcyA9IHJjOwogCQlyYyA9IC1FRkFVTFQ7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVj OwotCX0KLQotCWlmIChmcmFtZV92ZWN0b3JfdG9fcGFnZXModXNlcnB0ci0+dmVjKSA8IDApIHsK LQkJZGV2X2VycihoZGV2LT5kZXYsCi0JCQkiRmFpbGVkIHRvIHRyYW5zbGF0ZSBmcmFtZSB2ZWN0 b3IgdG8gcGFnZXNcbiIpOwotCQlyYyA9IC1FRkFVTFQ7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOwor CQlnb3RvIHB1dF9wYWdlczsKIAl9CisJdXNlcnB0ci0+bnBhZ2VzID0gbnBhZ2VzOwogCiAJcmMg PSBzZ19hbGxvY190YWJsZV9mcm9tX3BhZ2VzKHVzZXJwdHItPnNndCwKLQkJCQkJZnJhbWVfdmVj dG9yX3BhZ2VzKHVzZXJwdHItPnZlYyksCi0JCQkJCW5wYWdlcywgb2Zmc2V0LCBzaXplLCBHRlBf QVRPTUlDKTsKKwkJCQkgICAgICAgdXNlcnB0ci0+cGFnZXMsCisJCQkJICAgICAgIG5wYWdlcywg b2Zmc2V0LCBzaXplLCBHRlBfQVRPTUlDKTsKIAlpZiAocmMgPCAwKSB7CiAJCWRldl9lcnIoaGRl di0+ZGV2LCAiZmFpbGVkIHRvIGNyZWF0ZSBTRyB0YWJsZSBmcm9tIHBhZ2VzXG4iKTsKLQkJZ290 byBwdXRfZnJhbWV2ZWM7CisJCWdvdG8gcHV0X3BhZ2VzOwogCX0KIAogCXJldHVybiAwOwogCi1w dXRfZnJhbWV2ZWM6Ci0JcHV0X3ZhZGRyX2ZyYW1lcyh1c2VycHRyLT52ZWMpOwotZGVzdHJveV9m cmFtZXZlYzoKLQlmcmFtZV92ZWN0b3JfZGVzdHJveSh1c2VycHRyLT52ZWMpOworcHV0X3BhZ2Vz OgorCXVucGluX3VzZXJfcGFnZXModXNlcnB0ci0+cGFnZXMsIG5wYWdlcyk7CitkZXN0cm95X3Bh Z2VzOgorCWt2ZnJlZSh1c2VycHRyLT5wYWdlcyk7CiAJcmV0dXJuIHJjOwogfQogCkBAIC0xNDE1 LDggKzE0MTEsNiBAQCBpbnQgaGxfcGluX2hvc3RfbWVtb3J5KHN0cnVjdCBobF9kZXZpY2UgKmhk ZXYsIHU2NCBhZGRyLCB1NjQgc2l6ZSwKICAqLwogdm9pZCBobF91bnBpbl9ob3N0X21lbW9yeShz dHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3QgaGxfdXNlcnB0ciAqdXNlcnB0cikKIHsKLQlz dHJ1Y3QgcGFnZSAqKnBhZ2VzOwotCiAJaGxfZGVidWdmc19yZW1vdmVfdXNlcnB0cihoZGV2LCB1 c2VycHRyKTsKIAogCWlmICh1c2VycHRyLT5kbWFfbWFwcGVkKQpAQCAtMTQyNCwxNSArMTQxOCw4 IEBAIHZvaWQgaGxfdW5waW5faG9zdF9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgc3Ry dWN0IGhsX3VzZXJwdHIgKnVzZXJwdHIpCiAJCQkJCQkJdXNlcnB0ci0+c2d0LT5uZW50cywKIAkJ CQkJCQl1c2VycHRyLT5kaXIpOwogCi0JcGFnZXMgPSBmcmFtZV92ZWN0b3JfcGFnZXModXNlcnB0 ci0+dmVjKTsKLQlpZiAoIUlTX0VSUihwYWdlcykpIHsKLQkJaW50IGk7Ci0KLQkJZm9yIChpID0g MDsgaSA8IGZyYW1lX3ZlY3Rvcl9jb3VudCh1c2VycHRyLT52ZWMpOyBpKyspCi0JCQlzZXRfcGFn ZV9kaXJ0eV9sb2NrKHBhZ2VzW2ldKTsKLQl9Ci0JcHV0X3ZhZGRyX2ZyYW1lcyh1c2VycHRyLT52 ZWMpOwotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95KHVzZXJwdHItPnZlYyk7CisJdW5waW5fdXNlcl9w YWdlc19kaXJ0eV9sb2NrKHVzZXJwdHItPnBhZ2VzLCB1c2VycHRyLT5ucGFnZXMsIHRydWUpOwor CWt2ZnJlZSh1c2VycHRyLT5wYWdlcyk7CiAKIAlsaXN0X2RlbCgmdXNlcnB0ci0+am9iX25vZGUp OwogCi0tIAoyLjI4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo=