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 959F7C43217 for ; Thu, 25 Nov 2021 12:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351060AbhKYMxU (ORCPT ); Thu, 25 Nov 2021 07:53:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:45582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353413AbhKYMvp (ORCPT ); Thu, 25 Nov 2021 07:51:45 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7750D61139; Thu, 25 Nov 2021 12:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637844399; bh=8IVaDVY9hPRIGDZRDN90aFjLyHB9vSl+f8YJ0WtixNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rEwyH3uNfHbBqv91vf66yCBCcd+vPBv2NFDtCdRxmaEbxzVZFKfzIBhUntF7oCDHs RWeiQYola42948pTu9MtHMtmCjjnbtIzLzOsc1DEbKlKyU59CSjNTfUFCCgk2MXs9v N+Gsu7p45MG2E56JNfAfKxQ8Ed2BM7MaQ0bd3oqmAEoWgIOuS8C9/oGEpXfVkbpNrM 82LYNbCfpkB+iMxy4atLGUUz1yhHeD7NkpLestOwtcg5+fBlRiI8kQkWtuDbXsd2Ww iWrUeHXCRyRqqowtQSyigEKU9rU7VVaT8hc5uYnmBKPMx3PW6AxPep/5c8rbaYvqlp gNeyoJIiHdjGQ== Received: by pali.im (Postfix) id 57DC467E; Thu, 25 Nov 2021 13:46:36 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/15] PCI: mvebu: Fix support for bus mastering and PCI_COMMAND on emulated bridge Date: Thu, 25 Nov 2021 13:45:56 +0100 Message-Id: <20211125124605.25915-7-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125124605.25915-1-pali@kernel.org> References: <20211125124605.25915-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 According to PCI specifications bits [0:2] of Command Register, this should be by default disabled on reset. So explicitly disable these bits at early beginning of driver initialization. Also remove code which unconditionally enables all 3 bits and let kernel code (via pci_set_master() function) to handle bus mastering of PCI Bridge via emulated PCI_COMMAND on emulated bridge. Adjust existing functions mvebu_pcie_handle_iobase_change() and mvebu_pcie_handle_membase_change() to handle PCI_IO_BASE and PCI_MEM_BASE registers correctly even when bus mastering on emulated bridge is disabled. Signed-off-by: Pali Rohár Cc: stable@vger.kernel.org --- drivers/pci/controller/pci-mvebu.c | 52 ++++++++++++++++++------------ 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index a3df352d440e..32694763e930 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -226,16 +226,14 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) { u32 cmd, mask; - /* Point PCIe unit MBUS decode windows to DRAM space. */ - mvebu_pcie_setup_wins(port); - - /* Master + slave enable. */ + /* Disable Root Bridge I/O space, memory space and bus mastering. */ cmd = mvebu_readl(port, PCIE_CMD_OFF); - cmd |= PCI_COMMAND_IO; - cmd |= PCI_COMMAND_MEMORY; - cmd |= PCI_COMMAND_MASTER; + cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); mvebu_writel(port, cmd, PCIE_CMD_OFF); + /* Point PCIe unit MBUS decode windows to DRAM space. */ + mvebu_pcie_setup_wins(port); + /* Enable interrupt lines A-D. */ mask = mvebu_readl(port, PCIE_MASK_OFF); mask |= PCIE_MASK_ENABLE_INTS; @@ -385,8 +383,7 @@ static void mvebu_pcie_handle_iobase_change(struct mvebu_pcie_port *port) /* Are the new iobase/iolimit values invalid? */ if (conf->iolimit < conf->iobase || - conf->iolimitupper < conf->iobaseupper || - !(conf->command & PCI_COMMAND_IO)) { + conf->iolimitupper < conf->iobaseupper) { mvebu_pcie_set_window(port, port->io_target, port->io_attr, &desired, &port->iowin); return; @@ -423,8 +420,7 @@ static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port) struct pci_bridge_emul_conf *conf = &port->bridge.conf; /* Are the new membase/memlimit values invalid? */ - if (conf->memlimit < conf->membase || - !(conf->command & PCI_COMMAND_MEMORY)) { + if (conf->memlimit < conf->membase) { mvebu_pcie_set_window(port, port->mem_target, port->mem_attr, &desired, &port->memwin); return; @@ -444,6 +440,24 @@ static void mvebu_pcie_handle_membase_change(struct mvebu_pcie_port *port) &port->memwin); } +static pci_bridge_emul_read_status_t +mvebu_pci_bridge_emul_base_conf_read(struct pci_bridge_emul *bridge, + int reg, u32 *value) +{ + struct mvebu_pcie_port *port = bridge->data; + + switch (reg) { + case PCI_COMMAND: + *value = mvebu_readl(port, PCIE_CMD_OFF); + break; + + default: + return PCI_BRIDGE_EMUL_NOT_HANDLED; + } + + return PCI_BRIDGE_EMUL_HANDLED; +} + static pci_bridge_emul_read_status_t mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge, int reg, u32 *value) @@ -498,17 +512,14 @@ mvebu_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge, switch (reg) { case PCI_COMMAND: - { - if (!mvebu_has_ioport(port)) - conf->command &= ~PCI_COMMAND_IO; - - if ((old ^ new) & PCI_COMMAND_IO) - mvebu_pcie_handle_iobase_change(port); - if ((old ^ new) & PCI_COMMAND_MEMORY) - mvebu_pcie_handle_membase_change(port); + if (!mvebu_has_ioport(port)) { + conf->command = cpu_to_le16( + le16_to_cpu(conf->command) & ~PCI_COMMAND_IO); + new &= ~PCI_COMMAND_IO; + } + mvebu_writel(port, new, PCIE_CMD_OFF); break; - } case PCI_IO_BASE: /* @@ -575,6 +586,7 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge, } static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = { + .read_base = mvebu_pci_bridge_emul_base_conf_read, .write_base = mvebu_pci_bridge_emul_base_conf_write, .read_pcie = mvebu_pci_bridge_emul_pcie_conf_read, .write_pcie = mvebu_pci_bridge_emul_pcie_conf_write, -- 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 F33EAC433EF for ; Thu, 25 Nov 2021 12:52:47 +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=Qw2SsYfEdvP3UGJkC7yLfCiRu0hxPyHBaGHOLFeWDQY=; b=ANSmlKnanTfu0N eCcjJMN0GP04K8WnRb9vU3V0CBBnQToV2f7LXdnzeePSBOLpSsXjU6yt5NZwgiLadEbxjvA8baOm5 1uyGuD6OLwCcXEf9EvlKjKeWo92ZFtOuM6ACZVkTVchGIHmc82edoZMj6Xn+F6/5LXPdVZ+MReNR8 j/A6P1rSRFDiQojLc9LUDcT25iKddYlh6VXfjTNCbwvZVll3GR/XPKV3sXOlO/6FqU/zgzj+pHCxX weujWRW3/carMxlJpThx+2avuwzUMaMdABFOjU5YUj2sICTMlDtcV5DsuDPTNFSCNZbOwviabjUuU PbTBJ7JIjr73hBom4LeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqED9-007Uo9-Az; Thu, 25 Nov 2021 12:50:47 +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 1mqE99-007SpG-GB for linux-arm-kernel@lists.infradead.org; Thu, 25 Nov 2021 12:46:41 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7750D61139; Thu, 25 Nov 2021 12:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637844399; bh=8IVaDVY9hPRIGDZRDN90aFjLyHB9vSl+f8YJ0WtixNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rEwyH3uNfHbBqv91vf66yCBCcd+vPBv2NFDtCdRxmaEbxzVZFKfzIBhUntF7oCDHs RWeiQYola42948pTu9MtHMtmCjjnbtIzLzOsc1DEbKlKyU59CSjNTfUFCCgk2MXs9v N+Gsu7p45MG2E56JNfAfKxQ8Ed2BM7MaQ0bd3oqmAEoWgIOuS8C9/oGEpXfVkbpNrM 82LYNbCfpkB+iMxy4atLGUUz1yhHeD7NkpLestOwtcg5+fBlRiI8kQkWtuDbXsd2Ww iWrUeHXCRyRqqowtQSyigEKU9rU7VVaT8hc5uYnmBKPMx3PW6AxPep/5c8rbaYvqlp gNeyoJIiHdjGQ== Received: by pali.im (Postfix) id 57DC467E; Thu, 25 Nov 2021 13:46:36 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/15] PCI: mvebu: Fix support for bus mastering and PCI_COMMAND on emulated bridge Date: Thu, 25 Nov 2021 13:45:56 +0100 Message-Id: <20211125124605.25915-7-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211125124605.25915-1-pali@kernel.org> References: <20211125124605.25915-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_044639_618268_84E17FBE X-CRM114-Status: GOOD ( 13.92 ) 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 QWNjb3JkaW5nIHRvIFBDSSBzcGVjaWZpY2F0aW9ucyBiaXRzIFswOjJdIG9mIENvbW1hbmQgUmVn aXN0ZXIsIHRoaXMgc2hvdWxkCmJlIGJ5IGRlZmF1bHQgZGlzYWJsZWQgb24gcmVzZXQuIFNvIGV4 cGxpY2l0bHkgZGlzYWJsZSB0aGVzZSBiaXRzIGF0IGVhcmx5CmJlZ2lubmluZyBvZiBkcml2ZXIg aW5pdGlhbGl6YXRpb24uCgpBbHNvIHJlbW92ZSBjb2RlIHdoaWNoIHVuY29uZGl0aW9uYWxseSBl bmFibGVzIGFsbCAzIGJpdHMgYW5kIGxldCBrZXJuZWwKY29kZSAodmlhIHBjaV9zZXRfbWFzdGVy KCkgZnVuY3Rpb24pIHRvIGhhbmRsZSBidXMgbWFzdGVyaW5nIG9mIFBDSSBCcmlkZ2UKdmlhIGVt dWxhdGVkIFBDSV9DT01NQU5EIG9uIGVtdWxhdGVkIGJyaWRnZS4KCkFkanVzdCBleGlzdGluZyBm dW5jdGlvbnMgbXZlYnVfcGNpZV9oYW5kbGVfaW9iYXNlX2NoYW5nZSgpIGFuZAptdmVidV9wY2ll X2hhbmRsZV9tZW1iYXNlX2NoYW5nZSgpIHRvIGhhbmRsZSBQQ0lfSU9fQkFTRSBhbmQgUENJX01F TV9CQVNFCnJlZ2lzdGVycyBjb3JyZWN0bHkgZXZlbiB3aGVuIGJ1cyBtYXN0ZXJpbmcgb24gZW11 bGF0ZWQgYnJpZGdlIGlzIGRpc2FibGVkLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIgPHBh bGlAa2VybmVsLm9yZz4KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKLS0tCiBkcml2ZXJzL3Bj aS9jb250cm9sbGVyL3BjaS1tdmVidS5jIHwgNTIgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZlYnUuYyBiL2RyaXZlcnMv cGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMKaW5kZXggYTNkZjM1MmQ0NDBlLi4zMjY5NDc2M2U5 MzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMKKysrIGIv ZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZlYnUuYwpAQCAtMjI2LDE2ICsyMjYsMTQgQEAg c3RhdGljIHZvaWQgbXZlYnVfcGNpZV9zZXR1cF9odyhzdHJ1Y3QgbXZlYnVfcGNpZV9wb3J0ICpw b3J0KQogewogCXUzMiBjbWQsIG1hc2s7CiAKLQkvKiBQb2ludCBQQ0llIHVuaXQgTUJVUyBkZWNv ZGUgd2luZG93cyB0byBEUkFNIHNwYWNlLiAqLwotCW12ZWJ1X3BjaWVfc2V0dXBfd2lucyhwb3J0 KTsKLQotCS8qIE1hc3RlciArIHNsYXZlIGVuYWJsZS4gKi8KKwkvKiBEaXNhYmxlIFJvb3QgQnJp ZGdlIEkvTyBzcGFjZSwgbWVtb3J5IHNwYWNlIGFuZCBidXMgbWFzdGVyaW5nLiAqLwogCWNtZCA9 IG12ZWJ1X3JlYWRsKHBvcnQsIFBDSUVfQ01EX09GRik7Ci0JY21kIHw9IFBDSV9DT01NQU5EX0lP OwotCWNtZCB8PSBQQ0lfQ09NTUFORF9NRU1PUlk7Ci0JY21kIHw9IFBDSV9DT01NQU5EX01BU1RF UjsKKwljbWQgJj0gfihQQ0lfQ09NTUFORF9JTyB8IFBDSV9DT01NQU5EX01FTU9SWSB8IFBDSV9D T01NQU5EX01BU1RFUik7CiAJbXZlYnVfd3JpdGVsKHBvcnQsIGNtZCwgUENJRV9DTURfT0ZGKTsK IAorCS8qIFBvaW50IFBDSWUgdW5pdCBNQlVTIGRlY29kZSB3aW5kb3dzIHRvIERSQU0gc3BhY2Uu ICovCisJbXZlYnVfcGNpZV9zZXR1cF93aW5zKHBvcnQpOworCiAJLyogRW5hYmxlIGludGVycnVw dCBsaW5lcyBBLUQuICovCiAJbWFzayA9IG12ZWJ1X3JlYWRsKHBvcnQsIFBDSUVfTUFTS19PRkYp OwogCW1hc2sgfD0gUENJRV9NQVNLX0VOQUJMRV9JTlRTOwpAQCAtMzg1LDggKzM4Myw3IEBAIHN0 YXRpYyB2b2lkIG12ZWJ1X3BjaWVfaGFuZGxlX2lvYmFzZV9jaGFuZ2Uoc3RydWN0IG12ZWJ1X3Bj aWVfcG9ydCAqcG9ydCkKIAogCS8qIEFyZSB0aGUgbmV3IGlvYmFzZS9pb2xpbWl0IHZhbHVlcyBp bnZhbGlkPyAqLwogCWlmIChjb25mLT5pb2xpbWl0IDwgY29uZi0+aW9iYXNlIHx8Ci0JICAgIGNv bmYtPmlvbGltaXR1cHBlciA8IGNvbmYtPmlvYmFzZXVwcGVyIHx8Ci0JICAgICEoY29uZi0+Y29t bWFuZCAmIFBDSV9DT01NQU5EX0lPKSkgeworCSAgICBjb25mLT5pb2xpbWl0dXBwZXIgPCBjb25m LT5pb2Jhc2V1cHBlcikgewogCQltdmVidV9wY2llX3NldF93aW5kb3cocG9ydCwgcG9ydC0+aW9f dGFyZ2V0LCBwb3J0LT5pb19hdHRyLAogCQkJCSAgICAgICZkZXNpcmVkLCAmcG9ydC0+aW93aW4p OwogCQlyZXR1cm47CkBAIC00MjMsOCArNDIwLDcgQEAgc3RhdGljIHZvaWQgbXZlYnVfcGNpZV9o YW5kbGVfbWVtYmFzZV9jaGFuZ2Uoc3RydWN0IG12ZWJ1X3BjaWVfcG9ydCAqcG9ydCkKIAlzdHJ1 Y3QgcGNpX2JyaWRnZV9lbXVsX2NvbmYgKmNvbmYgPSAmcG9ydC0+YnJpZGdlLmNvbmY7CiAKIAkv KiBBcmUgdGhlIG5ldyBtZW1iYXNlL21lbWxpbWl0IHZhbHVlcyBpbnZhbGlkPyAqLwotCWlmIChj b25mLT5tZW1saW1pdCA8IGNvbmYtPm1lbWJhc2UgfHwKLQkgICAgIShjb25mLT5jb21tYW5kICYg UENJX0NPTU1BTkRfTUVNT1JZKSkgeworCWlmIChjb25mLT5tZW1saW1pdCA8IGNvbmYtPm1lbWJh c2UpIHsKIAkJbXZlYnVfcGNpZV9zZXRfd2luZG93KHBvcnQsIHBvcnQtPm1lbV90YXJnZXQsIHBv cnQtPm1lbV9hdHRyLAogCQkJCSAgICAgICZkZXNpcmVkLCAmcG9ydC0+bWVtd2luKTsKIAkJcmV0 dXJuOwpAQCAtNDQ0LDYgKzQ0MCwyNCBAQCBzdGF0aWMgdm9pZCBtdmVidV9wY2llX2hhbmRsZV9t ZW1iYXNlX2NoYW5nZShzdHJ1Y3QgbXZlYnVfcGNpZV9wb3J0ICpwb3J0KQogCQkJICAgICAgJnBv cnQtPm1lbXdpbik7CiB9CiAKK3N0YXRpYyBwY2lfYnJpZGdlX2VtdWxfcmVhZF9zdGF0dXNfdAor bXZlYnVfcGNpX2JyaWRnZV9lbXVsX2Jhc2VfY29uZl9yZWFkKHN0cnVjdCBwY2lfYnJpZGdlX2Vt dWwgKmJyaWRnZSwKKwkJCQkgICAgIGludCByZWcsIHUzMiAqdmFsdWUpCit7CisJc3RydWN0IG12 ZWJ1X3BjaWVfcG9ydCAqcG9ydCA9IGJyaWRnZS0+ZGF0YTsKKworCXN3aXRjaCAocmVnKSB7CisJ Y2FzZSBQQ0lfQ09NTUFORDoKKwkJKnZhbHVlID0gbXZlYnVfcmVhZGwocG9ydCwgUENJRV9DTURf T0ZGKTsKKwkJYnJlYWs7CisKKwlkZWZhdWx0OgorCQlyZXR1cm4gUENJX0JSSURHRV9FTVVMX05P VF9IQU5ETEVEOworCX0KKworCXJldHVybiBQQ0lfQlJJREdFX0VNVUxfSEFORExFRDsKK30KKwog c3RhdGljIHBjaV9icmlkZ2VfZW11bF9yZWFkX3N0YXR1c190CiBtdmVidV9wY2lfYnJpZGdlX2Vt dWxfcGNpZV9jb25mX3JlYWQoc3RydWN0IHBjaV9icmlkZ2VfZW11bCAqYnJpZGdlLAogCQkJCSAg ICAgaW50IHJlZywgdTMyICp2YWx1ZSkKQEAgLTQ5OCwxNyArNTEyLDE0IEBAIG12ZWJ1X3BjaV9i cmlkZ2VfZW11bF9iYXNlX2NvbmZfd3JpdGUoc3RydWN0IHBjaV9icmlkZ2VfZW11bCAqYnJpZGdl LAogCiAJc3dpdGNoIChyZWcpIHsKIAljYXNlIFBDSV9DT01NQU5EOgotCXsKLQkJaWYgKCFtdmVi dV9oYXNfaW9wb3J0KHBvcnQpKQotCQkJY29uZi0+Y29tbWFuZCAmPSB+UENJX0NPTU1BTkRfSU87 Ci0KLQkJaWYgKChvbGQgXiBuZXcpICYgUENJX0NPTU1BTkRfSU8pCi0JCQltdmVidV9wY2llX2hh bmRsZV9pb2Jhc2VfY2hhbmdlKHBvcnQpOwotCQlpZiAoKG9sZCBeIG5ldykgJiBQQ0lfQ09NTUFO RF9NRU1PUlkpCi0JCQltdmVidV9wY2llX2hhbmRsZV9tZW1iYXNlX2NoYW5nZShwb3J0KTsKKwkJ aWYgKCFtdmVidV9oYXNfaW9wb3J0KHBvcnQpKSB7CisJCQljb25mLT5jb21tYW5kID0gY3B1X3Rv X2xlMTYoCisJCQkJbGUxNl90b19jcHUoY29uZi0+Y29tbWFuZCkgJiB+UENJX0NPTU1BTkRfSU8p OworCQkJbmV3ICY9IH5QQ0lfQ09NTUFORF9JTzsKKwkJfQogCisJCW12ZWJ1X3dyaXRlbChwb3J0 LCBuZXcsIFBDSUVfQ01EX09GRik7CiAJCWJyZWFrOwotCX0KIAogCWNhc2UgUENJX0lPX0JBU0U6 CiAJCS8qCkBAIC01NzUsNiArNTg2LDcgQEAgbXZlYnVfcGNpX2JyaWRnZV9lbXVsX3BjaWVfY29u Zl93cml0ZShzdHJ1Y3QgcGNpX2JyaWRnZV9lbXVsICpicmlkZ2UsCiB9CiAKIHN0YXRpYyBzdHJ1 Y3QgcGNpX2JyaWRnZV9lbXVsX29wcyBtdmVidV9wY2lfYnJpZGdlX2VtdWxfb3BzID0geworCS5y ZWFkX2Jhc2UgPSBtdmVidV9wY2lfYnJpZGdlX2VtdWxfYmFzZV9jb25mX3JlYWQsCiAJLndyaXRl X2Jhc2UgPSBtdmVidV9wY2lfYnJpZGdlX2VtdWxfYmFzZV9jb25mX3dyaXRlLAogCS5yZWFkX3Bj aWUgPSBtdmVidV9wY2lfYnJpZGdlX2VtdWxfcGNpZV9jb25mX3JlYWQsCiAJLndyaXRlX3BjaWUg PSBtdmVidV9wY2lfYnJpZGdlX2VtdWxfcGNpZV9jb25mX3dyaXRlLAotLSAKMi4yMC4xCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtl cm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0 dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5l bAo=