Merge pull request #109 from SolidHal/ath9k-no-ep-patch

Merge in new ath9k workaround and backported 5.x patches

makefile

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with PrawnOS.  If not, see <https://www.gnu.org/licenses/>.
 
-KVER=4.19.53
+KVER=4.19.67
 ifeq ($(PRAWNOS_SUITE),)
 PRAWNOS_SUITE=buster
 endif

resources/BuildResources/cmdline

@@ -1 +1 @@
-console=tty1 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootfstype=ext4 rootwait ro net.ifnames=0
+console=tty1 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootfstype=ext4 rootwait ro net.ifnames=0 console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8

resources/BuildResources/config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.53-gnu Kernel Configuration
+# Linux/arm 4.19.67-gnu Kernel Configuration
 #
 
 #
@@ -1441,7 +1441,7 @@ CONFIG_SWPHY=y
 #
 # CONFIG_AMD_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
-# CONFIG_ASIX_PHY is not set
+# CONFIG_AX88796B_PHY is not set
 # CONFIG_AT803X_PHY is not set
 # CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCM87XX_PHY is not set
@@ -1525,15 +1525,18 @@ CONFIG_WLAN=y
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 CONFIG_ATH_COMMON=y
 CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH_DEBUG=y
+# CONFIG_ATH_TRACEPOINTS is not set
 # CONFIG_ATH5K is not set
 # CONFIG_ATH5K_PCI is not set
 CONFIG_ATH9K_HW=y
 CONFIG_ATH9K_COMMON=y
+CONFIG_ATH9K_COMMON_DEBUG=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K is not set
 CONFIG_ATH9K_HTC=y
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HTC_DEBUGFS=y
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_CARL9170=y
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y

resources/BuildResources/patches-tested/DTS/5.x-dts/0001-ARM-dts-rockchip-Fix-rk3288-rock2-vcc_flash-name.patch

