Re: [PATCH v10 00/14] PCI: imx6: Clean up and add imx95 pci support

From: Lorenzo Pieralisi <lpieralisi@kernel.org>
To: Niklas Cassel <cassel@kernel.org>
Cc: Frank Li <Frank.li@nxp.com>,
	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
	bhelgaas@google.com, conor+dt@kernel.org,
	devicetree@vger.kernel.org, festevam@gmail.com,
	helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev,
	kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org,
	krzysztof.kozlowski@linaro.org, kw@linux.com,
	l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org,
	linux-imx@nxp.com, linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org, robh@kernel.org,
	s.hauer@pengutronix.de, shawnguo@kernel.org
Subject: Re: [PATCH v10 00/14] PCI: imx6: Clean up and add imx95 pci support
Date: Tue, 20 Feb 2024 11:08:17 +0100	[thread overview]
Message-ID: <ZdR6EUOv6hzLEmUa@lpieralisi> (raw)
In-Reply-To: <ZdR2FRQ9Fe8hhK9I@x1-carbon>

On Tue, Feb 20, 2024 at 10:51:17AM +0100, Niklas Cassel wrote:
> On Mon, Feb 19, 2024 at 11:18:03AM -0500, Frank Li wrote:
> > On Mon, Feb 19, 2024 at 09:42:08PM +0530, Manivannan Sadhasivam wrote:
> > > On Mon, Feb 19, 2024 at 10:11:45AM -0500, Frank Li wrote:
> > > > On Mon, Feb 05, 2024 at 12:33:21PM -0500, Frank Li wrote:
> > > > > first 6 patches use drvdata: flags to simplify some switch-case code.
> > > > > Improve maintaince and easy to read code.
> > > > > 
> > > > 
> > > > @Lorenzo Pieralisi:
> > > > 
> > > > 	Do you have chance to look other patches?
> > > > 	Mani's apply EP side change. 
> > > 
> > > Even though the controller is for the endpoint, it is still a controller
> > > driver. So all the patches should go through Lorenzo.
> > > 
> > > I only merge patches under drivers/pci/endpoint. Hope this clarifies.
> > 
> > Sorry. It confused everyone. My means was that Mani applied Niklas Cassel's
> > patches, which cause my 14th patch build failure.
> 
> Hello Frank,
> 
> Patch 14, which adds this:
> 
> +static const struct pci_epc_features imx95_pcie_epc_features = {
> +       .msi_capable = true,
> +       .bar_fixed_size[1] = SZ_64K,
> +       .align = SZ_4K,
> +};
> 
> 
> Should, after rebasing on Mani's pci/endpoint branch, instead look like this:
> 
> +static const struct pci_epc_features imx95_pcie_epc_features = {
> +       .msi_capable = true,
> +       .bar[BAR_1] = { .type = BAR_FIXED, .fixed_size = SZ_64K, },
> +       .align = SZ_4K,
> +};
> 
> 
> > 
> > I asked if I need update my 14th patch or applied 1-13 only. 
> 
> I see, you want the maintainers to apply 1-13, and simply drop patch 14
> instead of you sending out a rebased series.
> 
> I assume that the maintainers will be fine with your suggested approach.

If patch 14 has no dependencies on 1-13 yes; if it does we need to
coordinate the merge between branches in the PCI tree.

Lorenzo