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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05116C433F5 for ; Wed, 24 Nov 2021 15:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241905AbhKXPpE (ORCPT ); Wed, 24 Nov 2021 10:45:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:48660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344106AbhKXPo6 (ORCPT ); Wed, 24 Nov 2021 10:44:58 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9218B60FE8; Wed, 24 Nov 2021 15:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637768508; bh=FqYmv0ijXFQECpsQq03m6A55pwsYwfkq9C+dIOKXchk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mULJUBOIDdAvOmaa9bqPdt1pFr5oSiBH2hspuCo/NP8fg/6ntosJxMIyeSO7Ziqo9 4V354m7EHrOT9/YJCeWTFfoY7xhOThKPuoz2RJ4mIsyCVYf9X3mCPNPMxb4P9idz6I 4ZmgSa4eIPYpRDj1aAh3BNz9G+OCIHWzjX3p2+8W08+Q1OCDguIamdoUiuZApPm7i7 tamQJula4Z23D8FUMFejBfz7lTCeVLYc0NO72NsLJ/rj1BCteEPpzqJDNd67m5G1D2 FEZ3z/OHBxCKgFOztyLkqTuQguTEKwK5czIFxN8lZZNRlCsg+3ojlZVWcrRO1eeTdX OYRe1Z0jyHmQw== Received: by pali.im (Postfix) id 51E4056D; Wed, 24 Nov 2021 16:41:48 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , Dominik Brodowski , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] arm: ioremap: Replace pci_ioremap_io() usage by pci_remap_iospace() Date: Wed, 24 Nov 2021 16:41:15 +0100 Message-Id: <20211124154116.916-5-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124154116.916-1-pali@kernel.org> References: <20211124154116.916-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Replace all usage of ARM specific pci_ioremap_io() function by standard PCI core API function pci_remap_iospace() in all drivers and arm march code. Signed-off-by: Pali Rohár --- arch/arm/mach-dove/pcie.c | 9 +++++---- arch/arm/mach-iop32x/pci.c | 5 ++++- arch/arm/mach-mv78xx0/pcie.c | 5 ++++- arch/arm/mach-orion5x/pci.c | 10 ++++++++-- drivers/pcmcia/at91_cf.c | 6 +++++- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index ee91ac6b5ebf..2a493bdfffc6 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -38,6 +38,7 @@ static int num_pcie_ports; static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys) { struct pcie_port *pp; + struct resource realio; if (nr >= num_pcie_ports) return 0; @@ -53,10 +54,10 @@ static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys) orion_pcie_setup(pp->base); - if (pp->index == 0) - pci_ioremap_io(sys->busnr * SZ_64K, DOVE_PCIE0_IO_PHYS_BASE); - else - pci_ioremap_io(sys->busnr * SZ_64K, DOVE_PCIE1_IO_PHYS_BASE); + realio.start = sys->busnr * SZ_64K; + realio.end = realio.start + SZ_64K - 1; + pci_remap_iospace(&realio, pp->index == 0 ? DOVE_PCIE0_IO_PHYS_BASE : + DOVE_PCIE1_IO_PHYS_BASE); /* * IORESOURCE_MEM diff --git a/arch/arm/mach-iop32x/pci.c b/arch/arm/mach-iop32x/pci.c index ab0010dc3145..7a215d2ee7e2 100644 --- a/arch/arm/mach-iop32x/pci.c +++ b/arch/arm/mach-iop32x/pci.c @@ -185,6 +185,7 @@ iop3xx_pci_abort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) int iop3xx_pci_setup(int nr, struct pci_sys_data *sys) { struct resource *res; + struct resource realio; if (nr != 0) return 0; @@ -206,7 +207,9 @@ int iop3xx_pci_setup(int nr, struct pci_sys_data *sys) pci_add_resource_offset(&sys->resources, res, sys->mem_offset); - pci_ioremap_io(0, IOP3XX_PCI_LOWER_IO_PA); + realio.start = 0; + realio.end = realio.start + SZ_64K - 1; + pci_remap_iospace(&realio, IOP3XX_PCI_LOWER_IO_PA); return 1; } diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 636d84b40466..e15646af7f26 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -101,6 +101,7 @@ static void __init mv78xx0_pcie_preinit(void) static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys) { struct pcie_port *pp; + struct resource realio; if (nr >= num_pcie_ports) return 0; @@ -115,7 +116,9 @@ static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys) orion_pcie_set_local_bus_nr(pp->base, sys->busnr); orion_pcie_setup(pp->base); - pci_ioremap_io(nr * SZ_64K, MV78XX0_PCIE_IO_PHYS_BASE(nr)); + realio.start = nr * SZ_64K; + realio.end = realio.start + SZ_64K - 1; + pci_remap_iospace(&realio, MV78XX0_PCIE_IO_PHYS_BASE(nr)); pci_add_resource_offset(&sys->resources, &pp->res, sys->mem_offset); diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 76951bfbacf5..92e938bba20d 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -142,6 +142,7 @@ static struct pci_ops pcie_ops = { static int __init pcie_setup(struct pci_sys_data *sys) { struct resource *res; + struct resource realio; int dev; /* @@ -164,7 +165,9 @@ static int __init pcie_setup(struct pci_sys_data *sys) pcie_ops.read = pcie_rd_conf_wa; } - pci_ioremap_io(sys->busnr * SZ_64K, ORION5X_PCIE_IO_PHYS_BASE); + realio.start = sys->busnr * SZ_64K; + realio.end = realio.start + SZ_64K - 1; + pci_remap_iospace(&realio, ORION5X_PCIE_IO_PHYS_BASE); /* * Request resources. @@ -466,6 +469,7 @@ static void __init orion5x_setup_pci_wins(void) static int __init pci_setup(struct pci_sys_data *sys) { struct resource *res; + struct resource realio; /* * Point PCI unit MBUS decode windows to DRAM space. @@ -482,7 +486,9 @@ static int __init pci_setup(struct pci_sys_data *sys) */ orion5x_setbits(PCI_CMD, PCI_CMD_HOST_REORDER); - pci_ioremap_io(sys->busnr * SZ_64K, ORION5X_PCI_IO_PHYS_BASE); + realio.start = sys->busnr * SZ_64K; + realio.end = realio.start + SZ_64K - 1; + pci_remap_iospace(&realio, ORION5X_PCI_IO_PHYS_BASE); /* * Request resources diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 6b1edfc890a3..92df2c2c5d07 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -230,6 +231,7 @@ static int at91_cf_probe(struct platform_device *pdev) struct at91_cf_socket *cf; struct at91_cf_data *board; struct resource *io; + struct resource realio; int status; board = devm_kzalloc(&pdev->dev, sizeof(*board), GFP_KERNEL); @@ -307,7 +309,9 @@ static int at91_cf_probe(struct platform_device *pdev) * io_offset is set to 0x10000 to avoid the check in static_find_io(). * */ cf->socket.io_offset = 0x10000; - status = pci_ioremap_io(0x10000, cf->phys_baseaddr + CF_IO_PHYS); + realio.start = cf->socket.io_offset; + realio.end = realio.start + SZ_64K - 1; + status = pci_remap_iospace(&realio, cf->phys_baseaddr + CF_IO_PHYS); if (status) goto fail0a; -- 2.20.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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4BECBC433F5 for ; Wed, 24 Nov 2021 15:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LYOUgON0+15FvBLxRDT+/HkaiPj2avvRTIbAalhgnOA=; b=Gb1TiSjYh7USEu /VUm9DiO6PQQ3tGIRfODWZyHIAN54LUDTI+5OD1oFNXZGjLsNqow5RFw3BoGf3hixLyqFlekCzCoS dL8u61U6qco4pj6YukVbw+wtt/JaIo2Dx3qm1CT5myeO/YWep0aVr2CXg1JYw8Of0p53f3JxTblvj wiv8GQbSG/lD3Sb6xiL99hSbTbgj0p8q4Tr1rQPj6SLZ+xVADdst65qRfh4zE7mGX/IwmcydaBZ5J D/zvW6AEdQ2NXOXGMUlfVuzZ0uB94ugL/xMf/dMzhTyTqCz01y7Z58m8DHbf5X6bwKoA+7D2wMDbE oL76ZN5xEQ2yVfzBpGXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpuPu-0057Os-PE; Wed, 24 Nov 2021 15:42:39 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpuP7-00579l-65 for linux-arm-kernel@lists.infradead.org; Wed, 24 Nov 2021 15:41:50 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9218B60FE8; Wed, 24 Nov 2021 15:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637768508; bh=FqYmv0ijXFQECpsQq03m6A55pwsYwfkq9C+dIOKXchk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mULJUBOIDdAvOmaa9bqPdt1pFr5oSiBH2hspuCo/NP8fg/6ntosJxMIyeSO7Ziqo9 4V354m7EHrOT9/YJCeWTFfoY7xhOThKPuoz2RJ4mIsyCVYf9X3mCPNPMxb4P9idz6I 4ZmgSa4eIPYpRDj1aAh3BNz9G+OCIHWzjX3p2+8W08+Q1OCDguIamdoUiuZApPm7i7 tamQJula4Z23D8FUMFejBfz7lTCeVLYc0NO72NsLJ/rj1BCteEPpzqJDNd67m5G1D2 FEZ3z/OHBxCKgFOztyLkqTuQguTEKwK5czIFxN8lZZNRlCsg+3ojlZVWcrRO1eeTdX OYRe1Z0jyHmQw== Received: by pali.im (Postfix) id 51E4056D; Wed, 24 Nov 2021 16:41:48 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , Dominik Brodowski , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] arm: ioremap: Replace pci_ioremap_io() usage by pci_remap_iospace() Date: Wed, 24 Nov 2021 16:41:15 +0100 Message-Id: <20211124154116.916-5-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124154116.916-1-pali@kernel.org> References: <20211124154116.916-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211124_074149_289318_98F57EF3 X-CRM114-Status: GOOD ( 17.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 UmVwbGFjZSBhbGwgdXNhZ2Ugb2YgQVJNIHNwZWNpZmljIHBjaV9pb3JlbWFwX2lvKCkgZnVuY3Rp b24gYnkgc3RhbmRhcmQgUENJCmNvcmUgQVBJIGZ1bmN0aW9uIHBjaV9yZW1hcF9pb3NwYWNlKCkg aW4gYWxsIGRyaXZlcnMgYW5kIGFybSBtYXJjaCBjb2RlLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBS b2jDoXIgPHBhbGlAa2VybmVsLm9yZz4KLS0tCiBhcmNoL2FybS9tYWNoLWRvdmUvcGNpZS5jICAg IHwgIDkgKysrKystLS0tCiBhcmNoL2FybS9tYWNoLWlvcDMyeC9wY2kuYyAgIHwgIDUgKysrKy0K IGFyY2gvYXJtL21hY2gtbXY3OHh4MC9wY2llLmMgfCAgNSArKysrLQogYXJjaC9hcm0vbWFjaC1v cmlvbjV4L3BjaS5jICB8IDEwICsrKysrKysrLS0KIGRyaXZlcnMvcGNtY2lhL2F0OTFfY2YuYyAg ICAgfCAgNiArKysrKy0KIDUgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLWRvdmUvcGNpZS5jIGIvYXJjaC9h cm0vbWFjaC1kb3ZlL3BjaWUuYwppbmRleCBlZTkxYWM2YjVlYmYuLjJhNDkzYmRmZmZjNiAxMDA2 NDQKLS0tIGEvYXJjaC9hcm0vbWFjaC1kb3ZlL3BjaWUuYworKysgYi9hcmNoL2FybS9tYWNoLWRv dmUvcGNpZS5jCkBAIC0zOCw2ICszOCw3IEBAIHN0YXRpYyBpbnQgbnVtX3BjaWVfcG9ydHM7CiBz dGF0aWMgaW50IF9faW5pdCBkb3ZlX3BjaWVfc2V0dXAoaW50IG5yLCBzdHJ1Y3QgcGNpX3N5c19k YXRhICpzeXMpCiB7CiAJc3RydWN0IHBjaWVfcG9ydCAqcHA7CisJc3RydWN0IHJlc291cmNlIHJl YWxpbzsKIAogCWlmIChuciA+PSBudW1fcGNpZV9wb3J0cykKIAkJcmV0dXJuIDA7CkBAIC01Mywx MCArNTQsMTAgQEAgc3RhdGljIGludCBfX2luaXQgZG92ZV9wY2llX3NldHVwKGludCBuciwgc3Ry dWN0IHBjaV9zeXNfZGF0YSAqc3lzKQogCiAJb3Jpb25fcGNpZV9zZXR1cChwcC0+YmFzZSk7CiAK LQlpZiAocHAtPmluZGV4ID09IDApCi0JCXBjaV9pb3JlbWFwX2lvKHN5cy0+YnVzbnIgKiBTWl82 NEssIERPVkVfUENJRTBfSU9fUEhZU19CQVNFKTsKLQllbHNlCi0JCXBjaV9pb3JlbWFwX2lvKHN5 cy0+YnVzbnIgKiBTWl82NEssIERPVkVfUENJRTFfSU9fUEhZU19CQVNFKTsKKwlyZWFsaW8uc3Rh cnQgPSBzeXMtPmJ1c25yICogU1pfNjRLOworCXJlYWxpby5lbmQgPSByZWFsaW8uc3RhcnQgKyBT Wl82NEsgLSAxOworCXBjaV9yZW1hcF9pb3NwYWNlKCZyZWFsaW8sIHBwLT5pbmRleCA9PSAwID8g RE9WRV9QQ0lFMF9JT19QSFlTX0JBU0UgOgorCQkJCQkJICAgIERPVkVfUENJRTFfSU9fUEhZU19C QVNFKTsKIAogCS8qCiAJICogSU9SRVNPVVJDRV9NRU0KZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21h Y2gtaW9wMzJ4L3BjaS5jIGIvYXJjaC9hcm0vbWFjaC1pb3AzMngvcGNpLmMKaW5kZXggYWIwMDEw ZGMzMTQ1Li43YTIxNWQyZWU3ZTIgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21hY2gtaW9wMzJ4L3Bj aS5jCisrKyBiL2FyY2gvYXJtL21hY2gtaW9wMzJ4L3BjaS5jCkBAIC0xODUsNiArMTg1LDcgQEAg aW9wM3h4X3BjaV9hYm9ydCh1bnNpZ25lZCBsb25nIGFkZHIsIHVuc2lnbmVkIGludCBmc3IsIHN0 cnVjdCBwdF9yZWdzICpyZWdzKQogaW50IGlvcDN4eF9wY2lfc2V0dXAoaW50IG5yLCBzdHJ1Y3Qg cGNpX3N5c19kYXRhICpzeXMpCiB7CiAJc3RydWN0IHJlc291cmNlICpyZXM7CisJc3RydWN0IHJl c291cmNlIHJlYWxpbzsKIAogCWlmIChuciAhPSAwKQogCQlyZXR1cm4gMDsKQEAgLTIwNiw3ICsy MDcsOSBAQCBpbnQgaW9wM3h4X3BjaV9zZXR1cChpbnQgbnIsIHN0cnVjdCBwY2lfc3lzX2RhdGEg KnN5cykKIAogCXBjaV9hZGRfcmVzb3VyY2Vfb2Zmc2V0KCZzeXMtPnJlc291cmNlcywgcmVzLCBz eXMtPm1lbV9vZmZzZXQpOwogCi0JcGNpX2lvcmVtYXBfaW8oMCwgSU9QM1hYX1BDSV9MT1dFUl9J T19QQSk7CisJcmVhbGlvLnN0YXJ0ID0gMDsKKwlyZWFsaW8uZW5kID0gcmVhbGlvLnN0YXJ0ICsg U1pfNjRLIC0gMTsKKwlwY2lfcmVtYXBfaW9zcGFjZSgmcmVhbGlvLCBJT1AzWFhfUENJX0xPV0VS X0lPX1BBKTsKIAogCXJldHVybiAxOwogfQpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1tdjc4 eHgwL3BjaWUuYyBiL2FyY2gvYXJtL21hY2gtbXY3OHh4MC9wY2llLmMKaW5kZXggNjM2ZDg0YjQw NDY2Li5lMTU2NDZhZjdmMjYgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21hY2gtbXY3OHh4MC9wY2ll LmMKKysrIGIvYXJjaC9hcm0vbWFjaC1tdjc4eHgwL3BjaWUuYwpAQCAtMTAxLDYgKzEwMSw3IEBA IHN0YXRpYyB2b2lkIF9faW5pdCBtdjc4eHgwX3BjaWVfcHJlaW5pdCh2b2lkKQogc3RhdGljIGlu dCBfX2luaXQgbXY3OHh4MF9wY2llX3NldHVwKGludCBuciwgc3RydWN0IHBjaV9zeXNfZGF0YSAq c3lzKQogewogCXN0cnVjdCBwY2llX3BvcnQgKnBwOworCXN0cnVjdCByZXNvdXJjZSByZWFsaW87 CiAKIAlpZiAobnIgPj0gbnVtX3BjaWVfcG9ydHMpCiAJCXJldHVybiAwOwpAQCAtMTE1LDcgKzEx Niw5IEBAIHN0YXRpYyBpbnQgX19pbml0IG12Nzh4eDBfcGNpZV9zZXR1cChpbnQgbnIsIHN0cnVj dCBwY2lfc3lzX2RhdGEgKnN5cykKIAlvcmlvbl9wY2llX3NldF9sb2NhbF9idXNfbnIocHAtPmJh c2UsIHN5cy0+YnVzbnIpOwogCW9yaW9uX3BjaWVfc2V0dXAocHAtPmJhc2UpOwogCi0JcGNpX2lv cmVtYXBfaW8obnIgKiBTWl82NEssIE1WNzhYWDBfUENJRV9JT19QSFlTX0JBU0UobnIpKTsKKwly ZWFsaW8uc3RhcnQgPSBuciAqIFNaXzY0SzsKKwlyZWFsaW8uZW5kID0gcmVhbGlvLnN0YXJ0ICsg U1pfNjRLIC0gMTsKKwlwY2lfcmVtYXBfaW9zcGFjZSgmcmVhbGlvLCBNVjc4WFgwX1BDSUVfSU9f UEhZU19CQVNFKG5yKSk7CiAKIAlwY2lfYWRkX3Jlc291cmNlX29mZnNldCgmc3lzLT5yZXNvdXJj ZXMsICZwcC0+cmVzLCBzeXMtPm1lbV9vZmZzZXQpOwogCmRpZmYgLS1naXQgYS9hcmNoL2FybS9t YWNoLW9yaW9uNXgvcGNpLmMgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvcGNpLmMKaW5kZXggNzY5 NTFiZmJhY2Y1Li45MmU5MzhiYmEyMGQgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21hY2gtb3Jpb241 eC9wY2kuYworKysgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvcGNpLmMKQEAgLTE0Miw2ICsxNDIs NyBAQCBzdGF0aWMgc3RydWN0IHBjaV9vcHMgcGNpZV9vcHMgPSB7CiBzdGF0aWMgaW50IF9faW5p dCBwY2llX3NldHVwKHN0cnVjdCBwY2lfc3lzX2RhdGEgKnN5cykKIHsKIAlzdHJ1Y3QgcmVzb3Vy Y2UgKnJlczsKKwlzdHJ1Y3QgcmVzb3VyY2UgcmVhbGlvOwogCWludCBkZXY7CiAKIAkvKgpAQCAt MTY0LDcgKzE2NSw5IEBAIHN0YXRpYyBpbnQgX19pbml0IHBjaWVfc2V0dXAoc3RydWN0IHBjaV9z eXNfZGF0YSAqc3lzKQogCQlwY2llX29wcy5yZWFkID0gcGNpZV9yZF9jb25mX3dhOwogCX0KIAot CXBjaV9pb3JlbWFwX2lvKHN5cy0+YnVzbnIgKiBTWl82NEssIE9SSU9ONVhfUENJRV9JT19QSFlT X0JBU0UpOworCXJlYWxpby5zdGFydCA9IHN5cy0+YnVzbnIgKiBTWl82NEs7CisJcmVhbGlvLmVu ZCA9IHJlYWxpby5zdGFydCArIFNaXzY0SyAtIDE7CisJcGNpX3JlbWFwX2lvc3BhY2UoJnJlYWxp bywgT1JJT041WF9QQ0lFX0lPX1BIWVNfQkFTRSk7CiAKIAkvKgogCSAqIFJlcXVlc3QgcmVzb3Vy Y2VzLgpAQCAtNDY2LDYgKzQ2OSw3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCBvcmlvbjV4X3NldHVw X3BjaV93aW5zKHZvaWQpCiBzdGF0aWMgaW50IF9faW5pdCBwY2lfc2V0dXAoc3RydWN0IHBjaV9z eXNfZGF0YSAqc3lzKQogewogCXN0cnVjdCByZXNvdXJjZSAqcmVzOworCXN0cnVjdCByZXNvdXJj ZSByZWFsaW87CiAKIAkvKgogCSAqIFBvaW50IFBDSSB1bml0IE1CVVMgZGVjb2RlIHdpbmRvd3Mg dG8gRFJBTSBzcGFjZS4KQEAgLTQ4Miw3ICs0ODYsOSBAQCBzdGF0aWMgaW50IF9faW5pdCBwY2lf c2V0dXAoc3RydWN0IHBjaV9zeXNfZGF0YSAqc3lzKQogCSAqLwogCW9yaW9uNXhfc2V0Yml0cyhQ Q0lfQ01ELCBQQ0lfQ01EX0hPU1RfUkVPUkRFUik7CiAKLQlwY2lfaW9yZW1hcF9pbyhzeXMtPmJ1 c25yICogU1pfNjRLLCBPUklPTjVYX1BDSV9JT19QSFlTX0JBU0UpOworCXJlYWxpby5zdGFydCA9 IHN5cy0+YnVzbnIgKiBTWl82NEs7CisJcmVhbGlvLmVuZCA9IHJlYWxpby5zdGFydCArIFNaXzY0 SyAtIDE7CisJcGNpX3JlbWFwX2lvc3BhY2UoJnJlYWxpbywgT1JJT041WF9QQ0lfSU9fUEhZU19C QVNFKTsKIAogCS8qCiAJICogUmVxdWVzdCByZXNvdXJjZXMKZGlmZiAtLWdpdCBhL2RyaXZlcnMv cGNtY2lhL2F0OTFfY2YuYyBiL2RyaXZlcnMvcGNtY2lhL2F0OTFfY2YuYwppbmRleCA2YjFlZGZj ODkwYTMuLjkyZGYyYzJjNWQwNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY21jaWEvYXQ5MV9jZi5j CisrKyBiL2RyaXZlcnMvcGNtY2lhL2F0OTFfY2YuYwpAQCAtMjAsNiArMjAsNyBAQAogI2luY2x1 ZGUgPGxpbnV4L29mLmg+CiAjaW5jbHVkZSA8bGludXgvb2ZfZGV2aWNlLmg+CiAjaW5jbHVkZSA8 bGludXgvb2ZfZ3Bpby5oPgorI2luY2x1ZGUgPGxpbnV4L3BjaS5oPgogI2luY2x1ZGUgPGxpbnV4 L3JlZ21hcC5oPgogCiAjaW5jbHVkZSA8cGNtY2lhL3NzLmg+CkBAIC0yMzAsNiArMjMxLDcgQEAg c3RhdGljIGludCBhdDkxX2NmX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJ c3RydWN0IGF0OTFfY2Zfc29ja2V0CSpjZjsKIAlzdHJ1Y3QgYXQ5MV9jZl9kYXRhCSpib2FyZDsK IAlzdHJ1Y3QgcmVzb3VyY2UJCSppbzsKKwlzdHJ1Y3QgcmVzb3VyY2UJCXJlYWxpbzsKIAlpbnQJ CQlzdGF0dXM7CiAKIAlib2FyZCA9IGRldm1fa3phbGxvYygmcGRldi0+ZGV2LCBzaXplb2YoKmJv YXJkKSwgR0ZQX0tFUk5FTCk7CkBAIC0zMDcsNyArMzA5LDkgQEAgc3RhdGljIGludCBhdDkxX2Nm X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJICogaW9fb2Zmc2V0IGlzIHNl dCB0byAweDEwMDAwIHRvIGF2b2lkIHRoZSBjaGVjayBpbiBzdGF0aWNfZmluZF9pbygpLgogCSAq ICovCiAJY2YtPnNvY2tldC5pb19vZmZzZXQgPSAweDEwMDAwOwotCXN0YXR1cyA9IHBjaV9pb3Jl bWFwX2lvKDB4MTAwMDAsIGNmLT5waHlzX2Jhc2VhZGRyICsgQ0ZfSU9fUEhZUyk7CisJcmVhbGlv LnN0YXJ0ID0gY2YtPnNvY2tldC5pb19vZmZzZXQ7CisJcmVhbGlvLmVuZCA9IHJlYWxpby5zdGFy dCArIFNaXzY0SyAtIDE7CisJc3RhdHVzID0gcGNpX3JlbWFwX2lvc3BhY2UoJnJlYWxpbywgY2Yt PnBoeXNfYmFzZWFkZHIgKyBDRl9JT19QSFlTKTsKIAlpZiAoc3RhdHVzKQogCQlnb3RvIGZhaWww YTsKIAotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBs aXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlz dGluZm8vbGludXgtYXJtLWtlcm5lbAo=