Amlogic fixes for v4.10-rc

Arnd, Olof,

A couple more Amlogic fixes for the -rc cycle. The reserved memory is updated after some debate/discussion of the first version. This one has and ack/review from Andreas who objected to the first version.

Kevin

Jerome Brunet (1):
ARM64: dts: meson-gxbb-odroidc2: fix GbE tx link breakage

Neil Armstrong (1):
ARM64: dts: meson-gx: Add firmware reserved memory zones

 arch/arm64/boot/dts/amlogic/meson-gx.dtsi           | 18 ++++++++++++++++++
 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 12 ++++++++++++
 2 files changed, 30 insertions(+)

2.9.3

From: Jerome Brunet <[email protected]>

OdroidC2 GbE link breaks under heavy tx transfer. This happens even if the MAC does not enable Energy Efficient Ethernet (No Low Power state Idle on the Tx path). The problem seems to come from the phy Rx path, entering the LPI state.

Disabling EEE advertisement on the phy prevent this feature to be negociated with the link partner and solve the issue.

---
 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

index 5d28e1cdc998..c59403adb387 100644
@@ -151,6 +151,18 @@
 	status = "okay";
 	pinctrl-0 = <&eth_rgmii_pins>;
 	pinctrl-names = "default";
+	phy-handle = <&eth_phy0>;
+
+	mdio {
+		compatible = "snps,dwmac-mdio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		eth_phy0: ethernet-phy at 0 {
+			reg = <0>;
+			eee-broken-1000t;
+		};
+	};
 };
 
 &ir {

2.9.3

From: Neil Armstrong <[email protected]>

The Amlogic Meson GXBB/GXL/GXM secure monitor uses part of the memory space, this patch adds these reserved zones.

Without such reserved memory zones, running the following stress command :

$ stress-ng --vm 16 --vm-bytes 128M --timeout 10s
multiple times:

Could lead to the following kernel crashes :

[   46.937975] Bad mode in Error handler detected on CPU1, code 0xbf000000 -- SError
...
[   47.058536] Internal error: Attempting to execute userspace memory: 8600000f [#3] PREEMPT SMP

...
Instead of the OOM killer.

---
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

index eada0b58ba1c..0cbe24b49710 100644
@@ -55,6 +55,24 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		/* 16 MiB reserved for Hardware ROM Firmware */
+		hwrom_reserved: hwrom at 0 {
+			reg = <0x0 0x0 0x0 0x1000000>;
+			no-map;
+		};
+
+		/* 2 MiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved: secmon at 10000000 {
+			reg = <0x0 0x10000000 0x0 0x200000>;
+			no-map;
+		};
+	};
+
 	cpus {
 		#address-cells = <0x2>;
 		#size-cells = <0x0>;

2.9.3

Kevin,

Am 20.01.2017 um 17:20 schrieb Kevin Hilman:

Is it intentional that this is not a PULL?

Regards,
Andreas

SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)

Yes. For one or two patches, arm-soc maintainers are happy to take patches. And in this case, it was especially intentional because these have a dependency on stuff already in arm-soc fixes, so I wanted them to be applied directly.

Kevin

Applied both to fixes, thanks!

Arnd