enable more pcie reset gpios

MeIsReallyBa · Apr 29, 2023 · e4d500c · e4d500c
1 parent f909d29
commit e4d500c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 44 deletions.
diff --git a/.../arch/mips/boot/dts/ralink/zte-e8820s.dts → ...arch/mips/boot/dts/ralink/zte-e8820s.dtsi b/.../arch/mips/boot/dts/ralink/zte-e8820s.dts → ...arch/mips/boot/dts/ralink/zte-e8820s.dtsi
@@ -104,6 +104,9 @@
 
 &pcie {
  status = "okay";
+ reset-gpios = <&gpio0 19 1>, <&gpio0 8 1>, <&gpio0 7 1>;
+ reset-gpio-names = "pcie0", "pcie1", "pcie2";
+
 };
 
 &xhci {

diff --git a/trunk/user/sqm-qos/scripts/hwqos.sh b/trunk/user/sqm-qos/scripts/hwqos.sh
@@ -2,26 +2,8 @@
 
 txq_num="16"
 
-func_stop() {
- for i in $(seq 0 $((txq_num - 1)))
- do
- if [ "${i}" -le $(((txq_num / 2) - 1)) ] ; then
- echo 0 0 0 0 0 0 4 > /sys/kernel/debug/hnat/qdma_txq$i
- else
- echo 1 0 0 0 0 0 4 > /sys/kernel/debug/hnat/qdma_txq$i
- fi
- done
-
- echo 0 sp 0 > /sys/kernel/debug/hnat/qdma_sch0
- echo 0 sp 0 > /sys/kernel/debug/hnat/qdma_sch1
- echo 0 0 0 0 0 0 4 > /sys/kernel/debug/hnat/qdma_txq0
- for i in $(seq 1 $((txq_num - 1)))
- do
- echo 0 0 0 0 0 0 0 > /sys/kernel/debug/hnat/qdma_txq$i
- done
-
- rmmod hw_nat
- modprobe hw_nat
+func_stop()
+{ 
  iptables -t mangle -D FORWARD -o br0 -j MARK --set-mark 6
  iptables -t mangle -D FORWARD -i br0 -j MARK --set-mark 14 
  iptables -t mangle -D FORWARD -o br0 -p udp -j MARK --set-mark 3
@@ -32,13 +14,19 @@ func_stop() {
  iptables -t mangle -D FORWARD -i br0 -p tcp --dport 1:65535 -m connlimit --connlimit-above 4 --connlimit-daddr -j MARK --set-mark 9 
  iptables -t mangle -D FORWARD -o br0 -p udp -m length --length :256 -j MARK --set-mark 7
  iptables -t mangle -D FORWARD -i br0 -p udp -m length --length :256 -j MARK --set-mark 15
+ qdma sch_rate 0 0 0
+ qdma sch_rate 1 0 0
+ qdma resv 0 4 4
+ for i in $(seq 1 $((txq_num - 1)))
+ do
+ qdma rate $i 0 0 0 0
+ qdma resv $i 0 0
+ done
  exit 0
 }
 
-
- func_start(){
-
- iptables -t mangle -D FORWARD -o br0 -j MARK --set-mark 6
+func_start()
+{ iptables -t mangle -D FORWARD -o br0 -j MARK --set-mark 6
  iptables -t mangle -D FORWARD -i br0 -j MARK --set-mark 14 
  iptables -t mangle -D FORWARD -o br0 -p udp -j MARK --set-mark 3
  iptables -t mangle -D FORWARD -i br0 -p udp -j MARK --set-mark 11
@@ -48,40 +36,48 @@ func_stop() {
  iptables -t mangle -D FORWARD -i br0 -p tcp --dport 1:65535 -m connlimit --connlimit-above 4 --connlimit-daddr -j MARK --set-mark 9 
  iptables -t mangle -D FORWARD -o br0 -p udp -m length --length :256 -j MARK --set-mark 7
  iptables -t mangle -D FORWARD -i br0 -p udp -m length --length :256 -j MARK --set-mark 15
-
-
- echo 0 sp $1 > /sys/kernel/debug/hnat/qdma_sch0
- echo 0 sp $2 > /sys/kernel/debug/hnat/qdma_sch1
-
- for i in $(seq 0 $((txq_num - 1)))
+
+ local dlmin dlmax ulmin ulmax 
+ qdma sch_rate 0 0 0
+ qdma sch_rate 1 0 0
+ qdma resv 0 4 4
+ for i in $(seq 1 $((txq_num - 1)))
+ do
+ qdma rate $i 0 0 0 0
+ qdma resv $i 0 0
+ done
+
+ for i in $(seq 1 $((txq_num - 1)))
  do
+ qdma resv $i 4 4
  if [ "${i}" -le $(((txq_num / 2) - 1)) ] ; then
- echo 0 0 0 0 0 0 4 > /sys/kernel/debug/hnat/qdma_txq$i
+ qdma sch $i 1
  else
- echo 1 0 0 0 0 0 4 > /sys/kernel/debug/hnat/qdma_txq$i
+ qdma sch $i 0
  fi
  done
 
- 
+
  dlmin=$(($1 * $3))
  dlmin=$((dlmin / 100))
  dlmax=$(($1 * 1))
  ulmin=$(($2 * $3))
  ulmin=$((ulmin / 100))
  ulmax=$(($2 * 1))
-
- for i in $(seq 0 $((txq_num - 1)))
+ for i in $(seq 1 $((txq_num - 1)))
  do
  if [ "${i}" -le $(((txq_num / 2) - 1)) ] ; then
- echo 0 1 "$dlmin" 1 "$dlmax" 0 4 > /sys/kernel/debug/hnat/qdma_txq$i
+ qdma rate $i 1 "$dlmin" 1 "$dlmax"
  else
- echo 1 1 "$ulmin" 1 "$ulmax" 0 4 > /sys/kernel/debug/hnat/qdma_txq$i
+ qdma rate $i 1 "$ulmin" 1 "$ulmax"
  fi
  done
-
- echo 1 sp $1 > /sys/kernel/debug/hnat/qdma_sch0
- echo 1 sp $2 > /sys/kernel/debug/hnat/qdma_sch1
-
+ qdma sch_rate 0 1 1000000
+ qdma sch_rate 1 1 "$dlmax"
+ qdma sch 0 0
+ qdma sch 12 0 
+ qdma rate 0 1 1000000 1 1000000
+ qdma rate 12 1 1000000 1 1000000
  iptables -t mangle -A FORWARD -o br0 -j MARK --set-mark 6
  iptables -t mangle -A FORWARD -i br0 -j MARK --set-mark 14 
  iptables -t mangle -A FORWARD -o br0 -p udp -j MARK --set-mark 3
@@ -92,8 +88,6 @@ func_stop() {
  iptables -t mangle -A FORWARD -i br0 -p tcp --dport 1:65535 -m connlimit --connlimit-above 4 --connlimit-daddr -j MARK --set-mark 9
  iptables -t mangle -A FORWARD -o br0 -p udp -m length --length :256 -j MARK --set-mark 7
  iptables -t mangle -A FORWARD -i br0 -p udp -m length --length :256 -j MARK --set-mark 15
- rmmod hw_nat
- modprobe hw_nat
  exit 0 
 }
 
@@ -106,8 +100,9 @@ stop)
  func_stop
  ;;
 *)
- echo "Usage: $0 {start dl ul percentage(70) |stop}"
+ echo "Usage: $0 {start dl ul percentage(0.7) |stop}"
  exit 1
  ;;
 esac
 
+exit 0