From 982e1fbf4eea5d7dc5825864e5552b8d253f33e7 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Wed, 9 Jun 2021 15:23:30 +0800
Subject: [PATCH] fix irq

---
 .../base-files/etc/init.d/adjust_network      | 19 ----
 .../base-files/etc/init.d/set-irq-affinity    | 22 +++++
 .../ipq40xx/base-files/lib/adjust_network.sh  | 89 -------------------
 3 files changed, 22 insertions(+), 108 deletions(-)
 delete mode 100755 root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network
 create mode 100755 root/target/linux/ipq40xx/base-files/etc/init.d/set-irq-affinity
 delete mode 100755 root/target/linux/ipq40xx/base-files/lib/adjust_network.sh

diff --git a/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network b/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network
deleted file mode 100755
index 02af8198..00000000
--- a/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=11
-STOP=98
-
-adjust_smp_affinity() {
-	test -f /lib/adjust_network.sh && {
-		. /lib/adjust_network.sh
-
-		adjust_eth_queue
-		adjust_edma_smp_affinity
-		adjust_radio_smp_affinity
-	}
-}
-
-boot() {
-	adjust_smp_affinity
-}
diff --git a/root/target/linux/ipq40xx/base-files/etc/init.d/set-irq-affinity b/root/target/linux/ipq40xx/base-files/etc/init.d/set-irq-affinity
new file mode 100755
index 00000000..910f661b
--- /dev/null
+++ b/root/target/linux/ipq40xx/base-files/etc/init.d/set-irq-affinity
@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+
+start() {
+	mask=4
+	for rps in /sys/class/net/eth0/queues/rx-*
+	do
+		echo "$mask" > "$rps/rps_cpus"
+	done
+	for irq in $(grep -F "ath10k_ahb" /proc/interrupts | cut -d: -f1 | sed 's, *,,')
+	do
+		echo "$mask" > "/proc/irq/$irq/smp_affinity"
+		mask=8
+	done
+
+	mask=2
+	for irq in $(grep -F "edma_eth_rx" /proc/interrupts | cut -d: -f1 | sed 's, *,,')
+	do
+		echo "$mask" > "/proc/irq/$irq/smp_affinity"
+	done
+}
\ No newline at end of file
diff --git a/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh b/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh
deleted file mode 100755
index 99423022..00000000
--- a/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# this scripts is used for adjust cpu's choice of interrupts.
-#
-
-################################################
-# Adjust smp_affinity of edma
-# Globals:
-#    None
-# Arguments:
-#    None
-# Returns:
-#    None
-# Remark:
-#    execute only once on start-up.
-################################################
-adjust_edma_smp_affinity() {
-	grep -q edma_eth_ /proc/interrupts || return 0
-	local nr=`cat /proc/cpuinfo | grep processor | wc -l`
-	local cpu=0
-	local tx_irq_num
-
-	for tx_num in `seq 0 1 15` ; do
-		cpu=`printf "%x" $((1<<((tx_num/4+0)%nr)))`
-		tx_irq_num=`grep -m1 edma_eth_tx$tx_num /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$tx_irq_num" ] && echo $cpu > /proc/irq/$tx_irq_num/smp_affinity
-	done
-
-	for rx_num in `seq 0 1 7` ; do
-		cpu=`printf "%x" $((1<<((rx_num/2)%nr)))`
-		rx_irq_num=`grep -m1 edma_eth_rx$rx_num /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '`
-		[ -n "$rx_irq_num" ] && echo $cpu > /proc/irq/$rx_irq_num/smp_affinity
-	done
-}
-
-################################################
-# Adjust smp_affinity of ath10k for 2G and 5G
-# Globals:
-#    None
-# Arguments:
-#    None
-# Returns:
-#    None
-# Remark:
-#    execute only once on start-up.
-################################################
-adjust_radio_smp_affinity() {
-	local irqs="`grep -E 'ath10k' /proc/interrupts | cut -d ':' -f 1 | tr -d ' '`"
-	local nr=`cat /proc/cpuinfo | grep processor | wc -l`
-	local idx=2
-
-	for irq in $irqs; do
-		cpu=`printf "%x" $((1<<((idx)%nr)))`
-		echo $cpu > /proc/irq/$irq/smp_affinity
-		idx=$((idx+1))
-	done
-}
-
-################################################
-# Adjust queue of eth
-# Globals:
-#    None
-# Arguments:
-#    None
-# Returns:
-#    None
-# Remark:
-#    Each network reboot needs to be executed.
-################################################
-adjust_eth_queue() {
-	local nr=`cat /proc/cpuinfo | grep processor | wc -l`
-	local idx=0
-
-	for epath in /sys/class/net/eth[0-9]*; do
-		test -e $epath || break
-		echo $epath | grep -q "\." && continue
-		eth=`basename $epath`
-		idx=0
-		for exps in /sys/class/net/$eth/queues/rx-[0-9]*/rps_cpus; do
-			test -e $exps || break
-			cpu=`printf "%x" $((1<<((idx+1)%nr)))`
-			idx=$((idx+1))
-			echo $cpu > $exps
-			echo 256 > `dirname $exps`/rps_flow_cnt
-		done
-		which ethtool >/dev/null 2>&1 && ethtool -K $eth gro off
-	done
-
-	echo 1024 > /proc/sys/net/core/rps_sock_flow_entries
-}