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 DB556C433FE for ; Wed, 5 Jan 2022 15:03:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241196AbiAEPDB (ORCPT ); Wed, 5 Jan 2022 10:03:01 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:55198 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241195AbiAEPCz (ORCPT ); Wed, 5 Jan 2022 10:02:55 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 78063B81BA6; Wed, 5 Jan 2022 15:02:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D684FC36AF2; Wed, 5 Jan 2022 15:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641394973; bh=7cnGPeKxrEx9BUioQPhHb7keGl7Sglo0nNvBLgQcPKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/6R2WHQkVheu0w6E3wnjT9szyYRIeLcvZogtUT15VSkf1EvS24LRyXlA31zlfbAy VUxUdz8kgAiTYIavZZL5jFxKdKuu7ZGIjO0wk17SgfytBeoG6rxxTjWjvelr64uHcv FqbR2hWX1OVZQUSIwLd8SpcXcm0LiUtsPEIAn+i/RQ+VMO6P3OpTWpn68Rf5A1xlFF hZc+SLNAMyBT3F1T2Iiy/rrnW7m+ql22i7nhmgq4++cWaqcmIOfXDrLf2CGpRungOy cop0PfQTpnJ8a9fjDcon5P5MsyVOL5E7A811OI7Ne3a9EPsyPtWRpUbJNHstA4xFuL d/uCZsheFR0bA== Received: by pali.im (Postfix) id 8B1B282A; Wed, 5 Jan 2022 16:02:52 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/11] PCI: pci-bridge-emul: Add support for PCI Bridge Subsystem Vendor ID capability Date: Wed, 5 Jan 2022 16:02:31 +0100 Message-Id: <20220105150239.9628-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220105150239.9628-1-pali@kernel.org> References: <20220105150239.9628-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 This is read-only capability in PCI config space. Put it between base PCI capability and base PCI Express capability. Driver just have to specify subsystem_vendor_id and subsystem_id fields in emulated bridge structure and pci-bridge-emul takes care of correctly compose PCI Bridge Subsystem Vendor ID capability. Signed-off-by: Pali Rohár --- drivers/pci/pci-bridge-emul.c | 69 +++++++++++++++++++++++++---------- drivers/pci/pci-bridge-emul.h | 2 + 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/drivers/pci/pci-bridge-emul.c b/drivers/pci/pci-bridge-emul.c index 9f4f173f0650..c84f423a5893 100644 --- a/drivers/pci/pci-bridge-emul.c +++ b/drivers/pci/pci-bridge-emul.c @@ -21,8 +21,11 @@ #include "pci-bridge-emul.h" #define PCI_BRIDGE_CONF_END PCI_STD_HEADER_SIZEOF +#define PCI_CAP_SSID_SIZEOF (PCI_SSVID_DEVICE_ID + 2) +#define PCI_CAP_SSID_START PCI_BRIDGE_CONF_END +#define PCI_CAP_SSID_END (PCI_CAP_SSID_START + PCI_CAP_SSID_SIZEOF) #define PCI_CAP_PCIE_SIZEOF (PCI_EXP_SLTSTA2 + 2) -#define PCI_CAP_PCIE_START PCI_BRIDGE_CONF_END +#define PCI_CAP_PCIE_START PCI_CAP_SSID_END #define PCI_CAP_PCIE_END (PCI_CAP_PCIE_START + PCI_CAP_PCIE_SIZEOF) /** @@ -315,6 +318,25 @@ struct pci_bridge_reg_behavior pcie_cap_regs_behavior[PCI_CAP_PCIE_SIZEOF / 4] = }, }; +static pci_bridge_emul_read_status_t +pci_bridge_emul_read_ssid(struct pci_bridge_emul *bridge, int reg, u32 *value) +{ + switch (reg) { + case PCI_CAP_LIST_ID: + *value = PCI_CAP_ID_SSVID | + (bridge->has_pcie ? (PCI_CAP_PCIE_START << 8) : 0); + return PCI_BRIDGE_EMUL_HANDLED; + + case PCI_SSVID_VENDOR_ID: + *value = bridge->subsystem_vendor_id | + (bridge->subsystem_id << 16); + return PCI_BRIDGE_EMUL_HANDLED; + + default: + return PCI_BRIDGE_EMUL_NOT_HANDLED; + } +} + /* * Initialize a pci_bridge_emul structure to represent a fake PCI * bridge configuration space. The caller needs to have initialized @@ -337,9 +359,17 @@ int pci_bridge_emul_init(struct pci_bridge_emul *bridge, if (!bridge->pci_regs_behavior) return -ENOMEM; - if (bridge->has_pcie) { + if (bridge->subsystem_vendor_id) + bridge->conf.capabilities_pointer = PCI_CAP_SSID_START; + else if (bridge->has_pcie) bridge->conf.capabilities_pointer = PCI_CAP_PCIE_START; + else + bridge->conf.capabilities_pointer = 0; + + if (bridge->conf.capabilities_pointer) bridge->conf.status |= cpu_to_le16(PCI_STATUS_CAP_LIST); + + if (bridge->has_pcie) { bridge->pcie_conf.cap_id = PCI_CAP_ID_EXP; bridge->pcie_conf.cap |= cpu_to_le16(PCI_EXP_TYPE_ROOT_PORT << 4); bridge->pcie_cap_regs_behavior = @@ -423,26 +453,28 @@ int pci_bridge_emul_conf_read(struct pci_bridge_emul *bridge, int where, read_op = bridge->ops->read_base; cfgspace = (__le32 *) &bridge->conf; behavior = bridge->pci_regs_behavior; - } else if (!bridge->has_pcie) { - /* PCIe space is not implemented, and no PCI capabilities */ - *value = 0; - return PCIBIOS_SUCCESSFUL; - } else if (reg < PCI_CAP_PCIE_END) { + } else if (reg >= PCI_CAP_SSID_START && reg < PCI_CAP_SSID_END && bridge->subsystem_vendor_id) { + /* Emulated PCI Bridge Subsystem Vendor ID capability */ + reg -= PCI_CAP_SSID_START; + read_op = pci_bridge_emul_read_ssid; + cfgspace = NULL; + behavior = NULL; + } else if (reg >= PCI_CAP_PCIE_START && reg < PCI_CAP_PCIE_END && bridge->has_pcie) { /* Our emulated PCIe capability */ reg -= PCI_CAP_PCIE_START; read_op = bridge->ops->read_pcie; cfgspace = (__le32 *) &bridge->pcie_conf; behavior = bridge->pcie_cap_regs_behavior; - } else if (reg < PCI_CFG_SPACE_SIZE) { - /* Rest of PCI space not implemented */ - *value = 0; - return PCIBIOS_SUCCESSFUL; - } else { + } else if (reg >= PCI_CFG_SPACE_SIZE && bridge->has_pcie) { /* PCIe extended capability space */ reg -= PCI_CFG_SPACE_SIZE; read_op = bridge->ops->read_ext; cfgspace = NULL; behavior = NULL; + } else { + /* Not implemented */ + *value = 0; + return PCIBIOS_SUCCESSFUL; } if (read_op) @@ -500,24 +532,21 @@ int pci_bridge_emul_conf_write(struct pci_bridge_emul *bridge, int where, write_op = bridge->ops->write_base; cfgspace = (__le32 *) &bridge->conf; behavior = bridge->pci_regs_behavior; - } else if (!bridge->has_pcie) { - /* PCIe space is not implemented, and no PCI capabilities */ - return PCIBIOS_SUCCESSFUL; - } else if (reg < PCI_CAP_PCIE_END) { + } else if (reg >= PCI_CAP_PCIE_START && reg < PCI_CAP_PCIE_END && bridge->has_pcie) { /* Our emulated PCIe capability */ reg -= PCI_CAP_PCIE_START; write_op = bridge->ops->write_pcie; cfgspace = (__le32 *) &bridge->pcie_conf; behavior = bridge->pcie_cap_regs_behavior; - } else if (reg < PCI_CFG_SPACE_SIZE) { - /* Rest of PCI space not implemented */ - return PCIBIOS_SUCCESSFUL; - } else { + } else if (reg >= PCI_CFG_SPACE_SIZE && bridge->has_pcie) { /* PCIe extended capability space */ reg -= PCI_CFG_SPACE_SIZE; write_op = bridge->ops->write_ext; cfgspace = NULL; behavior = NULL; + } else { + /* Not implemented */ + return PCIBIOS_SUCCESSFUL; } shift = (where & 0x3) * 8; diff --git a/drivers/pci/pci-bridge-emul.h b/drivers/pci/pci-bridge-emul.h index 6b5f75b2ad02..71392b67471d 100644 --- a/drivers/pci/pci-bridge-emul.h +++ b/drivers/pci/pci-bridge-emul.h @@ -132,6 +132,8 @@ struct pci_bridge_emul { struct pci_bridge_reg_behavior *pcie_cap_regs_behavior; void *data; bool has_pcie; + u16 subsystem_vendor_id; + u16 subsystem_id; }; enum { -- 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 E107EC433F5 for ; Wed, 5 Jan 2022 15:04:30 +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=KRgItu6R9KbQYvoDG6w/nV7+8xbS5JS/oz7ltorMoIU=; b=wsFWkNqaCgGRIe tvpuVZ92ZiLoPJguk3ITagaezWql8THMAX0aLdtRQhGotjVQkUm75OrhO9/lGAal4ymnNVyENtYvo 7esd7U3aXBuBsYjDAgZ/fBzOGOH2J3uKAU8BQVo4fyUqFw3OJMmdSibRPQdvixGh243a0fUl7wCG1 JrGOaXWrmsS3DUI9huYdnR4tyiV7RzyRfJR55KGInErg6u5qmQv3FHgK/z5nNfVAKBz+tfmhudhON VP7kjKypjf5tL5kcCa7dyqHsfrU9SQAWgzVAf8fBM7mDuwc+uqxs9xXM/1zG8y8Adgn0ov3LlZuPU 9M5OBCugPuedPIrY2Q2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n57oX-00F4CP-Ud; Wed, 05 Jan 2022 15:02:58 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n57oU-00F4Aa-9G for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 15:02:55 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB51F6178E; Wed, 5 Jan 2022 15:02:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D684FC36AF2; Wed, 5 Jan 2022 15:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641394973; bh=7cnGPeKxrEx9BUioQPhHb7keGl7Sglo0nNvBLgQcPKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/6R2WHQkVheu0w6E3wnjT9szyYRIeLcvZogtUT15VSkf1EvS24LRyXlA31zlfbAy VUxUdz8kgAiTYIavZZL5jFxKdKuu7ZGIjO0wk17SgfytBeoG6rxxTjWjvelr64uHcv FqbR2hWX1OVZQUSIwLd8SpcXcm0LiUtsPEIAn+i/RQ+VMO6P3OpTWpn68Rf5A1xlFF hZc+SLNAMyBT3F1T2Iiy/rrnW7m+ql22i7nhmgq4++cWaqcmIOfXDrLf2CGpRungOy cop0PfQTpnJ8a9fjDcon5P5MsyVOL5E7A811OI7Ne3a9EPsyPtWRpUbJNHstA4xFuL d/uCZsheFR0bA== Received: by pali.im (Postfix) id 8B1B282A; Wed, 5 Jan 2022 16:02:52 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/11] PCI: pci-bridge-emul: Add support for PCI Bridge Subsystem Vendor ID capability Date: Wed, 5 Jan 2022 16:02:31 +0100 Message-Id: <20220105150239.9628-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220105150239.9628-1-pali@kernel.org> References: <20220105150239.9628-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220105_070254_434147_8D2ED25F X-CRM114-Status: GOOD ( 19.50 ) 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 VGhpcyBpcyByZWFkLW9ubHkgY2FwYWJpbGl0eSBpbiBQQ0kgY29uZmlnIHNwYWNlLiBQdXQgaXQg YmV0d2VlbiBiYXNlIFBDSQpjYXBhYmlsaXR5IGFuZCBiYXNlIFBDSSBFeHByZXNzIGNhcGFiaWxp dHkuCgpEcml2ZXIganVzdCBoYXZlIHRvIHNwZWNpZnkgc3Vic3lzdGVtX3ZlbmRvcl9pZCBhbmQg c3Vic3lzdGVtX2lkIGZpZWxkcyBpbgplbXVsYXRlZCBicmlkZ2Ugc3RydWN0dXJlIGFuZCBwY2kt YnJpZGdlLWVtdWwgdGFrZXMgY2FyZSBvZiBjb3JyZWN0bHkKY29tcG9zZSBQQ0kgQnJpZGdlIFN1 YnN5c3RlbSBWZW5kb3IgSUQgY2FwYWJpbGl0eS4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9ow6Fy IDxwYWxpQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9wY2kvcGNpLWJyaWRnZS1lbXVsLmMgfCA2 OSArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9wY2kvcGNpLWJy aWRnZS1lbXVsLmggfCAgMiArCiAyIGZpbGVzIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDIw IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL3BjaS1icmlkZ2UtZW11bC5j IGIvZHJpdmVycy9wY2kvcGNpLWJyaWRnZS1lbXVsLmMKaW5kZXggOWY0ZjE3M2YwNjUwLi5jODRm NDIzYTU4OTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL3BjaS1icmlkZ2UtZW11bC5jCisrKyBi L2RyaXZlcnMvcGNpL3BjaS1icmlkZ2UtZW11bC5jCkBAIC0yMSw4ICsyMSwxMSBAQAogI2luY2x1 ZGUgInBjaS1icmlkZ2UtZW11bC5oIgogCiAjZGVmaW5lIFBDSV9CUklER0VfQ09ORl9FTkQJUENJ X1NURF9IRUFERVJfU0laRU9GCisjZGVmaW5lIFBDSV9DQVBfU1NJRF9TSVpFT0YJKFBDSV9TU1ZJ RF9ERVZJQ0VfSUQgKyAyKQorI2RlZmluZSBQQ0lfQ0FQX1NTSURfU1RBUlQJUENJX0JSSURHRV9D T05GX0VORAorI2RlZmluZSBQQ0lfQ0FQX1NTSURfRU5ECShQQ0lfQ0FQX1NTSURfU1RBUlQgKyBQ Q0lfQ0FQX1NTSURfU0laRU9GKQogI2RlZmluZSBQQ0lfQ0FQX1BDSUVfU0laRU9GCShQQ0lfRVhQ X1NMVFNUQTIgKyAyKQotI2RlZmluZSBQQ0lfQ0FQX1BDSUVfU1RBUlQJUENJX0JSSURHRV9DT05G X0VORAorI2RlZmluZSBQQ0lfQ0FQX1BDSUVfU1RBUlQJUENJX0NBUF9TU0lEX0VORAogI2RlZmlu ZSBQQ0lfQ0FQX1BDSUVfRU5ECShQQ0lfQ0FQX1BDSUVfU1RBUlQgKyBQQ0lfQ0FQX1BDSUVfU0la RU9GKQogCiAvKioKQEAgLTMxNSw2ICszMTgsMjUgQEAgc3RydWN0IHBjaV9icmlkZ2VfcmVnX2Jl aGF2aW9yIHBjaWVfY2FwX3JlZ3NfYmVoYXZpb3JbUENJX0NBUF9QQ0lFX1NJWkVPRiAvIDRdID0K IAl9LAogfTsKIAorc3RhdGljIHBjaV9icmlkZ2VfZW11bF9yZWFkX3N0YXR1c190CitwY2lfYnJp ZGdlX2VtdWxfcmVhZF9zc2lkKHN0cnVjdCBwY2lfYnJpZGdlX2VtdWwgKmJyaWRnZSwgaW50IHJl ZywgdTMyICp2YWx1ZSkKK3sKKwlzd2l0Y2ggKHJlZykgeworCWNhc2UgUENJX0NBUF9MSVNUX0lE OgorCQkqdmFsdWUgPSBQQ0lfQ0FQX0lEX1NTVklEIHwKKwkJCShicmlkZ2UtPmhhc19wY2llID8g KFBDSV9DQVBfUENJRV9TVEFSVCA8PCA4KSA6IDApOworCQlyZXR1cm4gUENJX0JSSURHRV9FTVVM X0hBTkRMRUQ7CisKKwljYXNlIFBDSV9TU1ZJRF9WRU5ET1JfSUQ6CisJCSp2YWx1ZSA9IGJyaWRn ZS0+c3Vic3lzdGVtX3ZlbmRvcl9pZCB8CisJCQkoYnJpZGdlLT5zdWJzeXN0ZW1faWQgPDwgMTYp OworCQlyZXR1cm4gUENJX0JSSURHRV9FTVVMX0hBTkRMRUQ7CisKKwlkZWZhdWx0OgorCQlyZXR1 cm4gUENJX0JSSURHRV9FTVVMX05PVF9IQU5ETEVEOworCX0KK30KKwogLyoKICAqIEluaXRpYWxp emUgYSBwY2lfYnJpZGdlX2VtdWwgc3RydWN0dXJlIHRvIHJlcHJlc2VudCBhIGZha2UgUENJCiAg KiBicmlkZ2UgY29uZmlndXJhdGlvbiBzcGFjZS4gVGhlIGNhbGxlciBuZWVkcyB0byBoYXZlIGlu aXRpYWxpemVkCkBAIC0zMzcsOSArMzU5LDE3IEBAIGludCBwY2lfYnJpZGdlX2VtdWxfaW5pdChz dHJ1Y3QgcGNpX2JyaWRnZV9lbXVsICpicmlkZ2UsCiAJaWYgKCFicmlkZ2UtPnBjaV9yZWdzX2Jl aGF2aW9yKQogCQlyZXR1cm4gLUVOT01FTTsKIAotCWlmIChicmlkZ2UtPmhhc19wY2llKSB7CisJ aWYgKGJyaWRnZS0+c3Vic3lzdGVtX3ZlbmRvcl9pZCkKKwkJYnJpZGdlLT5jb25mLmNhcGFiaWxp dGllc19wb2ludGVyID0gUENJX0NBUF9TU0lEX1NUQVJUOworCWVsc2UgaWYgKGJyaWRnZS0+aGFz X3BjaWUpCiAJCWJyaWRnZS0+Y29uZi5jYXBhYmlsaXRpZXNfcG9pbnRlciA9IFBDSV9DQVBfUENJ RV9TVEFSVDsKKwllbHNlCisJCWJyaWRnZS0+Y29uZi5jYXBhYmlsaXRpZXNfcG9pbnRlciA9IDA7 CisKKwlpZiAoYnJpZGdlLT5jb25mLmNhcGFiaWxpdGllc19wb2ludGVyKQogCQlicmlkZ2UtPmNv bmYuc3RhdHVzIHw9IGNwdV90b19sZTE2KFBDSV9TVEFUVVNfQ0FQX0xJU1QpOworCisJaWYgKGJy aWRnZS0+aGFzX3BjaWUpIHsKIAkJYnJpZGdlLT5wY2llX2NvbmYuY2FwX2lkID0gUENJX0NBUF9J RF9FWFA7CiAJCWJyaWRnZS0+cGNpZV9jb25mLmNhcCB8PSBjcHVfdG9fbGUxNihQQ0lfRVhQX1RZ UEVfUk9PVF9QT1JUIDw8IDQpOwogCQlicmlkZ2UtPnBjaWVfY2FwX3JlZ3NfYmVoYXZpb3IgPQpA QCAtNDIzLDI2ICs0NTMsMjggQEAgaW50IHBjaV9icmlkZ2VfZW11bF9jb25mX3JlYWQoc3RydWN0 IHBjaV9icmlkZ2VfZW11bCAqYnJpZGdlLCBpbnQgd2hlcmUsCiAJCXJlYWRfb3AgPSBicmlkZ2Ut Pm9wcy0+cmVhZF9iYXNlOwogCQljZmdzcGFjZSA9IChfX2xlMzIgKikgJmJyaWRnZS0+Y29uZjsK IAkJYmVoYXZpb3IgPSBicmlkZ2UtPnBjaV9yZWdzX2JlaGF2aW9yOwotCX0gZWxzZSBpZiAoIWJy aWRnZS0+aGFzX3BjaWUpIHsKLQkJLyogUENJZSBzcGFjZSBpcyBub3QgaW1wbGVtZW50ZWQsIGFu ZCBubyBQQ0kgY2FwYWJpbGl0aWVzICovCi0JCSp2YWx1ZSA9IDA7Ci0JCXJldHVybiBQQ0lCSU9T X1NVQ0NFU1NGVUw7Ci0JfSBlbHNlIGlmIChyZWcgPCBQQ0lfQ0FQX1BDSUVfRU5EKSB7CisJfSBl bHNlIGlmIChyZWcgPj0gUENJX0NBUF9TU0lEX1NUQVJUICYmIHJlZyA8IFBDSV9DQVBfU1NJRF9F TkQgJiYgYnJpZGdlLT5zdWJzeXN0ZW1fdmVuZG9yX2lkKSB7CisJCS8qIEVtdWxhdGVkIFBDSSBC cmlkZ2UgU3Vic3lzdGVtIFZlbmRvciBJRCBjYXBhYmlsaXR5ICovCisJCXJlZyAtPSBQQ0lfQ0FQ X1NTSURfU1RBUlQ7CisJCXJlYWRfb3AgPSBwY2lfYnJpZGdlX2VtdWxfcmVhZF9zc2lkOworCQlj ZmdzcGFjZSA9IE5VTEw7CisJCWJlaGF2aW9yID0gTlVMTDsKKwl9IGVsc2UgaWYgKHJlZyA+PSBQ Q0lfQ0FQX1BDSUVfU1RBUlQgJiYgcmVnIDwgUENJX0NBUF9QQ0lFX0VORCAmJiBicmlkZ2UtPmhh c19wY2llKSB7CiAJCS8qIE91ciBlbXVsYXRlZCBQQ0llIGNhcGFiaWxpdHkgKi8KIAkJcmVnIC09 IFBDSV9DQVBfUENJRV9TVEFSVDsKIAkJcmVhZF9vcCA9IGJyaWRnZS0+b3BzLT5yZWFkX3BjaWU7 CiAJCWNmZ3NwYWNlID0gKF9fbGUzMiAqKSAmYnJpZGdlLT5wY2llX2NvbmY7CiAJCWJlaGF2aW9y ID0gYnJpZGdlLT5wY2llX2NhcF9yZWdzX2JlaGF2aW9yOwotCX0gZWxzZSBpZiAocmVnIDwgUENJ X0NGR19TUEFDRV9TSVpFKSB7Ci0JCS8qIFJlc3Qgb2YgUENJIHNwYWNlIG5vdCBpbXBsZW1lbnRl ZCAqLwotCQkqdmFsdWUgPSAwOwotCQlyZXR1cm4gUENJQklPU19TVUNDRVNTRlVMOwotCX0gZWxz ZSB7CisJfSBlbHNlIGlmIChyZWcgPj0gUENJX0NGR19TUEFDRV9TSVpFICYmIGJyaWRnZS0+aGFz X3BjaWUpIHsKIAkJLyogUENJZSBleHRlbmRlZCBjYXBhYmlsaXR5IHNwYWNlICovCiAJCXJlZyAt PSBQQ0lfQ0ZHX1NQQUNFX1NJWkU7CiAJCXJlYWRfb3AgPSBicmlkZ2UtPm9wcy0+cmVhZF9leHQ7 CiAJCWNmZ3NwYWNlID0gTlVMTDsKIAkJYmVoYXZpb3IgPSBOVUxMOworCX0gZWxzZSB7CisJCS8q IE5vdCBpbXBsZW1lbnRlZCAqLworCQkqdmFsdWUgPSAwOworCQlyZXR1cm4gUENJQklPU19TVUND RVNTRlVMOwogCX0KIAogCWlmIChyZWFkX29wKQpAQCAtNTAwLDI0ICs1MzIsMjEgQEAgaW50IHBj aV9icmlkZ2VfZW11bF9jb25mX3dyaXRlKHN0cnVjdCBwY2lfYnJpZGdlX2VtdWwgKmJyaWRnZSwg aW50IHdoZXJlLAogCQl3cml0ZV9vcCA9IGJyaWRnZS0+b3BzLT53cml0ZV9iYXNlOwogCQljZmdz cGFjZSA9IChfX2xlMzIgKikgJmJyaWRnZS0+Y29uZjsKIAkJYmVoYXZpb3IgPSBicmlkZ2UtPnBj aV9yZWdzX2JlaGF2aW9yOwotCX0gZWxzZSBpZiAoIWJyaWRnZS0+aGFzX3BjaWUpIHsKLQkJLyog UENJZSBzcGFjZSBpcyBub3QgaW1wbGVtZW50ZWQsIGFuZCBubyBQQ0kgY2FwYWJpbGl0aWVzICov Ci0JCXJldHVybiBQQ0lCSU9TX1NVQ0NFU1NGVUw7Ci0JfSBlbHNlIGlmIChyZWcgPCBQQ0lfQ0FQ X1BDSUVfRU5EKSB7CisJfSBlbHNlIGlmIChyZWcgPj0gUENJX0NBUF9QQ0lFX1NUQVJUICYmIHJl ZyA8IFBDSV9DQVBfUENJRV9FTkQgJiYgYnJpZGdlLT5oYXNfcGNpZSkgewogCQkvKiBPdXIgZW11 bGF0ZWQgUENJZSBjYXBhYmlsaXR5ICovCiAJCXJlZyAtPSBQQ0lfQ0FQX1BDSUVfU1RBUlQ7CiAJ CXdyaXRlX29wID0gYnJpZGdlLT5vcHMtPndyaXRlX3BjaWU7CiAJCWNmZ3NwYWNlID0gKF9fbGUz MiAqKSAmYnJpZGdlLT5wY2llX2NvbmY7CiAJCWJlaGF2aW9yID0gYnJpZGdlLT5wY2llX2NhcF9y ZWdzX2JlaGF2aW9yOwotCX0gZWxzZSBpZiAocmVnIDwgUENJX0NGR19TUEFDRV9TSVpFKSB7Ci0J CS8qIFJlc3Qgb2YgUENJIHNwYWNlIG5vdCBpbXBsZW1lbnRlZCAqLwotCQlyZXR1cm4gUENJQklP U19TVUNDRVNTRlVMOwotCX0gZWxzZSB7CisJfSBlbHNlIGlmIChyZWcgPj0gUENJX0NGR19TUEFD RV9TSVpFICYmIGJyaWRnZS0+aGFzX3BjaWUpIHsKIAkJLyogUENJZSBleHRlbmRlZCBjYXBhYmls aXR5IHNwYWNlICovCiAJCXJlZyAtPSBQQ0lfQ0ZHX1NQQUNFX1NJWkU7CiAJCXdyaXRlX29wID0g YnJpZGdlLT5vcHMtPndyaXRlX2V4dDsKIAkJY2Znc3BhY2UgPSBOVUxMOwogCQliZWhhdmlvciA9 IE5VTEw7CisJfSBlbHNlIHsKKwkJLyogTm90IGltcGxlbWVudGVkICovCisJCXJldHVybiBQQ0lC SU9TX1NVQ0NFU1NGVUw7CiAJfQogCiAJc2hpZnQgPSAod2hlcmUgJiAweDMpICogODsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvcGNpL3BjaS1icmlkZ2UtZW11bC5oIGIvZHJpdmVycy9wY2kvcGNpLWJy aWRnZS1lbXVsLmgKaW5kZXggNmI1Zjc1YjJhZDAyLi43MTM5MmI2NzQ3MWQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvcGNpL3BjaS1icmlkZ2UtZW11bC5oCisrKyBiL2RyaXZlcnMvcGNpL3BjaS1icmlk Z2UtZW11bC5oCkBAIC0xMzIsNiArMTMyLDggQEAgc3RydWN0IHBjaV9icmlkZ2VfZW11bCB7CiAJ c3RydWN0IHBjaV9icmlkZ2VfcmVnX2JlaGF2aW9yICpwY2llX2NhcF9yZWdzX2JlaGF2aW9yOwog CXZvaWQgKmRhdGE7CiAJYm9vbCBoYXNfcGNpZTsKKwl1MTYgc3Vic3lzdGVtX3ZlbmRvcl9pZDsK Kwl1MTYgc3Vic3lzdGVtX2lkOwogfTsKIAogZW51bSB7Ci0tIAoyLjIwLjEKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1h aWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xp c3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==