@@ -0,0 +1,31 @@
+From 03d9f8fa2bfdc791865624d3adc29070cf67814e Mon Sep 17 00:00:00 2001
+From: John Keeping <[email protected]>
+Date: Tue, 13 Nov 2018 15:24:13 +0000
+Subject: [PATCH 01/54] ARM: dts: rockchip: Fix rk3288-rock2 vcc_flash name
+
+There is no functional change from this, but it is confusing to find two
+copies of vcc_sys and no vcc_flash when looking in
+/sys/class/regulator/*/name.
+
+Signed-off-by: John Keeping <[email protected]>
+Signed-off-by: Heiko Stuebner <[email protected]>
+---
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+index 50325489c0ce..32e1ab336662 100644
+--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
++++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+@@ -25,7 +25,7 @@
+
+ 	vcc_flash: flash-regulator {
+ 		compatible = "regulator-fixed";
+-		regulator-name = "vcc_sys";
++		regulator-name = "vcc_flash";
+ 		regulator-min-microvolt = <1800000>;
+ 		regulator-max-microvolt = <1800000>;
+ 		startup-delay-us = <150>;
+-- 
+2.11.0
+

resources/BuildResources/patches-tested/DTS/5.x-dts/0002-ARM-dts-rockchip-Add-all-CPUs-in-cooling-maps.patch

@@ -0,0 +1,143 @@
+From 99935bd4b5b4558beb069222e6d6143fe5830d64 Mon Sep 17 00:00:00 2001
+From: Viresh Kumar <[email protected]>
+Date: Fri, 16 Nov 2018 15:31:13 +0530
+Subject: [PATCH 02/54] ARM: dts: rockchip: Add all CPUs in cooling maps
+
+Each CPU can (and does) participate in cooling down the system but the
+DT only captures a handful of them, normally CPU0, in the cooling maps.
+Things work by chance currently as under normal circumstances its the
+first CPU of each cluster which is used by the operating systems to
+probe the cooling devices. But as soon as this CPU ordering changes and
+any other CPU is used to bring up the cooling device, we will start
+seeing failures.
+
+Also the DT is rather incomplete when we list only one CPU in the
+cooling maps, as the hardware doesn't have any such limitations.
+
+Update cooling maps to include all devices affected by individual trip
+points.
+
+Signed-off-by: Viresh Kumar <[email protected]>
+Signed-off-by: Heiko Stuebner <[email protected]>
+---
+ arch/arm/boot/dts/rk322x.dtsi              | 10 ++++++++--
+ arch/arm/boot/dts/rk3288-veyron-mickey.dts | 24 ++++++++++++++----------
+ arch/arm/boot/dts/rk3288.dtsi              | 15 ++++++++++++---
+ 3 files changed, 34 insertions(+), 15 deletions(-)
+
+diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
+index cd8f2a3b0e91..29f19076dceb 100644
+--- a/arch/arm/boot/dts/rk322x.dtsi
++++ b/arch/arm/boot/dts/rk322x.dtsi
+@@ -493,12 +493,18 @@
+ 				map0 {
+ 					trip = <&cpu_alert0>;
+ 					cooling-device =
+-						<&cpu0 THERMAL_NO_LIMIT 6>;
++						<&cpu0 THERMAL_NO_LIMIT 6>,
++						<&cpu1 THERMAL_NO_LIMIT 6>,
++						<&cpu2 THERMAL_NO_LIMIT 6>,
++						<&cpu3 THERMAL_NO_LIMIT 6>;
+ 				};
+ 				map1 {
+ 					trip = <&cpu_alert1>;
+ 					cooling-device =
+-						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ 				};
+ 			};
+ 		};
+diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
+index 1e0158acf895..d889ab3c8235 100644
+--- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts
++++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
+@@ -81,8 +81,10 @@
+ 		 */
+ 		cpu_warm_limit_cpu {
+ 			trip = <&cpu_alert_warm>;
+-			cooling-device =
+-				<&cpu0 THERMAL_NO_LIMIT 4>;
++			cooling-device = <&cpu0 THERMAL_NO_LIMIT 4>,
++					 <&cpu1 THERMAL_NO_LIMIT 4>,
++					 <&cpu2 THERMAL_NO_LIMIT 4>,
++					 <&cpu3 THERMAL_NO_LIMIT 4>;
+ 		};
+
+ 		/*
+@@ -103,23 +105,25 @@
+ 		 */
+ 		cpu_almost_hot_limit_cpu {
+ 			trip = <&cpu_alert_almost_hot>;
+-			cooling-device =
+-				<&cpu0 5 6>;
++			cooling-device = <&cpu0 5 6>, <&cpu1 5 6>, <&cpu2 5 6>,
++					 <&cpu3 5 6>;
+ 		};
+ 		cpu_hot_limit_cpu {
+ 			trip = <&cpu_alert_hot>;
+-			cooling-device =
+-				<&cpu0 7 7>;
++			cooling-device = <&cpu0 7 7>, <&cpu1 7 7>, <&cpu2 7 7>,
++					 <&cpu3 7 7>;
+ 		};
+ 		cpu_hotter_limit_cpu {
+ 			trip = <&cpu_alert_hotter>;
+-			cooling-device =
+-				<&cpu0 7 8>;
++			cooling-device = <&cpu0 7 8>, <&cpu1 7 8>, <&cpu2 7 8>,
++					 <&cpu3 7 8>;
+ 		};
+ 		cpu_very_hot_limit_cpu {
+ 			trip = <&cpu_alert_very_hot>;
+-			cooling-device =
+-				<&cpu0 8 THERMAL_NO_LIMIT>;
++			cooling-device = <&cpu0 8 THERMAL_NO_LIMIT>,
++					 <&cpu1 8 THERMAL_NO_LIMIT>,
++					 <&cpu2 8 THERMAL_NO_LIMIT>,
++					 <&cpu3 8 THERMAL_NO_LIMIT>;
+ 		};
+ 	};
+ };
+diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
+index 0840ffb3205c..1da86e82bb57 100644
+--- a/arch/arm/boot/dts/rk3288.dtsi
++++ b/arch/arm/boot/dts/rk3288.dtsi
+@@ -508,12 +508,18 @@
+ 				map0 {
+ 					trip = <&cpu_alert0>;
+ 					cooling-device =
+-						<&cpu0 THERMAL_NO_LIMIT 6>;
++						<&cpu0 THERMAL_NO_LIMIT 6>,
++						<&cpu1 THERMAL_NO_LIMIT 6>,
++						<&cpu2 THERMAL_NO_LIMIT 6>,
++						<&cpu3 THERMAL_NO_LIMIT 6>;
+ 				};
+ 				map1 {
+ 					trip = <&cpu_alert1>;
+ 					cooling-device =
+-						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ 				};
+ 			};
+ 		};
+@@ -541,7 +547,10 @@
+ 				map0 {
+ 					trip = <&gpu_alert0>;
+ 					cooling-device =
+-						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++						<&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
++						<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+ 				};
+ 			};
+ 		};
+-- 
+2.11.0
+

