linux-next: manual merge of the pci tree with the arm-soc tree

linux-next: manual merge of the pci tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4229 bytes --]

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

between commit:

  68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC")

from the arm-soc tree and commit:

  8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 8e8a77eb596a,71d7c6949b9e..000000000000
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@@ -611,6 -594,89 +611,58 @@@
  			#thermal-sensor-cells = <1>;
  		};
  
 -		thermal-zones {
 -			core-cluster {
 -				polling-delay-passive = <1000>;
 -				polling-delay = <5000>;
 -				thermal-sensors = <&tmu 0>;
 -
 -				trips {
 -					core_cluster_alert: core-cluster-alert {
 -						temperature = <85000>;
 -						hysteresis = <2000>;
 -						type = "passive";
 -					};
 -
 -					core_cluster_crit: core-cluster-crit {
 -						temperature = <95000>;
 -						hysteresis = <2000>;
 -						type = "critical";
 -					};
 -				};
 -
 -				cooling-maps {
 -					map0 {
 -						trip = <&core_cluster_alert>;
 -						cooling-device =
 -							<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 -							<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 -					};
 -				};
 -			};
 -		};
 -
+ 		pcie@3400000 {
+ 			compatible = "fsl,ls1028a-pcie";
+ 			reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
+ 			       0x80 0x00000000 0x0 0x00002000>; /* configuration space */
+ 			reg-names = "regs", "config";
+ 			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
+ 				     <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; /* aer interrupt */
+ 			interrupt-names = "pme", "aer";
+ 			#address-cells = <3>;
+ 			#size-cells = <2>;
+ 			device_type = "pci";
+ 			dma-coherent;
+ 			num-viewport = <8>;
+ 			bus-range = <0x0 0xff>;
+ 			ranges = <0x81000000 0x0 0x00000000 0x80 0x00010000 0x0 0x00010000   /* downstream I/O */
+ 				  0x82000000 0x0 0x40000000 0x80 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+ 			msi-parent = <&its>;
+ 			#interrupt-cells = <1>;
+ 			interrupt-map-mask = <0 0 0 7>;
+ 			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
+ 					<0000 0 0 2 &gic 0 0 GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
+ 					<0000 0 0 3 &gic 0 0 GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,
+ 					<0000 0 0 4 &gic 0 0 GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+ 			status = "disabled";
+ 		};
+ 
+ 		pcie@3500000 {
+ 			compatible = "fsl,ls1028a-pcie";
+ 			reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
+ 			       0x88 0x00000000 0x0 0x00002000>; /* configuration space */
+ 			reg-names = "regs", "config";
+ 			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
+ 				     <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+ 			interrupt-names = "pme", "aer";
+ 			#address-cells = <3>;
+ 			#size-cells = <2>;
+ 			device_type = "pci";
+ 			dma-coherent;
+ 			num-viewport = <8>;
+ 			bus-range = <0x0 0xff>;
+ 			ranges = <0x81000000 0x0 0x00000000 0x88 0x00010000 0x0 0x00010000   /* downstream I/O */
+ 				  0x82000000 0x0 0x40000000 0x88 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+ 			msi-parent = <&its>;
+ 			#interrupt-cells = <1>;
+ 			interrupt-map-mask = <0 0 0 7>;
+ 			interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
+ 					<0000 0 0 2 &gic 0 0 GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
+ 					<0000 0 0 3 &gic 0 0 GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+ 					<0000 0 0 4 &gic 0 0 GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+ 			status = "disabled";
+ 		};
+ 
  		pcie@1f0000000 { /* Integrated Endpoint Root Complex */
  			compatible = "pci-host-ecam-generic";
  			reg = <0x01 0xf0000000 0x0 0x100000>;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Olof Johansson]

On Wed, Nov 6, 2019 at 2:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
>   arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
>
> between commit:
>
>   68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC")
>
> from the arm-soc tree and commit:
>
>   8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes")

Bjorn, we ask that driver subsystem maintainers don't pick up DT
changes since it causes conflicts like these.

Is it easy for you to drop this patch, or are we stuck with it?
Ideally it should never have been sent to you in the first place. :(


-Olof

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Bjorn Helgaas]

