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 D3D20C433F5 for ; Tue, 22 Feb 2022 16:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234203AbiBVQdv (ORCPT ); Tue, 22 Feb 2022 11:33:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234065AbiBVQcr (ORCPT ); Tue, 22 Feb 2022 11:32:47 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B96DBB091; Tue, 22 Feb 2022 08:32:21 -0800 (PST) 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 E90A360AC8; Tue, 22 Feb 2022 16:32:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F382EC340EB; Tue, 22 Feb 2022 16:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645547540; bh=8/bdC9IksqEvPqTzZhPSiT319NiwbJYyn6PKo0ZgPJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uYkxD0gbGh/IEja4Sz1GZLSbOoiKicNK6plE4O0wpzcKRLjV894SQOPmN8jQn4v6f cgi+r/Zh2VOygyZPVj5WvBfsYYd/fHO8qQskCUNq37ADEqu6IXavTPenSqvHM3kKk3 9YsX4iS+CJOlYPrqDfNwD5T4gg6RrhF/BsVC36DK0LtQn34w7Lcd+BuH6e8S7HvkWj oSjMx77titZx+lgFwXO0uUfIUfWRqyFb501QVz0xgHnEasrhwvPZkxlOkRAfi6z2I4 1a5f6z4qpl4ej6oL1PyH/mYr5aOWJh+Pq94sXNPslZWJmHzIgHFEz0Tvg+Ec6Je+Sm 34VhHjoqqrSww== Received: by pali.im (Postfix) id ABB3FFDB; Tue, 22 Feb 2022 17:32:19 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Andrew Lunn , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King , Gregory Clement Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] PCI: mvebu: Add support for sending Set_Slot_Power_Limit message Date: Tue, 22 Feb 2022 17:31:57 +0100 Message-Id: <20220222163158.1666-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220222163158.1666-1-pali@kernel.org> References: <20220222163158.1666-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 PCIe message is sent automatically by mvebu HW when link changes status from down to up. Slot power limit is read from DT property 'slot-power-limit-milliwatt' and set to mvebu HW. When this DT property is not specified then driver treat it as "Slot Capabilities register has not yet been initialized". Signed-off-by: Pali Rohár --- drivers/pci/controller/pci-mvebu.c | 85 ++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index a75d2b9196f9..c786feec4d17 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -66,6 +66,12 @@ #define PCIE_STAT_BUS 0xff00 #define PCIE_STAT_DEV 0x1f0000 #define PCIE_STAT_LINK_DOWN BIT(0) +#define PCIE_SSPL_OFF 0x1a0c +#define PCIE_SSPL_VALUE_SHIFT 0 +#define PCIE_SSPL_VALUE_MASK GENMASK(7, 0) +#define PCIE_SSPL_SCALE_SHIFT 8 +#define PCIE_SSPL_SCALE_MASK GENMASK(9, 8) +#define PCIE_SSPL_ENABLE BIT(16) #define PCIE_RC_RTSTA 0x1a14 #define PCIE_DEBUG_CTRL 0x1a60 #define PCIE_DEBUG_SOFT_RESET BIT(20) @@ -111,6 +117,8 @@ struct mvebu_pcie_port { struct mvebu_pcie_window iowin; u32 saved_pcie_stat; struct resource regs; + u8 slot_power_limit_value; + u8 slot_power_limit_scale; struct irq_domain *intx_irq_domain; raw_spinlock_t irq_lock; int intx_irq; @@ -239,7 +247,7 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) { - u32 ctrl, lnkcap, cmd, dev_rev, unmask; + u32 ctrl, lnkcap, cmd, dev_rev, unmask, sspl; /* Setup PCIe controller to Root Complex mode. */ ctrl = mvebu_readl(port, PCIE_CTRL_OFF); @@ -292,6 +300,20 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) /* Point PCIe unit MBUS decode windows to DRAM space. */ mvebu_pcie_setup_wins(port); + /* + * Program Root Complex to automatically sends Set Slot Power Limit + * PCIe Message when changing status from Dl-Down to Dl-Up and valid + * slot power limit was specified. + */ + sspl = mvebu_readl(port, PCIE_SSPL_OFF); + sspl &= ~(PCIE_SSPL_VALUE_MASK | PCIE_SSPL_SCALE_MASK | PCIE_SSPL_ENABLE); + if (port->slot_power_limit_value && port->slot_power_limit_scale) { + sspl |= port->slot_power_limit_value << PCIE_SSPL_VALUE_SHIFT; + sspl |= port->slot_power_limit_scale << PCIE_SSPL_SCALE_SHIFT; + sspl |= PCIE_SSPL_ENABLE; + } + mvebu_writel(port, sspl, PCIE_SSPL_OFF); + /* Mask all interrupt sources. */ mvebu_writel(port, ~PCIE_INT_ALL_MASK, PCIE_INT_UNMASK_OFF); @@ -628,9 +650,16 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge, (PCI_EXP_LNKSTA_DLLLA << 16) : 0); break; - case PCI_EXP_SLTCTL: - *value = PCI_EXP_SLTSTA_PDS << 16; + case PCI_EXP_SLTCTL: { + u16 slotsta = le16_to_cpu(bridge->pcie_conf.slotsta); + u32 val = 0; + if (!(mvebu_readl(port, PCIE_SSPL_OFF) & PCIE_SSPL_ENABLE)) + val |= PCI_EXP_SLTCTL_ASPL_DISABLE; + /* PCI_EXP_SLTCTL is 32-bit and contains also slot status bits */ + val |= slotsta << 16; + *value = val; break; + } case PCI_EXP_RTSTA: *value = mvebu_readl(port, PCIE_RC_RTSTA); @@ -774,6 +803,19 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge, mvebu_writel(port, new, PCIE_CAP_PCIEXP + PCI_EXP_LNKCTL); break; + case PCI_EXP_SLTCTL: + if ((mask & PCI_EXP_SLTCTL_ASPL_DISABLE) && + port->slot_power_limit_value && + port->slot_power_limit_scale) { + u32 sspl = mvebu_readl(port, PCIE_SSPL_OFF); + if (new & PCI_EXP_SLTCTL_ASPL_DISABLE) + sspl &= ~PCIE_SSPL_ENABLE; + else + sspl |= PCIE_SSPL_ENABLE; + mvebu_writel(port, sspl, PCIE_SSPL_OFF); + } + break; + case PCI_EXP_RTSTA: /* * PME Status bit in Root Status Register (PCIE_RC_RTSTA) @@ -868,8 +910,26 @@ static int mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port) /* * Older mvebu hardware provides PCIe Capability structure only in * version 1. New hardware provides it in version 2. + * Enable slot support which is emulated. */ - bridge->pcie_conf.cap = cpu_to_le16(pcie_cap_ver); + bridge->pcie_conf.cap = cpu_to_le16(pcie_cap_ver | PCI_EXP_FLAGS_SLOT); + + /* + * Set Presence Detect State bit permanently as there is no support for + * unplugging PCIe card from the slot. Assume that PCIe card is always + * connected in slot. + * + * Set physical slot number to port+1 as mvebu ports are indexed from + * zero and zero value is reserved for ports within the same silicon + * as Root Port which is not mvebu case. + * + * Also set correct slot power limit. + */ + bridge->pcie_conf.slotcap = cpu_to_le32( + (port->slot_power_limit_value << PCI_EXP_SLTCAP_SPLV_SHIFT) | + (port->slot_power_limit_scale << PCI_EXP_SLTCAP_SPLS_SHIFT) | + ((port->port+1) << PCI_EXP_SLTCAP_PSN_SHIFT)); + bridge->pcie_conf.slotsta = cpu_to_le16(PCI_EXP_SLTSTA_PDS); bridge->subsystem_vendor_id = ssdev_id & 0xffff; bridge->subsystem_id = ssdev_id >> 16; @@ -1191,6 +1251,7 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie, { struct device *dev = &pcie->pdev->dev; enum of_gpio_flags flags; + u32 slot_power_limit; int reset_gpio, ret; u32 num_lanes; @@ -1291,6 +1352,15 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie, port->reset_gpio = gpio_to_desc(reset_gpio); } + slot_power_limit = of_pci_get_slot_power_limit(child, + &port->slot_power_limit_value, + &port->slot_power_limit_scale); + if (slot_power_limit) + dev_info(dev, "%s: Slot power limit %u.%uW\n", + port->name, + slot_power_limit / 1000, + (slot_power_limit / 100) % 10); + port->clk = of_clk_get_by_name(child, NULL); if (IS_ERR(port->clk)) { dev_err(dev, "%s: cannot get clock\n", port->name); @@ -1587,7 +1657,7 @@ static int mvebu_pcie_remove(struct platform_device *pdev) { struct mvebu_pcie *pcie = platform_get_drvdata(pdev); struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie); - u32 cmd; + u32 cmd, sspl; int i; /* Remove PCI bus with all devices. */ @@ -1624,6 +1694,11 @@ static int mvebu_pcie_remove(struct platform_device *pdev) /* Free config space for emulated root bridge. */ pci_bridge_emul_cleanup(&port->bridge); + /* Disable sending Set Slot Power Limit PCIe Message. */ + sspl = mvebu_readl(port, PCIE_SSPL_OFF); + sspl &= ~(PCIE_SSPL_VALUE_MASK | PCIE_SSPL_SCALE_MASK | PCIE_SSPL_ENABLE); + mvebu_writel(port, sspl, PCIE_SSPL_OFF); + /* Disable and clear BARs and windows. */ mvebu_pcie_disable_wins(port); -- 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 A0F59C433EF for ; Tue, 22 Feb 2022 16:35:03 +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=sqbWI3yfoN8eF7Xrvob1ZGx9QPw3Oifb6dp/ttzxiNI=; b=nOYFFwGkfQcD9i LHiGzTWywMxrgU8quXrI1hE2dEzV3jBVV4OqOpa6yeLcrIz4WQuv0mtnIA8GIpbQNaE1mxlo+k1tJ pjF6jL7q0+BCA7QqSvL0AK/QiBSTGzLMb0LHjOsGkPN0WvMZfbUS584r04gN7Ibm0abTbM5+FclKs FEzh3JrNmU6w6goOpbmMyXv1G9cvozlDHUQlHM5anEpATWVcHXUoyv0/yPvoVnR3Q4YLpxuzA1brG Yc7JXhxtOQRNI3wTBBjAvkWihhmUDNBWOPlh4XKtXNJAEN3u7Pp5V6vSiHY7dHZDISDQbSCI3fihS TuOR9PeqXxdIq9vzFBkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMY6Z-00AePP-7R; Tue, 22 Feb 2022 16:33:35 +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 1nMY5N-00AdnR-1z for linux-arm-kernel@lists.infradead.org; Tue, 22 Feb 2022 16:32:23 +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 7CBF660AF4; Tue, 22 Feb 2022 16:32:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F382EC340EB; Tue, 22 Feb 2022 16:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645547540; bh=8/bdC9IksqEvPqTzZhPSiT319NiwbJYyn6PKo0ZgPJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uYkxD0gbGh/IEja4Sz1GZLSbOoiKicNK6plE4O0wpzcKRLjV894SQOPmN8jQn4v6f cgi+r/Zh2VOygyZPVj5WvBfsYYd/fHO8qQskCUNq37ADEqu6IXavTPenSqvHM3kKk3 9YsX4iS+CJOlYPrqDfNwD5T4gg6RrhF/BsVC36DK0LtQn34w7Lcd+BuH6e8S7HvkWj oSjMx77titZx+lgFwXO0uUfIUfWRqyFb501QVz0xgHnEasrhwvPZkxlOkRAfi6z2I4 1a5f6z4qpl4ej6oL1PyH/mYr5aOWJh+Pq94sXNPslZWJmHzIgHFEz0Tvg+Ec6Je+Sm 34VhHjoqqrSww== Received: by pali.im (Postfix) id ABB3FFDB; Tue, 22 Feb 2022 17:32:19 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Andrew Lunn , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King , Gregory Clement Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] PCI: mvebu: Add support for sending Set_Slot_Power_Limit message Date: Tue, 22 Feb 2022 17:31:57 +0100 Message-Id: <20220222163158.1666-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220222163158.1666-1-pali@kernel.org> References: <20220222163158.1666-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220222_083221_203342_29D1B5B4 X-CRM114-Status: GOOD ( 23.63 ) 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 VGhpcyBQQ0llIG1lc3NhZ2UgaXMgc2VudCBhdXRvbWF0aWNhbGx5IGJ5IG12ZWJ1IEhXIHdoZW4g bGluayBjaGFuZ2VzCnN0YXR1cyBmcm9tIGRvd24gdG8gdXAuCgpTbG90IHBvd2VyIGxpbWl0IGlz IHJlYWQgZnJvbSBEVCBwcm9wZXJ0eSAnc2xvdC1wb3dlci1saW1pdC1taWxsaXdhdHQnIGFuZApz ZXQgdG8gbXZlYnUgSFcuIFdoZW4gdGhpcyBEVCBwcm9wZXJ0eSBpcyBub3Qgc3BlY2lmaWVkIHRo ZW4gZHJpdmVyIHRyZWF0Cml0IGFzICJTbG90IENhcGFiaWxpdGllcyByZWdpc3RlciBoYXMgbm90 IHlldCBiZWVuIGluaXRpYWxpemVkIi4KClNpZ25lZC1vZmYtYnk6IFBhbGkgUm9ow6FyIDxwYWxp QGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZlYnUuYyB8IDg1 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDgwIGluc2Vy dGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29udHJv bGxlci9wY2ktbXZlYnUuYyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMKaW5k ZXggYTc1ZDJiOTE5NmY5Li5jNzg2ZmVlYzRkMTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL2Nv bnRyb2xsZXIvcGNpLW12ZWJ1LmMKKysrIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZl YnUuYwpAQCAtNjYsNiArNjYsMTIgQEAKICNkZWZpbmUgIFBDSUVfU1RBVF9CVVMgICAgICAgICAg ICAgICAgICAweGZmMDAKICNkZWZpbmUgIFBDSUVfU1RBVF9ERVYgICAgICAgICAgICAgICAgICAw eDFmMDAwMAogI2RlZmluZSAgUENJRV9TVEFUX0xJTktfRE9XTgkJQklUKDApCisjZGVmaW5lIFBD SUVfU1NQTF9PRkYJCTB4MWEwYworI2RlZmluZSAgUENJRV9TU1BMX1ZBTFVFX1NISUZUCQkwCisj ZGVmaW5lICBQQ0lFX1NTUExfVkFMVUVfTUFTSwkJR0VOTUFTSyg3LCAwKQorI2RlZmluZSAgUENJ RV9TU1BMX1NDQUxFX1NISUZUCQk4CisjZGVmaW5lICBQQ0lFX1NTUExfU0NBTEVfTUFTSwkJR0VO TUFTSyg5LCA4KQorI2RlZmluZSAgUENJRV9TU1BMX0VOQUJMRQkJQklUKDE2KQogI2RlZmluZSBQ Q0lFX1JDX1JUU1RBCQkweDFhMTQKICNkZWZpbmUgUENJRV9ERUJVR19DVFJMICAgICAgICAgMHgx YTYwCiAjZGVmaW5lICBQQ0lFX0RFQlVHX1NPRlRfUkVTRVQJCUJJVCgyMCkKQEAgLTExMSw2ICsx MTcsOCBAQCBzdHJ1Y3QgbXZlYnVfcGNpZV9wb3J0IHsKIAlzdHJ1Y3QgbXZlYnVfcGNpZV93aW5k b3cgaW93aW47CiAJdTMyIHNhdmVkX3BjaWVfc3RhdDsKIAlzdHJ1Y3QgcmVzb3VyY2UgcmVnczsK Kwl1OCBzbG90X3Bvd2VyX2xpbWl0X3ZhbHVlOworCXU4IHNsb3RfcG93ZXJfbGltaXRfc2NhbGU7 CiAJc3RydWN0IGlycV9kb21haW4gKmludHhfaXJxX2RvbWFpbjsKIAlyYXdfc3BpbmxvY2tfdCBp cnFfbG9jazsKIAlpbnQgaW50eF9pcnE7CkBAIC0yMzksNyArMjQ3LDcgQEAgc3RhdGljIHZvaWQg bXZlYnVfcGNpZV9zZXR1cF93aW5zKHN0cnVjdCBtdmVidV9wY2llX3BvcnQgKnBvcnQpCiAKIHN0 YXRpYyB2b2lkIG12ZWJ1X3BjaWVfc2V0dXBfaHcoc3RydWN0IG12ZWJ1X3BjaWVfcG9ydCAqcG9y dCkKIHsKLQl1MzIgY3RybCwgbG5rY2FwLCBjbWQsIGRldl9yZXYsIHVubWFzazsKKwl1MzIgY3Ry bCwgbG5rY2FwLCBjbWQsIGRldl9yZXYsIHVubWFzaywgc3NwbDsKIAogCS8qIFNldHVwIFBDSWUg Y29udHJvbGxlciB0byBSb290IENvbXBsZXggbW9kZS4gKi8KIAljdHJsID0gbXZlYnVfcmVhZGwo cG9ydCwgUENJRV9DVFJMX09GRik7CkBAIC0yOTIsNiArMzAwLDIwIEBAIHN0YXRpYyB2b2lkIG12 ZWJ1X3BjaWVfc2V0dXBfaHcoc3RydWN0IG12ZWJ1X3BjaWVfcG9ydCAqcG9ydCkKIAkvKiBQb2lu dCBQQ0llIHVuaXQgTUJVUyBkZWNvZGUgd2luZG93cyB0byBEUkFNIHNwYWNlLiAqLwogCW12ZWJ1 X3BjaWVfc2V0dXBfd2lucyhwb3J0KTsKIAorCS8qCisJICogUHJvZ3JhbSBSb290IENvbXBsZXgg dG8gYXV0b21hdGljYWxseSBzZW5kcyBTZXQgU2xvdCBQb3dlciBMaW1pdAorCSAqIFBDSWUgTWVz c2FnZSB3aGVuIGNoYW5naW5nIHN0YXR1cyBmcm9tIERsLURvd24gdG8gRGwtVXAgYW5kIHZhbGlk CisJICogc2xvdCBwb3dlciBsaW1pdCB3YXMgc3BlY2lmaWVkLgorCSAqLworCXNzcGwgPSBtdmVi dV9yZWFkbChwb3J0LCBQQ0lFX1NTUExfT0ZGKTsKKwlzc3BsICY9IH4oUENJRV9TU1BMX1ZBTFVF X01BU0sgfCBQQ0lFX1NTUExfU0NBTEVfTUFTSyB8IFBDSUVfU1NQTF9FTkFCTEUpOworCWlmIChw b3J0LT5zbG90X3Bvd2VyX2xpbWl0X3ZhbHVlICYmIHBvcnQtPnNsb3RfcG93ZXJfbGltaXRfc2Nh bGUpIHsKKwkJc3NwbCB8PSBwb3J0LT5zbG90X3Bvd2VyX2xpbWl0X3ZhbHVlIDw8IFBDSUVfU1NQ TF9WQUxVRV9TSElGVDsKKwkJc3NwbCB8PSBwb3J0LT5zbG90X3Bvd2VyX2xpbWl0X3NjYWxlIDw8 IFBDSUVfU1NQTF9TQ0FMRV9TSElGVDsKKwkJc3NwbCB8PSBQQ0lFX1NTUExfRU5BQkxFOworCX0K KwltdmVidV93cml0ZWwocG9ydCwgc3NwbCwgUENJRV9TU1BMX09GRik7CisKIAkvKiBNYXNrIGFs bCBpbnRlcnJ1cHQgc291cmNlcy4gKi8KIAltdmVidV93cml0ZWwocG9ydCwgflBDSUVfSU5UX0FM TF9NQVNLLCBQQ0lFX0lOVF9VTk1BU0tfT0ZGKTsKIApAQCAtNjI4LDkgKzY1MCwxNiBAQCBtdmVi dV9wY2lfYnJpZGdlX2VtdWxfcGNpZV9jb25mX3JlYWQoc3RydWN0IHBjaV9icmlkZ2VfZW11bCAq YnJpZGdlLAogCQkJICAoUENJX0VYUF9MTktTVEFfRExMTEEgPDwgMTYpIDogMCk7CiAJCWJyZWFr OwogCi0JY2FzZSBQQ0lfRVhQX1NMVENUTDoKLQkJKnZhbHVlID0gUENJX0VYUF9TTFRTVEFfUERT IDw8IDE2OworCWNhc2UgUENJX0VYUF9TTFRDVEw6IHsKKwkJdTE2IHNsb3RzdGEgPSBsZTE2X3Rv X2NwdShicmlkZ2UtPnBjaWVfY29uZi5zbG90c3RhKTsKKwkJdTMyIHZhbCA9IDA7CisJCWlmICgh KG12ZWJ1X3JlYWRsKHBvcnQsIFBDSUVfU1NQTF9PRkYpICYgUENJRV9TU1BMX0VOQUJMRSkpCisJ CQl2YWwgfD0gUENJX0VYUF9TTFRDVExfQVNQTF9ESVNBQkxFOworCQkvKiBQQ0lfRVhQX1NMVENU TCBpcyAzMi1iaXQgYW5kIGNvbnRhaW5zIGFsc28gc2xvdCBzdGF0dXMgYml0cyAqLworCQl2YWwg fD0gc2xvdHN0YSA8PCAxNjsKKwkJKnZhbHVlID0gdmFsOwogCQlicmVhazsKKwl9CiAKIAljYXNl IFBDSV9FWFBfUlRTVEE6CiAJCSp2YWx1ZSA9IG12ZWJ1X3JlYWRsKHBvcnQsIFBDSUVfUkNfUlRT VEEpOwpAQCAtNzc0LDYgKzgwMywxOSBAQCBtdmVidV9wY2lfYnJpZGdlX2VtdWxfcGNpZV9jb25m X3dyaXRlKHN0cnVjdCBwY2lfYnJpZGdlX2VtdWwgKmJyaWRnZSwKIAkJbXZlYnVfd3JpdGVsKHBv cnQsIG5ldywgUENJRV9DQVBfUENJRVhQICsgUENJX0VYUF9MTktDVEwpOwogCQlicmVhazsKIAor CWNhc2UgUENJX0VYUF9TTFRDVEw6CisJCWlmICgobWFzayAmIFBDSV9FWFBfU0xUQ1RMX0FTUExf RElTQUJMRSkgJiYKKwkJICAgIHBvcnQtPnNsb3RfcG93ZXJfbGltaXRfdmFsdWUgJiYKKwkJICAg IHBvcnQtPnNsb3RfcG93ZXJfbGltaXRfc2NhbGUpIHsKKwkJCXUzMiBzc3BsID0gbXZlYnVfcmVh ZGwocG9ydCwgUENJRV9TU1BMX09GRik7CisJCQlpZiAobmV3ICYgUENJX0VYUF9TTFRDVExfQVNQ TF9ESVNBQkxFKQorCQkJCXNzcGwgJj0gflBDSUVfU1NQTF9FTkFCTEU7CisJCQllbHNlCisJCQkJ c3NwbCB8PSBQQ0lFX1NTUExfRU5BQkxFOworCQkJbXZlYnVfd3JpdGVsKHBvcnQsIHNzcGwsIFBD SUVfU1NQTF9PRkYpOworCQl9CisJCWJyZWFrOworCiAJY2FzZSBQQ0lfRVhQX1JUU1RBOgogCQkv KgogCQkgKiBQTUUgU3RhdHVzIGJpdCBpbiBSb290IFN0YXR1cyBSZWdpc3RlciAoUENJRV9SQ19S VFNUQSkKQEAgLTg2OCw4ICs5MTAsMjYgQEAgc3RhdGljIGludCBtdmVidV9wY2lfYnJpZGdlX2Vt dWxfaW5pdChzdHJ1Y3QgbXZlYnVfcGNpZV9wb3J0ICpwb3J0KQogCS8qCiAJICogT2xkZXIgbXZl YnUgaGFyZHdhcmUgcHJvdmlkZXMgUENJZSBDYXBhYmlsaXR5IHN0cnVjdHVyZSBvbmx5IGluCiAJ ICogdmVyc2lvbiAxLiBOZXcgaGFyZHdhcmUgcHJvdmlkZXMgaXQgaW4gdmVyc2lvbiAyLgorCSAq IEVuYWJsZSBzbG90IHN1cHBvcnQgd2hpY2ggaXMgZW11bGF0ZWQuCiAJICovCi0JYnJpZGdlLT5w Y2llX2NvbmYuY2FwID0gY3B1X3RvX2xlMTYocGNpZV9jYXBfdmVyKTsKKwlicmlkZ2UtPnBjaWVf Y29uZi5jYXAgPSBjcHVfdG9fbGUxNihwY2llX2NhcF92ZXIgfCBQQ0lfRVhQX0ZMQUdTX1NMT1Qp OworCisJLyoKKwkgKiBTZXQgUHJlc2VuY2UgRGV0ZWN0IFN0YXRlIGJpdCBwZXJtYW5lbnRseSBh cyB0aGVyZSBpcyBubyBzdXBwb3J0IGZvcgorCSAqIHVucGx1Z2dpbmcgUENJZSBjYXJkIGZyb20g dGhlIHNsb3QuIEFzc3VtZSB0aGF0IFBDSWUgY2FyZCBpcyBhbHdheXMKKwkgKiBjb25uZWN0ZWQg aW4gc2xvdC4KKwkgKgorCSAqIFNldCBwaHlzaWNhbCBzbG90IG51bWJlciB0byBwb3J0KzEgYXMg bXZlYnUgcG9ydHMgYXJlIGluZGV4ZWQgZnJvbQorCSAqIHplcm8gYW5kIHplcm8gdmFsdWUgaXMg cmVzZXJ2ZWQgZm9yIHBvcnRzIHdpdGhpbiB0aGUgc2FtZSBzaWxpY29uCisJICogYXMgUm9vdCBQ b3J0IHdoaWNoIGlzIG5vdCBtdmVidSBjYXNlLgorCSAqCisJICogQWxzbyBzZXQgY29ycmVjdCBz bG90IHBvd2VyIGxpbWl0LgorCSAqLworCWJyaWRnZS0+cGNpZV9jb25mLnNsb3RjYXAgPSBjcHVf dG9fbGUzMigKKwkJKHBvcnQtPnNsb3RfcG93ZXJfbGltaXRfdmFsdWUgPDwgUENJX0VYUF9TTFRD QVBfU1BMVl9TSElGVCkgfAorCQkocG9ydC0+c2xvdF9wb3dlcl9saW1pdF9zY2FsZSA8PCBQQ0lf RVhQX1NMVENBUF9TUExTX1NISUZUKSB8CisJCSgocG9ydC0+cG9ydCsxKSA8PCBQQ0lfRVhQX1NM VENBUF9QU05fU0hJRlQpKTsKKwlicmlkZ2UtPnBjaWVfY29uZi5zbG90c3RhID0gY3B1X3RvX2xl MTYoUENJX0VYUF9TTFRTVEFfUERTKTsKIAogCWJyaWRnZS0+c3Vic3lzdGVtX3ZlbmRvcl9pZCA9 IHNzZGV2X2lkICYgMHhmZmZmOwogCWJyaWRnZS0+c3Vic3lzdGVtX2lkID0gc3NkZXZfaWQgPj4g MTY7CkBAIC0xMTkxLDYgKzEyNTEsNyBAQCBzdGF0aWMgaW50IG12ZWJ1X3BjaWVfcGFyc2VfcG9y dChzdHJ1Y3QgbXZlYnVfcGNpZSAqcGNpZSwKIHsKIAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmcGNp ZS0+cGRldi0+ZGV2OwogCWVudW0gb2ZfZ3Bpb19mbGFncyBmbGFnczsKKwl1MzIgc2xvdF9wb3dl cl9saW1pdDsKIAlpbnQgcmVzZXRfZ3BpbywgcmV0OwogCXUzMiBudW1fbGFuZXM7CiAKQEAgLTEy OTEsNiArMTM1MiwxNSBAQCBzdGF0aWMgaW50IG12ZWJ1X3BjaWVfcGFyc2VfcG9ydChzdHJ1Y3Qg bXZlYnVfcGNpZSAqcGNpZSwKIAkJcG9ydC0+cmVzZXRfZ3BpbyA9IGdwaW9fdG9fZGVzYyhyZXNl dF9ncGlvKTsKIAl9CiAKKwlzbG90X3Bvd2VyX2xpbWl0ID0gb2ZfcGNpX2dldF9zbG90X3Bvd2Vy X2xpbWl0KGNoaWxkLAorCQkJCSZwb3J0LT5zbG90X3Bvd2VyX2xpbWl0X3ZhbHVlLAorCQkJCSZw b3J0LT5zbG90X3Bvd2VyX2xpbWl0X3NjYWxlKTsKKwlpZiAoc2xvdF9wb3dlcl9saW1pdCkKKwkJ ZGV2X2luZm8oZGV2LCAiJXM6IFNsb3QgcG93ZXIgbGltaXQgJXUuJXVXXG4iLAorCQkJIHBvcnQt Pm5hbWUsCisJCQkgc2xvdF9wb3dlcl9saW1pdCAvIDEwMDAsCisJCQkgKHNsb3RfcG93ZXJfbGlt aXQgLyAxMDApICUgMTApOworCiAJcG9ydC0+Y2xrID0gb2ZfY2xrX2dldF9ieV9uYW1lKGNoaWxk LCBOVUxMKTsKIAlpZiAoSVNfRVJSKHBvcnQtPmNsaykpIHsKIAkJZGV2X2VycihkZXYsICIlczog Y2Fubm90IGdldCBjbG9ja1xuIiwgcG9ydC0+bmFtZSk7CkBAIC0xNTg3LDcgKzE2NTcsNyBAQCBz dGF0aWMgaW50IG12ZWJ1X3BjaWVfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYp CiB7CiAJc3RydWN0IG12ZWJ1X3BjaWUgKnBjaWUgPSBwbGF0Zm9ybV9nZXRfZHJ2ZGF0YShwZGV2 KTsKIAlzdHJ1Y3QgcGNpX2hvc3RfYnJpZGdlICpicmlkZ2UgPSBwY2lfaG9zdF9icmlkZ2VfZnJv bV9wcml2KHBjaWUpOwotCXUzMiBjbWQ7CisJdTMyIGNtZCwgc3NwbDsKIAlpbnQgaTsKIAogCS8q IFJlbW92ZSBQQ0kgYnVzIHdpdGggYWxsIGRldmljZXMuICovCkBAIC0xNjI0LDYgKzE2OTQsMTEg QEAgc3RhdGljIGludCBtdmVidV9wY2llX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2KQogCQkvKiBGcmVlIGNvbmZpZyBzcGFjZSBmb3IgZW11bGF0ZWQgcm9vdCBicmlkZ2UuICov CiAJCXBjaV9icmlkZ2VfZW11bF9jbGVhbnVwKCZwb3J0LT5icmlkZ2UpOwogCisJCS8qIERpc2Fi bGUgc2VuZGluZyBTZXQgU2xvdCBQb3dlciBMaW1pdCBQQ0llIE1lc3NhZ2UuICovCisJCXNzcGwg PSBtdmVidV9yZWFkbChwb3J0LCBQQ0lFX1NTUExfT0ZGKTsKKwkJc3NwbCAmPSB+KFBDSUVfU1NQ TF9WQUxVRV9NQVNLIHwgUENJRV9TU1BMX1NDQUxFX01BU0sgfCBQQ0lFX1NTUExfRU5BQkxFKTsK KwkJbXZlYnVfd3JpdGVsKHBvcnQsIHNzcGwsIFBDSUVfU1NQTF9PRkYpOworCiAJCS8qIERpc2Fi bGUgYW5kIGNsZWFyIEJBUnMgYW5kIHdpbmRvd3MuICovCiAJCW12ZWJ1X3BjaWVfZGlzYWJsZV93 aW5zKHBvcnQpOwogCi0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==