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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 E64D9C5519F for ; Mon, 30 Nov 2020 08:33:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C12B20719 for ; Mon, 30 Nov 2020 08:33:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WJ5AxPuY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727805AbgK3Idi (ORCPT ); Mon, 30 Nov 2020 03:33:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726950AbgK3Idh (ORCPT ); Mon, 30 Nov 2020 03:33:37 -0500 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 268EEC0613D4; Mon, 30 Nov 2020 00:32:57 -0800 (PST) Received: by mail-lj1-x231.google.com with SMTP id y10so16472995ljc.7; Mon, 30 Nov 2020 00:32:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HyXbdo2hXDjhZebrj1MjXRgu3sgvcOhu5l8NPDQBwRI=; b=WJ5AxPuYwLEAJRDdmAsTi8cZHbG2C1sDtyObblBhGXjJJFHcpe6gjSskGed2AgSZdp d3YXocVCwGt8ep0xsYgz+r91onJh4GnwdmcK/6L1TlxZpzqb8RToXnYBQAEaHS8EWiwy QXslelUKLHG8HoMC0RxM97yiEW4aQe9sJmwBYt/xFvgB2p3S7sH/vlvebBW0C8a6G5LH Ljvv7PbpnTg2YjPL6Jv0TXjXC9Of2SA9M5cVmWUCJ+9l2YXrGc7sjXoIHpBCfPtXya+L uddgtiygw7Gs3KtO/cTNZBILyXLw8dBtFd1pfN3tSb+Zt7V3BpqFBtdessu5Ml1zKm/W LOYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HyXbdo2hXDjhZebrj1MjXRgu3sgvcOhu5l8NPDQBwRI=; b=OGCGVCCecIbFlAfpwocVRm57zvjhqeUkZ5ycS13pXlPF8DApBdFUUW78wJHIbooqmt sa2rM3rfUwSvb/cNXfr1IzOuPmA6FoaRwiAYzi49COlf39+znSLWist+I6hDhfalqQ17 C4/zRNdjcxKfq8DitHrbSlYYCD/dAj84Ma45S8yfMaEX5ZVjAk/rs8rq0XgxsScDQAQk vs5x+6KYbppdzIvJadG0MSQiI3PCV9m+KxKL0X5kNXX/BFFGFzBsAQ+d2L4pDUwxtnLZ OfpzYaAGFHkQz9SOw5ibJpEvbA9emOQrwzMNmy74xKePfkwJb+wsnjuMdnY99n6vTcrU YSiw== X-Gm-Message-State: AOAM530mcS9KNDbJkrSO0SY9Btrmclzyi/W6wZ1m2Hf8UTrloXY8rYZW szVuThRSemOwq+XWpY+xwLFHiRYIkTE= X-Google-Smtp-Source: ABdhPJy6IT6LoolcCk/kaXobihraCsDZDLQCY0VHa91NksmJz9Ctv3qa0cg9dS2PCZswndkINvIVQQ== X-Received: by 2002:a05:651c:c7:: with SMTP id 7mr8636307ljr.116.1606725175530; Mon, 30 Nov 2020 00:32:55 -0800 (PST) Received: from elitebook.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id y81sm2355420lfc.100.2020.11.30.00.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 00:32:54 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Lorenzo Pieralisi Cc: Bjorn Helgaas , Rob Herring , linux-pci@vger.kernel.org, devicetree@vger.kernel.org, Florian Fainelli , Nicolas Saenz Julienne , Philipp Zabel , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V2 2/2] PCI: brcmstb: support BCM4908 with external PERST# signal controller Date: Mon, 30 Nov 2020 09:32:23 +0100 Message-Id: <20201130083223.32594-3-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130083223.32594-1-zajec5@gmail.com> References: <20201130083223.32594-1-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Rafał Miłecki BCM4908 uses external MISC block for controlling PERST# signal. Use it as a reset controller. Signed-off-by: Rafał Miłecki --- V2: Reorder BCM4908 in the enum pcie_type Use devm_reset_control_get_optional_exclusive() Don't move hw_rev read up in the code --- drivers/pci/controller/Kconfig | 2 +- drivers/pci/controller/pcie-brcmstb.c | 32 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index 64e2f5e379aa..d44c70bb88f6 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -273,7 +273,7 @@ config VMD config PCIE_BRCMSTB tristate "Broadcom Brcmstb PCIe host controller" - depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST + depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || COMPILE_TEST depends on OF depends on PCI_MSI_IRQ_DOMAIN default ARCH_BRCMSTB diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 9c3d2982248d..98536cf3af58 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -96,6 +96,7 @@ #define PCIE_MISC_REVISION 0x406c #define BRCM_PCIE_HW_REV_33 0x0303 +#define BRCM_PCIE_HW_REV_3_20 0x0320 #define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT 0x4070 #define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_MASK 0xfff00000 @@ -190,6 +191,7 @@ struct brcm_pcie; static inline void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, u32 val); +static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_perst_set_7278(struct brcm_pcie *pcie, u32 val); static inline void brcm_pcie_perst_set_generic(struct brcm_pcie *pcie, u32 val); @@ -206,6 +208,7 @@ enum { enum pcie_type { GENERIC, + BCM4908, BCM7278, BCM2711, }; @@ -230,6 +233,13 @@ static const struct pcie_cfg_data generic_cfg = { .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, }; +static const struct pcie_cfg_data bcm4908_cfg = { + .offsets = pcie_offsets, + .type = BCM4908, + .perst_set = brcm_pcie_perst_set_4908, + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, +}; + static const int pcie_offset_bcm7278[] = { [RGR1_SW_INIT_1] = 0xc010, [EXT_CFG_INDEX] = 0x9000, @@ -282,6 +292,7 @@ struct brcm_pcie { const int *reg_offsets; enum pcie_type type; struct reset_control *rescal; + struct reset_control *perst_reset; int num_memc; u64 memc_size[PCIE_BRCM_MAX_MEMC]; u32 hw_rev; @@ -747,6 +758,17 @@ static inline void brcm_pcie_bridge_sw_init_set_7278(struct brcm_pcie *pcie, u32 writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); } +static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val) +{ + if (WARN_ONCE(!pcie->perst_reset, "missing PERST# reset controller\n")) + return; + + if (val) + reset_control_assert(pcie->perst_reset); + else + reset_control_deassert(pcie->perst_reset); +} + static inline void brcm_pcie_perst_set_7278(struct brcm_pcie *pcie, u32 val) { u32 tmp; @@ -1206,6 +1228,7 @@ static int brcm_pcie_remove(struct platform_device *pdev) static const struct of_device_id brcm_pcie_match[] = { { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg }, + { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, { .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg }, { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg }, { .compatible = "brcm,bcm7216-pcie", .data = &bcm7278_cfg }, @@ -1262,6 +1285,11 @@ static int brcm_pcie_probe(struct platform_device *pdev) clk_disable_unprepare(pcie->clk); return PTR_ERR(pcie->rescal); } + pcie->perst_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "perst"); + if (IS_ERR(pcie->perst_reset)) { + clk_disable_unprepare(pcie->clk); + return PTR_ERR(pcie->perst_reset); + } ret = reset_control_deassert(pcie->rescal); if (ret) @@ -1279,6 +1307,10 @@ static int brcm_pcie_probe(struct platform_device *pdev) goto fail; pcie->hw_rev = readl(pcie->base + PCIE_MISC_REVISION); + if (pcie->type == BCM4908 && pcie->hw_rev >= BRCM_PCIE_HW_REV_3_20) { + dev_err(pcie->dev, "hardware revision with unsupported PERST# setup\n"); + goto fail; + } msi_np = of_parse_phandle(pcie->np, "msi-parent", 0); if (pci_msi_enabled() && msi_np == pcie->np) { -- 2.26.2 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,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 8EF39C5519F for ; Mon, 30 Nov 2020 08:34:24 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 1BA84207BC for ; Mon, 30 Nov 2020 08:34:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PT/fOSYn"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WJ5AxPuY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BA84207BC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.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=9+yeA+dHw4Y4ZNwe3jd12/wGgaZ1krxdxr5HNPBZP9A=; b=PT/fOSYn+NssvPDP3rSnC4Xnf tDDpN/KUnkjaYRLJaqZLQDh3z9HAifl9RCT89YTCZlIntI4o7H24fOCS7w4muZf8U8yigC9wdQjy9 4ErMxuwjA2G7M66QYCywk71fpEw72RHkX3epb7Ea2QngxboM9aw7kSEj2GnGtHgi6wkyk3v3lHoHN 0OwMtumfQJ2CpA8e0EKIwZDj+naB5ESRFcfkjw8KnY5PR2MLK0B1QXKOR2WTWk0VdWYAZY4+His8Z dl3osPntppaxJg+93fIcdIG+q1ObDDcBPYCCLmSPmsFCUE5dggblNFJo7LKwf3kCp0HeOKTPyv9As 9Y7an23hA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kjecS-0001wy-1l; Mon, 30 Nov 2020 08:33:12 +0000 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kjecD-0001sW-9e; Mon, 30 Nov 2020 08:32:58 +0000 Received: by mail-lj1-x232.google.com with SMTP id q8so7446084ljc.12; Mon, 30 Nov 2020 00:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HyXbdo2hXDjhZebrj1MjXRgu3sgvcOhu5l8NPDQBwRI=; b=WJ5AxPuYwLEAJRDdmAsTi8cZHbG2C1sDtyObblBhGXjJJFHcpe6gjSskGed2AgSZdp d3YXocVCwGt8ep0xsYgz+r91onJh4GnwdmcK/6L1TlxZpzqb8RToXnYBQAEaHS8EWiwy QXslelUKLHG8HoMC0RxM97yiEW4aQe9sJmwBYt/xFvgB2p3S7sH/vlvebBW0C8a6G5LH Ljvv7PbpnTg2YjPL6Jv0TXjXC9Of2SA9M5cVmWUCJ+9l2YXrGc7sjXoIHpBCfPtXya+L uddgtiygw7Gs3KtO/cTNZBILyXLw8dBtFd1pfN3tSb+Zt7V3BpqFBtdessu5Ml1zKm/W LOYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HyXbdo2hXDjhZebrj1MjXRgu3sgvcOhu5l8NPDQBwRI=; b=TGaviMYX46KmnFgYKLV1GW5tAIUEw7xw0So9eFffRYk3hPbjSBLR3DKLENnIr4eEKS d2JQbDb2O/oyAuZCRElULVMAVZzy0k/wO3LxvQys0Q/SRcS5eNNGXKMiPkAWJRI3lG1N 9PYOkerKLSr9SenqMHXTnju3wNrGo9AqUHanresPSjBsdQkHWhG/2VIWo7rwfalKKrWt Dk+Gvhd9DaESDX3TMPzqGOPUwUFialH7qi6zBZ1Dn7XP6k11o+O5klFuAn/HmJEJ9GM8 YCszOPHqBKI0HOv3d+1kQVqpYsWEx9WaIWfoajWZcrvfEsYH9sm9WwGBJYoAhLyplgtM cgkA== X-Gm-Message-State: AOAM530M72VrhaHpIO8jxmaT1xZC6gcDvAKiedyHSB/MySKzD5Zu723N p6GBVNJaT0A0L2+FhJgtRJg= X-Google-Smtp-Source: ABdhPJy6IT6LoolcCk/kaXobihraCsDZDLQCY0VHa91NksmJz9Ctv3qa0cg9dS2PCZswndkINvIVQQ== X-Received: by 2002:a05:651c:c7:: with SMTP id 7mr8636307ljr.116.1606725175530; Mon, 30 Nov 2020 00:32:55 -0800 (PST) Received: from elitebook.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id y81sm2355420lfc.100.2020.11.30.00.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 00:32:54 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Lorenzo Pieralisi Subject: [PATCH V2 2/2] PCI: brcmstb: support BCM4908 with external PERST# signal controller Date: Mon, 30 Nov 2020 09:32:23 +0100 Message-Id: <20201130083223.32594-3-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130083223.32594-1-zajec5@gmail.com> References: <20201130083223.32594-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201130_033257_419524_E0A82F40 X-CRM114-Status: GOOD ( 20.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Florian Fainelli , linux-pci@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Rob Herring , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Philipp Zabel , Bjorn Helgaas , Nicolas Saenz Julienne 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 RnJvbTogUmFmYcWCIE1pxYJlY2tpIDxyYWZhbEBtaWxlY2tpLnBsPgoKQkNNNDkwOCB1c2VzIGV4 dGVybmFsIE1JU0MgYmxvY2sgZm9yIGNvbnRyb2xsaW5nIFBFUlNUIyBzaWduYWwuIFVzZSBpdAph cyBhIHJlc2V0IGNvbnRyb2xsZXIuCgpTaWduZWQtb2ZmLWJ5OiBSYWZhxYIgTWnFgmVja2kgPHJh ZmFsQG1pbGVja2kucGw+Ci0tLQpWMjogUmVvcmRlciBCQ000OTA4IGluIHRoZSBlbnVtIHBjaWVf dHlwZQogICAgVXNlIGRldm1fcmVzZXRfY29udHJvbF9nZXRfb3B0aW9uYWxfZXhjbHVzaXZlKCkK ICAgIERvbid0IG1vdmUgaHdfcmV2IHJlYWQgdXAgaW4gdGhlIGNvZGUKLS0tCiBkcml2ZXJzL3Bj aS9jb250cm9sbGVyL0tjb25maWcgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvcGNpL2NvbnRyb2xs ZXIvcGNpZS1icmNtc3RiLmMgfCAzMiArKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmls ZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvS2NvbmZpZyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIv S2NvbmZpZwppbmRleCA2NGUyZjVlMzc5YWEuLmQ0NGM3MGJiODhmNiAxMDA2NDQKLS0tIGEvZHJp dmVycy9wY2kvY29udHJvbGxlci9LY29uZmlnCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIv S2NvbmZpZwpAQCAtMjczLDcgKzI3Myw3IEBAIGNvbmZpZyBWTUQKIAogY29uZmlnIFBDSUVfQlJD TVNUQgogCXRyaXN0YXRlICJCcm9hZGNvbSBCcmNtc3RiIFBDSWUgaG9zdCBjb250cm9sbGVyIgot CWRlcGVuZHMgb24gQVJDSF9CUkNNU1RCIHx8IEFSQ0hfQkNNMjgzNSB8fCBDT01QSUxFX1RFU1QK KwlkZXBlbmRzIG9uIEFSQ0hfQlJDTVNUQiB8fCBBUkNIX0JDTTI4MzUgfHwgQVJDSF9CQ000OTA4 IHx8IENPTVBJTEVfVEVTVAogCWRlcGVuZHMgb24gT0YKIAlkZXBlbmRzIG9uIFBDSV9NU0lfSVJR X0RPTUFJTgogCWRlZmF1bHQgQVJDSF9CUkNNU1RCCmRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9j b250cm9sbGVyL3BjaWUtYnJjbXN0Yi5jIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2llLWJy Y21zdGIuYwppbmRleCA5YzNkMjk4MjI0OGQuLjk4NTM2Y2YzYWY1OCAxMDA2NDQKLS0tIGEvZHJp dmVycy9wY2kvY29udHJvbGxlci9wY2llLWJyY21zdGIuYworKysgYi9kcml2ZXJzL3BjaS9jb250 cm9sbGVyL3BjaWUtYnJjbXN0Yi5jCkBAIC05Niw2ICs5Niw3IEBACiAKICNkZWZpbmUgUENJRV9N SVNDX1JFVklTSU9OCQkJCTB4NDA2YwogI2RlZmluZSAgQlJDTV9QQ0lFX0hXX1JFVl8zMwkJCQkw eDAzMDMKKyNkZWZpbmUgIEJSQ01fUENJRV9IV19SRVZfM18yMAkJCQkweDAzMjAKIAogI2RlZmlu ZSBQQ0lFX01JU0NfQ1BVXzJfUENJRV9NRU1fV0lOMF9CQVNFX0xJTUlUCQkweDQwNzAKICNkZWZp bmUgIFBDSUVfTUlTQ19DUFVfMl9QQ0lFX01FTV9XSU4wX0JBU0VfTElNSVRfTElNSVRfTUFTSwkw eGZmZjAwMDAwCkBAIC0xOTAsNiArMTkxLDcgQEAKIHN0cnVjdCBicmNtX3BjaWU7CiBzdGF0aWMg aW5saW5lIHZvaWQgYnJjbV9wY2llX2JyaWRnZV9zd19pbml0X3NldF83Mjc4KHN0cnVjdCBicmNt X3BjaWUgKnBjaWUsIHUzMiB2YWwpOwogc3RhdGljIGlubGluZSB2b2lkIGJyY21fcGNpZV9icmlk Z2Vfc3dfaW5pdF9zZXRfZ2VuZXJpYyhzdHJ1Y3QgYnJjbV9wY2llICpwY2llLCB1MzIgdmFsKTsK K3N0YXRpYyBpbmxpbmUgdm9pZCBicmNtX3BjaWVfcGVyc3Rfc2V0XzQ5MDgoc3RydWN0IGJyY21f cGNpZSAqcGNpZSwgdTMyIHZhbCk7CiBzdGF0aWMgaW5saW5lIHZvaWQgYnJjbV9wY2llX3BlcnN0 X3NldF83Mjc4KHN0cnVjdCBicmNtX3BjaWUgKnBjaWUsIHUzMiB2YWwpOwogc3RhdGljIGlubGlu ZSB2b2lkIGJyY21fcGNpZV9wZXJzdF9zZXRfZ2VuZXJpYyhzdHJ1Y3QgYnJjbV9wY2llICpwY2ll LCB1MzIgdmFsKTsKIApAQCAtMjA2LDYgKzIwOCw3IEBAIGVudW0gewogCiBlbnVtIHBjaWVfdHlw ZSB7CiAJR0VORVJJQywKKwlCQ000OTA4LAogCUJDTTcyNzgsCiAJQkNNMjcxMSwKIH07CkBAIC0y MzAsNiArMjMzLDEzIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcGNpZV9jZmdfZGF0YSBnZW5lcmlj X2NmZyA9IHsKIAkuYnJpZGdlX3N3X2luaXRfc2V0ID0gYnJjbV9wY2llX2JyaWRnZV9zd19pbml0 X3NldF9nZW5lcmljLAogfTsKIAorc3RhdGljIGNvbnN0IHN0cnVjdCBwY2llX2NmZ19kYXRhIGJj bTQ5MDhfY2ZnID0geworCS5vZmZzZXRzCT0gcGNpZV9vZmZzZXRzLAorCS50eXBlCQk9IEJDTTQ5 MDgsCisJLnBlcnN0X3NldAk9IGJyY21fcGNpZV9wZXJzdF9zZXRfNDkwOCwKKwkuYnJpZGdlX3N3 X2luaXRfc2V0ID0gYnJjbV9wY2llX2JyaWRnZV9zd19pbml0X3NldF9nZW5lcmljLAorfTsKKwog c3RhdGljIGNvbnN0IGludCBwY2llX29mZnNldF9iY203Mjc4W10gPSB7CiAJW1JHUjFfU1dfSU5J VF8xXSA9IDB4YzAxMCwKIAlbRVhUX0NGR19JTkRFWF0gPSAweDkwMDAsCkBAIC0yODIsNiArMjky LDcgQEAgc3RydWN0IGJyY21fcGNpZSB7CiAJY29uc3QgaW50CQkqcmVnX29mZnNldHM7CiAJZW51 bSBwY2llX3R5cGUJCXR5cGU7CiAJc3RydWN0IHJlc2V0X2NvbnRyb2wJKnJlc2NhbDsKKwlzdHJ1 Y3QgcmVzZXRfY29udHJvbAkqcGVyc3RfcmVzZXQ7CiAJaW50CQkJbnVtX21lbWM7CiAJdTY0CQkJ bWVtY19zaXplW1BDSUVfQlJDTV9NQVhfTUVNQ107CiAJdTMyCQkJaHdfcmV2OwpAQCAtNzQ3LDYg Kzc1OCwxNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgYnJjbV9wY2llX2JyaWRnZV9zd19pbml0X3Nl dF83Mjc4KHN0cnVjdCBicmNtX3BjaWUgKnBjaWUsIHUzMgogCXdyaXRlbCh0bXAsIHBjaWUtPmJh c2UgKyBQQ0lFX1JHUjFfU1dfSU5JVF8xKHBjaWUpKTsKIH0KIAorc3RhdGljIGlubGluZSB2b2lk IGJyY21fcGNpZV9wZXJzdF9zZXRfNDkwOChzdHJ1Y3QgYnJjbV9wY2llICpwY2llLCB1MzIgdmFs KQoreworCWlmIChXQVJOX09OQ0UoIXBjaWUtPnBlcnN0X3Jlc2V0LCAibWlzc2luZyBQRVJTVCMg cmVzZXQgY29udHJvbGxlclxuIikpCisJCXJldHVybjsKKworCWlmICh2YWwpCisJCXJlc2V0X2Nv bnRyb2xfYXNzZXJ0KHBjaWUtPnBlcnN0X3Jlc2V0KTsKKwllbHNlCisJCXJlc2V0X2NvbnRyb2xf ZGVhc3NlcnQocGNpZS0+cGVyc3RfcmVzZXQpOworfQorCiBzdGF0aWMgaW5saW5lIHZvaWQgYnJj bV9wY2llX3BlcnN0X3NldF83Mjc4KHN0cnVjdCBicmNtX3BjaWUgKnBjaWUsIHUzMiB2YWwpCiB7 CiAJdTMyIHRtcDsKQEAgLTEyMDYsNiArMTIyOCw3IEBAIHN0YXRpYyBpbnQgYnJjbV9wY2llX3Jl bW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCiBzdGF0aWMgY29uc3Qgc3RydWN0 IG9mX2RldmljZV9pZCBicmNtX3BjaWVfbWF0Y2hbXSA9IHsKIAl7IC5jb21wYXRpYmxlID0gImJy Y20sYmNtMjcxMS1wY2llIiwgLmRhdGEgPSAmYmNtMjcxMV9jZmcgfSwKKwl7IC5jb21wYXRpYmxl ID0gImJyY20sYmNtNDkwOC1wY2llIiwgLmRhdGEgPSAmYmNtNDkwOF9jZmcgfSwKIAl7IC5jb21w YXRpYmxlID0gImJyY20sYmNtNzIxMS1wY2llIiwgLmRhdGEgPSAmZ2VuZXJpY19jZmcgfSwKIAl7 IC5jb21wYXRpYmxlID0gImJyY20sYmNtNzI3OC1wY2llIiwgLmRhdGEgPSAmYmNtNzI3OF9jZmcg fSwKIAl7IC5jb21wYXRpYmxlID0gImJyY20sYmNtNzIxNi1wY2llIiwgLmRhdGEgPSAmYmNtNzI3 OF9jZmcgfSwKQEAgLTEyNjIsNiArMTI4NSwxMSBAQCBzdGF0aWMgaW50IGJyY21fcGNpZV9wcm9i ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCQljbGtfZGlzYWJsZV91bnByZXBhcmUo cGNpZS0+Y2xrKTsKIAkJcmV0dXJuIFBUUl9FUlIocGNpZS0+cmVzY2FsKTsKIAl9CisJcGNpZS0+ cGVyc3RfcmVzZXQgPSBkZXZtX3Jlc2V0X2NvbnRyb2xfZ2V0X29wdGlvbmFsX2V4Y2x1c2l2ZSgm cGRldi0+ZGV2LCAicGVyc3QiKTsKKwlpZiAoSVNfRVJSKHBjaWUtPnBlcnN0X3Jlc2V0KSkgewor CQljbGtfZGlzYWJsZV91bnByZXBhcmUocGNpZS0+Y2xrKTsKKwkJcmV0dXJuIFBUUl9FUlIocGNp ZS0+cGVyc3RfcmVzZXQpOworCX0KIAogCXJldCA9IHJlc2V0X2NvbnRyb2xfZGVhc3NlcnQocGNp ZS0+cmVzY2FsKTsKIAlpZiAocmV0KQpAQCAtMTI3OSw2ICsxMzA3LDEwIEBAIHN0YXRpYyBpbnQg YnJjbV9wY2llX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCWdvdG8gZmFp bDsKIAogCXBjaWUtPmh3X3JldiA9IHJlYWRsKHBjaWUtPmJhc2UgKyBQQ0lFX01JU0NfUkVWSVNJ T04pOworCWlmIChwY2llLT50eXBlID09IEJDTTQ5MDggJiYgcGNpZS0+aHdfcmV2ID49IEJSQ01f UENJRV9IV19SRVZfM18yMCkgeworCQlkZXZfZXJyKHBjaWUtPmRldiwgImhhcmR3YXJlIHJldmlz aW9uIHdpdGggdW5zdXBwb3J0ZWQgUEVSU1QjIHNldHVwXG4iKTsKKwkJZ290byBmYWlsOworCX0K IAogCW1zaV9ucCA9IG9mX3BhcnNlX3BoYW5kbGUocGNpZS0+bnAsICJtc2ktcGFyZW50IiwgMCk7 CiAJaWYgKHBjaV9tc2lfZW5hYmxlZCgpICYmIG1zaV9ucCA9PSBwY2llLT5ucCkgewotLSAKMi4y Ni4yCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGlu dXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRl YWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgt YXJtLWtlcm5lbAo=