From d749589810e59b1c40d1f5843a233523d71ef0e3 Mon Sep 17 00:00:00 2001
From: Aditya Prayoga <aprayoga@users.noreply.github.com>
Date: Wed, 4 Nov 2020 14:20:43 +0700
Subject: [PATCH] Fix race condition on armbian-hardware-optimization (#2301)

* armbian-hardware-optimization: delay applying eth0 tweak on rk3399

* armbian-hardware-optimization: delay applying eth0 tweak on rockchip64

* armbian-hardware-optimization: fixed irq smp affinity for usb

on rockchip64.

Similar like the one applied to rk3399 on commit [eaf6853]
---
 .../lib/armbian/armbian-hardware-optimization | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/bsp/common/usr/lib/armbian/armbian-hardware-optimization b/packages/bsp/common/usr/lib/armbian/armbian-hardware-optimization
index 52377ab147..5af46a40d4 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-hardware-optimization
+++ b/packages/bsp/common/usr/lib/armbian/armbian-hardware-optimization
@@ -186,9 +186,22 @@ prepare_board() {
 			for i in $(awk -F':' '/Mali/{print $1}' </proc/interrupts | sed 's/\ //g'); do
 				echo 2 >/proc/irq/$i/smp_affinity
 			done
-			echo 2 >/proc/irq/$(awk -F":" "/ehci/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
-			echo 2 >/proc/irq/$(awk -F":" "/ohci/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
-			echo 4 >/proc/irq/$(awk -F":" "/xhci/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
+			for i in $(awk -F":" "/ehci/ {print \$1}" </proc/interrupts | sed 's/\ //g'); do
+				echo 2 >/proc/irq/$i/smp_affinity
+			done
+			for i in $(awk -F":" "/ohci/ {print \$1}" </proc/interrupts | sed 's/\ //g'); do
+				echo 2 >/proc/irq/$i/smp_affinity
+			done
+			for i in $(awk -F":" "/xhci/ {print \$1}" </proc/interrupts | sed 's/\ //g'); do
+				echo 4 >/proc/irq/$i/smp_affinity
+			done
+
+			# Wait (up to 5s) until eth0 brought up
+			for i in {1..5}; do
+				grep -q "eth0" /proc/interrupts && break
+				sleep 1
+			done
+
 			echo 8 >/proc/irq/$(awk -F":" "/eth0/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
 			echo 7 >/sys/class/net/eth0/queues/rx-0/rps_cpus
 			echo 32768 >/proc/sys/net/core/rps_sock_flow_entries
@@ -211,6 +224,13 @@ prepare_board() {
 			for i in $(awk -F":" "/xhci/ {print \$1}" </proc/interrupts | sed 's/\ //g'); do
 				echo 4 >/proc/irq/$i/smp_affinity
 			done
+
+			# Wait (up to 5s) until eth0 brought up
+			for i in {1..5}; do
+				grep -q "eth0" /proc/interrupts && break
+				sleep 1
+			done
+
 			echo 8 >/proc/irq/$(awk -F":" "/eth0/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
 			echo 7 >/sys/class/net/eth0/queues/rx-0/rps_cpus
 			echo 32768 >/proc/sys/net/core/rps_sock_flow_entries