On Thu, Nov 07, 2019 at 10:27:20AM -0800, Olof Johansson wrote:
> On Wed, Nov 6, 2019 at 2:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the pci tree got a conflict in:
> >
> >   arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> >
> > between commit:
> >
> >   68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC")
> >
> > from the arm-soc tree and commit:
> >
> >   8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes")
> 
> Bjorn, we ask that driver subsystem maintainers don't pick up DT
> changes since it causes conflicts like these.
> 
> Is it easy for you to drop this patch, or are we stuck with it?
> Ideally it should never have been sent to you in the first place. :(

Lorenzo, is it feasible for you to drop it from your pci/layerscape
branch and repush it?  If so, I can redo the merge into my "next"
branch.

Bjorn

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Lorenzo Pieralisi]

On Thu, Nov 07, 2019 at 03:18:01PM -0600, Bjorn Helgaas wrote:
> On Thu, Nov 07, 2019 at 10:27:20AM -0800, Olof Johansson wrote:
> > On Wed, Nov 6, 2019 at 2:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Hi all,
> > >
> > > Today's linux-next merge of the pci tree got a conflict in:
> > >
> > >   arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> > >
> > > between commit:
> > >
> > >   68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC")
> > >
> > > from the arm-soc tree and commit:
> > >
> > >   8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes")
> > 
> > Bjorn, we ask that driver subsystem maintainers don't pick up DT
> > changes since it causes conflicts like these.
> > 
> > Is it easy for you to drop this patch, or are we stuck with it?
> > Ideally it should never have been sent to you in the first place. :(
> 
> Lorenzo, is it feasible for you to drop it from your pci/layerscape
> branch and repush it?  If so, I can redo the merge into my "next"
> branch.

Done. Should we ignore all dts updates from now onwards ?

Thanks,
Lorenzo

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Bjorn Helgaas]

On Fri, Nov 8, 2019 at 5:07 AM Lorenzo Pieralisi
<lorenzo.pieralisi@arm.com> wrote:
>
> On Thu, Nov 07, 2019 at 03:18:01PM -0600, Bjorn Helgaas wrote:
> > On Thu, Nov 07, 2019 at 10:27:20AM -0800, Olof Johansson wrote:
> > > On Wed, Nov 6, 2019 at 2:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the pci tree got a conflict in:
> > > >
> > > >   arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> > > >
> > > > between commit:
> > > >
> > > >   68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC")
> > > >
> > > > from the arm-soc tree and commit:
> > > >
> > > >   8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes")
> > >
> > > Bjorn, we ask that driver subsystem maintainers don't pick up DT
> > > changes since it causes conflicts like these.
> > >
> > > Is it easy for you to drop this patch, or are we stuck with it?
> > > Ideally it should never have been sent to you in the first place. :(
> >
> > Lorenzo, is it feasible for you to drop it from your pci/layerscape
> > branch and repush it?  If so, I can redo the merge into my "next"
> > branch.
>
> Done. ...

Thanks, I updated my "next" branch to incorporate this.

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Olof Johansson]

On Fri, Nov 8, 2019 at 3:07 AM Lorenzo Pieralisi
<lorenzo.pieralisi@arm.com> wrote:
>
> On Thu, Nov 07, 2019 at 03:18:01PM -0600, Bjorn Helgaas wrote:
> > On Thu, Nov 07, 2019 at 10:27:20AM -0800, Olof Johansson wrote:
> > > On Wed, Nov 6, 2019 at 2:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the pci tree got a conflict in:
> > > >
> > > >   arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> > > >
> > > > between commit:
> > > >
> > > >   68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC")
> > > >
> > > > from the arm-soc tree and commit:
> > > >
> > > >   8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes")
> > >
> > > Bjorn, we ask that driver subsystem maintainers don't pick up DT
> > > changes since it causes conflicts like these.
> > >
> > > Is it easy for you to drop this patch, or are we stuck with it?
> > > Ideally it should never have been sent to you in the first place. :(
> >
> > Lorenzo, is it feasible for you to drop it from your pci/layerscape
> > branch and repush it?  If so, I can redo the merge into my "next"
> > branch.
>
> Done. Should we ignore all dts updates from now onwards ?

Thanks!

Indeed, dts updates should only go in through the platform maintainers
(i.e. through soc tree), unless there are strong reasons to bring them
in through driver trees.

If there's a need for a dt-include to be shared between driver and
dts, getting them on a stable branch that's merged through both trees
is usually the best way. Reach out when that happens and we can
coordinate.


Regards,

-Olof

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Serge Semin]

On Thu, Dec 15, 2022 at 01:06:29PM +0100, Thierry Reding wrote:
> On Thu, Dec 15, 2022 at 01:07:35AM +0300, Serge Semin wrote:
> > On Wed, Dec 14, 2022 at 03:37:35PM +0100, Thierry Reding wrote:
> > > On Wed, Dec 14, 2022 at 02:36:49AM +0300, Serge Semin wrote:
> > > > On Tue, Dec 13, 2022 at 02:07:33PM -0600, Bjorn Helgaas wrote:
> > > > > On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote:
> > > > > > On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> > > > > > > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > > > > > > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > > > > > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > > > > > > > > Hi all,
> > > > > > > > > > 
> > > > > > > > > > Today's linux-next merge of the pci tree got a conflict in:
> > > > > > > > > > 
> > > > > > > > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > > > > > > > 
> > > > > > > > > > between commit:
> > > > > > > > > > 
> > > > > > > > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > > > > > > > > 
> > > > > > > > > > from the arm-soc tree and commit:
> > > > > > > > > > 
> > > > > > > > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > > > > > > > > 
> > > > > > > > > > from the pci tree.
> > > > > > > > > > 
> > > > > > > > > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > > > > > > > > the addition of "ecam").
> > > > > > > > > 
> > > > > > > > > Did I miss a suggested resolution for this?
> > > > > > > 
> > > > > > > > We had a brief discussion about this in another thread. So basically
> > > > > > > > Stephen's resolution is fine here and the plan is to instead add the
> > > > > > > > ECAM bits that the Tegra patch does in a separate patch on top of
> > > > > > > > Serge's patch. I should get around to sending that patch tomorrow.
> > > > > > > 
> > > > > > > Actually the discussion still goes. I haven't got a respond to my
> > > > > > > last suggestion which seems to me more reasonable than extending the
> > > > > > > DT-bindings with another vendor-specific reg-name. @Bjorn, please join
> > > > > > > the discussion here:
> > > > > > > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/
> > > > > > 
> > > > 
> > > > > > Sorry, it's really too late for discussion.  I need to send the v6.2
> > > > > > pull request today or at the very latest, tomorrow, so the only thing
> > > > > > to decide is how to resolve the merge conflict in the simplest
> > > > > > possible way.  Unless there's a very compelling reason to resolve it
> > > > > > differently than Stephen did, that's going to be the answer.
> > > > 
> > > > Sigh... One more redundant vendor-specific name. I wish I was in the
> > > > Cc-list of the original series.
> > > > 
> > > > > 
> > > > > To be more specific, the current answer is this (which is the same as
> > > > > what's in next-20221213):
> > > > > 
> > > > >   https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=f64171fdd171
> > > > 
> > > > Thanks. I've got it from the @Stephen message. @Thierry will submit a
> > > > new patch with the same 'ecam'-names change rebased on top of the
> > > > updated DT-schema.
> > > 
> > 
> > > If Rob doesn't mind this being broken in linux-next for a few more days,
> > > I can discuss this internally with our PCI and UEFI teams and find out
> > > if your proposal could be made to work.
> > 
> > That would be awesome if you managed to work with the already defined
> > 'config' reg-name so the DT-schema would look a bit cleaner. Thanks
> > in advance.
> 

> Looks like Linus has now pulled this in and resolved the conflict
> himself. I think there is some benefit in "ecam" being more specific
> than "config" and with ECAM being a PCIe standard mapping, it doesn't
> seem like it's worth overcomplicating things by overloading the meaning
> of "config".

It's vise versa actually. Adding the new name overcomplicates the
DT-interface for no reason. Using the 'config' name for mapping both
the unrolled and single-sided cfg-spaces would look much cleaner.

-Serge(y)

> 
> Thierry

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 3927 bytes --]

On Thu, Dec 15, 2022 at 01:07:35AM +0300, Serge Semin wrote:
> On Wed, Dec 14, 2022 at 03:37:35PM +0100, Thierry Reding wrote:
> > On Wed, Dec 14, 2022 at 02:36:49AM +0300, Serge Semin wrote:
> > > On Tue, Dec 13, 2022 at 02:07:33PM -0600, Bjorn Helgaas wrote:
> > > > On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote:
> > > > > On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> > > > > > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > > > > > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > > > > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > > > > > > > Hi all,
> > > > > > > > > 
> > > > > > > > > Today's linux-next merge of the pci tree got a conflict in:
> > > > > > > > > 
> > > > > > > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > > > > > > 
> > > > > > > > > between commit:
> > > > > > > > > 
> > > > > > > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > > > > > > > 
> > > > > > > > > from the arm-soc tree and commit:
> > > > > > > > > 
> > > > > > > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > > > > > > > 
> > > > > > > > > from the pci tree.
> > > > > > > > > 
> > > > > > > > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > > > > > > > the addition of "ecam").
> > > > > > > > 
> > > > > > > > Did I miss a suggested resolution for this?
> > > > > > 
> > > > > > > We had a brief discussion about this in another thread. So basically
> > > > > > > Stephen's resolution is fine here and the plan is to instead add the
> > > > > > > ECAM bits that the Tegra patch does in a separate patch on top of
> > > > > > > Serge's patch. I should get around to sending that patch tomorrow.
> > > > > > 
> > > > > > Actually the discussion still goes. I haven't got a respond to my
> > > > > > last suggestion which seems to me more reasonable than extending the
> > > > > > DT-bindings with another vendor-specific reg-name. @Bjorn, please join
> > > > > > the discussion here:
> > > > > > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/
> > > > > 
> > > 
> > > > > Sorry, it's really too late for discussion.  I need to send the v6.2
> > > > > pull request today or at the very latest, tomorrow, so the only thing
> > > > > to decide is how to resolve the merge conflict in the simplest
> > > > > possible way.  Unless there's a very compelling reason to resolve it
> > > > > differently than Stephen did, that's going to be the answer.
> > > 
> > > Sigh... One more redundant vendor-specific name. I wish I was in the
> > > Cc-list of the original series.
> > > 
> > > > 
> > > > To be more specific, the current answer is this (which is the same as
> > > > what's in next-20221213):
> > > > 
> > > >   https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=f64171fdd171
> > > 
> > > Thanks. I've got it from the @Stephen message. @Thierry will submit a
> > > new patch with the same 'ecam'-names change rebased on top of the
> > > updated DT-schema.
> > 
> 
> > If Rob doesn't mind this being broken in linux-next for a few more days,
> > I can discuss this internally with our PCI and UEFI teams and find out
> > if your proposal could be made to work.
> 
> That would be awesome if you managed to work with the already defined
> 'config' reg-name so the DT-schema would look a bit cleaner. Thanks
> in advance.

Looks like Linus has now pulled this in and resolved the conflict
himself. I think there is some benefit in "ecam" being more specific
than "config" and with ECAM being a PCIe standard mapping, it doesn't
seem like it's worth overcomplicating things by overloading the meaning
of "config".

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Serge Semin]

On Wed, Dec 14, 2022 at 03:37:35PM +0100, Thierry Reding wrote:
> On Wed, Dec 14, 2022 at 02:36:49AM +0300, Serge Semin wrote:
> > On Tue, Dec 13, 2022 at 02:07:33PM -0600, Bjorn Helgaas wrote:
> > > On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote:
> > > > On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> > > > > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > > > > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > > > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > > > > > > Hi all,
> > > > > > > > 
> > > > > > > > Today's linux-next merge of the pci tree got a conflict in:
> > > > > > > > 
> > > > > > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > > > > > 
> > > > > > > > between commit:
> > > > > > > > 
> > > > > > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > > > > > > 
> > > > > > > > from the arm-soc tree and commit:
> > > > > > > > 
> > > > > > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > > > > > > 
> > > > > > > > from the pci tree.
> > > > > > > > 
> > > > > > > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > > > > > > the addition of "ecam").
> > > > > > > 
> > > > > > > Did I miss a suggested resolution for this?
> > > > > 
> > > > > > We had a brief discussion about this in another thread. So basically
> > > > > > Stephen's resolution is fine here and the plan is to instead add the
> > > > > > ECAM bits that the Tegra patch does in a separate patch on top of
> > > > > > Serge's patch. I should get around to sending that patch tomorrow.
> > > > > 
> > > > > Actually the discussion still goes. I haven't got a respond to my
> > > > > last suggestion which seems to me more reasonable than extending the
> > > > > DT-bindings with another vendor-specific reg-name. @Bjorn, please join
> > > > > the discussion here:
> > > > > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/
> > > > 
> > 
> > > > Sorry, it's really too late for discussion.  I need to send the v6.2
> > > > pull request today or at the very latest, tomorrow, so the only thing
> > > > to decide is how to resolve the merge conflict in the simplest
> > > > possible way.  Unless there's a very compelling reason to resolve it
> > > > differently than Stephen did, that's going to be the answer.
> > 
> > Sigh... One more redundant vendor-specific name. I wish I was in the
> > Cc-list of the original series.
> > 
> > > 
> > > To be more specific, the current answer is this (which is the same as
> > > what's in next-20221213):
> > > 
> > >   https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=f64171fdd171
> > 
> > Thanks. I've got it from the @Stephen message. @Thierry will submit a
> > new patch with the same 'ecam'-names change rebased on top of the
> > updated DT-schema.
> 

> If Rob doesn't mind this being broken in linux-next for a few more days,
> I can discuss this internally with our PCI and UEFI teams and find out
> if your proposal could be made to work.

That would be awesome if you managed to work with the already defined
'config' reg-name so the DT-schema would look a bit cleaner. Thanks
in advance.

-Serge(y)

> 
> Thierry

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 3086 bytes --]

On Wed, Dec 14, 2022 at 02:36:49AM +0300, Serge Semin wrote:
> On Tue, Dec 13, 2022 at 02:07:33PM -0600, Bjorn Helgaas wrote:
> > On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote:
> > > On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> > > > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > > > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > > > > > Hi all,
> > > > > > > 
> > > > > > > Today's linux-next merge of the pci tree got a conflict in:
> > > > > > > 
> > > > > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > > > > 
> > > > > > > between commit:
> > > > > > > 
> > > > > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > > > > > 
> > > > > > > from the arm-soc tree and commit:
> > > > > > > 
> > > > > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > > > > > 
> > > > > > > from the pci tree.
> > > > > > > 
> > > > > > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > > > > > the addition of "ecam").
> > > > > > 
> > > > > > Did I miss a suggested resolution for this?
> > > > 
> > > > > We had a brief discussion about this in another thread. So basically
> > > > > Stephen's resolution is fine here and the plan is to instead add the
> > > > > ECAM bits that the Tegra patch does in a separate patch on top of
> > > > > Serge's patch. I should get around to sending that patch tomorrow.
> > > > 
> > > > Actually the discussion still goes. I haven't got a respond to my
> > > > last suggestion which seems to me more reasonable than extending the
> > > > DT-bindings with another vendor-specific reg-name. @Bjorn, please join
> > > > the discussion here:
> > > > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/
> > > 
> 
> > > Sorry, it's really too late for discussion.  I need to send the v6.2
> > > pull request today or at the very latest, tomorrow, so the only thing
> > > to decide is how to resolve the merge conflict in the simplest
> > > possible way.  Unless there's a very compelling reason to resolve it
> > > differently than Stephen did, that's going to be the answer.
> 
> Sigh... One more redundant vendor-specific name. I wish I was in the
> Cc-list of the original series.
> 
> > 
> > To be more specific, the current answer is this (which is the same as
> > what's in next-20221213):
> > 
> >   https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=f64171fdd171
> 
> Thanks. I've got it from the @Stephen message. @Thierry will submit a
> new patch with the same 'ecam'-names change rebased on top of the
> updated DT-schema.

If Rob doesn't mind this being broken in linux-next for a few more days,
I can discuss this internally with our PCI and UEFI teams and find out
if your proposal could be made to work.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Serge Semin]

On Tue, Dec 13, 2022 at 02:07:33PM -0600, Bjorn Helgaas wrote:
> On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote:
> > On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> > > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > > > > Hi all,
> > > > > > 
> > > > > > Today's linux-next merge of the pci tree got a conflict in:
> > > > > > 
> > > > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > > > 
> > > > > > between commit:
> > > > > > 
> > > > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > > > > 
> > > > > > from the arm-soc tree and commit:
> > > > > > 
> > > > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > > > > 
> > > > > > from the pci tree.
> > > > > > 
> > > > > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > > > > the addition of "ecam").
> > > > > 
> > > > > Did I miss a suggested resolution for this?
> > > 
> > > > We had a brief discussion about this in another thread. So basically
> > > > Stephen's resolution is fine here and the plan is to instead add the
> > > > ECAM bits that the Tegra patch does in a separate patch on top of
> > > > Serge's patch. I should get around to sending that patch tomorrow.
> > > 
> > > Actually the discussion still goes. I haven't got a respond to my
> > > last suggestion which seems to me more reasonable than extending the
> > > DT-bindings with another vendor-specific reg-name. @Bjorn, please join
> > > the discussion here:
> > > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/
> > 

> > Sorry, it's really too late for discussion.  I need to send the v6.2
> > pull request today or at the very latest, tomorrow, so the only thing
> > to decide is how to resolve the merge conflict in the simplest
> > possible way.  Unless there's a very compelling reason to resolve it
> > differently than Stephen did, that's going to be the answer.

Sigh... One more redundant vendor-specific name. I wish I was in the
Cc-list of the original series.

> 
> To be more specific, the current answer is this (which is the same as
> what's in next-20221213):
> 
>   https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=f64171fdd171

Thanks. I've got it from the @Stephen message. @Thierry will submit a
new patch with the same 'ecam'-names change rebased on top of the
updated DT-schema.

-Serge(y)

> 
> If you think it needs to be different, please respond with a patch and
> explanation.
> 
> Bjorn
> 

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Bjorn Helgaas]

On Tue, Dec 13, 2022 at 01:53:13PM -0600, Bjorn Helgaas wrote:
> On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> > On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > > > Hi all,
> > > > > 
> > > > > Today's linux-next merge of the pci tree got a conflict in:
> > > > > 
> > > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > > 
> > > > > between commit:
> > > > > 
> > > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > > > 
> > > > > from the arm-soc tree and commit:
> > > > > 
> > > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > > > 
> > > > > from the pci tree.
> > > > > 
> > > > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > > > the addition of "ecam").
> > > > 
> > > > Did I miss a suggested resolution for this?
> > 
> > > We had a brief discussion about this in another thread. So basically
> > > Stephen's resolution is fine here and the plan is to instead add the
> > > ECAM bits that the Tegra patch does in a separate patch on top of
> > > Serge's patch. I should get around to sending that patch tomorrow.
> > 
> > Actually the discussion still goes. I haven't got a respond to my
> > last suggestion which seems to me more reasonable than extending the
> > DT-bindings with another vendor-specific reg-name. @Bjorn, please join
> > the discussion here:
> > https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/
> 
> Sorry, it's really too late for discussion.  I need to send the v6.2
> pull request today or at the very latest, tomorrow, so the only thing
> to decide is how to resolve the merge conflict in the simplest
> possible way.  Unless there's a very compelling reason to resolve it
> differently than Stephen did, that's going to be the answer.

To be more specific, the current answer is this (which is the same as
what's in next-20221213):

  https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml?id=f64171fdd171

If you think it needs to be different, please respond with a patch and
explanation.

Bjorn

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Bjorn Helgaas]

On Tue, Dec 13, 2022 at 10:03:10PM +0300, Serge Semin wrote:
> On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> > On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > > Hi all,
> > > > 
> > > > Today's linux-next merge of the pci tree got a conflict in:
> > > > 
> > > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > > 
> > > > between commit:
> > > > 
> > > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > > 
> > > > from the arm-soc tree and commit:
> > > > 
> > > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > > 
> > > > from the pci tree.
> > > > 
> > > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > > the addition of "ecam").
> > > 
> > > Did I miss a suggested resolution for this?
> > 
> 
> > We had a brief discussion about this in another thread. So basically
> > Stephen's resolution is fine here and the plan is to instead add the
> > ECAM bits that the Tegra patch does in a separate patch on top of
> > Serge's patch. I should get around to sending that patch tomorrow.
> > 
> > Thierry
> 
> Actually the discussion still goes. I haven't got a respond to my
> last suggestion which seems to me more reasonable than extending the
> DT-bindings with another vendor-specific reg-name. @Bjorn, please join
> the discussion here:
> https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/

Sorry, it's really too late for discussion.  I need to send the v6.2
pull request today or at the very latest, tomorrow, so the only thing
to decide is how to resolve the merge conflict in the simplest
possible way.  Unless there's a very compelling reason to resolve it
differently than Stephen did, that's going to be the answer.

Bjorn

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Serge Semin]