resources/BuildResources/patches-tested/DTS/5.x-dts/0003-ARM-dts-rockchip-add-VPU-device-node-for-RK3288.patch

@@ -0,0 +1,52 @@
+From ad5399d12ca4f68fdb9e58e4b9a556eb997a9639 Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <[email protected]>
+Date: Fri, 30 Nov 2018 14:34:31 -0300
+Subject: [PATCH 03/54] ARM: dts: rockchip: add VPU device node for RK3288
+
+Add the Video Processing Unit node for RK3288 SoC.
+
+Fix the VPU IOMMU node, which was disabled and lacking
+its power domain property.
+
+Reviewed-by: Tomasz Figa <[email protected]>
+Signed-off-by: Ezequiel Garcia <[email protected]>
+Signed-off-by: Heiko Stuebner <[email protected]>
+---
+ arch/arm/boot/dts/rk3288.dtsi | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
+index 1da86e82bb57..ca7d52daa8fb 100644
+--- a/arch/arm/boot/dts/rk3288.dtsi
++++ b/arch/arm/boot/dts/rk3288.dtsi
+@@ -1232,6 +1232,18 @@
+ 		};
+ 	};
+
++	vpu: video-codec@ff9a0000 {
++		compatible = "rockchip,rk3288-vpu";
++		reg = <0x0 0xff9a0000 0x0 0x800>;
++		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
++			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
++		interrupt-names = "vepu", "vdpu";
++		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
++		clock-names = "aclk", "hclk";
++		iommus = <&vpu_mmu>;
++		power-domains = <&power RK3288_PD_VIDEO>;
++	};
++
+ 	vpu_mmu: iommu@ff9a0800 {
+ 		compatible = "rockchip,iommu";
+ 		reg = <0x0 0xff9a0800 0x0 0x100>;
+@@ -1240,7 +1252,7 @@
+ 		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+ 		clock-names = "aclk", "iface";
+ 		#iommu-cells = <0>;
+-		status = "disabled";
++		power-domains = <&power RK3288_PD_VIDEO>;
+ 	};
+
+ 	hevc_mmu: iommu@ff9c0440 {
+-- 
+2.11.0
+

resources/BuildResources/patches-tested/DTS/5.x-dts/0005-ARM-dts-rockchip-add-chosen-node-on-veyron-devices.patch

@@ -0,0 +1,33 @@
+From 5aed37a5cdef6453eb3bf307574e19e547ca0432 Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <[email protected]>
+Date: Fri, 15 Feb 2019 12:51:50 +0100
+Subject: [PATCH 05/54] ARM: dts: rockchip: add chosen node on veyron devices
+
+In order to use earlycon, the stdout-path property needs to be set
+in the chosen node. All veyron devices use uart2 for debugging, so
+add it to the core veyron dtsi.
+
+Signed-off-by: Enric Balletbo i Serra <[email protected]>
+Signed-off-by: Heiko Stuebner <[email protected]>
+---
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
+index d8bf939a3aff..0bc2409f6903 100644
+--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
++++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
+@@ -10,6 +10,10 @@
+ #include "rk3288.dtsi"
+
+ / {
++	chosen {
++		stdout-path = "serial2:115200n8";
++	};
++
+ 	/*
+ 	 * The default coreboot on veyron devices ignores memory@0 nodes
+ 	 * and would instead create another memory node.
+-- 
+2.11.0
+