* [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2)
@ 2017-06-22 12:26 Gregory CLEMENT
2017-06-23 12:32 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Gregory CLEMENT @ 2017-06-22 12:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Here is the second pull request for dt64 for mvebu for v4.13.
This came only now because I waited for that the drivers part was
accepted. Now that is was done we can enable the last missing part of
the infrastructure for the Aramda 7K/8K SoCs.
Also note that there is a trivial merge conflict with the mvebu-fixes
branch. In case of doubt it was resolved in the last merge commit of
the mvebu/for-next branch.
Thanks,
Gregory
The following changes since commit f66b2aff46eaf0825dbe1560e28fcb845dd2a215:
arm64: dts: marvell: add xmdio nodes for 7k/8k (2017-06-17 08:19:29 +0200)
are available in the git repository at:
git://git.infradead.org/linux-mvebu.git tags/mvebu-dt64-4.13-2
for you to fetch changes up to 6ef84a827c37547504514a80bdb35f74a67df5a3:
arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K (2017-06-21 17:09:48 +0200)
----------------------------------------------------------------
mvebu dt64 for 4.13 (part 2)
- use new clock binding for Armada 7K/8K
- add pinctrl on Armada 7K/8K
- add GPIO on Armada 7K/8K
- switch from GIC to ICU on CP110 (Armada 7K/8K)
- enable the mdio node on the mcbin (Armada 8K based board)
----------------------------------------------------------------
Antoine Tenart (2):
arm64: dts: marvell: mcbin: enable the mdio node
arm64: dts: marvell: use new bindings for xor clocks on ap806
Gregory CLEMENT (4):
arm64: dts: marvell: remove *-clock-output-names on cp110
arm64: dts: marvell: use new binding for the system controller on cp110
arm64: dts: marvell: add pinctrl support for Armada 7K/8K
arm64: dts: marvell: add gpio support for Armada 7K/8K
Thomas Petazzoni (1):
arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K
arch/arm64/boot/dts/marvell/armada-7020.dtsi | 2 +-
arch/arm64/boot/dts/marvell/armada-7040.dtsi | 2 +-
arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 68 +++++++++++
arch/arm64/boot/dts/marvell/armada-8020.dtsi | 3 +-
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 2 +
arch/arm64/boot/dts/marvell/armada-8040.dtsi | 3 +-
arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 76 ++++++++++++
arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 29 ++++-
.../boot/dts/marvell/armada-cp110-master.dtsi | 136 ++++++++++++---------
.../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 131 +++++++++++---------
10 files changed, 329 insertions(+), 123 deletions(-)
create mode 100644 arch/arm64/boot/dts/marvell/armada-70x0.dtsi
create mode 100644 arch/arm64/boot/dts/marvell/armada-80x0.dtsi
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2) 2017-06-22 12:26 [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2) Gregory CLEMENT @ 2017-06-23 12:32 ` Arnd Bergmann 2017-06-23 14:14 ` Gregory CLEMENT 0 siblings, 1 reply; 6+ messages in thread From: Arnd Bergmann @ 2017-06-23 12:32 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jun 22, 2017 at 2:26 PM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > Hi, > > Here is the second pull request for dt64 for mvebu for v4.13. > > This came only now because I waited for that the drivers part was > accepted. Now that is was done we can enable the last missing part of > the infrastructure for the Aramda 7K/8K SoCs. Pulled into next/dt64, thanks! > Also note that there is a trivial merge conflict with the mvebu-fixes > branch. In case of doubt it was resolved in the last merge commit of > the mvebu/for-next branch. Thanks, that helped, my initial merge ended up with a typo. However, while doing the merge, I stumbled over an obviously broken commit: commit b1a97f86b7359da7bbd7a8dd2900d62352c04644 Author: Antoine Tenart <antoine.tenart@free-electrons.com> Date: Wed May 24 16:10:33 2017 +0200 arm64: dts: marvell: add dma-mask in crypto nodes for 7k/8k The EIP197 cryptographic engine supports 64 bits address width but is limited to 40 bits on 7k/8k. Add a dma-mask property in the cryptographic engine nodes to reflect this. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index 576e825585c9..e02ac90f7fdf 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -242,6 +242,7 @@ interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3", "eip"; clocks = <&cpm_syscon0 1 26>; + dma-mask = <0xff 0xffffffff>; status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi index 797208a11f9d..7468fe00fc37 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -232,6 +232,7 @@ interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3", "eip"; clocks = <&cps_syscon0 1 26>; + dma-mask = <0xff 0xffffffff>; status = "disabled"; }; }; Please send a revert for that, and remove the code that tries to parse the dma-mask from DT from that driver! Arnd ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2) 2017-06-23 12:32 ` Arnd Bergmann @ 2017-06-23 14:14 ` Gregory CLEMENT 2017-06-23 14:28 ` Arnd Bergmann 0 siblings, 1 reply; 6+ messages in thread From: Gregory CLEMENT @ 2017-06-23 14:14 UTC (permalink / raw) To: linux-arm-kernel Hi Arnd, On ven., juin 23 2017, Arnd Bergmann <arnd@arndb.de> wrote: > > > Please send a revert for that, and remove the code that tries to > parse the dma-mask from DT from that driver! I see on IRC you agree with Antoine about it the driver part. For the DT part do you want a PR with the revert or just the patch alone? Thanks, Gregory > > Arnd -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2) 2017-06-23 14:14 ` Gregory CLEMENT @ 2017-06-23 14:28 ` Arnd Bergmann 2017-06-23 14:30 ` Gregory CLEMENT 0 siblings, 1 reply; 6+ messages in thread From: Arnd Bergmann @ 2017-06-23 14:28 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jun 23, 2017 at 4:14 PM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > Hi Arnd, > > On ven., juin 23 2017, Arnd Bergmann <arnd@arndb.de> wrote: > > >> >> >> Please send a revert for that, and remove the code that tries to >> parse the dma-mask from DT from that driver! > > I see on IRC you agree with Antoine about it the driver part. For the DT > part do you want a PR with the revert or just the patch alone? Either way is fine, or just let me know (here or on IRC) if I should just revert the patch and add an explanation myself. Arnd ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2) 2017-06-23 14:28 ` Arnd Bergmann @ 2017-06-23 14:30 ` Gregory CLEMENT 2017-06-23 14:38 ` Arnd Bergmann 0 siblings, 1 reply; 6+ messages in thread From: Gregory CLEMENT @ 2017-06-23 14:30 UTC (permalink / raw) To: linux-arm-kernel Hi Arnd, On ven., juin 23 2017, Arnd Bergmann <arnd@arndb.de> wrote: > On Fri, Jun 23, 2017 at 4:14 PM, Gregory CLEMENT > <gregory.clement@free-electrons.com> wrote: >> Hi Arnd, >> >> On ven., juin 23 2017, Arnd Bergmann <arnd@arndb.de> wrote: >> >> >>> >>> >>> Please send a revert for that, and remove the code that tries to >>> parse the dma-mask from DT from that driver! >> >> I see on IRC you agree with Antoine about it the driver part. For the DT >> part do you want a PR with the revert or just the patch alone? > > Either way is fine, or just let me know (here or on IRC) if I should > just revert the patch and add an explanation myself. If you can do it, it's better. You know better than me why we should revert this patch! :) Gregory > > Arnd > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2) 2017-06-23 14:30 ` Gregory CLEMENT @ 2017-06-23 14:38 ` Arnd Bergmann 0 siblings, 0 replies; 6+ messages in thread From: Arnd Bergmann @ 2017-06-23 14:38 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jun 23, 2017 at 4:30 PM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > Hi Arnd, > > On ven., juin 23 2017, Arnd Bergmann <arnd@arndb.de> wrote: > >> On Fri, Jun 23, 2017 at 4:14 PM, Gregory CLEMENT >> <gregory.clement@free-electrons.com> wrote: >>> Hi Arnd, >>> >>> On ven., juin 23 2017, Arnd Bergmann <arnd@arndb.de> wrote: >>> >>> >>>> >>>> >>>> Please send a revert for that, and remove the code that tries to >>>> parse the dma-mask from DT from that driver! >>> >>> I see on IRC you agree with Antoine about it the driver part. For the DT >>> part do you want a PR with the revert or just the patch alone? >> >> Either way is fine, or just let me know (here or on IRC) if I should >> just revert the patch and add an explanation myself. > > If you can do it, it's better. You know better than me why we should > revert this patch! :) No worries, I applied this patch now: >From 2b29ca22ed8a79ef1942b6546ccab5953678028d Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Fri, 23 Jun 2017 16:33:43 +0200 Subject: [PATCH] Revert "arm64: dts: marvell: add dma-mask in crypto nodes for 7k/8k" As I found by chance while merging another patch, the usage of a dma-mask in this DT node is wrong for multiple reasons: - dma-masks are a Linux specific concept, not a general hardware feature - In DT, we use the "dma-ranges" property to describe how DMA addresses related between devices. - The 40-bit mask appears to be completely unnecessary here, as the SoC cannot address that much memory anyway, so simply asking for a 64-bit mask (as supported by the device) should succeed anyway. The patch to remove the parsing of the property is getting merged through the crypto tree. Signed-off-by: Arnd Bergmann <arnd@arndb.de> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index f611e843094c..726528ce54e9 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -270,7 +270,6 @@ interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3", "eip"; clocks = <&cpm_clk 1 26>; - dma-mask = <0xff 0xffffffff>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi index 84d3bd80eb51..95f8e5f607f6 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -261,7 +261,6 @@ interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3", "eip"; clocks = <&cps_clk 1 26>; - dma-mask = <0xff 0xffffffff>; /* * The cryptographic engine found on the cp110 * master is enabled by default at the SoC ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-23 14:38 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-06-22 12:26 [GIT PULL] ARM: mvebu: dt64 for v4.13 (#2) Gregory CLEMENT 2017-06-23 12:32 ` Arnd Bergmann 2017-06-23 14:14 ` Gregory CLEMENT 2017-06-23 14:28 ` Arnd Bergmann 2017-06-23 14:30 ` Gregory CLEMENT 2017-06-23 14:38 ` Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox