From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 29305C433E0 for ; Thu, 6 Aug 2020 18:32:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 75B9A2310F for ; Thu, 6 Aug 2020 18:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596738722; bh=DPZaom5NAT2KivsfSxfg/NbbYwOmpa1upzg9nMe0pn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JYGv7l6tDY4CSUqvvihRcHzfGgeV+KcVO8hbF+SSErYKMvwwOzS5dvOe6myeW8s1A znYGUWdkeka/jO5WTduGI8Q1UzAeir5jAC4PHCCVMrofRl32X4gq9BfxdYGG0Nez8T lcxyh5/a4/fDuplQcmQpKW7YxUABAFBUUyTENtYU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728507AbgHFSbR (ORCPT ); Thu, 6 Aug 2020 14:31:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:51158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728341AbgHFSXc (ORCPT ); Thu, 6 Aug 2020 14:23:32 -0400 Received: from localhost.localdomain (unknown [194.230.155.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5165E22D04; Thu, 6 Aug 2020 18:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596738133; bh=DPZaom5NAT2KivsfSxfg/NbbYwOmpa1upzg9nMe0pn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=br6SESXvsfakDzF/1hP0mUDf1oXB70eWCEQ3qKKN4rKgzInWtHHsBHxX7FsBumrlM KVyZKT299K/KhuKeLy4D9GiQf3wrSnoelofZuN05GtEz5b2oKezgkhRVlQ9nvg3CUl jO7awguu5PH2xrZFl15Fm8gfnewVTkzd8ShLjiKc= From: Krzysztof Kozlowski To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Krzysztof Kozlowski , Russell King , Felipe Balbi , Greg Kroah-Hartman , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 08/41] usb: gadget: s3c: use platform resources Date: Thu, 6 Aug 2020 20:20:25 +0200 Message-Id: <20200806182059.2431-8-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806181932.2253-1-krzk@kernel.org> References: <20200806181932.2253-1-krzk@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann The resources are correctly initialized, so just use them instead of relying on hardcoded data from platform headers. Signed-off-by: Arnd Bergmann Signed-off-by: Krzysztof Kozlowski --- drivers/usb/gadget/udc/s3c2410_udc.c | 31 +++++++------------ drivers/usb/gadget/udc/s3c2410_udc.h | 1 + .../usb/gadget/udc/s3c2410_udc_regs.h | 0 3 files changed, 12 insertions(+), 20 deletions(-) rename arch/arm/plat-samsung/include/plat/regs-udc.h => drivers/usb/gadget/udc/s3c2410_udc_regs.h (100%) diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c index e875a0b967c0..f1ea51476add 100644 --- a/drivers/usb/gadget/udc/s3c2410_udc.c +++ b/drivers/usb/gadget/udc/s3c2410_udc.c @@ -36,15 +36,11 @@ #include #include #include -#include -#include - -#include #include - #include "s3c2410_udc.h" +#include "s3c2410_udc_regs.h" #define DRIVER_DESC "S3C2410 USB Device Controller Gadget" #define DRIVER_AUTHOR "Herbert Pötzl , " \ @@ -57,6 +53,7 @@ static struct s3c2410_udc *the_controller; static struct clk *udc_clock; static struct clk *usb_bus_clock; static void __iomem *base_addr; +static int irq_usbd; static u64 rsrc_start; static u64 rsrc_len; static struct dentry *s3c2410_udc_debugfs_root; @@ -835,8 +832,6 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep) } } -#include - /* * s3c2410_udc_irq - interrupt handler */ @@ -977,7 +972,7 @@ static irqreturn_t s3c2410_udc_irq(int dummy, void *_dev) } } - dprintk(DEBUG_VERBOSE, "irq: %d s3c2410_udc_done.\n", IRQ_USBD); + dprintk(DEBUG_VERBOSE, "irq: %d s3c2410_udc_done.\n", irq_usbd); /* Restore old index */ udc_write(idx, S3C2410_UDC_INDEX_REG); @@ -1777,13 +1772,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) spin_lock_init(&udc->lock); udc_info = dev_get_platdata(&pdev->dev); - rsrc_start = S3C2410_PA_USBDEV; - rsrc_len = S3C24XX_SZ_USBDEV; - - if (!request_mem_region(rsrc_start, rsrc_len, gadget_name)) - return -EBUSY; - - base_addr = ioremap(rsrc_start, rsrc_len); + base_addr = devm_platform_ioremap_resource(pdev, 0); if (!base_addr) { retval = -ENOMEM; goto err_mem; @@ -1795,17 +1784,19 @@ static int s3c2410_udc_probe(struct platform_device *pdev) s3c2410_udc_disable(udc); s3c2410_udc_reinit(udc); + irq_usbd = platform_get_irq(pdev, 0); + /* irq setup after old hardware state is cleaned up */ - retval = request_irq(IRQ_USBD, s3c2410_udc_irq, + retval = request_irq(irq_usbd, s3c2410_udc_irq, 0, gadget_name, udc); if (retval != 0) { - dev_err(dev, "cannot get irq %i, err %d\n", IRQ_USBD, retval); + dev_err(dev, "cannot get irq %i, err %d\n", irq_usbd, retval); retval = -EBUSY; goto err_map; } - dev_dbg(dev, "got irq %i\n", IRQ_USBD); + dev_dbg(dev, "got irq %i\n", irq_usbd); if (udc_info && udc_info->vbus_pin > 0) { retval = gpio_request(udc_info->vbus_pin, "udc vbus"); @@ -1872,7 +1863,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) if (udc_info && udc_info->vbus_pin > 0) gpio_free(udc_info->vbus_pin); err_int: - free_irq(IRQ_USBD, udc); + free_irq(irq_usbd, udc); err_map: iounmap(base_addr); err_mem: @@ -1906,7 +1897,7 @@ static int s3c2410_udc_remove(struct platform_device *pdev) free_irq(irq, udc); } - free_irq(IRQ_USBD, udc); + free_irq(irq_usbd, udc); iounmap(base_addr); release_mem_region(rsrc_start, rsrc_len); diff --git a/drivers/usb/gadget/udc/s3c2410_udc.h b/drivers/usb/gadget/udc/s3c2410_udc.h index bdcaa8dd300f..68bdf3e5aac2 100644 --- a/drivers/usb/gadget/udc/s3c2410_udc.h +++ b/drivers/usb/gadget/udc/s3c2410_udc.h @@ -90,6 +90,7 @@ struct s3c2410_udc { unsigned req_pending : 1; u8 vbus; struct dentry *regs_info; + int irq; }; #define to_s3c2410(g) (container_of((g), struct s3c2410_udc, gadget)) diff --git a/arch/arm/plat-samsung/include/plat/regs-udc.h b/drivers/usb/gadget/udc/s3c2410_udc_regs.h similarity index 100% rename from arch/arm/plat-samsung/include/plat/regs-udc.h rename to drivers/usb/gadget/udc/s3c2410_udc_regs.h -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 4213DC433E0 for ; Thu, 6 Aug 2020 18:24:15 +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 7832E22E02 for ; Thu, 6 Aug 2020 18:24:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tiXuJD+n"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="br6SESXv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7832E22E02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=cYFlrolwcp7eNjS5AECChM7WGBPMYazxAJs78+vKCTs=; b=tiXuJD+ny6eeoU67S3RGIDALI HGfneBzwz8KSkmUM1SpYK+vW3zUN+bJAN+1pXdhwj2zK5gyuzPpgaGvrr+aTQvI94IV9+gtzTJd34 pLs9QEqaaEUMSlvW5iYmlieLKO4AjqvqAyvkl1PAsERCYXqzowVd3B03YHipXeEoh2RKZewQJAIZW 4vmAnF7tlpYQr4wL1Silf6/25oRCZnu66pKQ1x3/ectpLdk5iYFurk4nnandwnoJxN82PamgMQTLm euEXbn6Iw8vIjkrXkebrL6vIZ+VQkmcwIcVMN2bzy8tvYwJy810KYrQBV49EF1VlLZ29l1Xj6UGoA Cci9/QwQQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3kX1-000853-Rh; Thu, 06 Aug 2020 18:22:23 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3kWr-0007yY-CY for linux-arm-kernel@lists.infradead.org; Thu, 06 Aug 2020 18:22:15 +0000 Received: from localhost.localdomain (unknown [194.230.155.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5165E22D04; Thu, 6 Aug 2020 18:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596738133; bh=DPZaom5NAT2KivsfSxfg/NbbYwOmpa1upzg9nMe0pn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=br6SESXvsfakDzF/1hP0mUDf1oXB70eWCEQ3qKKN4rKgzInWtHHsBHxX7FsBumrlM KVyZKT299K/KhuKeLy4D9GiQf3wrSnoelofZuN05GtEz5b2oKezgkhRVlQ9nvg3CUl jO7awguu5PH2xrZFl15Fm8gfnewVTkzd8ShLjiKc= From: Krzysztof Kozlowski To: linux-kernel@vger.kernel.org Subject: [PATCH v2 08/41] usb: gadget: s3c: use platform resources Date: Thu, 6 Aug 2020 20:20:25 +0200 Message-Id: <20200806182059.2431-8-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806181932.2253-1-krzk@kernel.org> References: <20200806181932.2253-1-krzk@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200806_142213_706692_36532FCF X-CRM114-Status: GOOD ( 19.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: Felipe Balbi , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Russell King , Krzysztof Kozlowski , Kukjin Kim , linux-arm-kernel@lists.infradead.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 RnJvbTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KClRoZSByZXNvdXJjZXMgYXJlIGNv cnJlY3RseSBpbml0aWFsaXplZCwgc28ganVzdCB1c2UgdGhlbQppbnN0ZWFkIG9mIHJlbHlpbmcg b24gaGFyZGNvZGVkIGRhdGEgZnJvbSBwbGF0Zm9ybSBoZWFkZXJzLgoKU2lnbmVkLW9mZi1ieTog QXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KU2lnbmVkLW9mZi1ieTogS3J6eXN6dG9mIEtv emxvd3NraSA8a3J6a0BrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvdXNiL2dhZGdldC91ZGMvczNj MjQxMF91ZGMuYyAgICAgICAgICB8IDMxICsrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvdXNi L2dhZGdldC91ZGMvczNjMjQxMF91ZGMuaCAgICAgICAgICB8ICAxICsKIC4uLi91c2IvZ2FkZ2V0 L3VkYy9zM2MyNDEwX3VkY19yZWdzLmggICAgICAgICB8ICAwCiAzIGZpbGVzIGNoYW5nZWQsIDEy IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQogcmVuYW1lIGFyY2gvYXJtL3BsYXQtc2Ft c3VuZy9pbmNsdWRlL3BsYXQvcmVncy11ZGMuaCA9PiBkcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3Mz YzI0MTBfdWRjX3JlZ3MuaCAoMTAwJSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9nYWRnZXQv dWRjL3MzYzI0MTBfdWRjLmMgYi9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3MzYzI0MTBfdWRjLmMK aW5kZXggZTg3NWEwYjk2N2MwLi5mMWVhNTE0NzZhZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNi L2dhZGdldC91ZGMvczNjMjQxMF91ZGMuYworKysgYi9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3Mz YzI0MTBfdWRjLmMKQEAgLTM2LDE1ICszNiwxMSBAQAogI2luY2x1ZGUgPGFzbS9ieXRlb3JkZXIu aD4KICNpbmNsdWRlIDxhc20vaXJxLmg+CiAjaW5jbHVkZSA8YXNtL3VuYWxpZ25lZC5oPgotI2lu Y2x1ZGUgPG1hY2gvaXJxcy5oPgogCi0jaW5jbHVkZSA8bWFjaC9oYXJkd2FyZS5oPgotCi0jaW5j bHVkZSA8cGxhdC9yZWdzLXVkYy5oPgogI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEvdXNi LXMzYzI0MTBfdWRjLmg+CiAKLQogI2luY2x1ZGUgInMzYzI0MTBfdWRjLmgiCisjaW5jbHVkZSAi czNjMjQxMF91ZGNfcmVncy5oIgogCiAjZGVmaW5lIERSSVZFUl9ERVNDCSJTM0MyNDEwIFVTQiBE ZXZpY2UgQ29udHJvbGxlciBHYWRnZXQiCiAjZGVmaW5lIERSSVZFUl9BVVRIT1IJIkhlcmJlcnQg UMO2dHpsIDxoZXJiZXJ0QDEzdGhmbG9vci5hdD4sICIgXApAQCAtNTcsNiArNTMsNyBAQCBzdGF0 aWMgc3RydWN0IHMzYzI0MTBfdWRjCSp0aGVfY29udHJvbGxlcjsKIHN0YXRpYyBzdHJ1Y3QgY2xr CQkqdWRjX2Nsb2NrOwogc3RhdGljIHN0cnVjdCBjbGsJCSp1c2JfYnVzX2Nsb2NrOwogc3RhdGlj IHZvaWQgX19pb21lbQkJKmJhc2VfYWRkcjsKK3N0YXRpYyBpbnQJCQlpcnFfdXNiZDsKIHN0YXRp YyB1NjQJCQlyc3JjX3N0YXJ0Owogc3RhdGljIHU2NAkJCXJzcmNfbGVuOwogc3RhdGljIHN0cnVj dCBkZW50cnkJCSpzM2MyNDEwX3VkY19kZWJ1Z2ZzX3Jvb3Q7CkBAIC04MzUsOCArODMyLDYgQEAg c3RhdGljIHZvaWQgczNjMjQxMF91ZGNfaGFuZGxlX2VwKHN0cnVjdCBzM2MyNDEwX2VwICplcCkK IAl9CiB9CiAKLSNpbmNsdWRlIDxtYWNoL3JlZ3MtaXJxLmg+Ci0KIC8qCiAgKglzM2MyNDEwX3Vk Y19pcnEgLSBpbnRlcnJ1cHQgaGFuZGxlcgogICovCkBAIC05NzcsNyArOTcyLDcgQEAgc3RhdGlj IGlycXJldHVybl90IHMzYzI0MTBfdWRjX2lycShpbnQgZHVtbXksIHZvaWQgKl9kZXYpCiAJCX0K IAl9CiAKLQlkcHJpbnRrKERFQlVHX1ZFUkJPU0UsICJpcnE6ICVkIHMzYzI0MTBfdWRjX2RvbmUu XG4iLCBJUlFfVVNCRCk7CisJZHByaW50ayhERUJVR19WRVJCT1NFLCAiaXJxOiAlZCBzM2MyNDEw X3VkY19kb25lLlxuIiwgaXJxX3VzYmQpOwogCiAJLyogUmVzdG9yZSBvbGQgaW5kZXggKi8KIAl1 ZGNfd3JpdGUoaWR4LCBTM0MyNDEwX1VEQ19JTkRFWF9SRUcpOwpAQCAtMTc3NywxMyArMTc3Miw3 IEBAIHN0YXRpYyBpbnQgczNjMjQxMF91ZGNfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikKIAlzcGluX2xvY2tfaW5pdCgmdWRjLT5sb2NrKTsKIAl1ZGNfaW5mbyA9IGRldl9nZXRf cGxhdGRhdGEoJnBkZXYtPmRldik7CiAKLQlyc3JjX3N0YXJ0ID0gUzNDMjQxMF9QQV9VU0JERVY7 Ci0JcnNyY19sZW4gICA9IFMzQzI0WFhfU1pfVVNCREVWOwotCi0JaWYgKCFyZXF1ZXN0X21lbV9y ZWdpb24ocnNyY19zdGFydCwgcnNyY19sZW4sIGdhZGdldF9uYW1lKSkKLQkJcmV0dXJuIC1FQlVT WTsKLQotCWJhc2VfYWRkciA9IGlvcmVtYXAocnNyY19zdGFydCwgcnNyY19sZW4pOworCWJhc2Vf YWRkciA9IGRldm1fcGxhdGZvcm1faW9yZW1hcF9yZXNvdXJjZShwZGV2LCAwKTsKIAlpZiAoIWJh c2VfYWRkcikgewogCQlyZXR2YWwgPSAtRU5PTUVNOwogCQlnb3RvIGVycl9tZW07CkBAIC0xNzk1 LDE3ICsxNzg0LDE5IEBAIHN0YXRpYyBpbnQgczNjMjQxMF91ZGNfcHJvYmUoc3RydWN0IHBsYXRm b3JtX2RldmljZSAqcGRldikKIAlzM2MyNDEwX3VkY19kaXNhYmxlKHVkYyk7CiAJczNjMjQxMF91 ZGNfcmVpbml0KHVkYyk7CiAKKwlpcnFfdXNiZCA9IHBsYXRmb3JtX2dldF9pcnEocGRldiwgMCk7 CisKIAkvKiBpcnEgc2V0dXAgYWZ0ZXIgb2xkIGhhcmR3YXJlIHN0YXRlIGlzIGNsZWFuZWQgdXAg Ki8KLQlyZXR2YWwgPSByZXF1ZXN0X2lycShJUlFfVVNCRCwgczNjMjQxMF91ZGNfaXJxLAorCXJl dHZhbCA9IHJlcXVlc3RfaXJxKGlycV91c2JkLCBzM2MyNDEwX3VkY19pcnEsCiAJCQkgICAgIDAs IGdhZGdldF9uYW1lLCB1ZGMpOwogCiAJaWYgKHJldHZhbCAhPSAwKSB7Ci0JCWRldl9lcnIoZGV2 LCAiY2Fubm90IGdldCBpcnEgJWksIGVyciAlZFxuIiwgSVJRX1VTQkQsIHJldHZhbCk7CisJCWRl dl9lcnIoZGV2LCAiY2Fubm90IGdldCBpcnEgJWksIGVyciAlZFxuIiwgaXJxX3VzYmQsIHJldHZh bCk7CiAJCXJldHZhbCA9IC1FQlVTWTsKIAkJZ290byBlcnJfbWFwOwogCX0KIAotCWRldl9kYmco ZGV2LCAiZ290IGlycSAlaVxuIiwgSVJRX1VTQkQpOworCWRldl9kYmcoZGV2LCAiZ290IGlycSAl aVxuIiwgaXJxX3VzYmQpOwogCiAJaWYgKHVkY19pbmZvICYmIHVkY19pbmZvLT52YnVzX3BpbiA+ IDApIHsKIAkJcmV0dmFsID0gZ3Bpb19yZXF1ZXN0KHVkY19pbmZvLT52YnVzX3BpbiwgInVkYyB2 YnVzIik7CkBAIC0xODcyLDcgKzE4NjMsNyBAQCBzdGF0aWMgaW50IHMzYzI0MTBfdWRjX3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJaWYgKHVkY19pbmZvICYmIHVkY19pbmZv LT52YnVzX3BpbiA+IDApCiAJCWdwaW9fZnJlZSh1ZGNfaW5mby0+dmJ1c19waW4pOwogZXJyX2lu dDoKLQlmcmVlX2lycShJUlFfVVNCRCwgdWRjKTsKKwlmcmVlX2lycShpcnFfdXNiZCwgdWRjKTsK IGVycl9tYXA6CiAJaW91bm1hcChiYXNlX2FkZHIpOwogZXJyX21lbToKQEAgLTE5MDYsNyArMTg5 Nyw3IEBAIHN0YXRpYyBpbnQgczNjMjQxMF91ZGNfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZp Y2UgKnBkZXYpCiAJCWZyZWVfaXJxKGlycSwgdWRjKTsKIAl9CiAKLQlmcmVlX2lycShJUlFfVVNC RCwgdWRjKTsKKwlmcmVlX2lycShpcnFfdXNiZCwgdWRjKTsKIAogCWlvdW5tYXAoYmFzZV9hZGRy KTsKIAlyZWxlYXNlX21lbV9yZWdpb24ocnNyY19zdGFydCwgcnNyY19sZW4pOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9zM2MyNDEwX3VkYy5oIGIvZHJpdmVycy91c2IvZ2Fk Z2V0L3VkYy9zM2MyNDEwX3VkYy5oCmluZGV4IGJkY2FhOGRkMzAwZi4uNjhiZGYzZTVhYWMyIDEw MDY0NAotLS0gYS9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3MzYzI0MTBfdWRjLmgKKysrIGIvZHJp dmVycy91c2IvZ2FkZ2V0L3VkYy9zM2MyNDEwX3VkYy5oCkBAIC05MCw2ICs5MCw3IEBAIHN0cnVj dCBzM2MyNDEwX3VkYyB7CiAJdW5zaWduZWQJCQlyZXFfcGVuZGluZyA6IDE7CiAJdTgJCQkJdmJ1 czsKIAlzdHJ1Y3QgZGVudHJ5CQkJKnJlZ3NfaW5mbzsKKwlpbnQJCQkJaXJxOwogfTsKICNkZWZp bmUgdG9fczNjMjQxMChnKQkoY29udGFpbmVyX29mKChnKSwgc3RydWN0IHMzYzI0MTBfdWRjLCBn YWRnZXQpKQogCmRpZmYgLS1naXQgYS9hcmNoL2FybS9wbGF0LXNhbXN1bmcvaW5jbHVkZS9wbGF0 L3JlZ3MtdWRjLmggYi9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3MzYzI0MTBfdWRjX3JlZ3MuaApz aW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gYXJjaC9hcm0vcGxhdC1zYW1zdW5nL2lu Y2x1ZGUvcGxhdC9yZWdzLXVkYy5oCnJlbmFtZSB0byBkcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3Mz YzI0MTBfdWRjX3JlZ3MuaAotLSAKMi4xNy4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgt YXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3Jn L21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=