From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CCF75C90F; Fri, 16 Feb 2024 11:19:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708082360; cv=none; b=aLFvnHvQIQ+jemM71UaLu8OvPTK26Fe1RijFuONZlRRAIoLmQOdcFA1aFux6TcoRBIqAWj/PxgRCAYj6sRgUFlTH4orjkaOh6FI783JUpcIx2xOPA7lF8WZ1xA2/BFjg7mtYXRJR5TQcT8PHFnS38odsXPViv/onRYhRwhyKVR0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708082360; c=relaxed/simple; bh=KbiyK3bvGuFNTKYJJHAnEbGXH9z7NGmmzn+I+PaPUz0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=PDF5wa7eSz+zwvrfnO6ehDBV9MX4fawW1mcWuLUV30t8O9VAt4IlLh5cSwh6/D1xBE7noKxzL3OT2w+6WOMqPgVoK9DhcYajVnsZbyeSUaVb/BnJPPlKwABRoZau5HPBQSSvzRU6t0urW/5o8K4qcHgk/0iOUDgEqAgdC5++7lU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G2M+M8ZU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G2M+M8ZU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4FB9C433C7; Fri, 16 Feb 2024 11:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708082360; bh=KbiyK3bvGuFNTKYJJHAnEbGXH9z7NGmmzn+I+PaPUz0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=G2M+M8ZUQhDqvRup5p9TlZYwfHP6CXltKW0DLJJzXwugtd4/H1nl86/IGFPjVQBr7 GCRemr582U0WH8hsjXa8e1U3s9b0Vl5yvGiqgI+fNcKVHuFDGHm7bPL4RGnQl3hFV0 cFWFdueXaG7/OjmB2SXtaC58pFYqaz053ojcdCGeZyjeXXjQcwbX7bhmTOGSqfCKAb 7mWtrvsPRDLrl5xI4ab5+bkNpl53Csknw7fcEchqTgt680PFUJO/jQRKvrP+jZvQrk 6AdJ1aVr+xyff4pRh2vw8Qc4coAE6C3qwV+TksfzuED4Cku5IveQ6lBc2Q+DFJkrMR 9pfzSd3QakT3A== Date: Fri, 16 Feb 2024 16:49:08 +0530 From: Manivannan Sadhasivam To: Niklas Cassel Cc: Richard Zhu , Lucas Stach , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Minghuan Lian , Mingkai Hu , Roy Zang , Srikanth Thokala , Marek Vasut , Yoshihiro Shimoda , Thierry Reding , Jonathan Hunter , Kunihiko Hayashi , Masami Hiramatsu , Jon Mason , Dave Jiang , Allen Hubbe , Manivannan Sadhasivam , Kishon Vijay Abraham I , Damien Le Moal , Frank Li , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-renesas-soc@vger.kernel.org, linux-tegra@vger.kernel.org, ntb@lists.linux.dev Subject: Re: [PATCH 1/2] PCI: endpoint: Clean up hardware description for BARs Message-ID: <20240216111908.GC2559@thinkpad> References: <20240210012634.600301-1-cassel@kernel.org> <20240210012634.600301-2-cassel@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240210012634.600301-2-cassel@kernel.org> On Sat, Feb 10, 2024 at 02:26:25AM +0100, Niklas Cassel wrote: > The hardware description for BARs is scattered in many different variables > in pci_epc_features. Some of these things are mutually exclusive, so it > can create confusion over which variable that has precedence over another. > > Improve the situation by creating a struct pci_epc_bar_desc, and a new > enum pci_epc_bar_type, and convert the endpoint controller drivers to use > this more well defined format. > > Signed-off-by: Niklas Cassel > --- > drivers/pci/controller/dwc/pci-imx6.c | 3 +- > drivers/pci/controller/dwc/pci-keystone.c | 12 +++---- > .../pci/controller/dwc/pci-layerscape-ep.c | 5 ++- > drivers/pci/controller/dwc/pcie-keembay.c | 8 +++-- > drivers/pci/controller/dwc/pcie-rcar-gen4.c | 4 ++- > drivers/pci/controller/dwc/pcie-tegra194.c | 10 ++++-- > drivers/pci/controller/dwc/pcie-uniphier-ep.c | 15 ++++++-- > drivers/pci/controller/pcie-rcar-ep.c | 14 +++++--- > drivers/pci/endpoint/functions/pci-epf-ntb.c | 4 +-- > drivers/pci/endpoint/functions/pci-epf-test.c | 8 ++--- > drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +- > drivers/pci/endpoint/pci-epc-core.c | 32 +++++++++-------- > drivers/pci/endpoint/pci-epf-core.c | 15 ++++---- > include/linux/pci-epc.h | 34 +++++++++++++++---- > 14 files changed, 108 insertions(+), 58 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index dc2c036ab28c..47a9a96484ed 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1081,7 +1081,8 @@ static const struct pci_epc_features imx8m_pcie_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = false, > - .reserved_bar = 1 << BAR_1 | 1 << BAR_3, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > .align = SZ_64K, > }; > > diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c > index c0c62533a3f1..b2b93b4fa82d 100644 > --- a/drivers/pci/controller/dwc/pci-keystone.c > +++ b/drivers/pci/controller/dwc/pci-keystone.c > @@ -924,12 +924,12 @@ static const struct pci_epc_features ks_pcie_am654_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = true, > - .reserved_bar = 1 << BAR_0 | 1 << BAR_1, > - .bar_fixed_64bit = 1 << BAR_0, > - .bar_fixed_size[2] = SZ_1M, > - .bar_fixed_size[3] = SZ_64K, > - .bar_fixed_size[4] = 256, > - .bar_fixed_size[5] = SZ_1M, > + .bar[BAR_0] = { .type = BAR_RESERVED, .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_2] = { .type = BAR_FIXED, .fixed_size = SZ_1M, }, > + .bar[BAR_3] = { .type = BAR_FIXED, .fixed_size = SZ_64K, }, > + .bar[BAR_4] = { .type = BAR_FIXED, .fixed_size = 256, }, > + .bar[BAR_5] = { .type = BAR_FIXED, .fixed_size = SZ_1M, }, > .align = SZ_1M, > }; > > diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c > index 2e398494e7c0..1f6ee1460ec2 100644 > --- a/drivers/pci/controller/dwc/pci-layerscape-ep.c > +++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c > @@ -250,7 +250,10 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) > pci->dev = dev; > pci->ops = pcie->drvdata->dw_pcie_ops; > > - ls_epc->bar_fixed_64bit = (1 << BAR_2) | (1 << BAR_4); > + ls_epc->bar[BAR_2].only_64bit = true; > + ls_epc->bar[BAR_3].type = BAR_RESERVED; BAR_3 and BAR_4 were not reserved previously. > + ls_epc->bar[BAR_4].only_64bit = true; > + ls_epc->bar[BAR_5].type = BAR_RESERVED; > ls_epc->linkup_notifier = true; > > pcie->pci = pci; > diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c > index 208d3b0ba196..5e8e54f597dd 100644 > --- a/drivers/pci/controller/dwc/pcie-keembay.c > +++ b/drivers/pci/controller/dwc/pcie-keembay.c > @@ -312,8 +312,12 @@ static const struct pci_epc_features keembay_pcie_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = true, > - .reserved_bar = BIT(BAR_1) | BIT(BAR_3) | BIT(BAR_5), > - .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), > + .bar[BAR_0] = { .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_2] = { .only_64bit = true, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_4] = { .only_64bit = true, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > .align = SZ_16K, > }; > > diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c > index e9166619b1f9..0be760ed420b 100644 > --- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c > +++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c > @@ -383,7 +383,9 @@ static const struct pci_epc_features rcar_gen4_pcie_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = false, > - .reserved_bar = 1 << BAR_1 | 1 << BAR_3 | 1 << BAR_5, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > .align = SZ_1M, > }; > > diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c > index 7afa9e9aabe2..1f7b662cb8e1 100644 > --- a/drivers/pci/controller/dwc/pcie-tegra194.c > +++ b/drivers/pci/controller/dwc/pcie-tegra194.c > @@ -2007,9 +2007,13 @@ static const struct pci_epc_features tegra_pcie_epc_features = { > .core_init_notifier = true, > .msi_capable = false, > .msix_capable = false, > - .reserved_bar = 1 << BAR_2 | 1 << BAR_3 | 1 << BAR_4 | 1 << BAR_5, > - .bar_fixed_64bit = 1 << BAR_0, > - .bar_fixed_size[0] = SZ_1M, > + .bar[BAR_0] = { .type = BAR_FIXED, .fixed_size = SZ_1M, > + .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, Same, BAR_1 was not reserved. > + .bar[BAR_2] = { .type = BAR_RESERVED, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_4] = { .type = BAR_RESERVED, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > }; > > static const struct pci_epc_features* > diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c > index 3fced0d3e851..265f65fc673f 100644 > --- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c > +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c > @@ -411,8 +411,12 @@ static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = { > .msi_capable = true, > .msix_capable = false, > .align = 1 << 16, > - .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), > - .reserved_bar = BIT(BAR_4), > + .bar[BAR_0] = { .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, Same as above. > + .bar[BAR_2] = { .only_64bit = true, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_4] = { .type = BAR_RESERVED, .only_64bit = true, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > }, > }; > > @@ -425,7 +429,12 @@ static const struct uniphier_pcie_ep_soc_data uniphier_nx1_data = { > .msi_capable = true, > .msix_capable = false, > .align = 1 << 12, > - .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), > + .bar[BAR_0] = { .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, Same as above. - Mani -- மணிவண்ணன் சதாசிவம் 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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 2B200C48260 for ; Fri, 16 Feb 2024 11:20:13 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=G2M+M8ZU; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4TbqGg45drz3vbm for ; Fri, 16 Feb 2024 22:20:11 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=G2M+M8ZU; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2604:1380:40e1:4800::1; helo=sin.source.kernel.org; envelope-from=mani@kernel.org; receiver=lists.ozlabs.org) Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4TbqFn0bcrz3dSv for ; Fri, 16 Feb 2024 22:19:25 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D3ED5CE2AA0; Fri, 16 Feb 2024 11:19:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4FB9C433C7; Fri, 16 Feb 2024 11:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708082360; bh=KbiyK3bvGuFNTKYJJHAnEbGXH9z7NGmmzn+I+PaPUz0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=G2M+M8ZUQhDqvRup5p9TlZYwfHP6CXltKW0DLJJzXwugtd4/H1nl86/IGFPjVQBr7 GCRemr582U0WH8hsjXa8e1U3s9b0Vl5yvGiqgI+fNcKVHuFDGHm7bPL4RGnQl3hFV0 cFWFdueXaG7/OjmB2SXtaC58pFYqaz053ojcdCGeZyjeXXjQcwbX7bhmTOGSqfCKAb 7mWtrvsPRDLrl5xI4ab5+bkNpl53Csknw7fcEchqTgt680PFUJO/jQRKvrP+jZvQrk 6AdJ1aVr+xyff4pRh2vw8Qc4coAE6C3qwV+TksfzuED4Cku5IveQ6lBc2Q+DFJkrMR 9pfzSd3QakT3A== Date: Fri, 16 Feb 2024 16:49:08 +0530 From: Manivannan Sadhasivam To: Niklas Cassel Subject: Re: [PATCH 1/2] PCI: endpoint: Clean up hardware description for BARs Message-ID: <20240216111908.GC2559@thinkpad> References: <20240210012634.600301-1-cassel@kernel.org> <20240210012634.600301-2-cassel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240210012634.600301-2-cassel@kernel.org> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Kunihiko Hayashi , linux-pci@vger.kernel.org, Lorenzo Pieralisi , Frank Li , Minghuan Lian , Thierry Reding , Manivannan Sadhasivam , Fabio Estevam , Marek Vasut , Kishon Vijay Abraham I , Rob Herring , Dave Jiang , linux-tegra@vger.kernel.org, Jonathan Hunter , NXP Linux Team , Allen Hubbe , Richard Zhu , Srikanth Thokala , Sascha Hauer , Damien Le Moal , Bjorn Helgaas , Mingkai Hu , linux-arm-kernel@lists.infradead.org, Roy Zang , linuxppc-dev@lists.ozlabs .org, Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, ntb@lists.linux.dev, Masami Hiramatsu , Pengutronix Kernel Team , Jon Mason , Shawn Guo , Lucas Stach Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Sat, Feb 10, 2024 at 02:26:25AM +0100, Niklas Cassel wrote: > The hardware description for BARs is scattered in many different variables > in pci_epc_features. Some of these things are mutually exclusive, so it > can create confusion over which variable that has precedence over another. > > Improve the situation by creating a struct pci_epc_bar_desc, and a new > enum pci_epc_bar_type, and convert the endpoint controller drivers to use > this more well defined format. > > Signed-off-by: Niklas Cassel > --- > drivers/pci/controller/dwc/pci-imx6.c | 3 +- > drivers/pci/controller/dwc/pci-keystone.c | 12 +++---- > .../pci/controller/dwc/pci-layerscape-ep.c | 5 ++- > drivers/pci/controller/dwc/pcie-keembay.c | 8 +++-- > drivers/pci/controller/dwc/pcie-rcar-gen4.c | 4 ++- > drivers/pci/controller/dwc/pcie-tegra194.c | 10 ++++-- > drivers/pci/controller/dwc/pcie-uniphier-ep.c | 15 ++++++-- > drivers/pci/controller/pcie-rcar-ep.c | 14 +++++--- > drivers/pci/endpoint/functions/pci-epf-ntb.c | 4 +-- > drivers/pci/endpoint/functions/pci-epf-test.c | 8 ++--- > drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +- > drivers/pci/endpoint/pci-epc-core.c | 32 +++++++++-------- > drivers/pci/endpoint/pci-epf-core.c | 15 ++++---- > include/linux/pci-epc.h | 34 +++++++++++++++---- > 14 files changed, 108 insertions(+), 58 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index dc2c036ab28c..47a9a96484ed 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1081,7 +1081,8 @@ static const struct pci_epc_features imx8m_pcie_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = false, > - .reserved_bar = 1 << BAR_1 | 1 << BAR_3, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > .align = SZ_64K, > }; > > diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c > index c0c62533a3f1..b2b93b4fa82d 100644 > --- a/drivers/pci/controller/dwc/pci-keystone.c > +++ b/drivers/pci/controller/dwc/pci-keystone.c > @@ -924,12 +924,12 @@ static const struct pci_epc_features ks_pcie_am654_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = true, > - .reserved_bar = 1 << BAR_0 | 1 << BAR_1, > - .bar_fixed_64bit = 1 << BAR_0, > - .bar_fixed_size[2] = SZ_1M, > - .bar_fixed_size[3] = SZ_64K, > - .bar_fixed_size[4] = 256, > - .bar_fixed_size[5] = SZ_1M, > + .bar[BAR_0] = { .type = BAR_RESERVED, .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_2] = { .type = BAR_FIXED, .fixed_size = SZ_1M, }, > + .bar[BAR_3] = { .type = BAR_FIXED, .fixed_size = SZ_64K, }, > + .bar[BAR_4] = { .type = BAR_FIXED, .fixed_size = 256, }, > + .bar[BAR_5] = { .type = BAR_FIXED, .fixed_size = SZ_1M, }, > .align = SZ_1M, > }; > > diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c > index 2e398494e7c0..1f6ee1460ec2 100644 > --- a/drivers/pci/controller/dwc/pci-layerscape-ep.c > +++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c > @@ -250,7 +250,10 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) > pci->dev = dev; > pci->ops = pcie->drvdata->dw_pcie_ops; > > - ls_epc->bar_fixed_64bit = (1 << BAR_2) | (1 << BAR_4); > + ls_epc->bar[BAR_2].only_64bit = true; > + ls_epc->bar[BAR_3].type = BAR_RESERVED; BAR_3 and BAR_4 were not reserved previously. > + ls_epc->bar[BAR_4].only_64bit = true; > + ls_epc->bar[BAR_5].type = BAR_RESERVED; > ls_epc->linkup_notifier = true; > > pcie->pci = pci; > diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c > index 208d3b0ba196..5e8e54f597dd 100644 > --- a/drivers/pci/controller/dwc/pcie-keembay.c > +++ b/drivers/pci/controller/dwc/pcie-keembay.c > @@ -312,8 +312,12 @@ static const struct pci_epc_features keembay_pcie_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = true, > - .reserved_bar = BIT(BAR_1) | BIT(BAR_3) | BIT(BAR_5), > - .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), > + .bar[BAR_0] = { .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_2] = { .only_64bit = true, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_4] = { .only_64bit = true, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > .align = SZ_16K, > }; > > diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c > index e9166619b1f9..0be760ed420b 100644 > --- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c > +++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c > @@ -383,7 +383,9 @@ static const struct pci_epc_features rcar_gen4_pcie_epc_features = { > .linkup_notifier = false, > .msi_capable = true, > .msix_capable = false, > - .reserved_bar = 1 << BAR_1 | 1 << BAR_3 | 1 << BAR_5, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > .align = SZ_1M, > }; > > diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c > index 7afa9e9aabe2..1f7b662cb8e1 100644 > --- a/drivers/pci/controller/dwc/pcie-tegra194.c > +++ b/drivers/pci/controller/dwc/pcie-tegra194.c > @@ -2007,9 +2007,13 @@ static const struct pci_epc_features tegra_pcie_epc_features = { > .core_init_notifier = true, > .msi_capable = false, > .msix_capable = false, > - .reserved_bar = 1 << BAR_2 | 1 << BAR_3 | 1 << BAR_4 | 1 << BAR_5, > - .bar_fixed_64bit = 1 << BAR_0, > - .bar_fixed_size[0] = SZ_1M, > + .bar[BAR_0] = { .type = BAR_FIXED, .fixed_size = SZ_1M, > + .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, Same, BAR_1 was not reserved. > + .bar[BAR_2] = { .type = BAR_RESERVED, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_4] = { .type = BAR_RESERVED, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > }; > > static const struct pci_epc_features* > diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c > index 3fced0d3e851..265f65fc673f 100644 > --- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c > +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c > @@ -411,8 +411,12 @@ static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = { > .msi_capable = true, > .msix_capable = false, > .align = 1 << 16, > - .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), > - .reserved_bar = BIT(BAR_4), > + .bar[BAR_0] = { .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, Same as above. > + .bar[BAR_2] = { .only_64bit = true, }, > + .bar[BAR_3] = { .type = BAR_RESERVED, }, > + .bar[BAR_4] = { .type = BAR_RESERVED, .only_64bit = true, }, > + .bar[BAR_5] = { .type = BAR_RESERVED, }, > }, > }; > > @@ -425,7 +429,12 @@ static const struct uniphier_pcie_ep_soc_data uniphier_nx1_data = { > .msi_capable = true, > .msix_capable = false, > .align = 1 << 12, > - .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), > + .bar[BAR_0] = { .only_64bit = true, }, > + .bar[BAR_1] = { .type = BAR_RESERVED, }, Same as above. - Mani -- மணிவண்ணன் சதாசிவம் 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 00C54C48260 for ; Fri, 16 Feb 2024 11:19:38 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sdD84va66/s2ALxL9X9WRJUnK0autRdDR+Mhjt68jwQ=; b=cQp37f7ME4AHDr TP4PykcXLMBrT07qURTbSSdrFY1TS4PwO2I/NyodhJxCQaSQvdnVh0dx9oX+YE5ONhvZIRm9zjPvu BLhWnySlYR34FjdM/GNglxntXqkzR3O8cxTTyjv+QURdqt/YgihqNKkH8vVy11TxQP/h1OwyncYeB MhHHaCTLJDirbYDhWNveza+wkcyuqgjnVYwtmmzm+rhPxxhMFSUQBpK/W75ONXXviCopswEZJrO4g 8AIAFpHhq8jkqjdLXWY4Y5Rr3Qe9oOCmS4ipRwUjD0QXRtdSNexiTJ6Ehjfs8EKsyQGfQKRCmHCgN lp2EDZHmKAIsebw6nWKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rawFa-000000027hG-1CyT; Fri, 16 Feb 2024 11:19:26 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rawFX-000000027gP-09P4 for linux-arm-kernel@lists.infradead.org; Fri, 16 Feb 2024 11:19:24 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D3ED5CE2AA0; Fri, 16 Feb 2024 11:19:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4FB9C433C7; Fri, 16 Feb 2024 11:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708082360; bh=KbiyK3bvGuFNTKYJJHAnEbGXH9z7NGmmzn+I+PaPUz0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=G2M+M8ZUQhDqvRup5p9TlZYwfHP6CXltKW0DLJJzXwugtd4/H1nl86/IGFPjVQBr7 GCRemr582U0WH8hsjXa8e1U3s9b0Vl5yvGiqgI+fNcKVHuFDGHm7bPL4RGnQl3hFV0 cFWFdueXaG7/OjmB2SXtaC58pFYqaz053ojcdCGeZyjeXXjQcwbX7bhmTOGSqfCKAb 7mWtrvsPRDLrl5xI4ab5+bkNpl53Csknw7fcEchqTgt680PFUJO/jQRKvrP+jZvQrk 6AdJ1aVr+xyff4pRh2vw8Qc4coAE6C3qwV+TksfzuED4Cku5IveQ6lBc2Q+DFJkrMR 9pfzSd3QakT3A== Date: Fri, 16 Feb 2024 16:49:08 +0530 From: Manivannan Sadhasivam To: Niklas Cassel Cc: Richard Zhu , Lucas Stach , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Minghuan Lian , Mingkai Hu , Roy Zang , Srikanth Thokala , Marek Vasut , Yoshihiro Shimoda , Thierry Reding , Jonathan Hunter , Kunihiko Hayashi , Masami Hiramatsu , Jon Mason , Dave Jiang , Allen Hubbe , Manivannan Sadhasivam , Kishon Vijay Abraham I , Damien Le Moal , Frank Li , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-renesas-soc@vger.kernel.org, linux-tegra@vger.kernel.org, ntb@lists.linux.dev Subject: Re: [PATCH 1/2] PCI: endpoint: Clean up hardware description for BARs Message-ID: <20240216111908.GC2559@thinkpad> References: <20240210012634.600301-1-cassel@kernel.org> <20240210012634.600301-2-cassel@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240210012634.600301-2-cassel@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240216_031923_457894_5EC174C8 X-CRM114-Status: GOOD ( 19.36 ) 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 T24gU2F0LCBGZWIgMTAsIDIwMjQgYXQgMDI6MjY6MjVBTSArMDEwMCwgTmlrbGFzIENhc3NlbCB3 cm90ZToKPiBUaGUgaGFyZHdhcmUgZGVzY3JpcHRpb24gZm9yIEJBUnMgaXMgc2NhdHRlcmVkIGlu IG1hbnkgZGlmZmVyZW50IHZhcmlhYmxlcwo+IGluIHBjaV9lcGNfZmVhdHVyZXMuIFNvbWUgb2Yg dGhlc2UgdGhpbmdzIGFyZSBtdXR1YWxseSBleGNsdXNpdmUsIHNvIGl0Cj4gY2FuIGNyZWF0ZSBj b25mdXNpb24gb3ZlciB3aGljaCB2YXJpYWJsZSB0aGF0IGhhcyBwcmVjZWRlbmNlIG92ZXIgYW5v dGhlci4KPiAKPiBJbXByb3ZlIHRoZSBzaXR1YXRpb24gYnkgY3JlYXRpbmcgYSBzdHJ1Y3QgcGNp X2VwY19iYXJfZGVzYywgYW5kIGEgbmV3Cj4gZW51bSBwY2lfZXBjX2Jhcl90eXBlLCBhbmQgY29u dmVydCB0aGUgZW5kcG9pbnQgY29udHJvbGxlciBkcml2ZXJzIHRvIHVzZQo+IHRoaXMgbW9yZSB3 ZWxsIGRlZmluZWQgZm9ybWF0Lgo+IAo+IFNpZ25lZC1vZmYtYnk6IE5pa2xhcyBDYXNzZWwgPGNh c3NlbEBrZXJuZWwub3JnPgo+IC0tLQo+ICBkcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3Yy9wY2kt aW14Ni5jICAgICAgICAgfCAgMyArLQo+ICBkcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3Yy9wY2kt a2V5c3RvbmUuYyAgICAgfCAxMiArKystLS0tCj4gIC4uLi9wY2kvY29udHJvbGxlci9kd2MvcGNp LWxheWVyc2NhcGUtZXAuYyAgICB8ICA1ICsrLQo+ICBkcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3 Yy9wY2llLWtlZW1iYXkuYyAgICAgfCAgOCArKystLQo+ICBkcml2ZXJzL3BjaS9jb250cm9sbGVy L2R3Yy9wY2llLXJjYXItZ2VuNC5jICAgfCAgNCArKy0KPiAgZHJpdmVycy9wY2kvY29udHJvbGxl ci9kd2MvcGNpZS10ZWdyYTE5NC5jICAgIHwgMTAgKysrKy0tCj4gIGRyaXZlcnMvcGNpL2NvbnRy b2xsZXIvZHdjL3BjaWUtdW5pcGhpZXItZXAuYyB8IDE1ICsrKysrKy0tCj4gIGRyaXZlcnMvcGNp L2NvbnRyb2xsZXIvcGNpZS1yY2FyLWVwLmMgICAgICAgICB8IDE0ICsrKysrLS0tCj4gIGRyaXZl cnMvcGNpL2VuZHBvaW50L2Z1bmN0aW9ucy9wY2ktZXBmLW50Yi5jICB8ICA0ICstLQo+ICBkcml2 ZXJzL3BjaS9lbmRwb2ludC9mdW5jdGlvbnMvcGNpLWVwZi10ZXN0LmMgfCAgOCArKy0tLQo+ICBk cml2ZXJzL3BjaS9lbmRwb2ludC9mdW5jdGlvbnMvcGNpLWVwZi12bnRiLmMgfCAgMiArLQo+ICBk cml2ZXJzL3BjaS9lbmRwb2ludC9wY2ktZXBjLWNvcmUuYyAgICAgICAgICAgfCAzMiArKysrKysr KystLS0tLS0tLQo+ICBkcml2ZXJzL3BjaS9lbmRwb2ludC9wY2ktZXBmLWNvcmUuYyAgICAgICAg ICAgfCAxNSArKysrLS0tLQo+ICBpbmNsdWRlL2xpbnV4L3BjaS1lcGMuaCAgICAgICAgICAgICAg ICAgICAgICAgfCAzNCArKysrKysrKysrKysrKystLS0tCj4gIDE0IGZpbGVzIGNoYW5nZWQsIDEw OCBpbnNlcnRpb25zKCspLCA1OCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9wY2kvY29udHJvbGxlci9kd2MvcGNpLWlteDYuYyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIv ZHdjL3BjaS1pbXg2LmMKPiBpbmRleCBkYzJjMDM2YWIyOGMuLjQ3YTlhOTY0ODRlZCAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3Yy9wY2ktaW14Ni5jCj4gKysrIGIvZHJp dmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpLWlteDYuYwo+IEBAIC0xMDgxLDcgKzEwODEsOCBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IHBjaV9lcGNfZmVhdHVyZXMgaW14OG1fcGNpZV9lcGNfZmVh dHVyZXMgPSB7Cj4gIAkubGlua3VwX25vdGlmaWVyID0gZmFsc2UsCj4gIAkubXNpX2NhcGFibGUg PSB0cnVlLAo+ICAJLm1zaXhfY2FwYWJsZSA9IGZhbHNlLAo+IC0JLnJlc2VydmVkX2JhciA9IDEg PDwgQkFSXzEgfCAxIDw8IEJBUl8zLAo+ICsJLmJhcltCQVJfMV0gPSB7IC50eXBlID0gQkFSX1JF U0VSVkVELCB9LAo+ICsJLmJhcltCQVJfM10gPSB7IC50eXBlID0gQkFSX1JFU0VSVkVELCB9LAo+ ICAJLmFsaWduID0gU1pfNjRLLAo+ICB9Owo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kv Y29udHJvbGxlci9kd2MvcGNpLWtleXN0b25lLmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3 Yy9wY2kta2V5c3RvbmUuYwo+IGluZGV4IGMwYzYyNTMzYTNmMS4uYjJiOTNiNGZhODJkIDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvZHdjL3BjaS1rZXlzdG9uZS5jCj4gKysr IGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpLWtleXN0b25lLmMKPiBAQCAtOTI0LDEy ICs5MjQsMTIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBwY2lfZXBjX2ZlYXR1cmVzIGtzX3BjaWVf YW02NTRfZXBjX2ZlYXR1cmVzID0gewo+ICAJLmxpbmt1cF9ub3RpZmllciA9IGZhbHNlLAo+ICAJ Lm1zaV9jYXBhYmxlID0gdHJ1ZSwKPiAgCS5tc2l4X2NhcGFibGUgPSB0cnVlLAo+IC0JLnJlc2Vy dmVkX2JhciA9IDEgPDwgQkFSXzAgfCAxIDw8IEJBUl8xLAo+IC0JLmJhcl9maXhlZF82NGJpdCA9 IDEgPDwgQkFSXzAsCj4gLQkuYmFyX2ZpeGVkX3NpemVbMl0gPSBTWl8xTSwKPiAtCS5iYXJfZml4 ZWRfc2l6ZVszXSA9IFNaXzY0SywKPiAtCS5iYXJfZml4ZWRfc2l6ZVs0XSA9IDI1NiwKPiAtCS5i YXJfZml4ZWRfc2l6ZVs1XSA9IFNaXzFNLAo+ICsJLmJhcltCQVJfMF0gPSB7IC50eXBlID0gQkFS X1JFU0VSVkVELCAub25seV82NGJpdCA9IHRydWUsIH0sCj4gKwkuYmFyW0JBUl8xXSA9IHsgLnR5 cGUgPSBCQVJfUkVTRVJWRUQsIH0sCj4gKwkuYmFyW0JBUl8yXSA9IHsgLnR5cGUgPSBCQVJfRklY RUQsIC5maXhlZF9zaXplID0gU1pfMU0sIH0sCj4gKwkuYmFyW0JBUl8zXSA9IHsgLnR5cGUgPSBC QVJfRklYRUQsIC5maXhlZF9zaXplID0gU1pfNjRLLCB9LAo+ICsJLmJhcltCQVJfNF0gPSB7IC50 eXBlID0gQkFSX0ZJWEVELCAuZml4ZWRfc2l6ZSA9IDI1NiwgfSwKPiArCS5iYXJbQkFSXzVdID0g eyAudHlwZSA9IEJBUl9GSVhFRCwgLmZpeGVkX3NpemUgPSBTWl8xTSwgfSwKPiAgCS5hbGlnbiA9 IFNaXzFNLAo+ICB9Owo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9k d2MvcGNpLWxheWVyc2NhcGUtZXAuYyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvZHdjL3BjaS1s YXllcnNjYXBlLWVwLmMKPiBpbmRleCAyZTM5ODQ5NGU3YzAuLjFmNmVlMTQ2MGVjMiAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3Yy9wY2ktbGF5ZXJzY2FwZS1lcC5jCj4g KysrIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpLWxheWVyc2NhcGUtZXAuYwo+IEBA IC0yNTAsNyArMjUwLDEwIEBAIHN0YXRpYyBpbnQgX19pbml0IGxzX3BjaWVfZXBfcHJvYmUoc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKPiAgCXBjaS0+ZGV2ID0gZGV2Owo+ICAJcGNpLT5v cHMgPSBwY2llLT5kcnZkYXRhLT5kd19wY2llX29wczsKPiAgCj4gLQlsc19lcGMtPmJhcl9maXhl ZF82NGJpdCA9ICgxIDw8IEJBUl8yKSB8ICgxIDw8IEJBUl80KTsKPiArCWxzX2VwYy0+YmFyW0JB Ul8yXS5vbmx5XzY0Yml0ID0gdHJ1ZTsKPiArCWxzX2VwYy0+YmFyW0JBUl8zXS50eXBlID0gQkFS X1JFU0VSVkVEOwoKQkFSXzMgYW5kIEJBUl80IHdlcmUgbm90IHJlc2VydmVkIHByZXZpb3VzbHku Cgo+ICsJbHNfZXBjLT5iYXJbQkFSXzRdLm9ubHlfNjRiaXQgPSB0cnVlOwo+ICsJbHNfZXBjLT5i YXJbQkFSXzVdLnR5cGUgPSBCQVJfUkVTRVJWRUQ7Cj4gIAlsc19lcGMtPmxpbmt1cF9ub3RpZmll ciA9IHRydWU7Cj4gIAo+ICAJcGNpZS0+cGNpID0gcGNpOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L3BjaS9jb250cm9sbGVyL2R3Yy9wY2llLWtlZW1iYXkuYyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xs ZXIvZHdjL3BjaWUta2VlbWJheS5jCj4gaW5kZXggMjA4ZDNiMGJhMTk2Li41ZThlNTRmNTk3ZGQg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS1rZWVtYmF5LmMK PiArKysgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3Yy9wY2llLWtlZW1iYXkuYwo+IEBAIC0z MTIsOCArMzEyLDEyIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcGNpX2VwY19mZWF0dXJlcyBrZWVt YmF5X3BjaWVfZXBjX2ZlYXR1cmVzID0gewo+ICAJLmxpbmt1cF9ub3RpZmllcgk9IGZhbHNlLAo+ ICAJLm1zaV9jYXBhYmxlCQk9IHRydWUsCj4gIAkubXNpeF9jYXBhYmxlCQk9IHRydWUsCj4gLQku cmVzZXJ2ZWRfYmFyCQk9IEJJVChCQVJfMSkgfCBCSVQoQkFSXzMpIHwgQklUKEJBUl81KSwKPiAt CS5iYXJfZml4ZWRfNjRiaXQJPSBCSVQoQkFSXzApIHwgQklUKEJBUl8yKSB8IEJJVChCQVJfNCks Cj4gKwkuYmFyW0JBUl8wXQkJPSB7IC5vbmx5XzY0Yml0ID0gdHJ1ZSwgfSwKPiArCS5iYXJbQkFS XzFdCQk9IHsgLnR5cGUgPSBCQVJfUkVTRVJWRUQsIH0sCj4gKwkuYmFyW0JBUl8yXQkJPSB7IC5v bmx5XzY0Yml0ID0gdHJ1ZSwgfSwKPiArCS5iYXJbQkFSXzNdCQk9IHsgLnR5cGUgPSBCQVJfUkVT RVJWRUQsIH0sCj4gKwkuYmFyW0JBUl80XQkJPSB7IC5vbmx5XzY0Yml0ID0gdHJ1ZSwgfSwKPiAr CS5iYXJbQkFSXzVdCQk9IHsgLnR5cGUgPSBCQVJfUkVTRVJWRUQsIH0sCj4gIAkuYWxpZ24JCQk9 IFNaXzE2SywKPiAgfTsKPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIv ZHdjL3BjaWUtcmNhci1nZW40LmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL2R3Yy9wY2llLXJj YXItZ2VuNC5jCj4gaW5kZXggZTkxNjY2MTliMWY5Li4wYmU3NjBlZDQyMGIgMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS1yY2FyLWdlbjQuYwo+ICsrKyBiL2Ry aXZlcnMvcGNpL2NvbnRyb2xsZXIvZHdjL3BjaWUtcmNhci1nZW40LmMKPiBAQCAtMzgzLDcgKzM4 Myw5IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcGNpX2VwY19mZWF0dXJlcyByY2FyX2dlbjRfcGNp ZV9lcGNfZmVhdHVyZXMgPSB7Cj4gIAkubGlua3VwX25vdGlmaWVyID0gZmFsc2UsCj4gIAkubXNp X2NhcGFibGUgPSB0cnVlLAo+ICAJLm1zaXhfY2FwYWJsZSA9IGZhbHNlLAo+IC0JLnJlc2VydmVk X2JhciA9IDEgPDwgQkFSXzEgfCAxIDw8IEJBUl8zIHwgMSA8PCBCQVJfNSwKPiArCS5iYXJbQkFS XzFdID0geyAudHlwZSA9IEJBUl9SRVNFUlZFRCwgfSwKPiArCS5iYXJbQkFSXzNdID0geyAudHlw ZSA9IEJBUl9SRVNFUlZFRCwgfSwKPiArCS5iYXJbQkFSXzVdID0geyAudHlwZSA9IEJBUl9SRVNF UlZFRCwgfSwKPiAgCS5hbGlnbiA9IFNaXzFNLAo+ICB9Owo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS10ZWdyYTE5NC5jIGIvZHJpdmVycy9wY2kvY29u dHJvbGxlci9kd2MvcGNpZS10ZWdyYTE5NC5jCj4gaW5kZXggN2FmYTllOWFhYmUyLi4xZjdiNjYy Y2I4ZTEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS10ZWdy YTE5NC5jCj4gKysrIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS10ZWdyYTE5NC5j Cj4gQEAgLTIwMDcsOSArMjAwNywxMyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHBjaV9lcGNfZmVh dHVyZXMgdGVncmFfcGNpZV9lcGNfZmVhdHVyZXMgPSB7Cj4gIAkuY29yZV9pbml0X25vdGlmaWVy ID0gdHJ1ZSwKPiAgCS5tc2lfY2FwYWJsZSA9IGZhbHNlLAo+ICAJLm1zaXhfY2FwYWJsZSA9IGZh bHNlLAo+IC0JLnJlc2VydmVkX2JhciA9IDEgPDwgQkFSXzIgfCAxIDw8IEJBUl8zIHwgMSA8PCBC QVJfNCB8IDEgPDwgQkFSXzUsCj4gLQkuYmFyX2ZpeGVkXzY0Yml0ID0gMSA8PCBCQVJfMCwKPiAt CS5iYXJfZml4ZWRfc2l6ZVswXSA9IFNaXzFNLAo+ICsJLmJhcltCQVJfMF0gPSB7IC50eXBlID0g QkFSX0ZJWEVELCAuZml4ZWRfc2l6ZSA9IFNaXzFNLAo+ICsJCQkub25seV82NGJpdCA9IHRydWUs IH0sCj4gKwkuYmFyW0JBUl8xXSA9IHsgLnR5cGUgPSBCQVJfUkVTRVJWRUQsIH0sCgpTYW1lLCBC QVJfMSB3YXMgbm90IHJlc2VydmVkLgoKPiArCS5iYXJbQkFSXzJdID0geyAudHlwZSA9IEJBUl9S RVNFUlZFRCwgfSwKPiArCS5iYXJbQkFSXzNdID0geyAudHlwZSA9IEJBUl9SRVNFUlZFRCwgfSwK PiArCS5iYXJbQkFSXzRdID0geyAudHlwZSA9IEJBUl9SRVNFUlZFRCwgfSwKPiArCS5iYXJbQkFS XzVdID0geyAudHlwZSA9IEJBUl9SRVNFUlZFRCwgfSwKPiAgfTsKPiAgCj4gIHN0YXRpYyBjb25z dCBzdHJ1Y3QgcGNpX2VwY19mZWF0dXJlcyoKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29u dHJvbGxlci9kd2MvcGNpZS11bmlwaGllci1lcC5jIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9k d2MvcGNpZS11bmlwaGllci1lcC5jCj4gaW5kZXggM2ZjZWQwZDNlODUxLi4yNjVmNjVmYzY3M2Yg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS11bmlwaGllci1l cC5jCj4gKysrIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9kd2MvcGNpZS11bmlwaGllci1lcC5j Cj4gQEAgLTQxMSw4ICs0MTEsMTIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCB1bmlwaGllcl9wY2ll X2VwX3NvY19kYXRhIHVuaXBoaWVyX3BybzVfZGF0YSA9IHsKPiAgCQkubXNpX2NhcGFibGUgPSB0 cnVlLAo+ICAJCS5tc2l4X2NhcGFibGUgPSBmYWxzZSwKPiAgCQkuYWxpZ24gPSAxIDw8IDE2LAo+ IC0JCS5iYXJfZml4ZWRfNjRiaXQgPSBCSVQoQkFSXzApIHwgQklUKEJBUl8yKSB8IEJJVChCQVJf NCksCj4gLQkJLnJlc2VydmVkX2JhciA9ICBCSVQoQkFSXzQpLAo+ICsJCS5iYXJbQkFSXzBdID0g eyAub25seV82NGJpdCA9IHRydWUsIH0sCj4gKwkJLmJhcltCQVJfMV0gPSB7IC50eXBlID0gQkFS X1JFU0VSVkVELCB9LAoKU2FtZSBhcyBhYm92ZS4KCj4gKwkJLmJhcltCQVJfMl0gPSB7IC5vbmx5 XzY0Yml0ID0gdHJ1ZSwgfSwKPiArCQkuYmFyW0JBUl8zXSA9IHsgLnR5cGUgPSBCQVJfUkVTRVJW RUQsIH0sCj4gKwkJLmJhcltCQVJfNF0gPSB7IC50eXBlID0gQkFSX1JFU0VSVkVELCAub25seV82 NGJpdCA9IHRydWUsIH0sCj4gKwkJLmJhcltCQVJfNV0gPSB7IC50eXBlID0gQkFSX1JFU0VSVkVE LCB9LAo+ICAJfSwKPiAgfTsKPiAgCj4gQEAgLTQyNSw3ICs0MjksMTIgQEAgc3RhdGljIGNvbnN0 IHN0cnVjdCB1bmlwaGllcl9wY2llX2VwX3NvY19kYXRhIHVuaXBoaWVyX254MV9kYXRhID0gewo+ ICAJCS5tc2lfY2FwYWJsZSA9IHRydWUsCj4gIAkJLm1zaXhfY2FwYWJsZSA9IGZhbHNlLAo+ICAJ CS5hbGlnbiA9IDEgPDwgMTIsCj4gLQkJLmJhcl9maXhlZF82NGJpdCA9IEJJVChCQVJfMCkgfCBC SVQoQkFSXzIpIHwgQklUKEJBUl80KSwKPiArCQkuYmFyW0JBUl8wXSA9IHsgLm9ubHlfNjRiaXQg PSB0cnVlLCB9LAo+ICsJCS5iYXJbQkFSXzFdID0geyAudHlwZSA9IEJBUl9SRVNFUlZFRCwgfSwK ClNhbWUgYXMgYWJvdmUuCgotIE1hbmkKCi0tIArgrq7grqPgrr/grrXgrqPgr43grqPgrqngr40g 4K6a4K6k4K6+4K6a4K6/4K614K6u4K+NCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==