Browse Source

rockchip: make SMP affinity of RTL8152 on XHCI more robust

XHCI bus numbers are assigned dynamically, it may varies among boards,
match the device irq name with regexp, drop the hardcoded name.

Signed-off-by: Furong Xu <[email protected]>
Furong Xu 1 year ago
parent
commit
314af7018a

+ 2 - 2
target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity

@@ -9,7 +9,7 @@ get_device_irq() {
 
 
 	# wait up to 10 seconds for the irq/device to appear
 	# wait up to 10 seconds for the irq/device to appear
 	while [ "${seconds}" -le 10 ]; do
 	while [ "${seconds}" -le 10 ]; do
-		line=$(grep -m 1 "${device}\$" /proc/interrupts) && break
+		line=$(grep -E -m 1 "${device}\$" /proc/interrupts) && break
 		seconds="$(( seconds + 2 ))"
 		seconds="$(( seconds + 2 ))"
 		sleep 2
 		sleep 2
 	done
 	done
@@ -34,7 +34,7 @@ friendlyarm,nanopi-r2s|\
 xunlong,orangepi-r1-plus|\
 xunlong,orangepi-r1-plus|\
 xunlong,orangepi-r1-plus-lts)
 xunlong,orangepi-r1-plus-lts)
 	set_interface_core 2 "eth0"
 	set_interface_core 2 "eth0"
-	set_interface_core 4 "eth1" "xhci-hcd:usb1"
+	set_interface_core 4 "eth1" "xhci-hcd:usb[0-9]+"
 	;;
 	;;
 friendlyarm,nanopi-r4s)
 friendlyarm,nanopi-r4s)
 	set_interface_core 10 "eth0"
 	set_interface_core 10 "eth0"