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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 280E3C8300E for ; Fri, 27 Nov 2020 16:42:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2DAF22255 for ; Fri, 27 Nov 2020 16:42:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="UhRRerfu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731706AbgK0QmH (ORCPT ); Fri, 27 Nov 2020 11:42:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731647AbgK0QmG (ORCPT ); Fri, 27 Nov 2020 11:42:06 -0500 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 A5A2FC061A48 for ; Fri, 27 Nov 2020 08:42:05 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id i2so6204356wrs.4 for ; Fri, 27 Nov 2020 08:42:05 -0800 (PST) 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=ZksVGApk98zqPsAWw78BKRzIEsQF4b04ZNKI0BcksDw=; b=UhRRerfutI6O0HsSwpe9AWN/5A4TFyk3ESQhXdxKTcxJAbAsj/B1y9zXC2vxCMgf9Q nyNxYWiTlYWnj/S+sRfdtVs98Ke+7sFH0UEcNGoUIKNHwPb1l6envlhCtYH8v1O2RtTU prSo4rWH81b9X6HhtrnUb9U5bRiaEJIQwpRE0= 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=ZksVGApk98zqPsAWw78BKRzIEsQF4b04ZNKI0BcksDw=; b=iiptbDg5SItt4OvDE0AqfYJGqUFFiPjaO2sUZW3FzMA1Ww2p/iGfqPw+MNaHjkSrVf XqkJiL8iuEzec1HSPCuttOpD6so2qEUbqIh9YYHOo4rXRcyDKbl7OdHoCXrVJ0G5Xhn5 MCaWKukE9bSrRZR/1vJBfb6llxEgMShCRDsEBDCS81Wmld65Ns9gY03OAunV1tB+cym8 a235BR1p4SBn0nBw38V9nvxjUoQ7rYQ+YZvwyCo9rUXFURfninY4eZeZbqvhHZAhKrre SdruC4NJYdWGqhm5VYrQqWAhCIj16h/3MSJyaWIX1P3OEIXg8GC+glj8iz+d+WhcAUzo IdUA== X-Gm-Message-State: AOAM533WzfrhdDtZIXwca5+gh7a/hW60GVMR3rfGkBvIwwY8IsYIwgpF VsLd2L9H6oKv+/ugdB1Hf8yAhQ== X-Google-Smtp-Source: ABdhPJzZTcHDI/HDUBPUkKv9r5yIfNsTxyzq9owJl03yvUAtrn6FZDouMmnPycgbxWmpK0rFsFq00g== X-Received: by 2002:a5d:5651:: with SMTP id j17mr11829464wrw.221.1606495321359; Fri, 27 Nov 2020 08:42:01 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q12sm14859078wrx.86.2020.11.27.08.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 08:42:00 -0800 (PST) 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 , Oded Gabbay , Daniel Vetter , Christoph Hellwig , 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 v7 03/17] misc/habana: Stop using frame_vector helpers Date: Fri, 27 Nov 2020 17:41:17 +0100 Message-Id: <20201127164131.2244124-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> References: <20201127164131.2244124-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. Note that pin_user_pages_fast is a safe replacement despite the seeming lack of checking for vma->vm_flasg & (VM_IO | VM_PFNMAP). Such ptes are marked with pte_mkspecial (which pup_fast rejects in the fastpath), and only architectures supporting that support the pin_user_pages_fast fastpath. Reviewed-by: John Hubbard Reviewed-by: Oded Gabbay Signed-off-by: Daniel Vetter Cc: Christoph Hellwig 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) v6: Explain why pup_fast is safe, after discussions with John and Christoph. v7: Remove error message for kmalloc failures, habanalabs doesn't do that (Oded) --- drivers/misc/habanalabs/Kconfig | 1 - drivers/misc/habanalabs/common/habanalabs.h | 6 ++- drivers/misc/habanalabs/common/memory.c | 51 ++++++++------------- 3 files changed, 22 insertions(+), 36 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 6ed974d2def0..107442a20197 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..2c59fa869684 100644 --- a/drivers/misc/habanalabs/common/memory.c +++ b/drivers/misc/habanalabs/common/memory.c @@ -1291,45 +1291,39 @@ static int get_user_memory(struct hl_device *hdev, u64 addr, u64 size, return -EFAULT; } - userptr->vec = frame_vector_create(npages); - if (!userptr->vec) { - dev_err(hdev->dev, "Failed to create frame vector\n"); + userptr->pages = kvmalloc_array(npages, sizeof(*userptr->pages), + GFP_KERNEL); + if (!userptr->pages) 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; - 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"); + goto destroy_pages; + npages = rc; 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 +1409,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 +1416,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.29.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 F0182C82480 for ; Fri, 27 Nov 2020 16:44:17 +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 94CF520657 for ; Fri, 27 Nov 2020 16:44:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Soq8YATZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="UhRRerfu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94CF520657 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=Cr15pDPyvvtKQ5Dg+GDcKqz6izgm4KCTRIFj+iN2VX8=; b=Soq8YATZrDVLNZea40l/oXm2C eUDb7RLq6hm1sy0JdoMkrr+0MyZVzRn8RHNBBzycu0YllV0mC/eeNWsP+8RNeEmaTZqlyANbN2hZi rQ6McCAv8kkx2QG9MD2FD7WRAejvtQc0OaOU6Ga5vyPzDC0HoLuVuN+Ssem0FqzAkHPepFuesS0rG Q0+tW3LZO/7iFdircNrsVcNIDHGNnnKWlVTSKHh2gM0d5tZjrPOj+MCHzploSO4sZFsZTN8jP0Jm0 wK1/RriZ47dI0pOMhGeKWV9Qd5ow+HMMwDLH68unh82ZOcg2Dq/OI8vtS9phJkQhR56HvSkeL9tat ghxdjO03g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kigpP-0007zn-3l; Fri, 27 Nov 2020 16:42:35 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kigos-0007lj-8T for linux-arm-kernel@lists.infradead.org; Fri, 27 Nov 2020 16:42:10 +0000 Received: by mail-wr1-x441.google.com with SMTP id m6so6194487wrg.7 for ; Fri, 27 Nov 2020 08:42:02 -0800 (PST) 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=ZksVGApk98zqPsAWw78BKRzIEsQF4b04ZNKI0BcksDw=; b=UhRRerfutI6O0HsSwpe9AWN/5A4TFyk3ESQhXdxKTcxJAbAsj/B1y9zXC2vxCMgf9Q nyNxYWiTlYWnj/S+sRfdtVs98Ke+7sFH0UEcNGoUIKNHwPb1l6envlhCtYH8v1O2RtTU prSo4rWH81b9X6HhtrnUb9U5bRiaEJIQwpRE0= 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=ZksVGApk98zqPsAWw78BKRzIEsQF4b04ZNKI0BcksDw=; b=biH7+G5pDnEFgbPPVvZFZOW0s+GcMPBmwyH7b8It4OPjkIFBv0NGp/zslPO6hwjx8M 5NWVvyKLjR2iN7VDSwWuK9XGVQXCGZCPkMcscRoptzaAS4AK1CvcDNbtJalxfk5zuK4H eoNH8BAER1OhYCeQYJf5ssOxrMo3LkYLlZUgB4D48EkRUDfc5C8v26bbVkieTs0xLmwH IQQOtRswbamQH2009Uw8GnMdvuTp8jnuPIixmo5IqoL5jzi/EzFNvv7xuW/oT7Jqlp9e MV6JbIXz3yPjadMHxGQbVb42vgLgnARplHf0e20MhuV074YJjWQywu+CzEqi0inkw2nL G6xg== X-Gm-Message-State: AOAM533sqALBS/fq+QcElOmmSs1/Ix2yVwQsvQs2o2WN8i1EuvePWdM9 2k3HsfwtHdJt5HYa2IxRDjv7qQ== X-Google-Smtp-Source: ABdhPJzZTcHDI/HDUBPUkKv9r5yIfNsTxyzq9owJl03yvUAtrn6FZDouMmnPycgbxWmpK0rFsFq00g== X-Received: by 2002:a5d:5651:: with SMTP id j17mr11829464wrw.221.1606495321359; Fri, 27 Nov 2020 08:42:01 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q12sm14859078wrx.86.2020.11.27.08.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 08:42:00 -0800 (PST) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v7 03/17] misc/habana: Stop using frame_vector helpers Date: Fri, 27 Nov 2020 17:41:17 +0100 Message-Id: <20201127164131.2244124-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> References: <20201127164131.2244124-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-20201127_114202_621364_13D1D517 X-CRM114-Status: GOOD ( 24.50 ) 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: Jan Kara , kvm@vger.kernel.org, Daniel Vetter , linux-mm@kvack.org, Daniel Vetter , linux-samsung-soc@vger.kernel.org, Omer Shpigelman , Christoph Hellwig , Jason Gunthorpe , Tomer Tayar , Moti Haimovski , linux-media@vger.kernel.org, John Hubbard , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Dan Williams , Ofir Bitton , linux-arm-kernel@lists.infradead.org, Oded Gabbay , Pawel Piskorski , Greg Kroah-Hartman , Oded Gabbay , Andrew Morton 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 c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKTm90ZSB0aGF0IHBpbl91c2VyX3BhZ2VzX2Zhc3Qg aXMgYSBzYWZlIHJlcGxhY2VtZW50IGRlc3BpdGUgdGhlCnNlZW1pbmcgbGFjayBvZiBjaGVja2lu ZyBmb3Igdm1hLT52bV9mbGFzZyAmIChWTV9JTyB8IFZNX1BGTk1BUCkuIFN1Y2gKcHRlcyBhcmUg bWFya2VkIHdpdGggcHRlX21rc3BlY2lhbCAod2hpY2ggcHVwX2Zhc3QgcmVqZWN0cyBpbiB0aGUK ZmFzdHBhdGgpLCBhbmQgb25seSBhcmNoaXRlY3R1cmVzIHN1cHBvcnRpbmcgdGhhdCBzdXBwb3J0 IHRoZQpwaW5fdXNlcl9wYWdlc19mYXN0IGZhc3RwYXRoLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHVi YmFyZCA8amh1YmJhcmRAbnZpZGlhLmNvbT4KUmV2aWV3ZWQtYnk6IE9kZWQgR2FiYmF5IDxvZ2Fi YmF5QGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAaW50ZWwuY29tPgpDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBpbmZyYWRlYWQub3JnPgpD YzogSmFzb24gR3VudGhvcnBlIDxqZ2dAemllcGUuY2E+CkNjOiBBbmRyZXcgTW9ydG9uIDxha3Bt QGxpbnV4LWZvdW5kYXRpb24ub3JnPgpDYzogSm9obiBIdWJiYXJkIDxqaHViYmFyZEBudmlkaWEu Y29tPgpDYzogSsOpcsO0bWUgR2xpc3NlIDxqZ2xpc3NlQHJlZGhhdC5jb20+CkNjOiBKYW4gS2Fy YSA8amFja0BzdXNlLmN6PgpDYzogRGFuIFdpbGxpYW1zIDxkYW4uai53aWxsaWFtc0BpbnRlbC5j b20+CkNjOiBsaW51eC1tbUBrdmFjay5vcmcKQ2M6IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5m cmFkZWFkLm9yZwpDYzogbGludXgtc2Ftc3VuZy1zb2NAdmdlci5rZXJuZWwub3JnCkNjOiBsaW51 eC1tZWRpYUB2Z2VyLmtlcm5lbC5vcmcKQ2M6IE9kZWQgR2FiYmF5IDxvZGVkLmdhYmJheUBnbWFp bC5jb20+CkNjOiBPbWVyIFNocGlnZWxtYW4gPG9zaHBpZ2VsbWFuQGhhYmFuYS5haT4KQ2M6IE9m aXIgQml0dG9uIDxvYml0dG9uQGhhYmFuYS5haT4KQ2M6IFRvbWVyIFRheWFyIDx0dGF5YXJAaGFi YW5hLmFpPgpDYzogTW90aSBIYWltb3Zza2kgPG1oYWltb3Zza2lAaGFiYW5hLmFpPgpDYzogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IEdyZWcgS3JvYWgtSGFydG1h biA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+CkNjOiBQYXdlbCBQaXNrb3Jza2kgPHBwaXNr b3Jza2lAaGFiYW5hLmFpPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGZmd2xsLmNoPgotLQp2MjogVXNlIHVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayAoSm9o bikKdjM6IFVwZGF0ZSBrZXJuZWxkb2MgKE9kZWQpCnY2OiBFeHBsYWluIHdoeSBwdXBfZmFzdCBp cyBzYWZlLCBhZnRlciBkaXNjdXNzaW9ucyB3aXRoIEpvaG4gYW5kCkNocmlzdG9waC4Kdjc6IFJl bW92ZSBlcnJvciBtZXNzYWdlIGZvciBrbWFsbG9jIGZhaWx1cmVzLCBoYWJhbmFsYWJzIGRvZXNu J3QgZG8KdGhhdCAoT2RlZCkKLS0tCiBkcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnICAg ICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxh YnMuaCB8ICA2ICsrLQogZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jICAg ICB8IDUxICsrKysrKysrLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRp b25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5h bGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZwppbmRleCAxNjQw MzQwZDNlNjIuLjI5M2Q3OTgxMTM3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxh YnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnCkBAIC02LDcg KzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQogCXRyaXN0YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRv cnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMgb24gUENJICYmIEhBU19JT01FTQotCXNlbGVjdCBG UkFNRV9WRUNUT1IKIAlzZWxlY3QgR0VORVJJQ19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KIAlo ZWxwCmRpZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFi cy5oIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAppbmRleCA2 ZWQ5NzRkMmRlZjAuLjEwNzQ0MmEyMDE5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAorKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vaGFiYW5hbGFicy5oCkBAIC05MjEsNyArOTIxLDggQEAgc3RydWN0IGhsX2N0eF9tZ3Ig ewogICogc3RydWN0IGhsX3VzZXJwdHIgLSBtZW1vcnkgbWFwcGluZyBjaHVuayBpbmZvcm1hdGlv bgogICogQHZtX3R5cGU6IHR5cGUgb2YgdGhlIFZNLgogICogQGpvYl9ub2RlOiBsaW5rZWQtbGlz dCBub2RlIGZvciBoYW5naW5nIHRoZSBvYmplY3Qgb24gdGhlIEpvYidzIGxpc3QuCi0gKiBAdmVj OiBwb2ludGVyIHRvIHRoZSBmcmFtZSB2ZWN0b3IuCisgKiBAcGFnZXM6IHBvaW50ZXIgdG8gc3Ry dWN0IHBhZ2UgYXJyYXkKKyAqIEBucGFnZXM6IHNpemUgb2YgQHBhZ2VzIGFycmF5CiAgKiBAc2d0 OiBwb2ludGVyIHRvIHRoZSBzY2F0dGVyLWdhdGhlciB0YWJsZSB0aGF0IGhvbGRzIHRoZSBwYWdl cy4KICAqIEBkaXI6IGZvciBETUEgdW5tYXBwaW5nLCB0aGUgZGlyZWN0aW9uIG11c3QgYmUgc3Vw cGxpZWQsIHNvIHNhdmUgaXQuCiAgKiBAZGVidWdmc19saXN0OiBub2RlIGluIGRlYnVnZnMgbGlz dCBvZiBjb21tYW5kIHN1Ym1pc3Npb25zLgpAQCAtOTMyLDcgKzkzMyw4IEBAIHN0cnVjdCBobF9j dHhfbWdyIHsKIHN0cnVjdCBobF91c2VycHRyIHsKIAllbnVtIHZtX3R5cGVfdAkJdm1fdHlwZTsg LyogbXVzdCBiZSBmaXJzdCAqLwogCXN0cnVjdCBsaXN0X2hlYWQJam9iX25vZGU7Ci0Jc3RydWN0 IGZyYW1lX3ZlY3RvcgkqdmVjOworCXN0cnVjdCBwYWdlCQkqKnBhZ2VzOworCXVuc2lnbmVkIGlu dAkJbnBhZ2VzOwogCXN0cnVjdCBzZ190YWJsZQkJKnNndDsKIAllbnVtIGRtYV9kYXRhX2RpcmVj dGlvbiBkaXI7CiAJc3RydWN0IGxpc3RfaGVhZAlkZWJ1Z2ZzX2xpc3Q7CmRpZmYgLS1naXQgYS9k cml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMgYi9kcml2ZXJzL21pc2MvaGFi YW5hbGFicy9jb21tb24vbWVtb3J5LmMKaW5kZXggODQyMjc4MTllNGQxLi4yYzU5ZmE4Njk2ODQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYworKysg Yi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMKQEAgLTEyOTEsNDUgKzEy OTEsMzkgQEAgc3RhdGljIGludCBnZXRfdXNlcl9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRl diwgdTY0IGFkZHIsIHU2NCBzaXplLAogCQlyZXR1cm4gLUVGQVVMVDsKIAl9CiAKLQl1c2VycHRy LT52ZWMgPSBmcmFtZV92ZWN0b3JfY3JlYXRlKG5wYWdlcyk7Ci0JaWYgKCF1c2VycHRyLT52ZWMp IHsKLQkJZGV2X2VycihoZGV2LT5kZXYsICJGYWlsZWQgdG8gY3JlYXRlIGZyYW1lIHZlY3Rvclxu Iik7CisJdXNlcnB0ci0+cGFnZXMgPSBrdm1hbGxvY19hcnJheShucGFnZXMsIHNpemVvZigqdXNl cnB0ci0+cGFnZXMpLAorCQkJCQlHRlBfS0VSTkVMKTsKKwlpZiAoIXVzZXJwdHItPnBhZ2VzKQog CQlyZXR1cm4gLUVOT01FTTsKLQl9CiAKLQlyYyA9IGdldF92YWRkcl9mcmFtZXMoc3RhcnQsIG5w YWdlcywgRk9MTF9GT1JDRSB8IEZPTExfV1JJVEUsCi0JCQkJdXNlcnB0ci0+dmVjKTsKKwlyYyA9 IHBpbl91c2VyX3BhZ2VzX2Zhc3Qoc3RhcnQsIG5wYWdlcywgRk9MTF9GT1JDRSB8IEZPTExfV1JJ VEUsCisJCQkJIHVzZXJwdHItPnBhZ2VzKTsKIAogCWlmIChyYyAhPSBucGFnZXMpIHsKIAkJZGV2 X2VycihoZGV2LT5kZXYsCiAJCQkiRmFpbGVkIHRvIG1hcCBob3N0IG1lbW9yeSwgdXNlciBwdHIg cHJvYmFibHkgd3JvbmdcbiIpOwogCQlpZiAocmMgPCAwKQotCQkJZ290byBkZXN0cm95X2ZyYW1l dmVjOwotCQlyYyA9IC1FRkFVTFQ7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOwotCX0KLQotCWlmIChm cmFtZV92ZWN0b3JfdG9fcGFnZXModXNlcnB0ci0+dmVjKSA8IDApIHsKLQkJZGV2X2VycihoZGV2 LT5kZXYsCi0JCQkiRmFpbGVkIHRvIHRyYW5zbGF0ZSBmcmFtZSB2ZWN0b3IgdG8gcGFnZXNcbiIp OworCQkJZ290byBkZXN0cm95X3BhZ2VzOworCQlucGFnZXMgPSByYzsKIAkJcmMgPSAtRUZBVUxU OwotCQlnb3RvIHB1dF9mcmFtZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJfQorCXVzZXJwdHIt Pm5wYWdlcyA9IG5wYWdlczsKIAogCXJjID0gc2dfYWxsb2NfdGFibGVfZnJvbV9wYWdlcyh1c2Vy cHRyLT5zZ3QsCi0JCQkJCWZyYW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpLAotCQkJCQlu cGFnZXMsIG9mZnNldCwgc2l6ZSwgR0ZQX0FUT01JQyk7CisJCQkJICAgICAgIHVzZXJwdHItPnBh Z2VzLAorCQkJCSAgICAgICBucGFnZXMsIG9mZnNldCwgc2l6ZSwgR0ZQX0FUT01JQyk7CiAJaWYg KHJjIDwgMCkgewogCQlkZXZfZXJyKGhkZXYtPmRldiwgImZhaWxlZCB0byBjcmVhdGUgU0cgdGFi bGUgZnJvbSBwYWdlc1xuIik7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOworCQlnb3RvIHB1dF9wYWdl czsKIAl9CiAKIAlyZXR1cm4gMDsKIAotcHV0X2ZyYW1ldmVjOgotCXB1dF92YWRkcl9mcmFtZXMo dXNlcnB0ci0+dmVjKTsKLWRlc3Ryb3lfZnJhbWV2ZWM6Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3ko dXNlcnB0ci0+dmVjKTsKK3B1dF9wYWdlczoKKwl1bnBpbl91c2VyX3BhZ2VzKHVzZXJwdHItPnBh Z2VzLCBucGFnZXMpOworZGVzdHJveV9wYWdlczoKKwlrdmZyZWUodXNlcnB0ci0+cGFnZXMpOwog CXJldHVybiByYzsKIH0KIApAQCAtMTQxNSw4ICsxNDA5LDYgQEAgaW50IGhsX3Bpbl9ob3N0X21l bW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCB1NjQgYWRkciwgdTY0IHNpemUsCiAgKi8KIHZv aWQgaGxfdW5waW5faG9zdF9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgc3RydWN0IGhs X3VzZXJwdHIgKnVzZXJwdHIpCiB7Ci0Jc3RydWN0IHBhZ2UgKipwYWdlczsKLQogCWhsX2RlYnVn ZnNfcmVtb3ZlX3VzZXJwdHIoaGRldiwgdXNlcnB0cik7CiAKIAlpZiAodXNlcnB0ci0+ZG1hX21h cHBlZCkKQEAgLTE0MjQsMTUgKzE0MTYsOCBAQCB2b2lkIGhsX3VucGluX2hvc3RfbWVtb3J5KHN0 cnVjdCBobF9kZXZpY2UgKmhkZXYsIHN0cnVjdCBobF91c2VycHRyICp1c2VycHRyKQogCQkJCQkJ CXVzZXJwdHItPnNndC0+bmVudHMsCiAJCQkJCQkJdXNlcnB0ci0+ZGlyKTsKIAotCXBhZ2VzID0g ZnJhbWVfdmVjdG9yX3BhZ2VzKHVzZXJwdHItPnZlYyk7Ci0JaWYgKCFJU19FUlIocGFnZXMpKSB7 Ci0JCWludCBpOwotCi0JCWZvciAoaSA9IDA7IGkgPCBmcmFtZV92ZWN0b3JfY291bnQodXNlcnB0 ci0+dmVjKTsgaSsrKQotCQkJc2V0X3BhZ2VfZGlydHlfbG9jayhwYWdlc1tpXSk7Ci0JfQotCXB1 dF92YWRkcl9mcmFtZXModXNlcnB0ci0+dmVjKTsKLQlmcmFtZV92ZWN0b3JfZGVzdHJveSh1c2Vy cHRyLT52ZWMpOworCXVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayh1c2VycHRyLT5wYWdlcywg dXNlcnB0ci0+bnBhZ2VzLCB0cnVlKTsKKwlrdmZyZWUodXNlcnB0ci0+cGFnZXMpOwogCiAJbGlz dF9kZWwoJnVzZXJwdHItPmpvYl9ub2RlKTsKIAotLSAKMi4yOS4yCgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5n IGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5p bmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 A65B7C64E90 for ; Fri, 27 Nov 2020 16:42:44 +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 5CE7920657 for ; Fri, 27 Nov 2020 16:42:44 +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="UhRRerfu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CE7920657 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 4807E6EE64; Fri, 27 Nov 2020 16:42:42 +0000 (UTC) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id E89E96EE56 for ; Fri, 27 Nov 2020 16:42:02 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id 23so6209591wrc.8 for ; Fri, 27 Nov 2020 08:42:02 -0800 (PST) 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=ZksVGApk98zqPsAWw78BKRzIEsQF4b04ZNKI0BcksDw=; b=UhRRerfutI6O0HsSwpe9AWN/5A4TFyk3ESQhXdxKTcxJAbAsj/B1y9zXC2vxCMgf9Q nyNxYWiTlYWnj/S+sRfdtVs98Ke+7sFH0UEcNGoUIKNHwPb1l6envlhCtYH8v1O2RtTU prSo4rWH81b9X6HhtrnUb9U5bRiaEJIQwpRE0= 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=ZksVGApk98zqPsAWw78BKRzIEsQF4b04ZNKI0BcksDw=; b=laM9R3JeGmYMDeqNLzm83gr0+s1iHAbKpMOTKoDe+crtfJzu2KdeFI/MmjJcw7wUP/ Rzu3I0WYY1zEmmQJ7TRdnRA+FFxLdNrOptlOeE2g51Z4VrYZRuly+7hVwkBJDM2DkGHU Lle3AhJDXwBv58LE4rwSobVYqOc0UWVrJTuBJR8O+PFVofVIjwivt7edy2V6h8Ne/zEI BU39QkNljXeGLAsH+lQFyo787Ncx9fHE9p8Gdtpsvzo2bcdzK3SfmaDgjXjopiivnAGm zlDBLZnbRUduwqJ+G1i5haMZsYi5tyN4AX9/KhDYNefy6ZDJzO9pdrYoJgZie7GWqLE5 E3zw== X-Gm-Message-State: AOAM532Q2rOhfU7KJqcK6xtk8N1QHqWYXQ4Jj12sEdd4Mw/PskNznePF 0jl+tq55AKcUWpTZf7cBwuqgmUAekEr1HQ== X-Google-Smtp-Source: ABdhPJzZTcHDI/HDUBPUkKv9r5yIfNsTxyzq9owJl03yvUAtrn6FZDouMmnPycgbxWmpK0rFsFq00g== X-Received: by 2002:a5d:5651:: with SMTP id j17mr11829464wrw.221.1606495321359; Fri, 27 Nov 2020 08:42:01 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q12sm14859078wrx.86.2020.11.27.08.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 08:42:00 -0800 (PST) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v7 03/17] misc/habana: Stop using frame_vector helpers Date: Fri, 27 Nov 2020 17:41:17 +0100 Message-Id: <20201127164131.2244124-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201127164131.2244124-1-daniel.vetter@ffwll.ch> References: <20201127164131.2244124-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: Jan Kara , kvm@vger.kernel.org, Daniel Vetter , linux-mm@kvack.org, Daniel Vetter , linux-samsung-soc@vger.kernel.org, Omer Shpigelman , Christoph Hellwig , Jason Gunthorpe , Tomer Tayar , Moti Haimovski , linux-media@vger.kernel.org, John Hubbard , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Dan Williams , Ofir Bitton , linux-arm-kernel@lists.infradead.org, Pawel Piskorski , Greg Kroah-Hartman , Oded Gabbay , Andrew Morton Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" QWxsIHdlIG5lZWQgYXJlIGEgcGFnZXMgYXJyYXksIHBpbl91c2VyX3BhZ2VzX2Zhc3QgY2FuIGdp dmUgdXMgdGhhdApkaXJlY3RseS4gUGx1cyB0aGlzIGF2b2lkcyB0aGUgZW50aXJlIHJhdyBwZm4g c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKTm90ZSB0aGF0IHBpbl91c2VyX3BhZ2VzX2Zhc3Qg aXMgYSBzYWZlIHJlcGxhY2VtZW50IGRlc3BpdGUgdGhlCnNlZW1pbmcgbGFjayBvZiBjaGVja2lu ZyBmb3Igdm1hLT52bV9mbGFzZyAmIChWTV9JTyB8IFZNX1BGTk1BUCkuIFN1Y2gKcHRlcyBhcmUg bWFya2VkIHdpdGggcHRlX21rc3BlY2lhbCAod2hpY2ggcHVwX2Zhc3QgcmVqZWN0cyBpbiB0aGUK ZmFzdHBhdGgpLCBhbmQgb25seSBhcmNoaXRlY3R1cmVzIHN1cHBvcnRpbmcgdGhhdCBzdXBwb3J0 IHRoZQpwaW5fdXNlcl9wYWdlc19mYXN0IGZhc3RwYXRoLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHVi YmFyZCA8amh1YmJhcmRAbnZpZGlhLmNvbT4KUmV2aWV3ZWQtYnk6IE9kZWQgR2FiYmF5IDxvZ2Fi YmF5QGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAaW50ZWwuY29tPgpDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBpbmZyYWRlYWQub3JnPgpD YzogSmFzb24gR3VudGhvcnBlIDxqZ2dAemllcGUuY2E+CkNjOiBBbmRyZXcgTW9ydG9uIDxha3Bt QGxpbnV4LWZvdW5kYXRpb24ub3JnPgpDYzogSm9obiBIdWJiYXJkIDxqaHViYmFyZEBudmlkaWEu Y29tPgpDYzogSsOpcsO0bWUgR2xpc3NlIDxqZ2xpc3NlQHJlZGhhdC5jb20+CkNjOiBKYW4gS2Fy YSA8amFja0BzdXNlLmN6PgpDYzogRGFuIFdpbGxpYW1zIDxkYW4uai53aWxsaWFtc0BpbnRlbC5j b20+CkNjOiBsaW51eC1tbUBrdmFjay5vcmcKQ2M6IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5m cmFkZWFkLm9yZwpDYzogbGludXgtc2Ftc3VuZy1zb2NAdmdlci5rZXJuZWwub3JnCkNjOiBsaW51 eC1tZWRpYUB2Z2VyLmtlcm5lbC5vcmcKQ2M6IE9kZWQgR2FiYmF5IDxvZGVkLmdhYmJheUBnbWFp bC5jb20+CkNjOiBPbWVyIFNocGlnZWxtYW4gPG9zaHBpZ2VsbWFuQGhhYmFuYS5haT4KQ2M6IE9m aXIgQml0dG9uIDxvYml0dG9uQGhhYmFuYS5haT4KQ2M6IFRvbWVyIFRheWFyIDx0dGF5YXJAaGFi YW5hLmFpPgpDYzogTW90aSBIYWltb3Zza2kgPG1oYWltb3Zza2lAaGFiYW5hLmFpPgpDYzogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IEdyZWcgS3JvYWgtSGFydG1h biA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+CkNjOiBQYXdlbCBQaXNrb3Jza2kgPHBwaXNr b3Jza2lAaGFiYW5hLmFpPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGZmd2xsLmNoPgotLQp2MjogVXNlIHVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayAoSm9o bikKdjM6IFVwZGF0ZSBrZXJuZWxkb2MgKE9kZWQpCnY2OiBFeHBsYWluIHdoeSBwdXBfZmFzdCBp cyBzYWZlLCBhZnRlciBkaXNjdXNzaW9ucyB3aXRoIEpvaG4gYW5kCkNocmlzdG9waC4Kdjc6IFJl bW92ZSBlcnJvciBtZXNzYWdlIGZvciBrbWFsbG9jIGZhaWx1cmVzLCBoYWJhbmFsYWJzIGRvZXNu J3QgZG8KdGhhdCAoT2RlZCkKLS0tCiBkcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnICAg ICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxh YnMuaCB8ICA2ICsrLQogZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jICAg ICB8IDUxICsrKysrKysrLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRp b25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5h bGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZwppbmRleCAxNjQw MzQwZDNlNjIuLjI5M2Q3OTgxMTM3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxh YnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnCkBAIC02LDcg KzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQogCXRyaXN0YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRv cnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMgb24gUENJICYmIEhBU19JT01FTQotCXNlbGVjdCBG UkFNRV9WRUNUT1IKIAlzZWxlY3QgR0VORVJJQ19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KIAlo ZWxwCmRpZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFi cy5oIGIvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAppbmRleCA2 ZWQ5NzRkMmRlZjAuLjEwNzQ0MmEyMDE5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFu YWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaAorKysgYi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vaGFiYW5hbGFicy5oCkBAIC05MjEsNyArOTIxLDggQEAgc3RydWN0IGhsX2N0eF9tZ3Ig ewogICogc3RydWN0IGhsX3VzZXJwdHIgLSBtZW1vcnkgbWFwcGluZyBjaHVuayBpbmZvcm1hdGlv bgogICogQHZtX3R5cGU6IHR5cGUgb2YgdGhlIFZNLgogICogQGpvYl9ub2RlOiBsaW5rZWQtbGlz dCBub2RlIGZvciBoYW5naW5nIHRoZSBvYmplY3Qgb24gdGhlIEpvYidzIGxpc3QuCi0gKiBAdmVj OiBwb2ludGVyIHRvIHRoZSBmcmFtZSB2ZWN0b3IuCisgKiBAcGFnZXM6IHBvaW50ZXIgdG8gc3Ry dWN0IHBhZ2UgYXJyYXkKKyAqIEBucGFnZXM6IHNpemUgb2YgQHBhZ2VzIGFycmF5CiAgKiBAc2d0 OiBwb2ludGVyIHRvIHRoZSBzY2F0dGVyLWdhdGhlciB0YWJsZSB0aGF0IGhvbGRzIHRoZSBwYWdl cy4KICAqIEBkaXI6IGZvciBETUEgdW5tYXBwaW5nLCB0aGUgZGlyZWN0aW9uIG11c3QgYmUgc3Vw cGxpZWQsIHNvIHNhdmUgaXQuCiAgKiBAZGVidWdmc19saXN0OiBub2RlIGluIGRlYnVnZnMgbGlz dCBvZiBjb21tYW5kIHN1Ym1pc3Npb25zLgpAQCAtOTMyLDcgKzkzMyw4IEBAIHN0cnVjdCBobF9j dHhfbWdyIHsKIHN0cnVjdCBobF91c2VycHRyIHsKIAllbnVtIHZtX3R5cGVfdAkJdm1fdHlwZTsg LyogbXVzdCBiZSBmaXJzdCAqLwogCXN0cnVjdCBsaXN0X2hlYWQJam9iX25vZGU7Ci0Jc3RydWN0 IGZyYW1lX3ZlY3RvcgkqdmVjOworCXN0cnVjdCBwYWdlCQkqKnBhZ2VzOworCXVuc2lnbmVkIGlu dAkJbnBhZ2VzOwogCXN0cnVjdCBzZ190YWJsZQkJKnNndDsKIAllbnVtIGRtYV9kYXRhX2RpcmVj dGlvbiBkaXI7CiAJc3RydWN0IGxpc3RfaGVhZAlkZWJ1Z2ZzX2xpc3Q7CmRpZmYgLS1naXQgYS9k cml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMgYi9kcml2ZXJzL21pc2MvaGFi YW5hbGFicy9jb21tb24vbWVtb3J5LmMKaW5kZXggODQyMjc4MTllNGQxLi4yYzU5ZmE4Njk2ODQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYworKysg Yi9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vbWVtb3J5LmMKQEAgLTEyOTEsNDUgKzEy OTEsMzkgQEAgc3RhdGljIGludCBnZXRfdXNlcl9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRl diwgdTY0IGFkZHIsIHU2NCBzaXplLAogCQlyZXR1cm4gLUVGQVVMVDsKIAl9CiAKLQl1c2VycHRy LT52ZWMgPSBmcmFtZV92ZWN0b3JfY3JlYXRlKG5wYWdlcyk7Ci0JaWYgKCF1c2VycHRyLT52ZWMp IHsKLQkJZGV2X2VycihoZGV2LT5kZXYsICJGYWlsZWQgdG8gY3JlYXRlIGZyYW1lIHZlY3Rvclxu Iik7CisJdXNlcnB0ci0+cGFnZXMgPSBrdm1hbGxvY19hcnJheShucGFnZXMsIHNpemVvZigqdXNl cnB0ci0+cGFnZXMpLAorCQkJCQlHRlBfS0VSTkVMKTsKKwlpZiAoIXVzZXJwdHItPnBhZ2VzKQog CQlyZXR1cm4gLUVOT01FTTsKLQl9CiAKLQlyYyA9IGdldF92YWRkcl9mcmFtZXMoc3RhcnQsIG5w YWdlcywgRk9MTF9GT1JDRSB8IEZPTExfV1JJVEUsCi0JCQkJdXNlcnB0ci0+dmVjKTsKKwlyYyA9 IHBpbl91c2VyX3BhZ2VzX2Zhc3Qoc3RhcnQsIG5wYWdlcywgRk9MTF9GT1JDRSB8IEZPTExfV1JJ VEUsCisJCQkJIHVzZXJwdHItPnBhZ2VzKTsKIAogCWlmIChyYyAhPSBucGFnZXMpIHsKIAkJZGV2 X2VycihoZGV2LT5kZXYsCiAJCQkiRmFpbGVkIHRvIG1hcCBob3N0IG1lbW9yeSwgdXNlciBwdHIg cHJvYmFibHkgd3JvbmdcbiIpOwogCQlpZiAocmMgPCAwKQotCQkJZ290byBkZXN0cm95X2ZyYW1l dmVjOwotCQlyYyA9IC1FRkFVTFQ7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOwotCX0KLQotCWlmIChm cmFtZV92ZWN0b3JfdG9fcGFnZXModXNlcnB0ci0+dmVjKSA8IDApIHsKLQkJZGV2X2VycihoZGV2 LT5kZXYsCi0JCQkiRmFpbGVkIHRvIHRyYW5zbGF0ZSBmcmFtZSB2ZWN0b3IgdG8gcGFnZXNcbiIp OworCQkJZ290byBkZXN0cm95X3BhZ2VzOworCQlucGFnZXMgPSByYzsKIAkJcmMgPSAtRUZBVUxU OwotCQlnb3RvIHB1dF9mcmFtZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJfQorCXVzZXJwdHIt Pm5wYWdlcyA9IG5wYWdlczsKIAogCXJjID0gc2dfYWxsb2NfdGFibGVfZnJvbV9wYWdlcyh1c2Vy cHRyLT5zZ3QsCi0JCQkJCWZyYW1lX3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpLAotCQkJCQlu cGFnZXMsIG9mZnNldCwgc2l6ZSwgR0ZQX0FUT01JQyk7CisJCQkJICAgICAgIHVzZXJwdHItPnBh Z2VzLAorCQkJCSAgICAgICBucGFnZXMsIG9mZnNldCwgc2l6ZSwgR0ZQX0FUT01JQyk7CiAJaWYg KHJjIDwgMCkgewogCQlkZXZfZXJyKGhkZXYtPmRldiwgImZhaWxlZCB0byBjcmVhdGUgU0cgdGFi bGUgZnJvbSBwYWdlc1xuIik7Ci0JCWdvdG8gcHV0X2ZyYW1ldmVjOworCQlnb3RvIHB1dF9wYWdl czsKIAl9CiAKIAlyZXR1cm4gMDsKIAotcHV0X2ZyYW1ldmVjOgotCXB1dF92YWRkcl9mcmFtZXMo dXNlcnB0ci0+dmVjKTsKLWRlc3Ryb3lfZnJhbWV2ZWM6Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3ko dXNlcnB0ci0+dmVjKTsKK3B1dF9wYWdlczoKKwl1bnBpbl91c2VyX3BhZ2VzKHVzZXJwdHItPnBh Z2VzLCBucGFnZXMpOworZGVzdHJveV9wYWdlczoKKwlrdmZyZWUodXNlcnB0ci0+cGFnZXMpOwog CXJldHVybiByYzsKIH0KIApAQCAtMTQxNSw4ICsxNDA5LDYgQEAgaW50IGhsX3Bpbl9ob3N0X21l bW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCB1NjQgYWRkciwgdTY0IHNpemUsCiAgKi8KIHZv aWQgaGxfdW5waW5faG9zdF9tZW1vcnkoc3RydWN0IGhsX2RldmljZSAqaGRldiwgc3RydWN0IGhs X3VzZXJwdHIgKnVzZXJwdHIpCiB7Ci0Jc3RydWN0IHBhZ2UgKipwYWdlczsKLQogCWhsX2RlYnVn ZnNfcmVtb3ZlX3VzZXJwdHIoaGRldiwgdXNlcnB0cik7CiAKIAlpZiAodXNlcnB0ci0+ZG1hX21h cHBlZCkKQEAgLTE0MjQsMTUgKzE0MTYsOCBAQCB2b2lkIGhsX3VucGluX2hvc3RfbWVtb3J5KHN0 cnVjdCBobF9kZXZpY2UgKmhkZXYsIHN0cnVjdCBobF91c2VycHRyICp1c2VycHRyKQogCQkJCQkJ CXVzZXJwdHItPnNndC0+bmVudHMsCiAJCQkJCQkJdXNlcnB0ci0+ZGlyKTsKIAotCXBhZ2VzID0g ZnJhbWVfdmVjdG9yX3BhZ2VzKHVzZXJwdHItPnZlYyk7Ci0JaWYgKCFJU19FUlIocGFnZXMpKSB7 Ci0JCWludCBpOwotCi0JCWZvciAoaSA9IDA7IGkgPCBmcmFtZV92ZWN0b3JfY291bnQodXNlcnB0 ci0+dmVjKTsgaSsrKQotCQkJc2V0X3BhZ2VfZGlydHlfbG9jayhwYWdlc1tpXSk7Ci0JfQotCXB1 dF92YWRkcl9mcmFtZXModXNlcnB0ci0+dmVjKTsKLQlmcmFtZV92ZWN0b3JfZGVzdHJveSh1c2Vy cHRyLT52ZWMpOworCXVucGluX3VzZXJfcGFnZXNfZGlydHlfbG9jayh1c2VycHRyLT5wYWdlcywg dXNlcnB0ci0+bnBhZ2VzLCB0cnVlKTsKKwlrdmZyZWUodXNlcnB0ci0+cGFnZXMpOwogCiAJbGlz dF9kZWwoJnVzZXJwdHItPmpvYl9ub2RlKTsKIAotLSAKMi4yOS4yCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK