Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the pci tree with the arm-soc tree
@ 2019-11-06 22:45 Stephen Rothwell
  2019-11-07 18:27 ` Olof Johansson
  0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2019-11-06 22:45 UTC (permalink / raw)
  To: Bjorn Helgaas, Olof Johansson, Arnd Bergmann, ARM
  Cc: Lorenzo Pieralisi, Xiaowei Bao, Shawn Guo, Hou Zhiqiang,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Fabio Estevam

[-- Attachment #1.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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the pci tree with the arm-soc tree
  2019-11-06 22:45 linux-next: manual merge of the pci tree with the arm-soc tree Stephen Rothwell
@ 2019-11-07 18:27 ` Olof Johansson
  2019-11-07 21:18   ` Bjorn Helgaas
  0 siblings, 1 reply; 8+ messages in thread
From: Olof Johansson @ 2019-11-07 18:27 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Lorenzo Pieralisi, Arnd Bergmann, Xiaowei Bao, Shawn Guo,
	Hou Zhiqiang, Linux Kernel Mailing List, Linux Next Mailing List,
	Bjorn Helgaas, Fabio Estevam, ARM

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the pci tree with the arm-soc tree
  2019-11-07 18:27 ` Olof Johansson
@ 2019-11-07 21:18   ` Bjorn Helgaas
  2019-11-08 11:07     ` Lorenzo Pieralisi
  0 siblings, 1 reply; 8+ messages in thread
From: Bjorn Helgaas @ 2019-11-07 21:18 UTC (permalink / raw)
  To: Olof Johansson, Lorenzo Pieralisi
  Cc: Stephen Rothwell, Arnd Bergmann, Xiaowei Bao, Shawn Guo,
	Hou Zhiqiang, Linux Kernel Mailing List, Linux Next Mailing List,
	Fabio Estevam, ARM

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the pci tree with the arm-soc tree
  2019-11-07 21:18   ` Bjorn Helgaas
@ 2019-11-08 11:07     ` Lorenzo Pieralisi
  2019-11-08 20:18       ` Bjorn Helgaas
  2019-11-08 22:29       ` Olof Johansson
  0 siblings, 2 replies; 8+ messages in thread
From: Lorenzo Pieralisi @ 2019-11-08 11:07 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Stephen Rothwell, Xiaowei Bao, Arnd Bergmann, Shawn Guo,
	Hou Zhiqiang, Linux Kernel Mailing List, Linux Next Mailing List,
	Olof Johansson, Fabio Estevam, ARM

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the pci tree with the arm-soc tree
  2019-11-08 11:07     ` Lorenzo Pieralisi
@ 2019-11-08 20:18       ` Bjorn Helgaas
  2019-11-08 22:29       ` Olof Johansson
  1 sibling, 0 replies; 8+ messages in thread
From: Bjorn Helgaas @ 2019-11-08 20:18 UTC (permalink / raw)
  To: Lorenzo Pieralisi
  Cc: Stephen Rothwell, Xiaowei Bao, Arnd Bergmann, Shawn Guo,
	Hou Zhiqiang, Linux Kernel Mailing List, Linux Next Mailing List,
	Bjorn Helgaas, Olof Johansson, Fabio Estevam, ARM

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.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: manual merge of the pci tree with the arm-soc tree
  2019-11-08 11:07     ` Lorenzo Pieralisi
  2019-11-08 20:18       ` Bjorn Helgaas
@ 2019-11-08 22:29       ` Olof Johansson
  1 sibling, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2019-11-08 22:29 UTC (permalink / raw)
  To: Lorenzo Pieralisi
  Cc: Stephen Rothwell, Xiaowei Bao, Arnd Bergmann, Shawn Guo,
	Hou Zhiqiang, Linux Kernel Mailing List, Linux Next Mailing List,
	Bjorn Helgaas, Fabio Estevam, ARM

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: manual merge of the pci tree with the arm-soc tree
@ 2018-04-03  2:00 sfr
  0 siblings, 0 replies; 8+ messages in thread
From: sfr @ 2018-04-03  2:00 UTC (permalink / raw)
  To: linux-arm-kernel

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180403/1485cf80/attachment.sig>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* linux-next: manual merge of the pci tree with the arm-soc tree
@ 2015-08-17  1:08 sfr
  0 siblings, 0 replies; 8+ messages in thread
From: sfr @ 2015-08-17  1:08 UTC (permalink / raw)
  To: linux-arm-kernel

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 at 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, back to index

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-06 22:45 linux-next: manual merge of the pci tree with the arm-soc tree Stephen Rothwell
2019-11-07 18:27 ` Olof Johansson
2019-11-07 21:18   ` Bjorn Helgaas
2019-11-08 11:07     ` Lorenzo Pieralisi
2019-11-08 20:18       ` Bjorn Helgaas
2019-11-08 22:29       ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2018-04-03  2:00 sfr
2015-08-17  1:08 sfr

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org
	public-inbox-index linux-arm-kernel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git