fix DS224+, fix MMC, fix printer, etc.

This commit is contained in:
Ing 2024-01-12 05:03:28 +08:00
parent 8c8945893b
commit 6c7e719d63
53 changed files with 1250 additions and 1174 deletions

View File

@ -92,11 +92,13 @@ SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
MAC1="$(readConfigKey "mac1" "${USER_CONFIG_FILE}")"
MAC2="$(readConfigKey "mac2" "${USER_CONFIG_FILE}")"
KERNELPANIC="$(readConfigKey "kernelpanic" "${USER_CONFIG_FILE}")"
EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
declare -A CMDLINE
# Automatic values
CMDLINE['syno_hw_version']="${MODEL}"
MODELID="$(readModelKey ${MODEL} "id")"
CMDLINE['syno_hw_version']="${MODELID:-${MODEL}}"
[ -z "${VID}" ] && VID="0x46f4" # Sanity check
[ -z "${PID}" ] && PID="0x0001" # Sanity check
CMDLINE['vid']="${VID}"
@ -135,6 +137,16 @@ CMDLINE['skip_vender_mac_interfaces']="0,1,2,3,4,5,6,7"
CMDLINE['loglevel']="15"
CMDLINE['log_buf_len']="32M"
if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ ! "${BUS}" = "mmc" ] && [ ! "${EMMCBOOT}" = "true" ]; then
[ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
fi
if [ "$(readModelKey "${MODEL}" "dt")" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "$(readModelKey "${MODEL}" "platform")"; then
[ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
CMDLINE['modprobe.blacklist']+="mpt3sas"
fi
# Read cmdline
while IFS=': ' read KEY VALUE; do
[ -n "${KEY}" ] && CMDLINE["${KEY}"]="${VALUE}"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -370,17 +370,28 @@ function ParsePat() {
echo -e "$(TEXT "pat Invalid, try again!")" >"${MKERR_FILE}"
break
fi
. ${UNTAR_PAT_PATH}/GRUB_VER
. ${UNTAR_PAT_PATH}/VERSION
if [ -n "${MODEL}" ]; then
if [ -f "${WORK_PATH}/model-configs/${MODEL}.yml" ]; then
MODEL=${MODEL}
MODELTMP=$(grep -E "MODEL=\".*\"" ${UNTAR_PAT_PATH}/GRUB_VER | sed 's/.*MODEL="\(.*\)".*/\1/')
if [ -n "${MODELTMP}" ]; then
if [ -f "${WORK_PATH}/model-configs/${MODELTMP}.yml" ]; then
MODEL=${MODELTMP}
else
echo "$(printf "$(TEXT "Currently, %s is not supported.")" "${MODEL}")" >"${MKERR_FILE}"
IS_FIND="false"
for M in $(find "${WORK_PATH}/model-configs" -maxdepth 1 -name \*.yml | sed 's/.*\///; s/\.yml//'); do
if [ "$(readModelKey "${M}" "id")" = "${MODELTMP}" ]; then
MODEL=${M}
IS_FIND="true"
break
fi
done
if [ "${IS_FIND}" = "false" ]; then
echo "$(printf "$(TEXT "Currently, %s is not supported.")" "${MODELTMP}")" >"${MKERR_FILE}"
break
fi
fi
fi
. ${UNTAR_PAT_PATH}/VERSION
if [ -n "${majorversion}" -a -n "${minorversion}" -a -n "$(readModelKey "${MODEL}" "productvers.[${majorversion}.${minorversion}]")" ]; then
PRODUCTVER=${majorversion}.${minorversion}
BUILDNUM=${buildnumber}
@ -604,6 +615,7 @@ function addonMenu() {
esac
done
}
###############################################################################
function moduleMenu() {
PLATFORM="$(readModelKey "${MODEL}" "platform")"
@ -760,6 +772,7 @@ function cmdlineMenu() {
MSG+="$(TEXT "Commonly used cmdlines:\n")"
MSG+="$(TEXT " * \Z4disable_mtrr_trim=\Zn\n disables kernel trim any uncacheable memory out.\n")"
MSG+="$(TEXT " * \Z4intel_idle.max_cstate=1\Zn\n Set the maximum C-state depth allowed by the intel_idle driver.\n")"
MSG+="$(TEXT " * \Z4libata.force=noncq\Zn\n Disable NCQ for all SATA ports.\n")"
MSG+="$(TEXT " * \Z4SataPortMap=??\Zn\n Sata Port Map.\n")"
MSG+="$(TEXT " * \Z4DiskIdxMap=??\Zn\n Disk Index Map, Modify disk name sequence.\n")"
MSG+="$(TEXT " * \Z4i915.enable_guc=2\Zn\n Enable the GuC firmware on Intel graphics hardware.(value: 1,2 or 3)\n")"
@ -1175,14 +1188,6 @@ function make() {
[ $? -ne 0 ] && break
fi
if [[ "${LOADER_DISK}" = /dev/mmcblk* ]] || [ "${EMMCBOOT}" = "true" ]; then
echo "$(TEXT "EMMC is used.")"
else
echo "$(TEXT "EMMC is not used. remove mmc modules.")"
deleteConfigKey "modules.mmc_block" "${USER_CONFIG_FILE}"
deleteConfigKey "modules.mmc_core" "${USER_CONFIG_FILE}"
fi
# Check disk space left
SPACELEFT=$(df --block-size=1 | grep ${LOADER_DISK_PART3} | awk '{print $4}')
[ ${SPACELEFT} -le 268435456 ] && rm -rf "${PART3_PATH}/dl"
@ -1256,7 +1261,7 @@ function advancedMenu() {
echo "d \"$(TEXT "Custom dts file # Need rebuild")\"" >>"${TMP_PATH}/menu"
fi
echo "0 \"$(TEXT "Custom patch script # Developer")\"" >>"${TMP_PATH}/menu"
if [ -b "/dev/mmcblk0" ]; then
if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ]; then
echo "b \"$(TEXT "Use EMMC as the system disk:") \Z4${EMMCBOOT}\Zn\"" >>"${TMP_PATH}/menu"
fi
echo "r \"$(TEXT "Clone bootloader disk to another disk")\"" >>"${TMP_PATH}/menu"

View File

@ -1,5 +1,6 @@
id: "DS1019+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS1520+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS1522+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS1621+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS1621xs+"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS1819+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS1821+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS1823xs+"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS220+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS423+"
id: "DS224+"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"
@ -21,7 +24,7 @@ patch: &patch
- "ramdisk-post-init-script-*.patch"
- "ramdisk-disable-root-pwd-*.patch"
platform: "geminilake"
unique: "synology_geminilake_423+"
unique: "synology_geminilake_224+"
serial:
prefix:
- "2350"

View File

@ -1,5 +1,6 @@
id: "DS2419+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS2422+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS3615xs"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS3617xs"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS3622xs+"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS423+"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS718+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS720+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS723+"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS916+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS918+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DS920+"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,8 @@
id: "DS923+"
synoinfo: &synoinfo
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DVA1622"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DVA3219"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "DVA3221"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "FS2500"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "FS3017"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "FS6400"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,10 +1,13 @@
id: "HD6500"
synoinfo: &synoinfo
supportext4: "yes"
internal_disk_without_led_mask: "no"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"
internal_disk_without_led_mask: "no"
support_syno_hybrid_raid:
supportraidgroup:
supportsas: "no"

View File

@ -1,6 +1,7 @@
id: "RS1221+"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "RS1619xs+"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "RS2423+"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "RS2423RP+"
id: "RS2423rp+"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "RS3413xs+"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "RS3618xs"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "RS3621xs+"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "RS4021xs+"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "SA3200D"
id: "SA3200d"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_hibernation: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"

View File

@ -1,6 +1,9 @@
id: "SA3400"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "SA3400D"
id: "SA3400d"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_hibernation: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"

View File

@ -1,6 +1,9 @@
id: "SA3410"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "SA3600"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "SA3610"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,6 +1,9 @@
id: "SA6400"
synoinfo: &synoinfo
supportext4: "yes"
support_uasp: "yes"
support_printer: "yes"
support_usb_printer: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -1,5 +1,6 @@
id: "VirtualDSM"
synoinfo: &synoinfo
support_uasp: "yes"
support_disk_compatibility: "no"
support_memory_compatibility: "no"
support_led_brightness_adjustment: "no"

View File

@ -136,17 +136,17 @@
lspci -d ::107 # 查看 HBA 控制器
lspci -d ::108 # 查看 NVME 控制器
lspci -d ::c03 # 查看 USB 控制器
lspci -d ::805 # 查看 SD Card 控制器
lspci -d ::805 # 查看 MMC 控制器
lspci -d ::100 # 查看 VIRTIO 控制器
ls -l /sys/class/scsi_host # 查看 ATA 硬盘 host 信息
ls -l /sys/class/mmc_host # 查看 SD Card 硬盘 host 信息
ls -l /sys/class/mmc_host # 查看 MMC 硬盘 host 信息
ls -l /sys/class/nvme # 查看 NVME 硬盘 host 信息
ls /sys/block/ # 查看块设备
ls /sys/block/sd* # 查看识别的 sata 硬盘 (非设备树(dtb)的型号)
ls /sys/block/sata* # 查看识别的 sata 硬盘 (设备树(dtb)的型号)
ls /sys/block/nvme* # 查看识别的 nvme 硬盘
ls /sys/block/mmc* # 查看识别的 SD Card 硬盘
ls /sys/block/usb* # 查看识别的 SD Card/USB 硬盘
ls /sys/block/mmc* # 查看识别的 mmc 硬盘
ls /sys/block/usb* # 查看识别的 usb 硬盘
cat /sys/block/sd*/device/syno_block_info # 查看识别的 sata 硬盘挂载点 (非设备树(dtb)的型号)
cat /sys/block/sata*/device/syno_block_info # 查看识别的 sata 硬盘挂载点 (设备树(dtb)的型号)
cat /sys/block/nvme*/device/syno_block_info # 查看识别的 nvme 硬盘挂载点
@ -163,6 +163,7 @@
systemctl enable cpufreq.service # 开机启动 CPU 频率调节器
systemctl disable cpufreq.service # 永久停止 CPU 频率调节器
netstat -tunlp # 查看端口
lsof -i :7681 # 查看 7681 端口占用情况
# 日志相关
dmesg # 内核日志