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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 200C8C43381 for ; Wed, 20 Feb 2019 09:48:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E16E82147C for ; Wed, 20 Feb 2019 09:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726317AbfBTJsz (ORCPT ); Wed, 20 Feb 2019 04:48:55 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:37275 "EHLO relay10.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725816AbfBTJsz (ORCPT ); Wed, 20 Feb 2019 04:48:55 -0500 Received: from localhost (aaubervilliers-681-1-81-190.w90-88.abo.wanadoo.fr [90.88.23.190]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 7EB3724001A; Wed, 20 Feb 2019 09:48:49 +0000 (UTC) From: Thomas Petazzoni To: Bjorn Helgaas , Lorenzo Pieralisi , linux-pci@vger.kernel.org Cc: Russell King , linux-arm-kernel@lists.infradead.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , =?UTF-8?q?Lu=C3=ADs=20Mendes?= , Leigh Brown , Thomas Petazzoni Subject: [PATCH 1/2] PCI: pci-bridge-emul: Create per-bridge copy of register behavior Date: Wed, 20 Feb 2019 10:48:40 +0100 Message-Id: <20190220094841.11129-2-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190220094841.11129-1-thomas.petazzoni@bootlin.com> References: <20190220094841.11129-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The behavior of the different registers of the PCI-to-PCI bridge is currently encoded in two global arrays, shared by all instances of PCI-to-PCI bridge emulation. However, we will need to tweak the behavior on a per-bridge basis, to accommodate for different capabilities of the platforms where this code is used. In preparation for this, this commit creates a per-bridge copy of the register behavior arrays, so that they can later be tweaked on a per-bridge basis. Reported-by: Luís Mendes Reported-by: Leigh Brown Cc: Luís Mendes Cc: Leigh Brown Fixes: 1f08673eef123 ("PCI: mvebu: Convert to PCI emulated bridge config space") Signed-off-by: Thomas Petazzoni --- drivers/pci/pci-bridge-emul.c | 80 +++++++++++++++++++++++------------ drivers/pci/pci-bridge-emul.h | 8 +++- 2 files changed, 60 insertions(+), 28 deletions(-) diff --git a/drivers/pci/pci-bridge-emul.c b/drivers/pci/pci-bridge-emul.c index 129738362d90..dd8d8060317e 100644 --- a/drivers/pci/pci-bridge-emul.c +++ b/drivers/pci/pci-bridge-emul.c @@ -24,29 +24,6 @@ #define PCI_CAP_PCIE_START PCI_BRIDGE_CONF_END #define PCI_CAP_PCIE_END (PCI_CAP_PCIE_START + PCI_EXP_SLTSTA2 + 2) -/* - * Initialize a pci_bridge_emul structure to represent a fake PCI - * bridge configuration space. The caller needs to have initialized - * the PCI configuration space with whatever values make sense - * (typically at least vendor, device, revision), the ->ops pointer, - * and optionally ->data and ->has_pcie. - */ -void pci_bridge_emul_init(struct pci_bridge_emul *bridge) -{ - bridge->conf.class_revision |= PCI_CLASS_BRIDGE_PCI << 16; - bridge->conf.header_type = PCI_HEADER_TYPE_BRIDGE; - bridge->conf.cache_line_size = 0x10; - bridge->conf.status = PCI_STATUS_CAP_LIST; - - if (bridge->has_pcie) { - bridge->conf.capabilities_pointer = PCI_CAP_PCIE_START; - bridge->pcie_conf.cap_id = PCI_CAP_ID_EXP; - /* Set PCIe v2, root port, slot support */ - bridge->pcie_conf.cap = PCI_EXP_TYPE_ROOT_PORT << 4 | 2 | - PCI_EXP_FLAGS_SLOT; - } -} - struct pci_bridge_reg_behavior { /* Read-only bits */ u32 ro; @@ -283,6 +260,55 @@ const static struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = { }, }; +/* + * Initialize a pci_bridge_emul structure to represent a fake PCI + * bridge configuration space. The caller needs to have initialized + * the PCI configuration space with whatever values make sense + * (typically at least vendor, device, revision), the ->ops pointer, + * and optionally ->data and ->has_pcie. + */ +int pci_bridge_emul_init(struct pci_bridge_emul *bridge) +{ + bridge->conf.class_revision |= PCI_CLASS_BRIDGE_PCI << 16; + bridge->conf.header_type = PCI_HEADER_TYPE_BRIDGE; + bridge->conf.cache_line_size = 0x10; + bridge->conf.status = PCI_STATUS_CAP_LIST; + bridge->pci_regs_behavior = kmemdup(pci_regs_behavior, + sizeof(pci_regs_behavior), + GFP_KERNEL); + if (!bridge->pci_regs_behavior) + return -ENOMEM; + + if (bridge->has_pcie) { + bridge->conf.capabilities_pointer = PCI_CAP_PCIE_START; + bridge->pcie_conf.cap_id = PCI_CAP_ID_EXP; + /* Set PCIe v2, root port, slot support */ + bridge->pcie_conf.cap = PCI_EXP_TYPE_ROOT_PORT << 4 | 2 | + PCI_EXP_FLAGS_SLOT; + bridge->pcie_cap_regs_behavior = + kmemdup(pcie_cap_regs_behavior, + sizeof(pcie_cap_regs_behavior), + GFP_KERNEL); + if (!bridge->pcie_cap_regs_behavior) { + kfree(bridge->pci_regs_behavior); + return -ENOMEM; + } + } + + return 0; +} + +/* + * Cleanup a pci_bridge_emul structure that was previously initilized + * using pci_bridge_emul_init(). + */ +void pci_bridge_emul_cleanup(struct pci_bridge_emul *bridge) +{ + if (bridge->has_pcie) + kfree(bridge->pcie_cap_regs_behavior); + kfree(bridge->pci_regs_behavior); +} + /* * Should be called by the PCI controller driver when reading the PCI * configuration space of the fake bridge. It will call back the @@ -312,11 +338,11 @@ int pci_bridge_emul_conf_read(struct pci_bridge_emul *bridge, int where, reg -= PCI_CAP_PCIE_START; read_op = bridge->ops->read_pcie; cfgspace = (u32 *) &bridge->pcie_conf; - behavior = pcie_cap_regs_behavior; + behavior = bridge->pcie_cap_regs_behavior; } else { read_op = bridge->ops->read_base; cfgspace = (u32 *) &bridge->conf; - behavior = pci_regs_behavior; + behavior = bridge->pci_regs_behavior; } if (read_op) @@ -383,11 +409,11 @@ int pci_bridge_emul_conf_write(struct pci_bridge_emul *bridge, int where, reg -= PCI_CAP_PCIE_START; write_op = bridge->ops->write_pcie; cfgspace = (u32 *) &bridge->pcie_conf; - behavior = pcie_cap_regs_behavior; + behavior = bridge->pcie_cap_regs_behavior; } else { write_op = bridge->ops->write_base; cfgspace = (u32 *) &bridge->conf; - behavior = pci_regs_behavior; + behavior = bridge->pci_regs_behavior; } /* Keep all bits, except the RW bits */ diff --git a/drivers/pci/pci-bridge-emul.h b/drivers/pci/pci-bridge-emul.h index 9d510ccf738b..f04637bb3222 100644 --- a/drivers/pci/pci-bridge-emul.h +++ b/drivers/pci/pci-bridge-emul.h @@ -107,15 +107,21 @@ struct pci_bridge_emul_ops { u32 old, u32 new, u32 mask); }; +struct pci_bridge_reg_behavior; + struct pci_bridge_emul { struct pci_bridge_emul_conf conf; struct pci_bridge_emul_pcie_conf pcie_conf; struct pci_bridge_emul_ops *ops; + struct pci_bridge_reg_behavior *pci_regs_behavior; + struct pci_bridge_reg_behavior *pcie_cap_regs_behavior; void *data; bool has_pcie; }; -void pci_bridge_emul_init(struct pci_bridge_emul *bridge); +int pci_bridge_emul_init(struct pci_bridge_emul *bridge); +void pci_bridge_emul_cleanup(struct pci_bridge_emul *bridge); + int pci_bridge_emul_conf_read(struct pci_bridge_emul *bridge, int where, int size, u32 *value); int pci_bridge_emul_conf_write(struct pci_bridge_emul *bridge, int where, -- 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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 7A9B9C43381 for ; Wed, 20 Feb 2019 09:49:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4E7842147C for ; Wed, 20 Feb 2019 09:49:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TcZGj+pF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E7842147C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.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=swItUxHxTEsUpmZ8SvVp80k4dfRiOlVLJdwLbz4jf2o=; b=TcZGj+pFQEcNgF eByYL7iPSiSpBCZT2riSu8/RiY+vPk/9kB+OoLTFLjMXBme9vsi7Ae1p9Iwx+4vVKK2lSJeYa8bMn J50T0hYjtxmLMHJDdUfmByoWgSBnzqdZ0ub5pYtg8uOs6YY1nms+c3KRCBXHUYmUXvGLJJ6jaA7bs zcN1rYxDq3b4Ak8m5cZktwL7ABIQQZtYfTf/E5ukd1BHVw9hsy3CegBr2QZO0+Mlzp5cZ+dkU4T9Q Ssz1KpQi+nIZ27QfPE6RbpknTIkZBw+3IWEXl6avRgWsJLnH7JaVdWsYrRpuQH+GiZgONwm6e06/7 ZkNVbcHxzPsVdG6L3ZiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwOVG-0005uX-RA; Wed, 20 Feb 2019 09:49:23 +0000 Received: from relay10.mail.gandi.net ([217.70.178.230]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwOUt-0005Si-4e for linux-arm-kernel@lists.infradead.org; Wed, 20 Feb 2019 09:49:01 +0000 Received: from localhost (aaubervilliers-681-1-81-190.w90-88.abo.wanadoo.fr [90.88.23.190]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 7EB3724001A; Wed, 20 Feb 2019 09:48:49 +0000 (UTC) From: Thomas Petazzoni To: Bjorn Helgaas , Lorenzo Pieralisi , linux-pci@vger.kernel.org Subject: [PATCH 1/2] PCI: pci-bridge-emul: Create per-bridge copy of register behavior Date: Wed, 20 Feb 2019 10:48:40 +0100 Message-Id: <20190220094841.11129-2-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190220094841.11129-1-thomas.petazzoni@bootlin.com> References: <20190220094841.11129-1-thomas.petazzoni@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190220_014859_613146_24FEBC23 X-CRM114-Status: GOOD ( 16.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Russell King , Jason Cooper , Gregory Clement , Thomas Petazzoni , Leigh Brown , =?UTF-8?q?Lu=C3=ADs=20Mendes?= , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlIGJlaGF2aW9yIG9mIHRoZSBkaWZmZXJlbnQgcmVnaXN0ZXJzIG9mIHRoZSBQQ0ktdG8tUENJ IGJyaWRnZSBpcwpjdXJyZW50bHkgZW5jb2RlZCBpbiB0d28gZ2xvYmFsIGFycmF5cywgc2hhcmVk IGJ5IGFsbCBpbnN0YW5jZXMgb2YKUENJLXRvLVBDSSBicmlkZ2UgZW11bGF0aW9uLgoKSG93ZXZl ciwgd2Ugd2lsbCBuZWVkIHRvIHR3ZWFrIHRoZSBiZWhhdmlvciBvbiBhIHBlci1icmlkZ2UgYmFz aXMsIHRvCmFjY29tbW9kYXRlIGZvciBkaWZmZXJlbnQgY2FwYWJpbGl0aWVzIG9mIHRoZSBwbGF0 Zm9ybXMgd2hlcmUgdGhpcwpjb2RlIGlzIHVzZWQuIEluIHByZXBhcmF0aW9uIGZvciB0aGlzLCB0 aGlzIGNvbW1pdCBjcmVhdGVzIGEKcGVyLWJyaWRnZSBjb3B5IG9mIHRoZSByZWdpc3RlciBiZWhh dmlvciBhcnJheXMsIHNvIHRoYXQgdGhleSBjYW4KbGF0ZXIgYmUgdHdlYWtlZCBvbiBhIHBlci1i cmlkZ2UgYmFzaXMuCgpSZXBvcnRlZC1ieTogTHXDrXMgTWVuZGVzIDxsdWlzLnAubWVuZGVzQGdt YWlsLmNvbT4KUmVwb3J0ZWQtYnk6IExlaWdoIEJyb3duIDxsZWlnaEBzb2xpbm5vLmNvLnVrPgpD YzogTHXDrXMgTWVuZGVzIDxsdWlzLnAubWVuZGVzQGdtYWlsLmNvbT4KQ2M6IExlaWdoIEJyb3du IDxsZWlnaEBzb2xpbm5vLmNvLnVrPgpGaXhlczogMWYwODY3M2VlZjEyMyAoIlBDSTogbXZlYnU6 IENvbnZlcnQgdG8gUENJIGVtdWxhdGVkIGJyaWRnZSBjb25maWcgc3BhY2UiKQpTaWduZWQtb2Zm LWJ5OiBUaG9tYXMgUGV0YXp6b25pIDx0aG9tYXMucGV0YXp6b25pQGJvb3RsaW4uY29tPgotLS0K IGRyaXZlcnMvcGNpL3BjaS1icmlkZ2UtZW11bC5jIHwgODAgKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0KIGRyaXZlcnMvcGNpL3BjaS1icmlkZ2UtZW11bC5oIHwgIDggKysrLQog MiBmaWxlcyBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL3BjaS9wY2ktYnJpZGdlLWVtdWwuYyBiL2RyaXZlcnMvcGNpL3BjaS1i cmlkZ2UtZW11bC5jCmluZGV4IDEyOTczODM2MmQ5MC4uZGQ4ZDgwNjAzMTdlIDEwMDY0NAotLS0g YS9kcml2ZXJzL3BjaS9wY2ktYnJpZGdlLWVtdWwuYworKysgYi9kcml2ZXJzL3BjaS9wY2ktYnJp ZGdlLWVtdWwuYwpAQCAtMjQsMjkgKzI0LDYgQEAKICNkZWZpbmUgUENJX0NBUF9QQ0lFX1NUQVJU CVBDSV9CUklER0VfQ09ORl9FTkQKICNkZWZpbmUgUENJX0NBUF9QQ0lFX0VORAkoUENJX0NBUF9Q Q0lFX1NUQVJUICsgUENJX0VYUF9TTFRTVEEyICsgMikKIAotLyoKLSAqIEluaXRpYWxpemUgYSBw Y2lfYnJpZGdlX2VtdWwgc3RydWN0dXJlIHRvIHJlcHJlc2VudCBhIGZha2UgUENJCi0gKiBicmlk Z2UgY29uZmlndXJhdGlvbiBzcGFjZS4gVGhlIGNhbGxlciBuZWVkcyB0byBoYXZlIGluaXRpYWxp emVkCi0gKiB0aGUgUENJIGNvbmZpZ3VyYXRpb24gc3BhY2Ugd2l0aCB3aGF0ZXZlciB2YWx1ZXMg bWFrZSBzZW5zZQotICogKHR5cGljYWxseSBhdCBsZWFzdCB2ZW5kb3IsIGRldmljZSwgcmV2aXNp b24pLCB0aGUgLT5vcHMgcG9pbnRlciwKLSAqIGFuZCBvcHRpb25hbGx5IC0+ZGF0YSBhbmQgLT5o YXNfcGNpZS4KLSAqLwotdm9pZCBwY2lfYnJpZGdlX2VtdWxfaW5pdChzdHJ1Y3QgcGNpX2JyaWRn ZV9lbXVsICpicmlkZ2UpCi17Ci0JYnJpZGdlLT5jb25mLmNsYXNzX3JldmlzaW9uIHw9IFBDSV9D TEFTU19CUklER0VfUENJIDw8IDE2OwotCWJyaWRnZS0+Y29uZi5oZWFkZXJfdHlwZSA9IFBDSV9I RUFERVJfVFlQRV9CUklER0U7Ci0JYnJpZGdlLT5jb25mLmNhY2hlX2xpbmVfc2l6ZSA9IDB4MTA7 Ci0JYnJpZGdlLT5jb25mLnN0YXR1cyA9IFBDSV9TVEFUVVNfQ0FQX0xJU1Q7Ci0KLQlpZiAoYnJp ZGdlLT5oYXNfcGNpZSkgewotCQlicmlkZ2UtPmNvbmYuY2FwYWJpbGl0aWVzX3BvaW50ZXIgPSBQ Q0lfQ0FQX1BDSUVfU1RBUlQ7Ci0JCWJyaWRnZS0+cGNpZV9jb25mLmNhcF9pZCA9IFBDSV9DQVBf SURfRVhQOwotCQkvKiBTZXQgUENJZSB2Miwgcm9vdCBwb3J0LCBzbG90IHN1cHBvcnQgKi8KLQkJ YnJpZGdlLT5wY2llX2NvbmYuY2FwID0gUENJX0VYUF9UWVBFX1JPT1RfUE9SVCA8PCA0IHwgMiB8 Ci0JCQlQQ0lfRVhQX0ZMQUdTX1NMT1Q7Ci0JfQotfQotCiBzdHJ1Y3QgcGNpX2JyaWRnZV9yZWdf YmVoYXZpb3IgewogCS8qIFJlYWQtb25seSBiaXRzICovCiAJdTMyIHJvOwpAQCAtMjgzLDYgKzI2 MCw1NSBAQCBjb25zdCBzdGF0aWMgc3RydWN0IHBjaV9icmlkZ2VfcmVnX2JlaGF2aW9yIHBjaWVf Y2FwX3JlZ3NfYmVoYXZpb3JbXSA9IHsKIAl9LAogfTsKIAorLyoKKyAqIEluaXRpYWxpemUgYSBw Y2lfYnJpZGdlX2VtdWwgc3RydWN0dXJlIHRvIHJlcHJlc2VudCBhIGZha2UgUENJCisgKiBicmlk Z2UgY29uZmlndXJhdGlvbiBzcGFjZS4gVGhlIGNhbGxlciBuZWVkcyB0byBoYXZlIGluaXRpYWxp emVkCisgKiB0aGUgUENJIGNvbmZpZ3VyYXRpb24gc3BhY2Ugd2l0aCB3aGF0ZXZlciB2YWx1ZXMg bWFrZSBzZW5zZQorICogKHR5cGljYWxseSBhdCBsZWFzdCB2ZW5kb3IsIGRldmljZSwgcmV2aXNp b24pLCB0aGUgLT5vcHMgcG9pbnRlciwKKyAqIGFuZCBvcHRpb25hbGx5IC0+ZGF0YSBhbmQgLT5o YXNfcGNpZS4KKyAqLworaW50IHBjaV9icmlkZ2VfZW11bF9pbml0KHN0cnVjdCBwY2lfYnJpZGdl X2VtdWwgKmJyaWRnZSkKK3sKKwlicmlkZ2UtPmNvbmYuY2xhc3NfcmV2aXNpb24gfD0gUENJX0NM QVNTX0JSSURHRV9QQ0kgPDwgMTY7CisJYnJpZGdlLT5jb25mLmhlYWRlcl90eXBlID0gUENJX0hF QURFUl9UWVBFX0JSSURHRTsKKwlicmlkZ2UtPmNvbmYuY2FjaGVfbGluZV9zaXplID0gMHgxMDsK KwlicmlkZ2UtPmNvbmYuc3RhdHVzID0gUENJX1NUQVRVU19DQVBfTElTVDsKKwlicmlkZ2UtPnBj aV9yZWdzX2JlaGF2aW9yID0ga21lbWR1cChwY2lfcmVnc19iZWhhdmlvciwKKwkJCQkJICAgIHNp emVvZihwY2lfcmVnc19iZWhhdmlvciksCisJCQkJCSAgICBHRlBfS0VSTkVMKTsKKwlpZiAoIWJy aWRnZS0+cGNpX3JlZ3NfYmVoYXZpb3IpCisJCXJldHVybiAtRU5PTUVNOworCisJaWYgKGJyaWRn ZS0+aGFzX3BjaWUpIHsKKwkJYnJpZGdlLT5jb25mLmNhcGFiaWxpdGllc19wb2ludGVyID0gUENJ X0NBUF9QQ0lFX1NUQVJUOworCQlicmlkZ2UtPnBjaWVfY29uZi5jYXBfaWQgPSBQQ0lfQ0FQX0lE X0VYUDsKKwkJLyogU2V0IFBDSWUgdjIsIHJvb3QgcG9ydCwgc2xvdCBzdXBwb3J0ICovCisJCWJy aWRnZS0+cGNpZV9jb25mLmNhcCA9IFBDSV9FWFBfVFlQRV9ST09UX1BPUlQgPDwgNCB8IDIgfAor CQkJUENJX0VYUF9GTEFHU19TTE9UOworCQlicmlkZ2UtPnBjaWVfY2FwX3JlZ3NfYmVoYXZpb3Ig PQorCQkJa21lbWR1cChwY2llX2NhcF9yZWdzX2JlaGF2aW9yLAorCQkJCXNpemVvZihwY2llX2Nh cF9yZWdzX2JlaGF2aW9yKSwKKwkJCQlHRlBfS0VSTkVMKTsKKwkJaWYgKCFicmlkZ2UtPnBjaWVf Y2FwX3JlZ3NfYmVoYXZpb3IpIHsKKwkJCWtmcmVlKGJyaWRnZS0+cGNpX3JlZ3NfYmVoYXZpb3Ip OworCQkJcmV0dXJuIC1FTk9NRU07CisJCX0KKwl9CisKKwlyZXR1cm4gMDsKK30KKworLyoKKyAq IENsZWFudXAgYSBwY2lfYnJpZGdlX2VtdWwgc3RydWN0dXJlIHRoYXQgd2FzIHByZXZpb3VzbHkg aW5pdGlsaXplZAorICogdXNpbmcgcGNpX2JyaWRnZV9lbXVsX2luaXQoKS4KKyAqLwordm9pZCBw Y2lfYnJpZGdlX2VtdWxfY2xlYW51cChzdHJ1Y3QgcGNpX2JyaWRnZV9lbXVsICpicmlkZ2UpCit7 CisJaWYgKGJyaWRnZS0+aGFzX3BjaWUpCisJCWtmcmVlKGJyaWRnZS0+cGNpZV9jYXBfcmVnc19i ZWhhdmlvcik7CisJa2ZyZWUoYnJpZGdlLT5wY2lfcmVnc19iZWhhdmlvcik7Cit9CisKIC8qCiAg KiBTaG91bGQgYmUgY2FsbGVkIGJ5IHRoZSBQQ0kgY29udHJvbGxlciBkcml2ZXIgd2hlbiByZWFk aW5nIHRoZSBQQ0kKICAqIGNvbmZpZ3VyYXRpb24gc3BhY2Ugb2YgdGhlIGZha2UgYnJpZGdlLiBJ dCB3aWxsIGNhbGwgYmFjayB0aGUKQEAgLTMxMiwxMSArMzM4LDExIEBAIGludCBwY2lfYnJpZGdl X2VtdWxfY29uZl9yZWFkKHN0cnVjdCBwY2lfYnJpZGdlX2VtdWwgKmJyaWRnZSwgaW50IHdoZXJl LAogCQlyZWcgLT0gUENJX0NBUF9QQ0lFX1NUQVJUOwogCQlyZWFkX29wID0gYnJpZGdlLT5vcHMt PnJlYWRfcGNpZTsKIAkJY2Znc3BhY2UgPSAodTMyICopICZicmlkZ2UtPnBjaWVfY29uZjsKLQkJ YmVoYXZpb3IgPSBwY2llX2NhcF9yZWdzX2JlaGF2aW9yOworCQliZWhhdmlvciA9IGJyaWRnZS0+ cGNpZV9jYXBfcmVnc19iZWhhdmlvcjsKIAl9IGVsc2UgewogCQlyZWFkX29wID0gYnJpZGdlLT5v cHMtPnJlYWRfYmFzZTsKIAkJY2Znc3BhY2UgPSAodTMyICopICZicmlkZ2UtPmNvbmY7Ci0JCWJl aGF2aW9yID0gcGNpX3JlZ3NfYmVoYXZpb3I7CisJCWJlaGF2aW9yID0gYnJpZGdlLT5wY2lfcmVn c19iZWhhdmlvcjsKIAl9CiAKIAlpZiAocmVhZF9vcCkKQEAgLTM4MywxMSArNDA5LDExIEBAIGlu dCBwY2lfYnJpZGdlX2VtdWxfY29uZl93cml0ZShzdHJ1Y3QgcGNpX2JyaWRnZV9lbXVsICpicmlk Z2UsIGludCB3aGVyZSwKIAkJcmVnIC09IFBDSV9DQVBfUENJRV9TVEFSVDsKIAkJd3JpdGVfb3Ag PSBicmlkZ2UtPm9wcy0+d3JpdGVfcGNpZTsKIAkJY2Znc3BhY2UgPSAodTMyICopICZicmlkZ2Ut PnBjaWVfY29uZjsKLQkJYmVoYXZpb3IgPSBwY2llX2NhcF9yZWdzX2JlaGF2aW9yOworCQliZWhh dmlvciA9IGJyaWRnZS0+cGNpZV9jYXBfcmVnc19iZWhhdmlvcjsKIAl9IGVsc2UgewogCQl3cml0 ZV9vcCA9IGJyaWRnZS0+b3BzLT53cml0ZV9iYXNlOwogCQljZmdzcGFjZSA9ICh1MzIgKikgJmJy aWRnZS0+Y29uZjsKLQkJYmVoYXZpb3IgPSBwY2lfcmVnc19iZWhhdmlvcjsKKwkJYmVoYXZpb3Ig PSBicmlkZ2UtPnBjaV9yZWdzX2JlaGF2aW9yOwogCX0KIAogCS8qIEtlZXAgYWxsIGJpdHMsIGV4 Y2VwdCB0aGUgUlcgYml0cyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvcGNpLWJyaWRnZS1l bXVsLmggYi9kcml2ZXJzL3BjaS9wY2ktYnJpZGdlLWVtdWwuaAppbmRleCA5ZDUxMGNjZjczOGIu LmYwNDYzN2JiMzIyMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvcGNpLWJyaWRnZS1lbXVsLmgK KysrIGIvZHJpdmVycy9wY2kvcGNpLWJyaWRnZS1lbXVsLmgKQEAgLTEwNywxNSArMTA3LDIxIEBA IHN0cnVjdCBwY2lfYnJpZGdlX2VtdWxfb3BzIHsKIAkJCSAgIHUzMiBvbGQsIHUzMiBuZXcsIHUz MiBtYXNrKTsKIH07CiAKK3N0cnVjdCBwY2lfYnJpZGdlX3JlZ19iZWhhdmlvcjsKKwogc3RydWN0 IHBjaV9icmlkZ2VfZW11bCB7CiAJc3RydWN0IHBjaV9icmlkZ2VfZW11bF9jb25mIGNvbmY7CiAJ c3RydWN0IHBjaV9icmlkZ2VfZW11bF9wY2llX2NvbmYgcGNpZV9jb25mOwogCXN0cnVjdCBwY2lf YnJpZGdlX2VtdWxfb3BzICpvcHM7CisJc3RydWN0IHBjaV9icmlkZ2VfcmVnX2JlaGF2aW9yICpw Y2lfcmVnc19iZWhhdmlvcjsKKwlzdHJ1Y3QgcGNpX2JyaWRnZV9yZWdfYmVoYXZpb3IgKnBjaWVf Y2FwX3JlZ3NfYmVoYXZpb3I7CiAJdm9pZCAqZGF0YTsKIAlib29sIGhhc19wY2llOwogfTsKIAot dm9pZCBwY2lfYnJpZGdlX2VtdWxfaW5pdChzdHJ1Y3QgcGNpX2JyaWRnZV9lbXVsICpicmlkZ2Up OworaW50IHBjaV9icmlkZ2VfZW11bF9pbml0KHN0cnVjdCBwY2lfYnJpZGdlX2VtdWwgKmJyaWRn ZSk7Cit2b2lkIHBjaV9icmlkZ2VfZW11bF9jbGVhbnVwKHN0cnVjdCBwY2lfYnJpZGdlX2VtdWwg KmJyaWRnZSk7CisKIGludCBwY2lfYnJpZGdlX2VtdWxfY29uZl9yZWFkKHN0cnVjdCBwY2lfYnJp ZGdlX2VtdWwgKmJyaWRnZSwgaW50IHdoZXJlLAogCQkJICAgICAgaW50IHNpemUsIHUzMiAqdmFs dWUpOwogaW50IHBjaV9icmlkZ2VfZW11bF9jb25mX3dyaXRlKHN0cnVjdCBwY2lfYnJpZGdlX2Vt dWwgKmJyaWRnZSwgaW50IHdoZXJlLAotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QK bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRl YWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=