On Tue, Dec 13, 2022 at 05:48:53PM +0100, Thierry Reding wrote:
> On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> > On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the pci tree got a conflict in:
> > > 
> > >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > > 
> > > between commit:
> > > 
> > >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > > 
> > > from the arm-soc tree and commit:
> > > 
> > >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > > 
> > > from the pci tree.
> > > 
> > > I didn't know how to fix this up, so I just used the latter (and so lost
> > > the addition of "ecam").
> > 
> > Did I miss a suggested resolution for this?
> 

> We had a brief discussion about this in another thread. So basically
> Stephen's resolution is fine here and the plan is to instead add the
> ECAM bits that the Tegra patch does in a separate patch on top of
> Serge's patch. I should get around to sending that patch tomorrow.
> 
> Thierry

Actually the discussion still goes. I haven't got a respond to my
last suggestion which seems to me more reasonable than extending the
DT-bindings with another vendor-specific reg-name. @Bjorn, please join
the discussion here:
https://lore.kernel.org/linux-pci/20221114155333.234496-2-jonathanh@nvidia.com/

-Sergey

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]

On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the pci tree got a conflict in:
> > 
> >   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> > 
> > between commit:
> > 
> >   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> > 
> > from the arm-soc tree and commit:
> > 
> >   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> > 
> > from the pci tree.
> > 
> > I didn't know how to fix this up, so I just used the latter (and so lost
> > the addition of "ecam").
> 
> Did I miss a suggested resolution for this?

We had a brief discussion about this in another thread. So basically
Stephen's resolution is fine here and the plan is to instead add the
ECAM bits that the Tegra patch does in a separate patch on top of
Serge's patch. I should get around to sending that patch tomorrow.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: manual merge of the pci tree with the arm-soc tree

[Bjorn Helgaas]

On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pci tree got a conflict in:
> 
>   Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
> 
> between commit:
> 
>   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
> 
> from the arm-soc tree and commit:
> 
>   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
> 
> from the pci tree.
> 
> I didn't know how to fix this up, so I just used the latter (and so lost
> the addition of "ecam").

Did I miss a suggested resolution for this?

linux-next: manual merge of the pci tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml

between commit:

  5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")

from the arm-soc tree and commit:

  4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")

from the pci tree.

I didn't know how to fix this up, so I just used the latter (and so lost
the addition of "ecam").

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the pci tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1324 bytes --]

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/bus/Makefile

between commit:

  1888d3ddc3d6 ("drivers/bus: Move Arm CCN PMU driver")

from the arm-soc tree and commit:

  38e3446c5d06 ("HISI LPC: Support the LPC host on Hip06/Hip07 with DT bindings")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/bus/Makefile
index 3d473b8adeac,50bb12a971a0..000000000000
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -5,11 -5,10 +5,13 @@@
  
  # Interconnect bus drivers for ARM platforms
  obj-$(CONFIG_ARM_CCI)		+= arm-cci.o
 -obj-$(CONFIG_ARM_CCN)		+= arm-ccn.o
+ 
+ obj-$(CONFIG_HISILICON_LPC)	+= hisi_lpc.o
  obj-$(CONFIG_BRCMSTB_GISB_ARB)	+= brcmstb_gisb.o
 +
 +# DPAA2 fsl-mc bus
 +obj-$(CONFIG_FSL_MC_BUS)	+= fsl-mc/
 +
  obj-$(CONFIG_IMX_WEIM)		+= imx-weim.o
  obj-$(CONFIG_MIPS_CDMM)		+= mips_cdmm.o
  obj-$(CONFIG_MVEBU_MBUS) 	+= mvebu-mbus.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the pci tree with the arm-soc tree

[Stephen Rothwell]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/host/Kconfig

between commit:

  70d334ca71b0 ("PCI: iproc: Fix BCMA dependency in Kconfig")

from the arm-soc tree and commit:

  05aa7d6a72c1 ("PCI: iproc: Allow BCMA bus driver to be built as module")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/host/Kconfig
index 48b5b3058d9d,e339a8c42f76..000000000000
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -135,8 -135,8 +135,8 @@@ config PCIE_IPROC_PLATFOR
  	  through the generic platform bus interface
  
  config PCIE_IPROC_BCMA
- 	bool "Broadcom iProc PCIe BCMA bus driver"
+ 	tristate "Broadcom iProc PCIe BCMA bus driver"
 -	depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
 +	depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
  	select PCIE_IPROC
  	select BCMA
  	select PCI_DOMAINS