From 1a09dc608393ca7c81df454216f86fa0e4743d17 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Wed, 28 May 2025 18:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=20geminilakenk=20?=
 =?UTF-8?q?=E5=92=8C=20r1000nk=20=E5=B9=B3=E5=8F=B0=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/initrd/opt/rr/boot.sh       | 8 ++++----
 files/initrd/opt/rr/menu.sh       | 6 +++---
 files/initrd/opt/rr/platforms.yml | 1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh
index e2dc4fcf..70b0760b 100755
--- a/files/initrd/opt/rr/boot.sh
+++ b/files/initrd/opt/rr/boot.sh
@@ -246,12 +246,12 @@ if [ "${USBASINTERNAL}" = "true" ]; then
   CMDLINE['usbasinternal']=""
 fi
 
-if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
+if echo "apollolake geminilake purley geminilakenk" | grep -wq "${PLATFORM}"; then
   CMDLINE["nox2apic"]=""
 fi
 
 # # Save command line to grubenv  RR_CMDLINE= ... nox2apic
-# if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
+# if echo "apollolake geminilake purley geminilakenk" | grep -wq "${PLATFORM}"; then
 #   if grep -Eq "^flags.*x2apic.*" /proc/cpuinfo; then
 #     checkCmdline "rr_cmdline" "nox2apic" || addCmdline "rr_cmdline" "nox2apic"
 #   fi
@@ -265,7 +265,7 @@ fi
 #     CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
 #   fi
 # fi
-if [ "${DT}" = "true" ] && ! echo "v1000nk epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
+if [ "${DT}" = "true" ] && ! echo "purley broadwellnkv2 epyc7002 geminilakenk r1000nk v1000nk" | grep -wq "${PLATFORM}"; then
   if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then
     [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
     CMDLINE['modprobe.blacklist']+="mpt3sas"
@@ -277,7 +277,7 @@ fi
 # CMDLINE['kvm.ignore_msrs']="1"
 # CMDLINE['kvm.report_ignored_msrs']="0"
 
-if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
+if echo "apollolake geminilake geminilakenk" | grep -wq "${PLATFORM}"; then
   CMDLINE["intel_iommu"]="igfx_off"
 fi
 
diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index ddef649d..30930edc 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -150,9 +150,9 @@ function modelMenu() {
       while true; do
         rm -f "${TMP_PATH}/menu"
         FLGNEX=0
-        IGPU1L=(apollolake geminilake v1000nk epyc7002)
-        IGPU2L=(v1000nk epyc7002)
-        KVER5L=(v1000nk epyc7002)
+        IGPU1L=(apollolake geminilake epyc7002 geminilakenk r1000nk v1000nk)
+        IGPU2L=(epyc7002 geminilakenk r1000nk v1000nk)
+        KVER5L=(epyc7002 geminilakenk r1000nk v1000nk)
         IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')"
         NVMEMS=(DS918+ RS1619xs+ DS419+ DS1019+ DS719+ DS1621xs+)
         NVMEMD=$(find /sys/devices -type d -name nvme | awk -F'/' '{print NF}' | sort -n | tail -n1)
diff --git a/files/initrd/opt/rr/platforms.yml b/files/initrd/opt/rr/platforms.yml
index 1cc1dc0e..566f84ed 100644
--- a/files/initrd/opt/rr/platforms.yml
+++ b/files/initrd/opt/rr/platforms.yml
@@ -119,6 +119,7 @@ platforms:
     productvers: *productvers5
   geminilakenk:
     dt: true
+    noflags: ["x2apic"]
     synoinfo:
       <<: *synoinfo
       netif_seq_by_dts: "no"