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 0023CC47427 for ; Wed, 7 Oct 2020 16:44:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E0EC2176B for ; Wed, 7 Oct 2020 16:44:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="GwLaASBB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728284AbgJGQop (ORCPT ); Wed, 7 Oct 2020 12:44:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728000AbgJGQoj (ORCPT ); Wed, 7 Oct 2020 12:44:39 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A0DEC0613DE for ; Wed, 7 Oct 2020 09:44:38 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id 13so3064468wmf.0 for ; Wed, 07 Oct 2020 09:44:38 -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=fbQ4UHoMI3gmmgUudGaz4yL7TM4S3Iddi1GT7Ee/+0U=; b=GwLaASBB1efTh6MPYPZRJ8sRahCLRvTt+3ohcP4zw6YZTX22OiwAXRVD6PAfYgfgqP MCyytYGELOTCoMpkehTDRE8nAbzQtjgDaBnw+1Ojb8/wCoU+VYASX13tI1VU/7VWuEaC 0AeT2tPwf+0OAmbFt5CWbHSjCY7HVIdMBTY9A= 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=fbQ4UHoMI3gmmgUudGaz4yL7TM4S3Iddi1GT7Ee/+0U=; b=QU4ySGLzDVguC/vss27zug2skC3DVGgdHy4wrCi3Ff+7jhowzMzDYHB1vGZubmbRaZ rDFWhCefJp41l5r/y0+ETCyXWUjd2txAyr23QnakuqlYG7R/gFZPDsIe6baVarQyuV6c g2u265X8PZUvFVntSx8kUYt0bzwXy7M4y1vE7kVeA5SXejdzi/5T9D5/zeBjQW5nCYFF KzlwoFmrBF8GuPgj+rmqUxhSPdHSRQiPMkbtAY0W0ASRm28Mli18mp1HtLgJEPY9HnV2 NCrpoh3kgVvBhSItAb4H3dhcCN38Nm/gNL4SXfaMmbjI4JxxPAU4V/29R/lnYPAX9pu+ NJfA== X-Gm-Message-State: AOAM5311kSZ5ZilbpzaYpJcT4Bnv52Zlm8B/0fhXFl95IdPtaifWhanA ELtE+E9g+aHEwQ74fceu58kKJg== X-Google-Smtp-Source: ABdhPJwEu4LC2Cz1K2rgxVwQrYuYinT+uwWru1r5SWZOb1CzlJ/0rEY8IUuIAasACAWLOr06TRZTNA== X-Received: by 2002:a1c:1983:: with SMTP id 125mr4134376wmz.29.1602089077113; Wed, 07 Oct 2020 09:44:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id z191sm3332280wme.40.2020.10.07.09.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 09:44:36 -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, linux-s390@vger.kernel.org, Daniel Vetter , Daniel Vetter , Jason Gunthorpe , Andrew Morton , John Hubbard , =?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 03/13] misc/habana: Stop using frame_vector helpers Date: Wed, 7 Oct 2020 18:44:16 +0200 Message-Id: <20201007164426.1812530-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007164426.1812530-1-daniel.vetter@ffwll.ch> References: <20201007164426.1812530-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. 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 --- drivers/misc/habanalabs/Kconfig | 1 - drivers/misc/habanalabs/common/habanalabs.h | 3 +- drivers/misc/habanalabs/common/memory.c | 51 +++++++++------------ 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/drivers/misc/habanalabs/Kconfig b/drivers/misc/habanalabs/Kconfig index 8eb5d38c618e..2f04187f7167 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 DMA_SHARED_BUFFER select GENERIC_ALLOCATOR select HWMON diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h index edbd627b29d2..c1b3ad613b15 100644 --- a/drivers/misc/habanalabs/common/habanalabs.h +++ b/drivers/misc/habanalabs/common/habanalabs.h @@ -881,7 +881,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 5ff4688683fd..ef89cfa2f95a 100644 --- a/drivers/misc/habanalabs/common/memory.c +++ b/drivers/misc/habanalabs/common/memory.c @@ -1281,45 +1281,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; } @@ -1405,7 +1401,7 @@ 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; + int i; hl_debugfs_remove_userptr(hdev, userptr); @@ -1414,15 +1410,10 @@ 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); + for (i = 0; i < userptr->npages; i++) + set_page_dirty_lock(userptr->pages[i]); + unpin_user_pages(userptr->pages, userptr->npages); + 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=-13.5 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 84DB1C47095 for ; Wed, 7 Oct 2020 16:46:58 +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 0B44120739 for ; Wed, 7 Oct 2020 16:46:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NAu7Ngmf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="GwLaASBB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B44120739 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=2mpzmfW84hbD3knsScAxLVCm+5HPjTMWtjr1J1PEoas=; b=NAu7Ngmf4XT+A7K8EJLBEtMcg ZLw7lSXIMqfe4iOO/+cwTTJthNxOecli5O5XFZlfEt5TUrXFXixpcZ7YrGV1Px2c5XDkX6GkalaEJ 1uNcipUBa1KJO/Uin+dGKOzoUMmJy01yQ2aS/TQTdTgDLvlMHu9tpUEdtKAjVbw5YzOUeDknvjXvX /+dgsT+3wtrTqWUG8ClWkVpVAzcE9IkRTGIljTdEWW+9WCVsQzDra+aGP3LGq2pafpM6uZbCYs+BB l5y8SSXftNQ42usfrYfZRCo9rXQJfRUKNBt6IaMUuMfyuGgQA3acn9p4irRlAYvd+ufD4Xx2gVLEG ySjbcWRbA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQCZ0-0001O8-Jw; Wed, 07 Oct 2020 16:45:14 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQCYQ-00017P-BB for linux-arm-kernel@lists.infradead.org; Wed, 07 Oct 2020 16:44:44 +0000 Received: by mail-wm1-x343.google.com with SMTP id d81so3055322wmc.1 for ; Wed, 07 Oct 2020 09:44:38 -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=fbQ4UHoMI3gmmgUudGaz4yL7TM4S3Iddi1GT7Ee/+0U=; b=GwLaASBB1efTh6MPYPZRJ8sRahCLRvTt+3ohcP4zw6YZTX22OiwAXRVD6PAfYgfgqP MCyytYGELOTCoMpkehTDRE8nAbzQtjgDaBnw+1Ojb8/wCoU+VYASX13tI1VU/7VWuEaC 0AeT2tPwf+0OAmbFt5CWbHSjCY7HVIdMBTY9A= 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=fbQ4UHoMI3gmmgUudGaz4yL7TM4S3Iddi1GT7Ee/+0U=; b=nSzRzU1R0s8ykMRidz54ymamkV7q9IUEU/cxJ0mIQVDvxFyISU1ZT7rnHjXIX467Xm WTdg76fqtj9EaR1xIgWnnU5myOWXBUBwiO/DrnQxGylc65o3qd+/uX5xdzzY/ENNHIam 8Bq1z9QNCTiBeSPPcUd3ZIw/BcN1r2iRtpMnoH6OrMTLoXR6NHTb/1ME1rnLFFV+rzX9 j3mnBwDBbVJYhRfEajXsZFCUJvxoQCEDg4sMMvl7n+ti3O6Bldh70xuPfD7j7Dc3CVRu fSDI9EnWmj+WjJkSKdU3qhM+sRrgLeQAfBnPT5e3sU3FahwJHgyKOsF//LptXwZVThdu v8QA== X-Gm-Message-State: AOAM532+h5D5PnjbvL6DKdNb2j12mfl+prydetFSY5m61xGXirK/0Q8o 2AGa9DCVSNNJYbvhakYncG7p6g== X-Google-Smtp-Source: ABdhPJwEu4LC2Cz1K2rgxVwQrYuYinT+uwWru1r5SWZOb1CzlJ/0rEY8IUuIAasACAWLOr06TRZTNA== X-Received: by 2002:a1c:1983:: with SMTP id 125mr4134376wmz.29.1602089077113; Wed, 07 Oct 2020 09:44:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id z191sm3332280wme.40.2020.10.07.09.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 09:44:36 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH 03/13] misc/habana: Stop using frame_vector helpers Date: Wed, 7 Oct 2020 18:44:16 +0200 Message-Id: <20201007164426.1812530-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007164426.1812530-1-daniel.vetter@ffwll.ch> References: <20201007164426.1812530-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-20201007_124438_508743_45E1F132 X-CRM114-Status: GOOD ( 21.23 ) 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-s390@vger.kernel.org, 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 c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5j YT4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2hu IEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlz c2VAcmVkaGF0LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlh bXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzog bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNv Y0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogT2Rl ZCBHYWJiYXkgPG9kZWQuZ2FiYmF5QGdtYWlsLmNvbT4KQ2M6IE9tZXIgU2hwaWdlbG1hbiA8b3No cGlnZWxtYW5AaGFiYW5hLmFpPgpDYzogT2ZpciBCaXR0b24gPG9iaXR0b25AaGFiYW5hLmFpPgpD YzogVG9tZXIgVGF5YXIgPHR0YXlhckBoYWJhbmEuYWk+CkNjOiBNb3RpIEhhaW1vdnNraSA8bWhh aW1vdnNraUBoYWJhbmEuYWk+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xs LmNoPgpDYzogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4K Q2M6IFBhd2VsIFBpc2tvcnNraSA8cHBpc2tvcnNraUBoYWJhbmEuYWk+Ci0tLQogZHJpdmVycy9t aXNjL2hhYmFuYWxhYnMvS2NvbmZpZyAgICAgICAgICAgICB8ICAxIC0KIGRyaXZlcnMvbWlzYy9o YWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFsYWJzLmggfCAgMyArLQogZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL21lbW9yeS5jICAgICB8IDUxICsrKysrKysrKy0tLS0tLS0tLS0tLQogMyBm aWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvS2NvbmZpZwppbmRleCA4ZWI1ZDM4YzYxOGUuLjJmMDQxODdmNzE2NyAxMDA2NDQKLS0t IGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21pc2MvaGFi YW5hbGFicy9LY29uZmlnCkBAIC02LDcgKzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQogCXRyaXN0 YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRvcnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMgb24gUENJ ICYmIEhBU19JT01FTQotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAlzZWxlY3QgRE1BX1NIQVJFRF9C VUZGRVIKIAlzZWxlY3QgR0VORVJJQ19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KZGlmZiAtLWdp dCBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFsYWJzLmggYi9kcml2ZXJz L21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCmluZGV4IGVkYmQ2MjdiMjlkMi4u YzFiM2FkNjEzYjE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24v aGFiYW5hbGFicy5oCisrKyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFs YWJzLmgKQEAgLTg4MSw3ICs4ODEsOCBAQCBzdHJ1Y3QgaGxfY3R4X21nciB7CiBzdHJ1Y3QgaGxf dXNlcnB0ciB7CiAJZW51bSB2bV90eXBlX3QJCXZtX3R5cGU7IC8qIG11c3QgYmUgZmlyc3QgKi8K IAlzdHJ1Y3QgbGlzdF9oZWFkCWpvYl9ub2RlOwotCXN0cnVjdCBmcmFtZV92ZWN0b3IJKnZlYzsK KwlzdHJ1Y3QgcGFnZQkJKipwYWdlczsKKwl1bnNpZ25lZCBpbnQJCW5wYWdlczsKIAlzdHJ1Y3Qg c2dfdGFibGUJCSpzZ3Q7CiAJZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyOwogCXN0cnVjdCBs aXN0X2hlYWQJZGVidWdmc19saXN0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9taXNjL2hhYmFuYWxh YnMvY29tbW9uL21lbW9yeS5jIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL21lbW9y eS5jCmluZGV4IDVmZjQ2ODg2ODNmZC4uZWY4OWNmYTJmOTVhIDEwMDY0NAotLS0gYS9kcml2ZXJz L21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMKKysrIGIvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL21lbW9yeS5jCkBAIC0xMjgxLDQ1ICsxMjgxLDQxIEBAIHN0YXRpYyBpbnQg Z2V0X3VzZXJfbWVtb3J5KHN0cnVjdCBobF9kZXZpY2UgKmhkZXYsIHU2NCBhZGRyLCB1NjQgc2l6 ZSwKIAkJcmV0dXJuIC1FRkFVTFQ7CiAJfQogCi0JdXNlcnB0ci0+dmVjID0gZnJhbWVfdmVjdG9y X2NyZWF0ZShucGFnZXMpOwotCWlmICghdXNlcnB0ci0+dmVjKSB7CisJdXNlcnB0ci0+cGFnZXMg PSBrdm1hbGxvY19hcnJheShucGFnZXMsIHNpemVvZigqdXNlcnB0ci0+cGFnZXMpLAorCQkJCQlH RlBfS0VSTkVMKTsKKwlpZiAoIXVzZXJwdHItPnBhZ2VzKSB7CiAJCWRldl9lcnIoaGRldi0+ZGV2 LCAiRmFpbGVkIHRvIGNyZWF0ZSBmcmFtZSB2ZWN0b3JcbiIpOwogCQlyZXR1cm4gLUVOT01FTTsK IAl9CiAKLQlyYyA9IGdldF92YWRkcl9mcmFtZXMoc3RhcnQsIG5wYWdlcywgRk9MTF9GT1JDRSB8 IEZPTExfV1JJVEUsCi0JCQkJdXNlcnB0ci0+dmVjKTsKKwlyYyA9IHBpbl91c2VyX3BhZ2VzX2Zh c3Qoc3RhcnQsIG5wYWdlcywgRk9MTF9GT1JDRSB8IEZPTExfV1JJVEUsCisJCQkJIHVzZXJwdHIt PnBhZ2VzKTsKIAogCWlmIChyYyAhPSBucGFnZXMpIHsKIAkJZGV2X2VycihoZGV2LT5kZXYsCiAJ CQkiRmFpbGVkIHRvIG1hcCBob3N0IG1lbW9yeSwgdXNlciBwdHIgcHJvYmFibHkgd3JvbmdcbiIp OwogCQlpZiAocmMgPCAwKQotCQkJZ290byBkZXN0cm95X2ZyYW1ldmVjOworCQkJZ290byBkZXN0 cm95X3BhZ2VzOworCQlucGFnZXMgPSByYzsKIAkJcmMgPSAtRUZBVUxUOwotCQlnb3RvIHB1dF9m cmFtZXZlYzsKLQl9Ci0KLQlpZiAoZnJhbWVfdmVjdG9yX3RvX3BhZ2VzKHVzZXJwdHItPnZlYykg PCAwKSB7Ci0JCWRldl9lcnIoaGRldi0+ZGV2LAotCQkJIkZhaWxlZCB0byB0cmFuc2xhdGUgZnJh bWUgdmVjdG9yIHRvIHBhZ2VzXG4iKTsKLQkJcmMgPSAtRUZBVUxUOwotCQlnb3RvIHB1dF9mcmFt ZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJfQorCXVzZXJwdHItPm5wYWdlcyA9IG5wYWdlczsK IAogCXJjID0gc2dfYWxsb2NfdGFibGVfZnJvbV9wYWdlcyh1c2VycHRyLT5zZ3QsCi0JCQkJCWZy YW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpLAotCQkJCQlucGFnZXMsIG9mZnNldCwgc2l6 ZSwgR0ZQX0FUT01JQyk7CisJCQkJICAgICAgIHVzZXJwdHItPnBhZ2VzLAorCQkJCSAgICAgICBu cGFnZXMsIG9mZnNldCwgc2l6ZSwgR0ZQX0FUT01JQyk7CiAJaWYgKHJjIDwgMCkgewogCQlkZXZf ZXJyKGhkZXYtPmRldiwgImZhaWxlZCB0byBjcmVhdGUgU0cgdGFibGUgZnJvbSBwYWdlc1xuIik7 Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOworCQlnb3RvIHB1dF9wYWdlczsKIAl9CiAKIAlyZXR1cm4g MDsKIAotcHV0X2ZyYW1ldmVjOgotCXB1dF92YWRkcl9mcmFtZXModXNlcnB0ci0+dmVjKTsKLWRl c3Ryb3lfZnJhbWV2ZWM6Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+dmVjKTsKK3B1 dF9wYWdlczoKKwl1bnBpbl91c2VyX3BhZ2VzKHVzZXJwdHItPnBhZ2VzLCBucGFnZXMpOworZGVz dHJveV9wYWdlczoKKwlrdmZyZWUodXNlcnB0ci0+cGFnZXMpOwogCXJldHVybiByYzsKIH0KIApA QCAtMTQwNSw3ICsxNDAxLDcgQEAgaW50IGhsX3Bpbl9ob3N0X21lbW9yeShzdHJ1Y3QgaGxfZGV2 aWNlICpoZGV2LCB1NjQgYWRkciwgdTY0IHNpemUsCiAgKi8KIHZvaWQgaGxfdW5waW5faG9zdF9t ZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgc3RydWN0IGhsX3VzZXJwdHIgKnVzZXJwdHIp CiB7Ci0Jc3RydWN0IHBhZ2UgKipwYWdlczsKKwlpbnQgaTsKIAogCWhsX2RlYnVnZnNfcmVtb3Zl X3VzZXJwdHIoaGRldiwgdXNlcnB0cik7CiAKQEAgLTE0MTQsMTUgKzE0MTAsMTAgQEAgdm9pZCBo bF91bnBpbl9ob3N0X21lbW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3QgaGxfdXNl cnB0ciAqdXNlcnB0cikKIAkJCQkJCQl1c2VycHRyLT5zZ3QtPm5lbnRzLAogCQkJCQkJCXVzZXJw dHItPmRpcik7CiAKLQlwYWdlcyA9IGZyYW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpOwot CWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlpbnQgaTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgZnJh bWVfdmVjdG9yX2NvdW50KHVzZXJwdHItPnZlYyk7IGkrKykKLQkJCXNldF9wYWdlX2RpcnR5X2xv Y2socGFnZXNbaV0pOwotCX0KLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7Ci0JZnJh bWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+dmVjKTsKKwlmb3IgKGkgPSAwOyBpIDwgdXNlcnB0 ci0+bnBhZ2VzOyBpKyspCisJCXNldF9wYWdlX2RpcnR5X2xvY2sodXNlcnB0ci0+cGFnZXNbaV0p OworCXVucGluX3VzZXJfcGFnZXModXNlcnB0ci0+cGFnZXMsIHVzZXJwdHItPm5wYWdlcyk7CisJ a3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAogCWxpc3RfZGVsKCZ1c2VycHRyLT5qb2Jfbm9kZSk7 CiAKLS0gCjIuMjguMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlz dHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2xpbnV4LWFybS1rZXJuZWwK 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.6 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 A0430C4727E for ; Wed, 7 Oct 2020 16:44:41 +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 2C596206FC for ; Wed, 7 Oct 2020 16:44:41 +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="GwLaASBB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C596206FC 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 76AE56E23D; Wed, 7 Oct 2020 16:44:40 +0000 (UTC) Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id D11D66E8AD for ; Wed, 7 Oct 2020 16:44:38 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id d4so3034341wmd.5 for ; Wed, 07 Oct 2020 09:44:38 -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=fbQ4UHoMI3gmmgUudGaz4yL7TM4S3Iddi1GT7Ee/+0U=; b=GwLaASBB1efTh6MPYPZRJ8sRahCLRvTt+3ohcP4zw6YZTX22OiwAXRVD6PAfYgfgqP MCyytYGELOTCoMpkehTDRE8nAbzQtjgDaBnw+1Ojb8/wCoU+VYASX13tI1VU/7VWuEaC 0AeT2tPwf+0OAmbFt5CWbHSjCY7HVIdMBTY9A= 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=fbQ4UHoMI3gmmgUudGaz4yL7TM4S3Iddi1GT7Ee/+0U=; b=OSTIYup2i8Sw4mjl7Nz74D29Nlf5hJXJc31VYztl2PEd4ohba444EI9i7X6ckYvX70 MNFwCUg4IyNC5Cu5cr8SISnL/SXW3nv+og0rq3RPKFcM3Kz0p9iJ6lx126/s1T7oASSl BDtnqu3IpMahmM+4s/p6+DU1hWJdM0tgqwrgSPcrcRiq2CS8QoMNtjXdLzh9jhZ+Xupy ApcDqZWJmedBJs0O0a9tgR3a2G/QV/l8fjOmTQGMH+63wcA/o5Psg3qcTuonDvjKEEuX fCaJPPT41u7b+lotqqIq0qbbfyQPu8kp4Kl5IV2yPZiPw6+SyIw8cuj4jtp3g+NGUSeK rQKA== X-Gm-Message-State: AOAM530mAzJ/KJYo+fiROGkDFWk18agShUbqx2lb9jZ7k52IIql3fyXL iMwUfYUFdzUTtoR2pri0IelJNoBJnWucANq1 X-Google-Smtp-Source: ABdhPJwEu4LC2Cz1K2rgxVwQrYuYinT+uwWru1r5SWZOb1CzlJ/0rEY8IUuIAasACAWLOr06TRZTNA== X-Received: by 2002:a1c:1983:: with SMTP id 125mr4134376wmz.29.1602089077113; Wed, 07 Oct 2020 09:44:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id z191sm3332280wme.40.2020.10.07.09.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 09:44:36 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH 03/13] misc/habana: Stop using frame_vector helpers Date: Wed, 7 Oct 2020 18:44:16 +0200 Message-Id: <20201007164426.1812530-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201007164426.1812530-1-daniel.vetter@ffwll.ch> References: <20201007164426.1812530-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-s390@vger.kernel.org, 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 c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5j YT4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2hu IEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlz c2VAcmVkaGF0LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlh bXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzog bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNv Y0B2Z2VyLmtlcm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogT2Rl ZCBHYWJiYXkgPG9kZWQuZ2FiYmF5QGdtYWlsLmNvbT4KQ2M6IE9tZXIgU2hwaWdlbG1hbiA8b3No cGlnZWxtYW5AaGFiYW5hLmFpPgpDYzogT2ZpciBCaXR0b24gPG9iaXR0b25AaGFiYW5hLmFpPgpD YzogVG9tZXIgVGF5YXIgPHR0YXlhckBoYWJhbmEuYWk+CkNjOiBNb3RpIEhhaW1vdnNraSA8bWhh aW1vdnNraUBoYWJhbmEuYWk+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xs LmNoPgpDYzogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4K Q2M6IFBhd2VsIFBpc2tvcnNraSA8cHBpc2tvcnNraUBoYWJhbmEuYWk+Ci0tLQogZHJpdmVycy9t aXNjL2hhYmFuYWxhYnMvS2NvbmZpZyAgICAgICAgICAgICB8ICAxIC0KIGRyaXZlcnMvbWlzYy9o YWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFsYWJzLmggfCAgMyArLQogZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL21lbW9yeS5jICAgICB8IDUxICsrKysrKysrKy0tLS0tLS0tLS0tLQogMyBm aWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvS2NvbmZpZwppbmRleCA4ZWI1ZDM4YzYxOGUuLjJmMDQxODdmNzE2NyAxMDA2NDQKLS0t IGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21pc2MvaGFi YW5hbGFicy9LY29uZmlnCkBAIC02LDcgKzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQogCXRyaXN0 YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRvcnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMgb24gUENJ ICYmIEhBU19JT01FTQotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAlzZWxlY3QgRE1BX1NIQVJFRF9C VUZGRVIKIAlzZWxlY3QgR0VORVJJQ19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KZGlmZiAtLWdp dCBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFsYWJzLmggYi9kcml2ZXJz L21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCmluZGV4IGVkYmQ2MjdiMjlkMi4u YzFiM2FkNjEzYjE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24v aGFiYW5hbGFicy5oCisrKyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFs YWJzLmgKQEAgLTg4MSw3ICs4ODEsOCBAQCBzdHJ1Y3QgaGxfY3R4X21nciB7CiBzdHJ1Y3QgaGxf dXNlcnB0ciB7CiAJZW51bSB2bV90eXBlX3QJCXZtX3R5cGU7IC8qIG11c3QgYmUgZmlyc3QgKi8K IAlzdHJ1Y3QgbGlzdF9oZWFkCWpvYl9ub2RlOwotCXN0cnVjdCBmcmFtZV92ZWN0b3IJKnZlYzsK KwlzdHJ1Y3QgcGFnZQkJKipwYWdlczsKKwl1bnNpZ25lZCBpbnQJCW5wYWdlczsKIAlzdHJ1Y3Qg c2dfdGFibGUJCSpzZ3Q7CiAJZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyOwogCXN0cnVjdCBs aXN0X2hlYWQJZGVidWdmc19saXN0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9taXNjL2hhYmFuYWxh YnMvY29tbW9uL21lbW9yeS5jIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL21lbW9y eS5jCmluZGV4IDVmZjQ2ODg2ODNmZC4uZWY4OWNmYTJmOTVhIDEwMDY0NAotLS0gYS9kcml2ZXJz L21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMKKysrIGIvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL21lbW9yeS5jCkBAIC0xMjgxLDQ1ICsxMjgxLDQxIEBAIHN0YXRpYyBpbnQg Z2V0X3VzZXJfbWVtb3J5KHN0cnVjdCBobF9kZXZpY2UgKmhkZXYsIHU2NCBhZGRyLCB1NjQgc2l6 ZSwKIAkJcmV0dXJuIC1FRkFVTFQ7CiAJfQogCi0JdXNlcnB0ci0+dmVjID0gZnJhbWVfdmVjdG9y X2NyZWF0ZShucGFnZXMpOwotCWlmICghdXNlcnB0ci0+dmVjKSB7CisJdXNlcnB0ci0+cGFnZXMg PSBrdm1hbGxvY19hcnJheShucGFnZXMsIHNpemVvZigqdXNlcnB0ci0+cGFnZXMpLAorCQkJCQlH RlBfS0VSTkVMKTsKKwlpZiAoIXVzZXJwdHItPnBhZ2VzKSB7CiAJCWRldl9lcnIoaGRldi0+ZGV2 LCAiRmFpbGVkIHRvIGNyZWF0ZSBmcmFtZSB2ZWN0b3JcbiIpOwogCQlyZXR1cm4gLUVOT01FTTsK IAl9CiAKLQlyYyA9IGdldF92YWRkcl9mcmFtZXMoc3RhcnQsIG5wYWdlcywgRk9MTF9GT1JDRSB8 IEZPTExfV1JJVEUsCi0JCQkJdXNlcnB0ci0+dmVjKTsKKwlyYyA9IHBpbl91c2VyX3BhZ2VzX2Zh c3Qoc3RhcnQsIG5wYWdlcywgRk9MTF9GT1JDRSB8IEZPTExfV1JJVEUsCisJCQkJIHVzZXJwdHIt PnBhZ2VzKTsKIAogCWlmIChyYyAhPSBucGFnZXMpIHsKIAkJZGV2X2VycihoZGV2LT5kZXYsCiAJ CQkiRmFpbGVkIHRvIG1hcCBob3N0IG1lbW9yeSwgdXNlciBwdHIgcHJvYmFibHkgd3JvbmdcbiIp OwogCQlpZiAocmMgPCAwKQotCQkJZ290byBkZXN0cm95X2ZyYW1ldmVjOworCQkJZ290byBkZXN0 cm95X3BhZ2VzOworCQlucGFnZXMgPSByYzsKIAkJcmMgPSAtRUZBVUxUOwotCQlnb3RvIHB1dF9m cmFtZXZlYzsKLQl9Ci0KLQlpZiAoZnJhbWVfdmVjdG9yX3RvX3BhZ2VzKHVzZXJwdHItPnZlYykg PCAwKSB7Ci0JCWRldl9lcnIoaGRldi0+ZGV2LAotCQkJIkZhaWxlZCB0byB0cmFuc2xhdGUgZnJh bWUgdmVjdG9yIHRvIHBhZ2VzXG4iKTsKLQkJcmMgPSAtRUZBVUxUOwotCQlnb3RvIHB1dF9mcmFt ZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJfQorCXVzZXJwdHItPm5wYWdlcyA9IG5wYWdlczsK IAogCXJjID0gc2dfYWxsb2NfdGFibGVfZnJvbV9wYWdlcyh1c2VycHRyLT5zZ3QsCi0JCQkJCWZy YW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpLAotCQkJCQlucGFnZXMsIG9mZnNldCwgc2l6 ZSwgR0ZQX0FUT01JQyk7CisJCQkJICAgICAgIHVzZXJwdHItPnBhZ2VzLAorCQkJCSAgICAgICBu cGFnZXMsIG9mZnNldCwgc2l6ZSwgR0ZQX0FUT01JQyk7CiAJaWYgKHJjIDwgMCkgewogCQlkZXZf ZXJyKGhkZXYtPmRldiwgImZhaWxlZCB0byBjcmVhdGUgU0cgdGFibGUgZnJvbSBwYWdlc1xuIik7 Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOworCQlnb3RvIHB1dF9wYWdlczsKIAl9CiAKIAlyZXR1cm4g MDsKIAotcHV0X2ZyYW1ldmVjOgotCXB1dF92YWRkcl9mcmFtZXModXNlcnB0ci0+dmVjKTsKLWRl c3Ryb3lfZnJhbWV2ZWM6Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+dmVjKTsKK3B1 dF9wYWdlczoKKwl1bnBpbl91c2VyX3BhZ2VzKHVzZXJwdHItPnBhZ2VzLCBucGFnZXMpOworZGVz dHJveV9wYWdlczoKKwlrdmZyZWUodXNlcnB0ci0+cGFnZXMpOwogCXJldHVybiByYzsKIH0KIApA QCAtMTQwNSw3ICsxNDAxLDcgQEAgaW50IGhsX3Bpbl9ob3N0X21lbW9yeShzdHJ1Y3QgaGxfZGV2 aWNlICpoZGV2LCB1NjQgYWRkciwgdTY0IHNpemUsCiAgKi8KIHZvaWQgaGxfdW5waW5faG9zdF9t ZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgc3RydWN0IGhsX3VzZXJwdHIgKnVzZXJwdHIp CiB7Ci0Jc3RydWN0IHBhZ2UgKipwYWdlczsKKwlpbnQgaTsKIAogCWhsX2RlYnVnZnNfcmVtb3Zl X3VzZXJwdHIoaGRldiwgdXNlcnB0cik7CiAKQEAgLTE0MTQsMTUgKzE0MTAsMTAgQEAgdm9pZCBo bF91bnBpbl9ob3N0X21lbW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3QgaGxfdXNl cnB0ciAqdXNlcnB0cikKIAkJCQkJCQl1c2VycHRyLT5zZ3QtPm5lbnRzLAogCQkJCQkJCXVzZXJw dHItPmRpcik7CiAKLQlwYWdlcyA9IGZyYW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpOwot CWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlpbnQgaTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgZnJh bWVfdmVjdG9yX2NvdW50KHVzZXJwdHItPnZlYyk7IGkrKykKLQkJCXNldF9wYWdlX2RpcnR5X2xv Y2socGFnZXNbaV0pOwotCX0KLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7Ci0JZnJh bWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+dmVjKTsKKwlmb3IgKGkgPSAwOyBpIDwgdXNlcnB0 ci0+bnBhZ2VzOyBpKyspCisJCXNldF9wYWdlX2RpcnR5X2xvY2sodXNlcnB0ci0+cGFnZXNbaV0p OworCXVucGluX3VzZXJfcGFnZXModXNlcnB0ci0+cGFnZXMsIHVzZXJwdHItPm5wYWdlcyk7CisJ a3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAogCWxpc3RfZGVsKCZ1c2VycHRyLT5qb2Jfbm9kZSk7 CiAKLS0gCjIuMjguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==