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 C4E10C6369E for ; Mon, 26 Oct 2020 11:00:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5C89822277 for ; Mon, 26 Oct 2020 11:00:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="hP+26NMV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1773016AbgJZLAf (ORCPT ); Mon, 26 Oct 2020 07:00:35 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35545 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1772258AbgJZK6c (ORCPT ); Mon, 26 Oct 2020 06:58:32 -0400 Received: by mail-wr1-f67.google.com with SMTP id n15so11913562wrq.2 for ; Mon, 26 Oct 2020 03:58:30 -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=gmqIPIW7gzq47FEKtDbSWASgt80RL8xNX11AC8WH7PY=; b=hP+26NMVJbwlsZ5oNa4aTJHgp3vCDl9SpqhoHCWsW6Bx3aDltWiZ/3B9lmDAfpD5IZ zLuwgeH/0GOSkR5MpK3lP+kjmjfEHGQk6jp7jAxPgID7ckQy7JIkqusKZWddyGYbjtNv 5E092xTQE9EiSVRdm7Haapv7tH27yDBPMujvE= 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=gmqIPIW7gzq47FEKtDbSWASgt80RL8xNX11AC8WH7PY=; b=C5qanQwG3aZW2X5WGkIUEt+s4ow7N6FOEqAdTWgnVzGfOm/1uRkrWSkl5GLr20gByU oOrOLBYjhjPCCC4ljbyCCKYyUtFvhotdmQdDgWPXzkSz7mzXHbpTbIhNCPsORJsU11qK 5CU8Xy+uXT/c8stJIDmBOL/7de7GSmi/L+vdNF7Dt8560xgG0WVQJZtmgenoPeRZgl/n a50LWqY0kfXUTrwDnwljuGztaBsyi8R7uxPh7SLKMRsiC2YmngmpkhCCMLnkuGayB48m KJUxds3MesZgJHdaSaJdGlAkJZv4bN/OcHazzuiGev8W/TS9ar1OQVV7IOceA7nsyRaB AOXQ== X-Gm-Message-State: AOAM532N5dprYMb7KH+izlTR87u+H02Xrv0/Y7wZzr/f1AaNneH0O3Rl zg0CqcOwjTbz7VhTZK4ec2wx1w== X-Google-Smtp-Source: ABdhPJy1J4DAvEr7d+sFHc8QwlpKQ4XKpkyh0+wUepUVHoN5V1vgck7gI6CK7RKj9gCNe5k6kouIVA== X-Received: by 2002:adf:a345:: with SMTP id d5mr18431255wrb.55.1603709909476; Mon, 26 Oct 2020 03:58:29 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id w83sm21165156wmg.48.2020.10.26.03.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:58:28 -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 , John Hubbard , Daniel Vetter , Jason Gunthorpe , Andrew Morton , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jan Kara , Dan Williams , Oded Gabbay , Omer Shpigelman , Ofir Bitton , Tomer Tayar , Moti Haimovski , Greg Kroah-Hartman , Pawel Piskorski Subject: [PATCH v4 03/15] misc/habana: Stop using frame_vector helpers Date: Mon, 26 Oct 2020 11:58:06 +0100 Message-Id: <20201026105818.2585306-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026105818.2585306-1-daniel.vetter@ffwll.ch> References: <20201026105818.2585306-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All we need are a pages array, pin_user_pages_fast can give us that directly. Plus this avoids the entire raw pfn side of get_vaddr_frames. Reviewed-by: John Hubbard Signed-off-by: Daniel Vetter Cc: Jason Gunthorpe Cc: Andrew Morton Cc: John Hubbard Cc: Jérôme Glisse Cc: Jan Kara Cc: Dan Williams Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: Oded Gabbay Cc: Omer Shpigelman Cc: Ofir Bitton Cc: Tomer Tayar Cc: Moti Haimovski Cc: Daniel Vetter Cc: Greg Kroah-Hartman Cc: Pawel Piskorski Signed-off-by: Daniel Vetter -- v2: Use unpin_user_pages_dirty_lock (John) v3: Update kerneldoc (Oded) --- drivers/misc/habanalabs/Kconfig | 1 - drivers/misc/habanalabs/common/habanalabs.h | 6 ++- drivers/misc/habanalabs/common/memory.c | 49 ++++++++------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/drivers/misc/habanalabs/Kconfig b/drivers/misc/habanalabs/Kconfig index 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..41af090b3e6a 100644 --- a/drivers/misc/habanalabs/common/habanalabs.h +++ b/drivers/misc/habanalabs/common/habanalabs.h @@ -870,7 +870,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. @@ -881,7 +882,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 D15A5C4363A for ; Mon, 26 Oct 2020 11:01:34 +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 6E35B22263 for ; Mon, 26 Oct 2020 11:01:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="C4OP3vEc"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="hP+26NMV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E35B22263 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=F8gsZP91dRUM1B9Vyml6vWDMC/TSOEd1LeUKoUjfYO4=; b=C4OP3vEcu/Hi3RwVmDk/6/uC3 M4FTksHkXsJvJS+kr8WCa9AjbVSOock1yIjjhe413aNKvbMJ2uDf66hepXEc0Q3RpWH9tBMpX40cy /enrVGQegMhZtR5OZDykYF/uibxAxThe22xhblSEj9dgY5J9rJVRh6aObXGi77S3+F8sS0w1mvpCE 2cplhg7z+Y711HeXgqjmvlpGXzOhVbI+omtB+Vpb2vsWfE2ZT/8HNRyEBJKNlSOd5tz7VUI3jlLX6 LiCIlFIRTRWZnf8DgOmoHD39bFNp/vSUBQGO2sOqTRKzG44k33B7epUe4kb+LtpzcDtGGhAunXcKm gOUDfe85g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX0Dz-0002Q4-M8; Mon, 26 Oct 2020 10:59:39 +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 1kX0Cs-0001uW-9P for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 10:58:38 +0000 Received: by mail-wr1-x441.google.com with SMTP id j7so11841129wrt.9 for ; Mon, 26 Oct 2020 03:58:30 -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=gmqIPIW7gzq47FEKtDbSWASgt80RL8xNX11AC8WH7PY=; b=hP+26NMVJbwlsZ5oNa4aTJHgp3vCDl9SpqhoHCWsW6Bx3aDltWiZ/3B9lmDAfpD5IZ zLuwgeH/0GOSkR5MpK3lP+kjmjfEHGQk6jp7jAxPgID7ckQy7JIkqusKZWddyGYbjtNv 5E092xTQE9EiSVRdm7Haapv7tH27yDBPMujvE= 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=gmqIPIW7gzq47FEKtDbSWASgt80RL8xNX11AC8WH7PY=; b=hCuEfBkzgFMDFvMFIyhNcX9lPutaXd0xXzrFETvod5puHxk/Ni1i6H9gWPLdgptQtB lIyw4qQIZ4ub7N8OksM3F93tWt9j/XYbpO+/4izrkka5OlCteHZz+LNbK472wxF65Ime Ry/rqJ2jHlHriEx5DTgPjASA/plgazn2Uf6ejEPdsDKtqpiJxcVL51qeJntxVzXDNfne KWJc1eN3pZ/i5AyE30k9Z/HltEhwslsziLULWu1DVK4c3iM0vqTE+7ibvJtKE0mOm0l7 WqpL/R2VsAjd4t2MRfm0DDgvcyNJ2Wjpm0NQ2MmqHTdmR0Rhq/gJ7umHGsisrPyFsjo5 heBw== X-Gm-Message-State: AOAM530oZFfnl7hj9+pd81ILhEQ9e0WwxS+ASu2TTe2paxaHGHg/pXcL BluQu4+WKJewoREzjpfpvstaNg== X-Google-Smtp-Source: ABdhPJy1J4DAvEr7d+sFHc8QwlpKQ4XKpkyh0+wUepUVHoN5V1vgck7gI6CK7RKj9gCNe5k6kouIVA== X-Received: by 2002:adf:a345:: with SMTP id d5mr18431255wrb.55.1603709909476; Mon, 26 Oct 2020 03:58:29 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id w83sm21165156wmg.48.2020.10.26.03.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:58:28 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v4 03/15] misc/habana: Stop using frame_vector helpers Date: Mon, 26 Oct 2020 11:58:06 +0100 Message-Id: <20201026105818.2585306-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026105818.2585306-1-daniel.vetter@ffwll.ch> References: <20201026105818.2585306-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-20201026_065830_408712_8760309D X-CRM114-Status: GOOD ( 22.66 ) 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 c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHViYmFyZCA8amh1 YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5jYT4KQ2M6IEFu ZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQg PGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0 LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5q LndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzogbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtl cm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogT2RlZCBHYWJiYXkg PG9kZWQuZ2FiYmF5QGdtYWlsLmNvbT4KQ2M6IE9tZXIgU2hwaWdlbG1hbiA8b3NocGlnZWxtYW5A aGFiYW5hLmFpPgpDYzogT2ZpciBCaXR0b24gPG9iaXR0b25AaGFiYW5hLmFpPgpDYzogVG9tZXIg VGF5YXIgPHR0YXlhckBoYWJhbmEuYWk+CkNjOiBNb3RpIEhhaW1vdnNraSA8bWhhaW1vdnNraUBo YWJhbmEuYWk+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzog R3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KQ2M6IFBhd2Vs IFBpc2tvcnNraSA8cHBpc2tvcnNraUBoYWJhbmEuYWk+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBW ZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tCnYyOiBVc2UgdW5waW5fdXNlcl9wYWdl c19kaXJ0eV9sb2NrIChKb2huKQp2MzogVXBkYXRlIGtlcm5lbGRvYyAoT2RlZCkKLS0tCiBkcml2 ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnICAgICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9t aXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaCB8ICA2ICsrLQogZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jICAgICB8IDQ5ICsrKysrKysrLS0tLS0tLS0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvS2NvbmZpZwppbmRleCA4ZWI1ZDM4YzYxOGUuLjJmMDQxODdmNzE2NyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21p c2MvaGFiYW5hbGFicy9LY29uZmlnCkBAIC02LDcgKzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQog CXRyaXN0YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRvcnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMg b24gUENJICYmIEhBU19JT01FTQotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAlzZWxlY3QgRE1BX1NI QVJFRF9CVUZGRVIKIAlzZWxlY3QgR0VORVJJQ19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFsYWJzLmggYi9k cml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCmluZGV4IGVkYmQ2Mjdi MjlkMi4uNDFhZjA5MGIzZTZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vaGFiYW5hbGFicy5oCisrKyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9o YWJhbmFsYWJzLmgKQEAgLTg3MCw3ICs4NzAsOCBAQCBzdHJ1Y3QgaGxfY3R4X21nciB7CiAgKiBz dHJ1Y3QgaGxfdXNlcnB0ciAtIG1lbW9yeSBtYXBwaW5nIGNodW5rIGluZm9ybWF0aW9uCiAgKiBA dm1fdHlwZTogdHlwZSBvZiB0aGUgVk0uCiAgKiBAam9iX25vZGU6IGxpbmtlZC1saXN0IG5vZGUg Zm9yIGhhbmdpbmcgdGhlIG9iamVjdCBvbiB0aGUgSm9iJ3MgbGlzdC4KLSAqIEB2ZWM6IHBvaW50 ZXIgdG8gdGhlIGZyYW1lIHZlY3Rvci4KKyAqIEBwYWdlczogcG9pbnRlciB0byBzdHJ1Y3QgcGFn ZSBhcnJheQorICogQG5wYWdlczogc2l6ZSBvZiBAcGFnZXMgYXJyYXkKICAqIEBzZ3Q6IHBvaW50 ZXIgdG8gdGhlIHNjYXR0ZXItZ2F0aGVyIHRhYmxlIHRoYXQgaG9sZHMgdGhlIHBhZ2VzLgogICog QGRpcjogZm9yIERNQSB1bm1hcHBpbmcsIHRoZSBkaXJlY3Rpb24gbXVzdCBiZSBzdXBwbGllZCwg c28gc2F2ZSBpdC4KICAqIEBkZWJ1Z2ZzX2xpc3Q6IG5vZGUgaW4gZGVidWdmcyBsaXN0IG9mIGNv bW1hbmQgc3VibWlzc2lvbnMuCkBAIC04ODEsNyArODgyLDggQEAgc3RydWN0IGhsX2N0eF9tZ3Ig ewogc3RydWN0IGhsX3VzZXJwdHIgewogCWVudW0gdm1fdHlwZV90CQl2bV90eXBlOyAvKiBtdXN0 IGJlIGZpcnN0ICovCiAJc3RydWN0IGxpc3RfaGVhZAlqb2Jfbm9kZTsKLQlzdHJ1Y3QgZnJhbWVf dmVjdG9yCSp2ZWM7CisJc3RydWN0IHBhZ2UJCSoqcGFnZXM7CisJdW5zaWduZWQgaW50CQlucGFn ZXM7CiAJc3RydWN0IHNnX3RhYmxlCQkqc2d0OwogCWVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRp cjsKIAlzdHJ1Y3QgbGlzdF9oZWFkCWRlYnVnZnNfbGlzdDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv bWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJz L2NvbW1vbi9tZW1vcnkuYwppbmRleCA1ZmY0Njg4NjgzZmQuLjMyN2I2NDQ3OWY5NyAxMDA2NDQK LS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jCisrKyBiL2RyaXZl cnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYwpAQCAtMTI4MSw0NSArMTI4MSw0MSBA QCBzdGF0aWMgaW50IGdldF91c2VyX21lbW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCB1NjQg YWRkciwgdTY0IHNpemUsCiAJCXJldHVybiAtRUZBVUxUOwogCX0KIAotCXVzZXJwdHItPnZlYyA9 IGZyYW1lX3ZlY3Rvcl9jcmVhdGUobnBhZ2VzKTsKLQlpZiAoIXVzZXJwdHItPnZlYykgeworCXVz ZXJwdHItPnBhZ2VzID0ga3ZtYWxsb2NfYXJyYXkobnBhZ2VzLCBzaXplb2YoKnVzZXJwdHItPnBh Z2VzKSwKKwkJCQkJR0ZQX0tFUk5FTCk7CisJaWYgKCF1c2VycHRyLT5wYWdlcykgewogCQlkZXZf ZXJyKGhkZXYtPmRldiwgIkZhaWxlZCB0byBjcmVhdGUgZnJhbWUgdmVjdG9yXG4iKTsKIAkJcmV0 dXJuIC1FTk9NRU07CiAJfQogCi0JcmMgPSBnZXRfdmFkZHJfZnJhbWVzKHN0YXJ0LCBucGFnZXMs IEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAotCQkJCXVzZXJwdHItPnZlYyk7CisJcmMgPSBwaW5f dXNlcl9wYWdlc19mYXN0KHN0YXJ0LCBucGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAor CQkJCSB1c2VycHRyLT5wYWdlcyk7CiAKIAlpZiAocmMgIT0gbnBhZ2VzKSB7CiAJCWRldl9lcnIo aGRldi0+ZGV2LAogCQkJIkZhaWxlZCB0byBtYXAgaG9zdCBtZW1vcnksIHVzZXIgcHRyIHByb2Jh Ymx5IHdyb25nXG4iKTsKIAkJaWYgKHJjIDwgMCkKLQkJCWdvdG8gZGVzdHJveV9mcmFtZXZlYzsK KwkJCWdvdG8gZGVzdHJveV9wYWdlczsKKwkJbnBhZ2VzID0gcmM7CiAJCXJjID0gLUVGQVVMVDsK LQkJZ290byBwdXRfZnJhbWV2ZWM7Ci0JfQotCi0JaWYgKGZyYW1lX3ZlY3Rvcl90b19wYWdlcyh1 c2VycHRyLT52ZWMpIDwgMCkgewotCQlkZXZfZXJyKGhkZXYtPmRldiwKLQkJCSJGYWlsZWQgdG8g dHJhbnNsYXRlIGZyYW1lIHZlY3RvciB0byBwYWdlc1xuIik7Ci0JCXJjID0gLUVGQVVMVDsKLQkJ Z290byBwdXRfZnJhbWV2ZWM7CisJCWdvdG8gcHV0X3BhZ2VzOwogCX0KKwl1c2VycHRyLT5ucGFn ZXMgPSBucGFnZXM7CiAKIAlyYyA9IHNnX2FsbG9jX3RhYmxlX2Zyb21fcGFnZXModXNlcnB0ci0+ c2d0LAotCQkJCQlmcmFtZV92ZWN0b3JfcGFnZXModXNlcnB0ci0+dmVjKSwKLQkJCQkJbnBhZ2Vz LCBvZmZzZXQsIHNpemUsIEdGUF9BVE9NSUMpOworCQkJCSAgICAgICB1c2VycHRyLT5wYWdlcywK KwkJCQkgICAgICAgbnBhZ2VzLCBvZmZzZXQsIHNpemUsIEdGUF9BVE9NSUMpOwogCWlmIChyYyA8 IDApIHsKIAkJZGV2X2VycihoZGV2LT5kZXYsICJmYWlsZWQgdG8gY3JlYXRlIFNHIHRhYmxlIGZy b20gcGFnZXNcbiIpOwotCQlnb3RvIHB1dF9mcmFtZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJ fQogCiAJcmV0dXJuIDA7CiAKLXB1dF9mcmFtZXZlYzoKLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJw dHItPnZlYyk7Ci1kZXN0cm95X2ZyYW1ldmVjOgotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95KHVzZXJw dHItPnZlYyk7CitwdXRfcGFnZXM6CisJdW5waW5fdXNlcl9wYWdlcyh1c2VycHRyLT5wYWdlcywg bnBhZ2VzKTsKK2Rlc3Ryb3lfcGFnZXM6CisJa3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAlyZXR1 cm4gcmM7CiB9CiAKQEAgLTE0MDUsOCArMTQwMSw2IEBAIGludCBobF9waW5faG9zdF9tZW1vcnko c3RydWN0IGhsX2RldmljZSAqaGRldiwgdTY0IGFkZHIsIHU2NCBzaXplLAogICovCiB2b2lkIGhs X3VucGluX2hvc3RfbWVtb3J5KHN0cnVjdCBobF9kZXZpY2UgKmhkZXYsIHN0cnVjdCBobF91c2Vy cHRyICp1c2VycHRyKQogewotCXN0cnVjdCBwYWdlICoqcGFnZXM7Ci0KIAlobF9kZWJ1Z2ZzX3Jl bW92ZV91c2VycHRyKGhkZXYsIHVzZXJwdHIpOwogCiAJaWYgKHVzZXJwdHItPmRtYV9tYXBwZWQp CkBAIC0xNDE0LDE1ICsxNDA4LDggQEAgdm9pZCBobF91bnBpbl9ob3N0X21lbW9yeShzdHJ1Y3Qg aGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3QgaGxfdXNlcnB0ciAqdXNlcnB0cikKIAkJCQkJCQl1c2Vy cHRyLT5zZ3QtPm5lbnRzLAogCQkJCQkJCXVzZXJwdHItPmRpcik7CiAKLQlwYWdlcyA9IGZyYW1l X3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpOwotCWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlp bnQgaTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgZnJhbWVfdmVjdG9yX2NvdW50KHVzZXJwdHItPnZl Yyk7IGkrKykKLQkJCXNldF9wYWdlX2RpcnR5X2xvY2socGFnZXNbaV0pOwotCX0KLQlwdXRfdmFk ZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+ dmVjKTsKKwl1bnBpbl91c2VyX3BhZ2VzX2RpcnR5X2xvY2sodXNlcnB0ci0+cGFnZXMsIHVzZXJw dHItPm5wYWdlcywgdHJ1ZSk7CisJa3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAogCWxpc3RfZGVs KCZ1c2VycHRyLT5qb2Jfbm9kZSk7CiAKLS0gCjIuMjguMAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0 CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFk ZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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 A10CDC64E75 for ; Mon, 26 Oct 2020 10:58:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D781223EA for ; Mon, 26 Oct 2020 10:58:39 +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="hP+26NMV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D781223EA 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 DEA246E28A; Mon, 26 Oct 2020 10:58:35 +0000 (UTC) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C09B6E0F3 for ; Mon, 26 Oct 2020 10:58:31 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id n18so11878101wrs.5 for ; Mon, 26 Oct 2020 03:58:31 -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=gmqIPIW7gzq47FEKtDbSWASgt80RL8xNX11AC8WH7PY=; b=hP+26NMVJbwlsZ5oNa4aTJHgp3vCDl9SpqhoHCWsW6Bx3aDltWiZ/3B9lmDAfpD5IZ zLuwgeH/0GOSkR5MpK3lP+kjmjfEHGQk6jp7jAxPgID7ckQy7JIkqusKZWddyGYbjtNv 5E092xTQE9EiSVRdm7Haapv7tH27yDBPMujvE= 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=gmqIPIW7gzq47FEKtDbSWASgt80RL8xNX11AC8WH7PY=; b=bMvxJzlmGspwFahq4FjK7/wRRdVczBy5vxk72RU6XxUgFIBaCWrq9YQpZ1DZl7ruRf HdZo+Cv/P0kmw0x4xQLTEjtQJIaiuinH90oU6eAb3jkrsHCtrxeV+CQAxnrAKO6spOs+ UgHa2kt8gsAOmjJgWHYRg6z7O+yFy92qc3JPPIpooTYwxX0vq8igosb0xD29Q9CqhMLe D2APAtKiQqj+7C6ZByK5syAbD0UCvgdjUoBvPeyIEJJPn+LWH7HXzvX7g+me2lXOfuud TOIHtKhw4p+Gl350c8bYntGq7FmmMvQFskAz/nwq1Mebztc0qOKhh0mYPchh9qBdXFK0 NK/Q== X-Gm-Message-State: AOAM531hNYI5cclp6uo/rEcs2u8LyTSRRnp8slioPdDtAJN0l9HITcA7 LFi7lGQMFMOrtwWNx3Z87RALb+7mszyxGFov X-Google-Smtp-Source: ABdhPJy1J4DAvEr7d+sFHc8QwlpKQ4XKpkyh0+wUepUVHoN5V1vgck7gI6CK7RKj9gCNe5k6kouIVA== X-Received: by 2002:adf:a345:: with SMTP id d5mr18431255wrb.55.1603709909476; Mon, 26 Oct 2020 03:58:29 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id w83sm21165156wmg.48.2020.10.26.03.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:58:28 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v4 03/15] misc/habana: Stop using frame_vector helpers Date: Mon, 26 Oct 2020 11:58:06 +0100 Message-Id: <20201026105818.2585306-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201026105818.2585306-1-daniel.vetter@ffwll.ch> References: <20201026105818.2585306-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 c2lkZSBvZiBnZXRfdmFkZHJfZnJhbWVzLgoKUmV2aWV3ZWQtYnk6IEpvaG4gSHViYmFyZCA8amh1 YmJhcmRAbnZpZGlhLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+CkNjOiBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVwZS5jYT4KQ2M6IEFu ZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQg PGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0 LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5q LndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzogbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtl cm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogT2RlZCBHYWJiYXkg PG9kZWQuZ2FiYmF5QGdtYWlsLmNvbT4KQ2M6IE9tZXIgU2hwaWdlbG1hbiA8b3NocGlnZWxtYW5A aGFiYW5hLmFpPgpDYzogT2ZpciBCaXR0b24gPG9iaXR0b25AaGFiYW5hLmFpPgpDYzogVG9tZXIg VGF5YXIgPHR0YXlhckBoYWJhbmEuYWk+CkNjOiBNb3RpIEhhaW1vdnNraSA8bWhhaW1vdnNraUBo YWJhbmEuYWk+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzog R3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KQ2M6IFBhd2Vs IFBpc2tvcnNraSA8cHBpc2tvcnNraUBoYWJhbmEuYWk+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBW ZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tCnYyOiBVc2UgdW5waW5fdXNlcl9wYWdl c19kaXJ0eV9sb2NrIChKb2huKQp2MzogVXBkYXRlIGtlcm5lbGRvYyAoT2RlZCkKLS0tCiBkcml2 ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnICAgICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9t aXNjL2hhYmFuYWxhYnMvY29tbW9uL2hhYmFuYWxhYnMuaCB8ICA2ICsrLQogZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jICAgICB8IDQ5ICsrKysrKysrLS0tLS0tLS0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9LY29uZmlnIGIvZHJpdmVycy9taXNj L2hhYmFuYWxhYnMvS2NvbmZpZwppbmRleCA4ZWI1ZDM4YzYxOGUuLjJmMDQxODdmNzE2NyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvS2NvbmZpZworKysgYi9kcml2ZXJzL21p c2MvaGFiYW5hbGFicy9LY29uZmlnCkBAIC02LDcgKzYsNiBAQAogY29uZmlnIEhBQkFOQV9BSQog CXRyaXN0YXRlICJIYWJhbmFBSSBhY2NlbGVyYXRvcnMgKGhhYmFuYWxhYnMpIgogCWRlcGVuZHMg b24gUENJICYmIEhBU19JT01FTQotCXNlbGVjdCBGUkFNRV9WRUNUT1IKIAlzZWxlY3QgRE1BX1NI QVJFRF9CVUZGRVIKIAlzZWxlY3QgR0VORVJJQ19BTExPQ0FUT1IKIAlzZWxlY3QgSFdNT04KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9oYWJhbmFsYWJzLmggYi9k cml2ZXJzL21pc2MvaGFiYW5hbGFicy9jb21tb24vaGFiYW5hbGFicy5oCmluZGV4IGVkYmQ2Mjdi MjlkMi4uNDFhZjA5MGIzZTZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL21pc2MvaGFiYW5hbGFicy9j b21tb24vaGFiYW5hbGFicy5oCisrKyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9o YWJhbmFsYWJzLmgKQEAgLTg3MCw3ICs4NzAsOCBAQCBzdHJ1Y3QgaGxfY3R4X21nciB7CiAgKiBz dHJ1Y3QgaGxfdXNlcnB0ciAtIG1lbW9yeSBtYXBwaW5nIGNodW5rIGluZm9ybWF0aW9uCiAgKiBA dm1fdHlwZTogdHlwZSBvZiB0aGUgVk0uCiAgKiBAam9iX25vZGU6IGxpbmtlZC1saXN0IG5vZGUg Zm9yIGhhbmdpbmcgdGhlIG9iamVjdCBvbiB0aGUgSm9iJ3MgbGlzdC4KLSAqIEB2ZWM6IHBvaW50 ZXIgdG8gdGhlIGZyYW1lIHZlY3Rvci4KKyAqIEBwYWdlczogcG9pbnRlciB0byBzdHJ1Y3QgcGFn ZSBhcnJheQorICogQG5wYWdlczogc2l6ZSBvZiBAcGFnZXMgYXJyYXkKICAqIEBzZ3Q6IHBvaW50 ZXIgdG8gdGhlIHNjYXR0ZXItZ2F0aGVyIHRhYmxlIHRoYXQgaG9sZHMgdGhlIHBhZ2VzLgogICog QGRpcjogZm9yIERNQSB1bm1hcHBpbmcsIHRoZSBkaXJlY3Rpb24gbXVzdCBiZSBzdXBwbGllZCwg c28gc2F2ZSBpdC4KICAqIEBkZWJ1Z2ZzX2xpc3Q6IG5vZGUgaW4gZGVidWdmcyBsaXN0IG9mIGNv bW1hbmQgc3VibWlzc2lvbnMuCkBAIC04ODEsNyArODgyLDggQEAgc3RydWN0IGhsX2N0eF9tZ3Ig ewogc3RydWN0IGhsX3VzZXJwdHIgewogCWVudW0gdm1fdHlwZV90CQl2bV90eXBlOyAvKiBtdXN0 IGJlIGZpcnN0ICovCiAJc3RydWN0IGxpc3RfaGVhZAlqb2Jfbm9kZTsKLQlzdHJ1Y3QgZnJhbWVf dmVjdG9yCSp2ZWM7CisJc3RydWN0IHBhZ2UJCSoqcGFnZXM7CisJdW5zaWduZWQgaW50CQlucGFn ZXM7CiAJc3RydWN0IHNnX3RhYmxlCQkqc2d0OwogCWVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRp cjsKIAlzdHJ1Y3QgbGlzdF9oZWFkCWRlYnVnZnNfbGlzdDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv bWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYyBiL2RyaXZlcnMvbWlzYy9oYWJhbmFsYWJz L2NvbW1vbi9tZW1vcnkuYwppbmRleCA1ZmY0Njg4NjgzZmQuLjMyN2I2NDQ3OWY5NyAxMDA2NDQK LS0tIGEvZHJpdmVycy9taXNjL2hhYmFuYWxhYnMvY29tbW9uL21lbW9yeS5jCisrKyBiL2RyaXZl cnMvbWlzYy9oYWJhbmFsYWJzL2NvbW1vbi9tZW1vcnkuYwpAQCAtMTI4MSw0NSArMTI4MSw0MSBA QCBzdGF0aWMgaW50IGdldF91c2VyX21lbW9yeShzdHJ1Y3QgaGxfZGV2aWNlICpoZGV2LCB1NjQg YWRkciwgdTY0IHNpemUsCiAJCXJldHVybiAtRUZBVUxUOwogCX0KIAotCXVzZXJwdHItPnZlYyA9 IGZyYW1lX3ZlY3Rvcl9jcmVhdGUobnBhZ2VzKTsKLQlpZiAoIXVzZXJwdHItPnZlYykgeworCXVz ZXJwdHItPnBhZ2VzID0ga3ZtYWxsb2NfYXJyYXkobnBhZ2VzLCBzaXplb2YoKnVzZXJwdHItPnBh Z2VzKSwKKwkJCQkJR0ZQX0tFUk5FTCk7CisJaWYgKCF1c2VycHRyLT5wYWdlcykgewogCQlkZXZf ZXJyKGhkZXYtPmRldiwgIkZhaWxlZCB0byBjcmVhdGUgZnJhbWUgdmVjdG9yXG4iKTsKIAkJcmV0 dXJuIC1FTk9NRU07CiAJfQogCi0JcmMgPSBnZXRfdmFkZHJfZnJhbWVzKHN0YXJ0LCBucGFnZXMs IEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAotCQkJCXVzZXJwdHItPnZlYyk7CisJcmMgPSBwaW5f dXNlcl9wYWdlc19mYXN0KHN0YXJ0LCBucGFnZXMsIEZPTExfRk9SQ0UgfCBGT0xMX1dSSVRFLAor CQkJCSB1c2VycHRyLT5wYWdlcyk7CiAKIAlpZiAocmMgIT0gbnBhZ2VzKSB7CiAJCWRldl9lcnIo aGRldi0+ZGV2LAogCQkJIkZhaWxlZCB0byBtYXAgaG9zdCBtZW1vcnksIHVzZXIgcHRyIHByb2Jh Ymx5IHdyb25nXG4iKTsKIAkJaWYgKHJjIDwgMCkKLQkJCWdvdG8gZGVzdHJveV9mcmFtZXZlYzsK KwkJCWdvdG8gZGVzdHJveV9wYWdlczsKKwkJbnBhZ2VzID0gcmM7CiAJCXJjID0gLUVGQVVMVDsK LQkJZ290byBwdXRfZnJhbWV2ZWM7Ci0JfQotCi0JaWYgKGZyYW1lX3ZlY3Rvcl90b19wYWdlcyh1 c2VycHRyLT52ZWMpIDwgMCkgewotCQlkZXZfZXJyKGhkZXYtPmRldiwKLQkJCSJGYWlsZWQgdG8g dHJhbnNsYXRlIGZyYW1lIHZlY3RvciB0byBwYWdlc1xuIik7Ci0JCXJjID0gLUVGQVVMVDsKLQkJ Z290byBwdXRfZnJhbWV2ZWM7CisJCWdvdG8gcHV0X3BhZ2VzOwogCX0KKwl1c2VycHRyLT5ucGFn ZXMgPSBucGFnZXM7CiAKIAlyYyA9IHNnX2FsbG9jX3RhYmxlX2Zyb21fcGFnZXModXNlcnB0ci0+ c2d0LAotCQkJCQlmcmFtZV92ZWN0b3JfcGFnZXModXNlcnB0ci0+dmVjKSwKLQkJCQkJbnBhZ2Vz LCBvZmZzZXQsIHNpemUsIEdGUF9BVE9NSUMpOworCQkJCSAgICAgICB1c2VycHRyLT5wYWdlcywK KwkJCQkgICAgICAgbnBhZ2VzLCBvZmZzZXQsIHNpemUsIEdGUF9BVE9NSUMpOwogCWlmIChyYyA8 IDApIHsKIAkJZGV2X2VycihoZGV2LT5kZXYsICJmYWlsZWQgdG8gY3JlYXRlIFNHIHRhYmxlIGZy b20gcGFnZXNcbiIpOwotCQlnb3RvIHB1dF9mcmFtZXZlYzsKKwkJZ290byBwdXRfcGFnZXM7CiAJ fQogCiAJcmV0dXJuIDA7CiAKLXB1dF9mcmFtZXZlYzoKLQlwdXRfdmFkZHJfZnJhbWVzKHVzZXJw dHItPnZlYyk7Ci1kZXN0cm95X2ZyYW1ldmVjOgotCWZyYW1lX3ZlY3Rvcl9kZXN0cm95KHVzZXJw dHItPnZlYyk7CitwdXRfcGFnZXM6CisJdW5waW5fdXNlcl9wYWdlcyh1c2VycHRyLT5wYWdlcywg bnBhZ2VzKTsKK2Rlc3Ryb3lfcGFnZXM6CisJa3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAlyZXR1 cm4gcmM7CiB9CiAKQEAgLTE0MDUsOCArMTQwMSw2IEBAIGludCBobF9waW5faG9zdF9tZW1vcnko c3RydWN0IGhsX2RldmljZSAqaGRldiwgdTY0IGFkZHIsIHU2NCBzaXplLAogICovCiB2b2lkIGhs X3VucGluX2hvc3RfbWVtb3J5KHN0cnVjdCBobF9kZXZpY2UgKmhkZXYsIHN0cnVjdCBobF91c2Vy cHRyICp1c2VycHRyKQogewotCXN0cnVjdCBwYWdlICoqcGFnZXM7Ci0KIAlobF9kZWJ1Z2ZzX3Jl bW92ZV91c2VycHRyKGhkZXYsIHVzZXJwdHIpOwogCiAJaWYgKHVzZXJwdHItPmRtYV9tYXBwZWQp CkBAIC0xNDE0LDE1ICsxNDA4LDggQEAgdm9pZCBobF91bnBpbl9ob3N0X21lbW9yeShzdHJ1Y3Qg aGxfZGV2aWNlICpoZGV2LCBzdHJ1Y3QgaGxfdXNlcnB0ciAqdXNlcnB0cikKIAkJCQkJCQl1c2Vy cHRyLT5zZ3QtPm5lbnRzLAogCQkJCQkJCXVzZXJwdHItPmRpcik7CiAKLQlwYWdlcyA9IGZyYW1l X3ZlY3Rvcl9wYWdlcyh1c2VycHRyLT52ZWMpOwotCWlmICghSVNfRVJSKHBhZ2VzKSkgewotCQlp bnQgaTsKLQotCQlmb3IgKGkgPSAwOyBpIDwgZnJhbWVfdmVjdG9yX2NvdW50KHVzZXJwdHItPnZl Yyk7IGkrKykKLQkJCXNldF9wYWdlX2RpcnR5X2xvY2socGFnZXNbaV0pOwotCX0KLQlwdXRfdmFk ZHJfZnJhbWVzKHVzZXJwdHItPnZlYyk7Ci0JZnJhbWVfdmVjdG9yX2Rlc3Ryb3kodXNlcnB0ci0+ dmVjKTsKKwl1bnBpbl91c2VyX3BhZ2VzX2RpcnR5X2xvY2sodXNlcnB0ci0+cGFnZXMsIHVzZXJw dHItPm5wYWdlcywgdHJ1ZSk7CisJa3ZmcmVlKHVzZXJwdHItPnBhZ2VzKTsKIAogCWxpc3RfZGVs KCZ1c2VycHRyLT5qb2Jfbm9kZSk7CiAKLS0gCjIuMjguMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==