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 DF570C433E7 for ; Fri, 9 Oct 2020 08:01:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7586622275 for ; Fri, 9 Oct 2020 08:01:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="bKzq2hZG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732910AbgJIIBu (ORCPT ); Fri, 9 Oct 2020 04:01:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732704AbgJIIAM (ORCPT ); Fri, 9 Oct 2020 04:00:12 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80F23C0613D2 for ; Fri, 9 Oct 2020 00:59:57 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id f21so8841698wml.3 for ; Fri, 09 Oct 2020 00:59:57 -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=L2oZv7vxEZZWtTO3C1Lp0XtxkN66QV3fUnWxu78Rh38=; b=bKzq2hZGOXu0fkRVuHIJG2XdpMLBMLxx8G3yFQUHXKyWtYO+OHOAhvEMdWtfddJPky lUh2trsfuVCq/RGQTrV1pHhiifcSTHeUjmS3vMPfONOs+Ca+ALkk3BA4oWopUBar7jBe WASwfm88dJqsT9h2tML16LqS2STnW0TBm//DA= 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=L2oZv7vxEZZWtTO3C1Lp0XtxkN66QV3fUnWxu78Rh38=; b=ocxzFv4LeE4M9GyCyOg3Qb5I2S88mtuOKYn74HDhEdmnlIuiwDTL+vRpHTw4JeCeL9 rQ/ABJBVcmrJR0HdsL7HFPsMiZIy8hVznoATMPFF2zQ4+1eyJWAqC9YX9Uu6JHDBBtMW /4NJHG1kyL3vDVoR/WyeCS5rbnmfIoULh9CyY4nW5qevXbY9ygC1okTDXCqhwxtyQOj6 ZWYTr0y94dDOYeIKLBfouUr8i2iYUBCi+HB2n2FA4rordGeJb/ncMVPNApscZnQ/+WVW iHLDTxKyAVJ/pSkr3kK8jmZspbKUwGwxX937uKMxZEQYx5CSxQmjBEDSJP1NQQn++3Hz lzLA== X-Gm-Message-State: AOAM53168lpO03XaZNgiLm/SndnlZpeJjFfoRSxNgz4uyI4YNqfWSYNG GfjYNLwGCtxnqiqoHt/Z5B16/g== X-Google-Smtp-Source: ABdhPJzG3BYXEMIUcMAsDOoP86h0w2yTKkQt8nM1pRPVArdkv8JKqITJk6zo5uSkNezo/eZMOHu0cw== X-Received: by 2002:a1c:8057:: with SMTP id b84mr12530132wmd.116.1602230396240; Fri, 09 Oct 2020 00:59:56 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u17sm11634118wri.45.2020.10.09.00.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 00:59:55 -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 v2 03/17] misc/habana: Stop using frame_vector helpers Date: Fri, 9 Oct 2020 09:59:20 +0200 Message-Id: <20201009075934.3509076-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> References: <20201009075934.3509076-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 -- v2: Use unpin_user_pages_dirty_lock (John) --- drivers/misc/habanalabs/Kconfig | 1 - drivers/misc/habanalabs/common/habanalabs.h | 3 +- drivers/misc/habanalabs/common/memory.c | 49 ++++++++------------- 3 files changed, 20 insertions(+), 33 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..327b64479f97 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,8 +1401,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) @@ -1414,15 +1408,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 01884C43457 for ; Fri, 9 Oct 2020 08:02:46 +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 86C7B21789 for ; Fri, 9 Oct 2020 08:02:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="X1AXUjZI"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="bKzq2hZG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86C7B21789 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=hDaN0puljT2JNRkaICIRL9P8cQicNUncsX0ev52sedg=; b=X1AXUjZI4dJFH8ul+z3E4HfUQ M38JW6/AXlhxoOa1Ij8+Rma2s6q9nI7iqirbFzYswoLj+6W/vVa8cTyCYdixQM32czMtliEfAaIZF IRksrGhYBGX6Pwil2H3JluwG5ZmtJYH3NkGgSRitgp2c7tO8/gJxE2ztay4AcG4dHHZSwW8MkQ8JV E1jwJb8tIU+LtT18nMsCeREs5DW6M/WbsHIp44hXHKxT+k0nDAnh1X4fwaS8uFGAksJYGZZz2Logq H4jlz7bXFbICv966CbAAvMolWvOoiJiUF0HAE5cdUP0vC8bHU+OHp2l/XB7upJIL9yrb4v1XKchzU comoWCutw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQnKh-0002pR-K0; Fri, 09 Oct 2020 08:00:55 +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 1kQnJl-0002PB-7j for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2020 08:00:04 +0000 Received: by mail-wm1-x343.google.com with SMTP id d81so8864191wmc.1 for ; Fri, 09 Oct 2020 00:59:57 -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=L2oZv7vxEZZWtTO3C1Lp0XtxkN66QV3fUnWxu78Rh38=; b=bKzq2hZGOXu0fkRVuHIJG2XdpMLBMLxx8G3yFQUHXKyWtYO+OHOAhvEMdWtfddJPky lUh2trsfuVCq/RGQTrV1pHhiifcSTHeUjmS3vMPfONOs+Ca+ALkk3BA4oWopUBar7jBe WASwfm88dJqsT9h2tML16LqS2STnW0TBm//DA= 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=L2oZv7vxEZZWtTO3C1Lp0XtxkN66QV3fUnWxu78Rh38=; b=JFL466gG73wstO0AQxAeQQgG+sJrfRFIXW827iO9gYXAa1Pkxk4RQFQwa4xIe9xZpF B3+oBmIaK47jRX6Jigra9kdw72dc1qEyTzUbY/yZSsn5O+8VVr1FdJqq5tcTjFq9d8It Nn0R28DebZBNAlsqW3yDb529fPCMO1FQRzE0G3stGaauv87tEQizc3uNXITSWynhBivL +TtMYQtCn00urz2K2bqNVKr6rPPqZTY5UWp5YvTTtxRhUAWpRbCAJkCIdiywe/WEdJI4 dpny4AAWDM7V+r4iCbhT3D3cgInRmlOokFNpxwKgHS3+tdK0S1zmVFUtxsuJqbdtATX+ qC4Q== X-Gm-Message-State: AOAM531zV7+5EWUuHtWk+QQWA7LQMVVTOJr+uxjJYzUlNR/06FvP66IJ hAtX1iwrrKxNcmOEZtffHntjuQ== X-Google-Smtp-Source: ABdhPJzG3BYXEMIUcMAsDOoP86h0w2yTKkQt8nM1pRPVArdkv8JKqITJk6zo5uSkNezo/eZMOHu0cw== X-Received: by 2002:a1c:8057:: with SMTP id b84mr12530132wmd.116.1602230396240; Fri, 09 Oct 2020 00:59:56 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u17sm11634118wri.45.2020.10.09.00.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 00:59:55 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v2 03/17] misc/habana: Stop using frame_vector helpers Date: Fri, 9 Oct 2020 09:59:20 +0200 Message-Id: <20201009075934.3509076-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> References: <20201009075934.3509076-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-20201009_035957_936659_03000F07 X-CRM114-Status: GOOD ( 21.07 ) 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+Ci0tCnYyOiBVc2UgdW5w aW5fdXNlcl9wYWdlc19kaXJ0eV9sb2NrIChKb2huKQotLS0KIGRyaXZlcnMvbWlzYy9oYWJhbmFs YWJzL0tjb25maWcgICAgICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vaGFiYW5hbGFicy5oIHwgIDMgKy0KIGRyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1v bi9tZW1vcnkuYyAgICAgfCA0OSArKysrKysrKy0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMjAgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL0tjb25m aWcKaW5kZXggOGViNWQzOGM2MThlLi4yZjA0MTg3ZjcxNjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv bWlzYy9oYWJhbmFsYWJzL0tjb25maWcKKysrIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2Nv bmZpZwpAQCAtNiw3ICs2LDYgQEAKIGNvbmZpZyBIQUJBTkFfQUkKIAl0cmlzdGF0ZSAiSGFiYW5h QUkgYWNjZWxlcmF0b3JzIChoYWJhbmFsYWJzKSIKIAlkZXBlbmRzIG9uIFBDSSAmJiBIQVNfSU9N RU0KLQlzZWxlY3QgRlJBTUVfVkVDVE9SCiAJc2VsZWN0IERNQV9TSEFSRURfQlVGRkVSCiAJc2Vs ZWN0IEdFTkVSSUNfQUxMT0NBVE9SCiAJc2VsZWN0IEhXTU9OCmRpZmYgLS1naXQgYS9kcml2ZXJz L21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oIGIvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAppbmRleCBlZGJkNjI3YjI5ZDIuLmMxYjNhZDYxM2Ix NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMu aAorKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCkBAIC04 ODEsNyArODgxLDggQEAgc3RydWN0IGhsX2N0eF9tZ3Igewogc3RydWN0IGhsX3VzZXJwdHIgewog CWVudW0gdm1fdHlwZV90CQl2bV90eXBlOyAvKiBtdXN0IGJlIGZpcnN0ICovCiAJc3RydWN0IGxp c3RfaGVhZAlqb2Jfbm9kZTsKLQlzdHJ1Y3QgZnJhbWVfdmVjdG9yCSp2ZWM7CisJc3RydWN0IHBh Z2UJCSoqcGFnZXM7CisJdW5zaWduZWQgaW50CQlucGFnZXM7CiAJc3RydWN0IHNnX3RhYmxlCQkq c2d0OwogCWVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpcjsKIAlzdHJ1Y3QgbGlzdF9oZWFkCWRl YnVnZnNfbGlzdDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9t ZW1vcnkuYyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYwppbmRleCA1 ZmY0Njg4NjgzZmQuLjMyN2I2NDQ3OWY5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL21lbW9yeS5jCisrKyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1v bi9tZW1vcnkuYwpAQCAtMTI4MSw0NSArMTI4MSw0MSBAQCBzdGF0aWMgaW50IGdldF91c2VyX21l bW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCB1NjQgYWRkciwgdTY0IHNpemUsCiAJCXJldHVy biAtRUZBVUxUOwogCX0KIAotCXVzZXJwdHItPnZlYyA9IGZyYW1lX3ZlY3Rvcl9jcmVhdGUobnBh Z2VzKTsKLQlpZiAoIXVzZXJwdHItPnZlYykgeworCXVzZXJwdHItPnBhZ2VzID0ga3ZtYWxsb2Nf YXJyYXkobnBhZ2VzLCBzaXplb2YoKnVzZXJwdHItPnBhZ2VzKSwKKwkJCQkJR0ZQX0tFUk5FTCk7 CisJaWYgKCF1c2VycHRyLT5wYWdlcykgewogCQlkZXZfZXJyKGhkZXYtPmRldiwgIkZhaWxlZCB0 byBjcmVhdGUgZnJhbWUgdmVjdG9yXG4iKTsKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0JcmMg PSBnZXRfdmFkZHJfZnJhbWVzKHN0YXJ0LCBucGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRF LAotCQkJCXVzZXJwdHItPnZlYyk7CisJcmMgPSBwaW5fdXNlcl9wYWdlc19mYXN0KHN0YXJ0LCBu cGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAorCQkJCSB1c2VycHRyLT5wYWdlcyk7CiAK IAlpZiAocmMgIT0gbnBhZ2VzKSB7CiAJCWRldl9lcnIoaGRldi0+ZGV2LAogCQkJIkZhaWxlZCB0 byBtYXAgaG9zdCBtZW1vcnksIHVzZXIgcHRyIHByb2JhYmx5IHdyb25nXG4iKTsKIAkJaWYgKHJj IDwgMCkKLQkJCWdvdG8gZGVzdHJveV9mcmFtZXZlYzsKKwkJCWdvdG8gZGVzdHJveV9wYWdlczsK KwkJbnBhZ2VzID0gcmM7CiAJCXJjID0gLUVGQVVMVDsKLQkJZ290byBwdXRfZnJhbWV2ZWM7Ci0J fQotCi0JaWYgKGZyYW1lX3ZlY3Rvcl90b19wYWdlcyh1c2VycHRyLT52ZWMpIDwgMCkgewotCQlk ZXZfZXJyKGhkZXYtPmRldiwKLQkJCSJGYWlsZWQgdG8gdHJhbnNsYXRlIGZyYW1lIHZlY3RvciB0 byBwYWdlc1xuIik7Ci0JCXJjID0gLUVGQVVMVDsKLQkJZ290byBwdXRfZnJhbWV2ZWM7CisJCWdv dG8gcHV0X3BhZ2VzOwogCX0KKwl1c2VycHRyLT5ucGFnZXMgPSBucGFnZXM7CiAKIAlyYyA9IHNn X2FsbG9jX3RhYmxlX2Zyb21fcGFnZXModXNlcnB0ci0+c2d0LAotCQkJCQlmcmFtZV92ZWN0b3Jf cGFnZXModXNlcnB0ci0+dmVjKSwKLQkJCQkJbnBhZ2VzLCBvZmZzZXQsIHNpemUsIEdGUF9BVE9N SUMpOworCQkJCSAgICAgICB1c2VycHRyLT5wYWdlcywKKwkJCQkgICAgICAgbnBhZ2VzLCBvZmZz ZXQsIHNpemUsIEdGUF9BVE9NSUMpOwogCWlmIChyYyA8IDApIHsKIAkJZGV2X2VycihoZGV2LT5k ZXYsICJmYWlsZWQgdG8gY3JlYXRlIFNHIHRhYmxlIGZyb20gcGFnZXNcbiIpOwotCQlnb3RvIHB1 dF9mcmFtZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJfQogCiAJcmV0dXJuIDA7CiAKLXB1dF9m cmFtZXZlYzoKLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7Ci1kZXN0cm95X2ZyYW1l dmVjOgotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95KHVzZXJwdHItPnZlYyk7CitwdXRfcGFnZXM6CisJ dW5waW5fdXNlcl9wYWdlcyh1c2VycHRyLT5wYWdlcywgbnBhZ2VzKTsKK2Rlc3Ryb3lfcGFnZXM6 CisJa3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAlyZXR1cm4gcmM7CiB9CiAKQEAgLTE0MDUsOCAr MTQwMSw2IEBAIGludCBobF9waW5faG9zdF9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwg dTY0IGFkZHIsIHU2NCBzaXplLAogICovCiB2b2lkIGhsX3VucGluX2hvc3RfbWVtb3J5KHN0cnVj dCBobF9kZXZpY2UgKmhkZXYsIHN0cnVjdCBobF91c2VycHRyICp1c2VycHRyKQogewotCXN0cnVj dCBwYWdlICoqcGFnZXM7Ci0KIAlobF9kZWJ1Z2ZzX3JlbW92ZV91c2VycHRyKGhkZXYsIHVzZXJw dHIpOwogCiAJaWYgKHVzZXJwdHItPmRtYV9tYXBwZWQpCkBAIC0xNDE0LDE1ICsxNDA4LDggQEAg dm9pZCBobF91bnBpbl9ob3N0X21lbW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3Qg aGxfdXNlcnB0ciAqdXNlcnB0cikKIAkJCQkJCQl1c2VycHRyLT5zZ3QtPm5lbnRzLAogCQkJCQkJ CXVzZXJwdHItPmRpcik7CiAKLQlwYWdlcyA9IGZyYW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52 ZWMpOwotCWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlpbnQgaTsKLQotCQlmb3IgKGkgPSAwOyBp IDwgZnJhbWVfdmVjdG9yX2NvdW50KHVzZXJwdHItPnZlYyk7IGkrKykKLQkJCXNldF9wYWdlX2Rp cnR5X2xvY2socGFnZXNbaV0pOwotCX0KLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7 Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+dmVjKTsKKwl1bnBpbl91c2VyX3BhZ2Vz X2RpcnR5X2xvY2sodXNlcnB0ci0+cGFnZXMsIHVzZXJwdHItPm5wYWdlcywgdHJ1ZSk7CisJa3Zm cmVlKHVzZXJwdHItPnBhZ2VzKTsKIAogCWxpc3RfZGVsKCZ1c2VycHRyLT5qb2Jfbm9kZSk7CiAK LS0gCjIuMjguMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMu aW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2xpbnV4LWFybS1rZXJuZWwK 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 DAC12C43467 for ; Fri, 9 Oct 2020 08:00:03 +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 6D7FA22275 for ; Fri, 9 Oct 2020 08:00:03 +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="bKzq2hZG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D7FA22275 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 5C20D6EC74; Fri, 9 Oct 2020 07:59:59 +0000 (UTC) Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id C99EA6EC74 for ; Fri, 9 Oct 2020 07:59:57 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id 13so8866522wmf.0 for ; Fri, 09 Oct 2020 00:59:57 -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=L2oZv7vxEZZWtTO3C1Lp0XtxkN66QV3fUnWxu78Rh38=; b=bKzq2hZGOXu0fkRVuHIJG2XdpMLBMLxx8G3yFQUHXKyWtYO+OHOAhvEMdWtfddJPky lUh2trsfuVCq/RGQTrV1pHhiifcSTHeUjmS3vMPfONOs+Ca+ALkk3BA4oWopUBar7jBe WASwfm88dJqsT9h2tML16LqS2STnW0TBm//DA= 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=L2oZv7vxEZZWtTO3C1Lp0XtxkN66QV3fUnWxu78Rh38=; b=g03qSxBHE6oHKMFYTWx1hwd3lEmR5b1UpOaO3vdkxFDqcgMHyyDxgskfnR7exgX/pd cdVR3qDNltleUTW2TQWZgB0Npmcjpj5AsKnoBaUo2xhwA7yR0XuWiADxGxSaGpvTEw5k HR7gsk9qWUG/a3sOyR2JWFYfZtIZrPEYkkj4hwf7Jn6LXjUpqjTnrMRSFjeODnlG/Vjg 0cqw+QTPRKuMJPnkw91HHGQ+04wOP2KyKZGCGolbKkmQe6Vwq7mF3Lwc2/Akp4XHyPLv y8F45XiBc6g0jHfN2BSoQX6JmUGWMJ5EXoRBitVLculw+xd/LgcgfogSKgroFiSDguKi yhUA== X-Gm-Message-State: AOAM530FQAHPuN9XCa8MsyV8TvySl7RWVTz2gjmkZ8R6dvZ9G0X8Oez8 njiWm2/vFH59/AM+YJvHWM4rmZ/5Yei2jneO X-Google-Smtp-Source: ABdhPJzG3BYXEMIUcMAsDOoP86h0w2yTKkQt8nM1pRPVArdkv8JKqITJk6zo5uSkNezo/eZMOHu0cw== X-Received: by 2002:a1c:8057:: with SMTP id b84mr12530132wmd.116.1602230396240; Fri, 09 Oct 2020 00:59:56 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u17sm11634118wri.45.2020.10.09.00.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 00:59:55 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v2 03/17] misc/habana: Stop using frame_vector helpers Date: Fri, 9 Oct 2020 09:59:20 +0200 Message-Id: <20201009075934.3509076-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> References: <20201009075934.3509076-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+Ci0tCnYyOiBVc2UgdW5w aW5fdXNlcl9wYWdlc19kaXJ0eV9sb2NrIChKb2huKQotLS0KIGRyaXZlcnMvbWlzYy9oYWJhbmFs YWJzL0tjb25maWcgICAgICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vaGFiYW5hbGFicy5oIHwgIDMgKy0KIGRyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1v bi9tZW1vcnkuYyAgICAgfCA0OSArKysrKysrKy0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMjAgaW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL0tjb25m aWcKaW5kZXggOGViNWQzOGM2MThlLi4yZjA0MTg3ZjcxNjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv bWlzYy9oYWJhbmFsYWJzL0tjb25maWcKKysrIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2Nv bmZpZwpAQCAtNiw3ICs2LDYgQEAKIGNvbmZpZyBIQUJBTkFfQUkKIAl0cmlzdGF0ZSAiSGFiYW5h QUkgYWNjZWxlcmF0b3JzIChoYWJhbmFsYWJzKSIKIAlkZXBlbmRzIG9uIFBDSSAmJiBIQVNfSU9N RU0KLQlzZWxlY3QgRlJBTUVfVkVDVE9SCiAJc2VsZWN0IERNQV9TSEFSRURfQlVGRkVSCiAJc2Vs ZWN0IEdFTkVSSUNfQUxMT0NBVE9SCiAJc2VsZWN0IEhXTU9OCmRpZmYgLS1naXQgYS9kcml2ZXJz L21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oIGIvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAppbmRleCBlZGJkNjI3YjI5ZDIuLmMxYjNhZDYxM2Ix NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMu aAorKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCkBAIC04 ODEsNyArODgxLDggQEAgc3RydWN0IGhsX2N0eF9tZ3Igewogc3RydWN0IGhsX3VzZXJwdHIgewog CWVudW0gdm1fdHlwZV90CQl2bV90eXBlOyAvKiBtdXN0IGJlIGZpcnN0ICovCiAJc3RydWN0IGxp c3RfaGVhZAlqb2Jfbm9kZTsKLQlzdHJ1Y3QgZnJhbWVfdmVjdG9yCSp2ZWM7CisJc3RydWN0IHBh Z2UJCSoqcGFnZXM7CisJdW5zaWduZWQgaW50CQlucGFnZXM7CiAJc3RydWN0IHNnX3RhYmxlCQkq c2d0OwogCWVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpcjsKIAlzdHJ1Y3QgbGlzdF9oZWFkCWRl YnVnZnNfbGlzdDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9t ZW1vcnkuYyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYwppbmRleCA1 ZmY0Njg4NjgzZmQuLjMyN2I2NDQ3OWY5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL21lbW9yeS5jCisrKyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1v bi9tZW1vcnkuYwpAQCAtMTI4MSw0NSArMTI4MSw0MSBAQCBzdGF0aWMgaW50IGdldF91c2VyX21l bW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCB1NjQgYWRkciwgdTY0IHNpemUsCiAJCXJldHVy biAtRUZBVUxUOwogCX0KIAotCXVzZXJwdHItPnZlYyA9IGZyYW1lX3ZlY3Rvcl9jcmVhdGUobnBh Z2VzKTsKLQlpZiAoIXVzZXJwdHItPnZlYykgeworCXVzZXJwdHItPnBhZ2VzID0ga3ZtYWxsb2Nf YXJyYXkobnBhZ2VzLCBzaXplb2YoKnVzZXJwdHItPnBhZ2VzKSwKKwkJCQkJR0ZQX0tFUk5FTCk7 CisJaWYgKCF1c2VycHRyLT5wYWdlcykgewogCQlkZXZfZXJyKGhkZXYtPmRldiwgIkZhaWxlZCB0 byBjcmVhdGUgZnJhbWUgdmVjdG9yXG4iKTsKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0JcmMg PSBnZXRfdmFkZHJfZnJhbWVzKHN0YXJ0LCBucGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRF LAotCQkJCXVzZXJwdHItPnZlYyk7CisJcmMgPSBwaW5fdXNlcl9wYWdlc19mYXN0KHN0YXJ0LCBu cGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAorCQkJCSB1c2VycHRyLT5wYWdlcyk7CiAK IAlpZiAocmMgIT0gbnBhZ2VzKSB7CiAJCWRldl9lcnIoaGRldi0+ZGV2LAogCQkJIkZhaWxlZCB0 byBtYXAgaG9zdCBtZW1vcnksIHVzZXIgcHRyIHByb2JhYmx5IHdyb25nXG4iKTsKIAkJaWYgKHJj IDwgMCkKLQkJCWdvdG8gZGVzdHJveV9mcmFtZXZlYzsKKwkJCWdvdG8gZGVzdHJveV9wYWdlczsK KwkJbnBhZ2VzID0gcmM7CiAJCXJjID0gLUVGQVVMVDsKLQkJZ290byBwdXRfZnJhbWV2ZWM7Ci0J fQotCi0JaWYgKGZyYW1lX3ZlY3Rvcl90b19wYWdlcyh1c2VycHRyLT52ZWMpIDwgMCkgewotCQlk ZXZfZXJyKGhkZXYtPmRldiwKLQkJCSJGYWlsZWQgdG8gdHJhbnNsYXRlIGZyYW1lIHZlY3RvciB0 byBwYWdlc1xuIik7Ci0JCXJjID0gLUVGQVVMVDsKLQkJZ290byBwdXRfZnJhbWV2ZWM7CisJCWdv dG8gcHV0X3BhZ2VzOwogCX0KKwl1c2VycHRyLT5ucGFnZXMgPSBucGFnZXM7CiAKIAlyYyA9IHNn X2FsbG9jX3RhYmxlX2Zyb21fcGFnZXModXNlcnB0ci0+c2d0LAotCQkJCQlmcmFtZV92ZWN0b3Jf cGFnZXModXNlcnB0ci0+dmVjKSwKLQkJCQkJbnBhZ2VzLCBvZmZzZXQsIHNpemUsIEdGUF9BVE9N SUMpOworCQkJCSAgICAgICB1c2VycHRyLT5wYWdlcywKKwkJCQkgICAgICAgbnBhZ2VzLCBvZmZz ZXQsIHNpemUsIEdGUF9BVE9NSUMpOwogCWlmIChyYyA8IDApIHsKIAkJZGV2X2VycihoZGV2LT5k ZXYsICJmYWlsZWQgdG8gY3JlYXRlIFNHIHRhYmxlIGZyb20gcGFnZXNcbiIpOwotCQlnb3RvIHB1 dF9mcmFtZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJfQogCiAJcmV0dXJuIDA7CiAKLXB1dF9m cmFtZXZlYzoKLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7Ci1kZXN0cm95X2ZyYW1l dmVjOgotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95KHVzZXJwdHItPnZlYyk7CitwdXRfcGFnZXM6CisJ dW5waW5fdXNlcl9wYWdlcyh1c2VycHRyLT5wYWdlcywgbnBhZ2VzKTsKK2Rlc3Ryb3lfcGFnZXM6 CisJa3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAlyZXR1cm4gcmM7CiB9CiAKQEAgLTE0MDUsOCAr MTQwMSw2IEBAIGludCBobF9waW5faG9zdF9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwg dTY0IGFkZHIsIHU2NCBzaXplLAogICovCiB2b2lkIGhsX3VucGluX2hvc3RfbWVtb3J5KHN0cnVj dCBobF9kZXZpY2UgKmhkZXYsIHN0cnVjdCBobF91c2VycHRyICp1c2VycHRyKQogewotCXN0cnVj dCBwYWdlICoqcGFnZXM7Ci0KIAlobF9kZWJ1Z2ZzX3JlbW92ZV91c2VycHRyKGhkZXYsIHVzZXJw dHIpOwogCiAJaWYgKHVzZXJwdHItPmRtYV9tYXBwZWQpCkBAIC0xNDE0LDE1ICsxNDA4LDggQEAg dm9pZCBobF91bnBpbl9ob3N0X21lbW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3Qg aGxfdXNlcnB0ciAqdXNlcnB0cikKIAkJCQkJCQl1c2VycHRyLT5zZ3QtPm5lbnRzLAogCQkJCQkJ CXVzZXJwdHItPmRpcik7CiAKLQlwYWdlcyA9IGZyYW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52 ZWMpOwotCWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlpbnQgaTsKLQotCQlmb3IgKGkgPSAwOyBp IDwgZnJhbWVfdmVjdG9yX2NvdW50KHVzZXJwdHItPnZlYyk7IGkrKykKLQkJCXNldF9wYWdlX2Rp cnR5X2xvY2socGFnZXNbaV0pOwotCX0KLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7 Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+dmVjKTsKKwl1bnBpbl91c2VyX3BhZ2Vz X2RpcnR5X2xvY2sodXNlcnB0ci0+cGFnZXMsIHVzZXJwdHItPm5wYWdlcywgdHJ1ZSk7CisJa3Zm cmVlKHVzZXJwdHItPnBhZ2VzKTsKIAogCWxpc3RfZGVsKCZ1c2VycHRyLT5qb2Jfbm9kZSk7CiAK LS0gCjIuMjguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==