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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7424C433EF for ; Mon, 1 Nov 2021 15:04:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0D5D60527 for ; Mon, 1 Nov 2021 15:04:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232070AbhKAPHG (ORCPT ); Mon, 1 Nov 2021 11:07:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:38306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229826AbhKAPHF (ORCPT ); Mon, 1 Nov 2021 11:07:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4144A610E5; Mon, 1 Nov 2021 15:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635779072; bh=srzdJY9DWsUKRRAlTPJse3oqP8KifB/YE/m+79Y120Q=; h=From:To:Cc:Subject:Date:From; b=GbGBjVYfDh1Pco0glqRhlXRHXsV7rrGtNpR0ZwIxjjxIYexkPQaaIlNqQxEh1CQgG W9Eamhl6YArcSag1szCYnSeQmg+NfDHZb5+IuvYxkF2+1f9K0KXalaymH+oxriT8/z tuuflinGydpplfKnO3Xw0JM2Lgll37xS4Fb4krS43L+fk0ykGAfcNJ2j1YFyp3QVoq ZxcntX+zDoT8vFnhk/UOkPnT12fGsl6sPzH+8UFfYQe0nS8rGTTFls2AN6E2Y4BJQW ZgNy3xdpnFkQnf1nbO0x8uagUIDm4iT8WneIR1x5tWcuQcOkLThOF5wM4x4OTEnuBa RVMHU7t3KkUEg== Received: by pali.im (Postfix) id DA02C7E4; Mon, 1 Nov 2021 16:04:29 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Jason Gunthorpe Cc: linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: Marvell: Update PCIe fixup Date: Mon, 1 Nov 2021 16:04:05 +0100 Message-Id: <20211101150405.14618-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org - The code relies on rc_pci_fixup being called, which only happens when CONFIG_PCI_QUIRKS is enabled, so add that to Kconfig. Omitting this causes a booting failure with a non-obvious cause. - Update rc_pci_fixup to set the class properly, copying the more modern style from other places - Correct the rc_pci_fixup comment This patch just re-applies commit 1dc831bf53fd ("ARM: Kirkwood: Update PCI-E fixup") for all other Marvell platforms which use same buggy PCIe controller. Signed-off-by: Pali Rohár Cc: Jason Gunthorpe Cc: stable@vger.kernel.org --- arch/arm/Kconfig | 1 + arch/arm/mach-dove/pcie.c | 11 ++++++++--- arch/arm/mach-mv78xx0/pcie.c | 11 ++++++++--- arch/arm/mach-orion5x/Kconfig | 1 + arch/arm/mach-orion5x/pci.c | 12 +++++++++--- arch/mips/Kconfig | 1 + arch/mips/pci/fixup-cobalt.c | 6 ++++++ 7 files changed, 34 insertions(+), 9 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fc196421b2ce..9f157e973555 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -400,6 +400,7 @@ config ARCH_DOVE select GENERIC_IRQ_MULTI_HANDLER select GPIOLIB select HAVE_PCI + select PCI_QUIRKS if PCI select MVEBU_MBUS select PINCTRL select PINCTRL_DOVE diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index ee91ac6b5ebf..ecf057a0f5ba 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -135,14 +135,19 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; +/* + * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it + * is operating as a root complex this needs to be switched to + * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on + * the device. Decoding setup is handled by the orion code. + */ static void rc_pci_fixup(struct pci_dev *dev) { - /* - * Prevent enumeration of root complex. - */ if (dev->bus->parent == NULL && dev->devfn == 0) { int i; + dev->class &= 0xff; + dev->class |= PCI_CLASS_BRIDGE_HOST << 8; for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { dev->resource[i].start = 0; dev->resource[i].end = 0; diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 636d84b40466..9362b5fc116f 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -177,14 +177,19 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; +/* + * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it + * is operating as a root complex this needs to be switched to + * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on + * the device. Decoding setup is handled by the orion code. + */ static void rc_pci_fixup(struct pci_dev *dev) { - /* - * Prevent enumeration of root complex. - */ if (dev->bus->parent == NULL && dev->devfn == 0) { int i; + dev->class &= 0xff; + dev->class |= PCI_CLASS_BRIDGE_HOST << 8; for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { dev->resource[i].start = 0; dev->resource[i].end = 0; diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index e94a61901ffd..7189a5b1ec46 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -6,6 +6,7 @@ menuconfig ARCH_ORION5X select GPIOLIB select MVEBU_MBUS select FORCE_PCI + select PCI_QUIRKS select PHYLIB if NETDEVICES select PLAT_ORION_LEGACY help diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 76951bfbacf5..5145fe89702e 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -509,14 +509,20 @@ static int __init pci_setup(struct pci_sys_data *sys) /***************************************************************************** * General PCIe + PCI ****************************************************************************/ + +/* + * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it + * is operating as a root complex this needs to be switched to + * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on + * the device. Decoding setup is handled by the orion code. + */ static void rc_pci_fixup(struct pci_dev *dev) { - /* - * Prevent enumeration of root complex. - */ if (dev->bus->parent == NULL && dev->devfn == 0) { int i; + dev->class &= 0xff; + dev->class |= PCI_CLASS_BRIDGE_HOST << 8; for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { dev->resource[i].start = 0; dev->resource[i].end = 0; diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 771ca53af06d..c8d51bd20b84 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -346,6 +346,7 @@ config MIPS_COBALT select CEVT_GT641XX select DMA_NONCOHERENT select FORCE_PCI + select PCI_QUIRKS select I8253 select I8259 select IRQ_MIPS_CPU diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c index 44be65c3e6bb..202f3a0bd97d 100644 --- a/arch/mips/pci/fixup-cobalt.c +++ b/arch/mips/pci/fixup-cobalt.c @@ -36,6 +36,12 @@ #define VIA_COBALT_BRD_ID_REG 0x94 #define VIA_COBALT_BRD_REG_to_ID(reg) ((unsigned char)(reg) >> 4) +/* + * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it + * is operating as a root complex this needs to be switched to + * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on + * the device. Decoding setup is handled by the orion code. + */ static void qube_raq_galileo_early_fixup(struct pci_dev *dev) { if (dev->devfn == PCI_DEVFN(0, 0) && -- 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33772C433FE for ; Mon, 1 Nov 2021 15:06:20 +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 05227610F7 for ; Mon, 1 Nov 2021 15:06:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 05227610F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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: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:In-Reply-To:References: List-Owner; bh=TZIkHWtbyMvDTDi8CbtFf0z8n1Zp7hXXLxphPWZf6Bc=; b=c9QYP0qOkm3clA Aqkf7eyj2j3TxzF4C6yr0Lr+qhWo3CoVcA7gzx16IgY0BKdgVBYNc+ug8mR1ccvpfe7v9fr/HDoq1 LsU9urr+lYoWb01L8pH/hiBbQa0rMcs2m6rmVWfgVWw8uS1CTrfITpO4beDyXoNfgqCmk2fiSElN4 wivdvlAH0KBwMZvlSX6n63oOIp7m/lq+e5Jv8cU+clv/GFUR9jJBnVI5shyr1FSz3QkwyxcK5vuJ8 onlm7VFNX/QyJ6mJ4qDEjATiuH6FHOp1IH+pzh90PVvO3HJQ6jDqIvWY47h6s0rSgG9C42pRaNiYk BPDzXh1q7EjcEURpTpZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mhYrV-00GdYv-8f; Mon, 01 Nov 2021 15:04:37 +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 1mhYrQ-00GdXu-Qa for linux-arm-kernel@lists.infradead.org; Mon, 01 Nov 2021 15:04:34 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4144A610E5; Mon, 1 Nov 2021 15:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635779072; bh=srzdJY9DWsUKRRAlTPJse3oqP8KifB/YE/m+79Y120Q=; h=From:To:Cc:Subject:Date:From; b=GbGBjVYfDh1Pco0glqRhlXRHXsV7rrGtNpR0ZwIxjjxIYexkPQaaIlNqQxEh1CQgG W9Eamhl6YArcSag1szCYnSeQmg+NfDHZb5+IuvYxkF2+1f9K0KXalaymH+oxriT8/z tuuflinGydpplfKnO3Xw0JM2Lgll37xS4Fb4krS43L+fk0ykGAfcNJ2j1YFyp3QVoq ZxcntX+zDoT8vFnhk/UOkPnT12fGsl6sPzH+8UFfYQe0nS8rGTTFls2AN6E2Y4BJQW ZgNy3xdpnFkQnf1nbO0x8uagUIDm4iT8WneIR1x5tWcuQcOkLThOF5wM4x4OTEnuBa RVMHU7t3KkUEg== Received: by pali.im (Postfix) id DA02C7E4; Mon, 1 Nov 2021 16:04:29 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Jason Gunthorpe Cc: linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: Marvell: Update PCIe fixup Date: Mon, 1 Nov 2021 16:04:05 +0100 Message-Id: <20211101150405.14618-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211101_080432_926133_E5BDA1EB X-CRM114-Status: GOOD ( 18.68 ) 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 LSBUaGUgY29kZSByZWxpZXMgb24gcmNfcGNpX2ZpeHVwIGJlaW5nIGNhbGxlZCwgd2hpY2ggb25s eSBoYXBwZW5zCiAgd2hlbiBDT05GSUdfUENJX1FVSVJLUyBpcyBlbmFibGVkLCBzbyBhZGQgdGhh dCB0byBLY29uZmlnLiBPbWl0dGluZwogIHRoaXMgY2F1c2VzIGEgYm9vdGluZyBmYWlsdXJlIHdp dGggYSBub24tb2J2aW91cyBjYXVzZS4KLSBVcGRhdGUgcmNfcGNpX2ZpeHVwIHRvIHNldCB0aGUg Y2xhc3MgcHJvcGVybHksIGNvcHlpbmcgdGhlCiAgbW9yZSBtb2Rlcm4gc3R5bGUgZnJvbSBvdGhl ciBwbGFjZXMKLSBDb3JyZWN0IHRoZSByY19wY2lfZml4dXAgY29tbWVudAoKVGhpcyBwYXRjaCBq dXN0IHJlLWFwcGxpZXMgY29tbWl0IDFkYzgzMWJmNTNmZCAoIkFSTTogS2lya3dvb2Q6IFVwZGF0 ZQpQQ0ktRSBmaXh1cCIpIGZvciBhbGwgb3RoZXIgTWFydmVsbCBwbGF0Zm9ybXMgd2hpY2ggdXNl IHNhbWUgYnVnZ3kgUENJZQpjb250cm9sbGVyLgoKU2lnbmVkLW9mZi1ieTogUGFsaSBSb2jDoXIg PHBhbGlAa2VybmVsLm9yZz4KQ2M6IEphc29uIEd1bnRob3JwZSA8amdnQG52aWRpYS5jb20+CkNj OiBzdGFibGVAdmdlci5rZXJuZWwub3JnCi0tLQogYXJjaC9hcm0vS2NvbmZpZyAgICAgICAgICAg ICAgfCAgMSArCiBhcmNoL2FybS9tYWNoLWRvdmUvcGNpZS5jICAgICB8IDExICsrKysrKysrLS0t CiBhcmNoL2FybS9tYWNoLW12Nzh4eDAvcGNpZS5jICB8IDExICsrKysrKysrLS0tCiBhcmNoL2Fy bS9tYWNoLW9yaW9uNXgvS2NvbmZpZyB8ICAxICsKIGFyY2gvYXJtL21hY2gtb3Jpb241eC9wY2ku YyAgIHwgMTIgKysrKysrKysrLS0tCiBhcmNoL21pcHMvS2NvbmZpZyAgICAgICAgICAgICB8ICAx ICsKIGFyY2gvbWlwcy9wY2kvZml4dXAtY29iYWx0LmMgIHwgIDYgKysrKysrCiA3IGZpbGVzIGNo YW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJj aC9hcm0vS2NvbmZpZyBiL2FyY2gvYXJtL0tjb25maWcKaW5kZXggZmMxOTY0MjFiMmNlLi45ZjE1 N2U5NzM1NTUgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL0tjb25maWcKKysrIGIvYXJjaC9hcm0vS2Nv bmZpZwpAQCAtNDAwLDYgKzQwMCw3IEBAIGNvbmZpZyBBUkNIX0RPVkUKIAlzZWxlY3QgR0VORVJJ Q19JUlFfTVVMVElfSEFORExFUgogCXNlbGVjdCBHUElPTElCCiAJc2VsZWN0IEhBVkVfUENJCisJ c2VsZWN0IFBDSV9RVUlSS1MgaWYgUENJCiAJc2VsZWN0IE1WRUJVX01CVVMKIAlzZWxlY3QgUElO Q1RSTAogCXNlbGVjdCBQSU5DVFJMX0RPVkUKZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtZG92 ZS9wY2llLmMgYi9hcmNoL2FybS9tYWNoLWRvdmUvcGNpZS5jCmluZGV4IGVlOTFhYzZiNWViZi4u ZWNmMDU3YTBmNWJhIDEwMDY0NAotLS0gYS9hcmNoL2FybS9tYWNoLWRvdmUvcGNpZS5jCisrKyBi L2FyY2gvYXJtL21hY2gtZG92ZS9wY2llLmMKQEAgLTEzNSwxNCArMTM1LDE5IEBAIHN0YXRpYyBz dHJ1Y3QgcGNpX29wcyBwY2llX29wcyA9IHsKIAkud3JpdGUgPSBwY2llX3dyX2NvbmYsCiB9Owog CisvKgorICogVGhlIHJvb3QgY29tcGxleCBoYXMgYSBoYXJkd2lyZWQgY2xhc3Mgb2YgUENJX0NM QVNTX01FTU9SWV9PVEhFUiwgd2hlbiBpdAorICogaXMgb3BlcmF0aW5nIGFzIGEgcm9vdCBjb21w bGV4IHRoaXMgbmVlZHMgdG8gYmUgc3dpdGNoZWQgdG8KKyAqIFBDSV9DTEFTU19CUklER0VfSE9T VCBvciBMaW51eCB3aWxsIGVycmFudGx5IHRyeSB0byBwcm9jZXNzIHRoZSBCQVIncyBvbgorICog dGhlIGRldmljZS4gRGVjb2Rpbmcgc2V0dXAgaXMgaGFuZGxlZCBieSB0aGUgb3Jpb24gY29kZS4K KyAqLwogc3RhdGljIHZvaWQgcmNfcGNpX2ZpeHVwKHN0cnVjdCBwY2lfZGV2ICpkZXYpCiB7Ci0J LyoKLQkgKiBQcmV2ZW50IGVudW1lcmF0aW9uIG9mIHJvb3QgY29tcGxleC4KLQkgKi8KIAlpZiAo ZGV2LT5idXMtPnBhcmVudCA9PSBOVUxMICYmIGRldi0+ZGV2Zm4gPT0gMCkgewogCQlpbnQgaTsK IAorCQlkZXYtPmNsYXNzICY9IDB4ZmY7CisJCWRldi0+Y2xhc3MgfD0gUENJX0NMQVNTX0JSSURH RV9IT1NUIDw8IDg7CiAJCWZvciAoaSA9IDA7IGkgPCBERVZJQ0VfQ09VTlRfUkVTT1VSQ0U7IGkr KykgewogCQkJZGV2LT5yZXNvdXJjZVtpXS5zdGFydCA9IDA7CiAJCQlkZXYtPnJlc291cmNlW2ld LmVuZCAgID0gMDsKZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtbXY3OHh4MC9wY2llLmMgYi9h cmNoL2FybS9tYWNoLW12Nzh4eDAvcGNpZS5jCmluZGV4IDYzNmQ4NGI0MDQ2Ni4uOTM2MmI1ZmMx MTZmIDEwMDY0NAotLS0gYS9hcmNoL2FybS9tYWNoLW12Nzh4eDAvcGNpZS5jCisrKyBiL2FyY2gv YXJtL21hY2gtbXY3OHh4MC9wY2llLmMKQEAgLTE3NywxNCArMTc3LDE5IEBAIHN0YXRpYyBzdHJ1 Y3QgcGNpX29wcyBwY2llX29wcyA9IHsKIAkud3JpdGUgPSBwY2llX3dyX2NvbmYsCiB9OwogCisv KgorICogVGhlIHJvb3QgY29tcGxleCBoYXMgYSBoYXJkd2lyZWQgY2xhc3Mgb2YgUENJX0NMQVNT X01FTU9SWV9PVEhFUiwgd2hlbiBpdAorICogaXMgb3BlcmF0aW5nIGFzIGEgcm9vdCBjb21wbGV4 IHRoaXMgbmVlZHMgdG8gYmUgc3dpdGNoZWQgdG8KKyAqIFBDSV9DTEFTU19CUklER0VfSE9TVCBv ciBMaW51eCB3aWxsIGVycmFudGx5IHRyeSB0byBwcm9jZXNzIHRoZSBCQVIncyBvbgorICogdGhl IGRldmljZS4gRGVjb2Rpbmcgc2V0dXAgaXMgaGFuZGxlZCBieSB0aGUgb3Jpb24gY29kZS4KKyAq Lwogc3RhdGljIHZvaWQgcmNfcGNpX2ZpeHVwKHN0cnVjdCBwY2lfZGV2ICpkZXYpCiB7Ci0JLyoK LQkgKiBQcmV2ZW50IGVudW1lcmF0aW9uIG9mIHJvb3QgY29tcGxleC4KLQkgKi8KIAlpZiAoZGV2 LT5idXMtPnBhcmVudCA9PSBOVUxMICYmIGRldi0+ZGV2Zm4gPT0gMCkgewogCQlpbnQgaTsKIAor CQlkZXYtPmNsYXNzICY9IDB4ZmY7CisJCWRldi0+Y2xhc3MgfD0gUENJX0NMQVNTX0JSSURHRV9I T1NUIDw8IDg7CiAJCWZvciAoaSA9IDA7IGkgPCBERVZJQ0VfQ09VTlRfUkVTT1VSQ0U7IGkrKykg ewogCQkJZGV2LT5yZXNvdXJjZVtpXS5zdGFydCA9IDA7CiAJCQlkZXYtPnJlc291cmNlW2ldLmVu ZCAgID0gMDsKZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtb3Jpb241eC9LY29uZmlnIGIvYXJj aC9hcm0vbWFjaC1vcmlvbjV4L0tjb25maWcKaW5kZXggZTk0YTYxOTAxZmZkLi43MTg5YTViMWVj NDYgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21hY2gtb3Jpb241eC9LY29uZmlnCisrKyBiL2FyY2gv YXJtL21hY2gtb3Jpb241eC9LY29uZmlnCkBAIC02LDYgKzYsNyBAQCBtZW51Y29uZmlnIEFSQ0hf T1JJT041WAogCXNlbGVjdCBHUElPTElCCiAJc2VsZWN0IE1WRUJVX01CVVMKIAlzZWxlY3QgRk9S Q0VfUENJCisJc2VsZWN0IFBDSV9RVUlSS1MKIAlzZWxlY3QgUEhZTElCIGlmIE5FVERFVklDRVMK IAlzZWxlY3QgUExBVF9PUklPTl9MRUdBQ1kKIAloZWxwCmRpZmYgLS1naXQgYS9hcmNoL2FybS9t YWNoLW9yaW9uNXgvcGNpLmMgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvcGNpLmMKaW5kZXggNzY5 NTFiZmJhY2Y1Li41MTQ1ZmU4OTcwMmUgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21hY2gtb3Jpb241 eC9wY2kuYworKysgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvcGNpLmMKQEAgLTUwOSwxNCArNTA5 LDIwIEBAIHN0YXRpYyBpbnQgX19pbml0IHBjaV9zZXR1cChzdHJ1Y3QgcGNpX3N5c19kYXRhICpz eXMpCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioKICAqIEdlbmVyYWwgUENJZSArIFBDSQogICoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKiovCisKKy8qCisgKiBUaGUgcm9vdCBjb21wbGV4IGhhcyBhIGhhcmR3aXJl ZCBjbGFzcyBvZiBQQ0lfQ0xBU1NfTUVNT1JZX09USEVSLCB3aGVuIGl0CisgKiBpcyBvcGVyYXRp bmcgYXMgYSByb290IGNvbXBsZXggdGhpcyBuZWVkcyB0byBiZSBzd2l0Y2hlZCB0bworICogUENJ X0NMQVNTX0JSSURHRV9IT1NUIG9yIExpbnV4IHdpbGwgZXJyYW50bHkgdHJ5IHRvIHByb2Nlc3Mg dGhlIEJBUidzIG9uCisgKiB0aGUgZGV2aWNlLiBEZWNvZGluZyBzZXR1cCBpcyBoYW5kbGVkIGJ5 IHRoZSBvcmlvbiBjb2RlLgorICovCiBzdGF0aWMgdm9pZCByY19wY2lfZml4dXAoc3RydWN0IHBj aV9kZXYgKmRldikKIHsKLQkvKgotCSAqIFByZXZlbnQgZW51bWVyYXRpb24gb2Ygcm9vdCBjb21w bGV4LgotCSAqLwogCWlmIChkZXYtPmJ1cy0+cGFyZW50ID09IE5VTEwgJiYgZGV2LT5kZXZmbiA9 PSAwKSB7CiAJCWludCBpOwogCisJCWRldi0+Y2xhc3MgJj0gMHhmZjsKKwkJZGV2LT5jbGFzcyB8 PSBQQ0lfQ0xBU1NfQlJJREdFX0hPU1QgPDwgODsKIAkJZm9yIChpID0gMDsgaSA8IERFVklDRV9D T1VOVF9SRVNPVVJDRTsgaSsrKSB7CiAJCQlkZXYtPnJlc291cmNlW2ldLnN0YXJ0ID0gMDsKIAkJ CWRldi0+cmVzb3VyY2VbaV0uZW5kICAgPSAwOwpkaWZmIC0tZ2l0IGEvYXJjaC9taXBzL0tjb25m aWcgYi9hcmNoL21pcHMvS2NvbmZpZwppbmRleCA3NzFjYTUzYWYwNmQuLmM4ZDUxYmQyMGI4NCAx MDA2NDQKLS0tIGEvYXJjaC9taXBzL0tjb25maWcKKysrIGIvYXJjaC9taXBzL0tjb25maWcKQEAg LTM0Niw2ICszNDYsNyBAQCBjb25maWcgTUlQU19DT0JBTFQKIAlzZWxlY3QgQ0VWVF9HVDY0MVhY CiAJc2VsZWN0IERNQV9OT05DT0hFUkVOVAogCXNlbGVjdCBGT1JDRV9QQ0kKKwlzZWxlY3QgUENJ X1FVSVJLUwogCXNlbGVjdCBJODI1MwogCXNlbGVjdCBJODI1OQogCXNlbGVjdCBJUlFfTUlQU19D UFUKZGlmZiAtLWdpdCBhL2FyY2gvbWlwcy9wY2kvZml4dXAtY29iYWx0LmMgYi9hcmNoL21pcHMv cGNpL2ZpeHVwLWNvYmFsdC5jCmluZGV4IDQ0YmU2NWMzZTZiYi4uMjAyZjNhMGJkOTdkIDEwMDY0 NAotLS0gYS9hcmNoL21pcHMvcGNpL2ZpeHVwLWNvYmFsdC5jCisrKyBiL2FyY2gvbWlwcy9wY2kv Zml4dXAtY29iYWx0LmMKQEAgLTM2LDYgKzM2LDEyIEBACiAjZGVmaW5lIFZJQV9DT0JBTFRfQlJE X0lEX1JFRyAgMHg5NAogI2RlZmluZSBWSUFfQ09CQUxUX0JSRF9SRUdfdG9fSUQocmVnKQkoKHVu c2lnbmVkIGNoYXIpKHJlZykgPj4gNCkKIAorLyoKKyAqIFRoZSByb290IGNvbXBsZXggaGFzIGEg aGFyZHdpcmVkIGNsYXNzIG9mIFBDSV9DTEFTU19NRU1PUllfT1RIRVIsIHdoZW4gaXQKKyAqIGlz IG9wZXJhdGluZyBhcyBhIHJvb3QgY29tcGxleCB0aGlzIG5lZWRzIHRvIGJlIHN3aXRjaGVkIHRv CisgKiBQQ0lfQ0xBU1NfQlJJREdFX0hPU1Qgb3IgTGludXggd2lsbCBlcnJhbnRseSB0cnkgdG8g cHJvY2VzcyB0aGUgQkFSJ3Mgb24KKyAqIHRoZSBkZXZpY2UuIERlY29kaW5nIHNldHVwIGlzIGhh bmRsZWQgYnkgdGhlIG9yaW9uIGNvZGUuCisgKi8KIHN0YXRpYyB2b2lkIHF1YmVfcmFxX2dhbGls ZW9fZWFybHlfZml4dXAoc3RydWN0IHBjaV9kZXYgKmRldikKIHsKIAlpZiAoZGV2LT5kZXZmbiA9 PSBQQ0lfREVWRk4oMCwgMCkgJiYKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0Cmxp bnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFk Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK