enable iommu

files/initrd/opt/rr/boot.sh

@@ -12,19 +12,6 @@ loaderIsConfigured || die "$(TEXT "Loader is not configured!")"
 # Check if machine has EFI
 [ -d /sys/firmware/efi ] && EFI=1 || EFI=0
 
-# Proc open nvidia driver when booting
-NVPCI_ADDR=$(lspci -nd 10de: | grep -e 0300 -e 0302 | awk '{print $1}')
-if [ -n "${NVPCI_ADDR}" ]; then
-  modprobe -r nouveau || true
-  NVDEV_PATH=$(find /sys/devices -name *${NVPCI_ADDR} | grep  -v supplier)
-  for DEV_PATH in ${NVDEV_PATH}
-  do
-    if [ -e ${DEV_PATH}/reset ]; then
-          echo 1 > ${DEV_PATH}/reset || true
-    fi
-  done
-fi
-
 BUS=$(getBus "${LOADER_DISK}")
 
 # Print text centralized
@@ -184,6 +171,9 @@ if [ "${DT}" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "${
   fi
 fi
 
+# CMDLINE['kvm.ignore_msrs']="1"
+# CMDLINE['kvm.report_ignored_msrs']="0"
+
 if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
   CMDLINE["intel_iommu"]="igfx_off"
 fi
@@ -317,7 +307,7 @@ else
     [ -f "${TMP_PATH}/qrcode_qhxg.png" ] && echo | fbv -acufi "${TMP_PATH}/qrcode_qhxg.png" >/dev/null 2>/dev/null || true
   fi
 
-   # Executes DSM kernel via KEXEC
+  # Executes DSM kernel via KEXEC
   KEXECARGS=""
   if [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 4 ] && [ ${EFI} -eq 1 ]; then
     echo -e "\033[1;33m$(TEXT "Warning, running kexec with --noefi param, strange things will happen!!")\033[0m"
@@ -332,6 +322,17 @@ else
   # Clear logs for dbgutils addons
   rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true
 
+  # Unload all network interfaces
+  for D in $(readlink /sys/class/net/*/device/driver); do rmmod -f "$(basename ${D})" 2>/dev/null || true; done
+
+  # Unload all graphics drivers
+  # for D in $(readlink /sys/class/drm/*/device/driver); do rmmod -f "$(basename ${D})" 2>/dev/null || true; done
+  for D in $(lsmod | grep -E '^(nouveau|amdgpu|radeon|i915)' | awk '{print $1}'); do rmmod -f "${D}" 2>/dev/null || true; done
+  for I in $(find /sys/devices -name uevent -exec bash -c 'cat {} 2>/dev/null | grep -Eq "PCI_CLASS=0?30[0|1|2]00" && dirname {}' \;); do
+    [ -e ${I}/reset ] && cat ${I}/vendor >/dev/null | grep -iq 0x10de && echo 1 >${I}/reset || true # Proc open nvidia driver when booting
+  done
+
+  # Reboot
   KERNELWAY="$(readConfigKey "kernelway" "${USER_CONFIG_FILE}")"
   [ "${KERNELWAY}" = "kexec" ] && kexec -a -e || poweroff
   exit 0

files/initrd/opt/rr/init.sh

@@ -100,6 +100,7 @@ if [ ! "LOCALBUILD" = "${LOADER_DISK}" ]; then
       sleep 1
     fi
     [ "${ETH::3}" = "eth" ] && ethtool -s ${ETH} wol g 2>/dev/null || true
+    [ "${ETH::3}" = "eth" ] && ethtool -K ${ETH} rxhash off 2>/dev/null || true
   done
 fi
 

files/initrd/opt/rr/menu.sh

@@ -897,10 +897,8 @@ function cmdlineMenu() {
       while read -r line; do LINENUM=$((LINENUM + 1 + ${#line} / 96)); done <<<"$(printf "${MSG}")" # When the width is 100, each line displays 96 characters.
       LINENUM=$((${LINENUM:-0} + 9))                                                                # When there are 2 parameters, 9 is the minimum value to include 1 line of MSG.
 
-      dialog --print-maxsize 2>"${TMP_PATH}/maxsize"
-      DIALOG_MAXX=$(cat "${TMP_PATH}/maxsize" 2>/dev/null | grep "MaxSize" | awk -F: '{print $2}' | cut -d, -f2 | xargs)
-      DIALOG_MAXY=$(cat "${TMP_PATH}/maxsize" 2>/dev/null | grep "MaxSize" | awk -F: '{print $2}' | cut -d, -f1 | xargs)
-
+      DIALOG_MAXX=$(ttysize 2>/dev/null | awk '{print $1}')
+      DIALOG_MAXY=$(ttysize 2>/dev/null | awk '{print $2}')
       if [ ${LINENUM:-0} -ge ${DIALOG_MAXY:-0} ]; then
         MSG="$(TEXT "Please enter the parameter key and value you need to add.\n")"
         LINENUM=9
@@ -1044,10 +1042,8 @@ function synoinfoMenu() {
       while read -r line; do LINENUM=$((LINENUM + 1 + ${#line} / 96)); done <<<"$(printf "${MSG}")" # When the width is 100, each line displays 96 characters.
       LINENUM=$((${LINENUM:-0} + 9))                                                                # When there are 2 parameters, 9 is the minimum value to include 1 line of MSG.
 
-      dialog --print-maxsize 2>"${TMP_PATH}/maxsize"
-      DIALOG_MAXX=$(cat "${TMP_PATH}/maxsize" 2>/dev/null | grep "MaxSize" | awk -F: '{print $2}' | cut -d, -f2 | xargs)
-      DIALOG_MAXY=$(cat "${TMP_PATH}/maxsize" 2>/dev/null | grep "MaxSize" | awk -F: '{print $2}' | cut -d, -f1 | xargs)
-
+      DIALOG_MAXX=$(ttysize 2>/dev/null | awk '{print $1}')
+      DIALOG_MAXY=$(ttysize 2>/dev/null | awk '{print $2}')
       if [ ${LINENUM:-0} -ge ${DIALOG_MAXY:-0} ]; then
         MSG="$(TEXT "Please enter the parameter key and value you need to add.\n")"
         LINENUM=9
@@ -2026,6 +2022,7 @@ function forceEnableDSMTelnetSSH() {
   fi
   (
     ONBOOTUP=""
+    ONBOOTUP="${ONBOOTUP}systemctl restart inetd\n"
     ONBOOTUP="${ONBOOTUP}synowebapi --exec api=SYNO.Core.Terminal method=set version=3 enable_telnet=true enable_ssh=true ssh_port=22 forbid_console=false\n"
     ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''RRONBOOTUPRR_SSH'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
     mkdir -p "${TMP_PATH}/mdX"

files/mnt/p1/boot/grub/grub.cfg

@@ -70,7 +70,7 @@ function set_gfxpayload {
   fi
 }
 
-set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 nox2apic nomodeset"
+set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 nox2apic nomodeset intremap=off"
 
 search --set=root --label "RR3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then