update to linux 6.11.3

Signed-off-by: John Clark <inindev@gmail.com>
inindev · Oct 11, 2024 · ca79c5c · ca79c5c
1 parent ac94bb5
commit ca79c5c
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 45 deletions.
diff --git a/kernel/make_kernel.sh b/kernel/make_kernel.sh
@@ -15,8 +15,8 @@ config_fixups() {
 }
 
 main() {
-    local linux='https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.tar.xz'
-    local lxsha='55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e'
+    local linux='https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.3.tar.xz'
+    local lxsha='057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73'
 
     local lf="$(basename "$linux")"
     local lv="$(echo "$lf" | sed -nE 's/linux-(.*)\.tar\..z/\1/p')"

diff --git a/kernel/patches/99_misc/0002-default-config-for-the-starfive-visionfive2.patch b/kernel/patches/99_misc/0002-default-config-for-the-starfive-visionfive2.patch
@@ -1,20 +1,20 @@
-From b5976b2ec26ee19e3a434c409e626497d0ab74a9 Mon Sep 17 00:00:00 2001
+From 0b477bad1a904c1aaf7ded12f1fbb1720119d3ce Mon Sep 17 00:00:00 2001
 From: John Clark <inindev@gmail.com>
 Date: Mon, 13 Nov 2023 03:50:50 +0000
 Subject: [PATCH 2/2] default config for the starfive visionfive2
 
 Signed-off-by: John Clark <inindev@gmail.com>
 ---
- .../configs/starfive_visionfive2_defconfig    | 846 ++++++++++++++++++
- 1 file changed, 846 insertions(+)
+ .../configs/starfive_visionfive2_defconfig    | 863 ++++++++++++++++++
+ 1 file changed, 863 insertions(+)
  create mode 100644 arch/riscv/configs/starfive_visionfive2_defconfig
 
 diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig
 new file mode 100644
-index 000000000..2dad7e5b3
+index 0000000..dcbe678
 --- /dev/null
 +++ b/arch/riscv/configs/starfive_visionfive2_defconfig
-@@ -0,0 +1,846 @@
+@@ -0,0 +1,863 @@
 +CONFIG_COMPILE_TEST=y
 +CONFIG_DEFAULT_HOSTNAME="StarFive"
 +CONFIG_SYSVIPC=y
@@ -75,9 +75,9 @@ index 000000000..2dad7e5b3
 +CONFIG_CPU_FREQ=y
 +CONFIG_CPU_FREQ_STAT=y
 +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
++CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 +CONFIG_CPU_FREQ_GOV_USERSPACE=y
-+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
++CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 +CONFIG_CPUFREQ_DT=y
 +CONFIG_ACPI_CPPC_CPUFREQ=m
@@ -203,6 +203,7 @@ index 000000000..2dad7e5b3
 +CONFIG_NFT_FWD_NETDEV=m
 +CONFIG_NF_FLOW_TABLE_INET=m
 +CONFIG_NF_FLOW_TABLE=m
++CONFIG_NETFILTER_XTABLES=y
 +CONFIG_NETFILTER_XT_SET=m
 +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -288,9 +289,10 @@ index 000000000..2dad7e5b3
 +CONFIG_NFT_FIB_IPV4=m
 +CONFIG_NF_LOG_ARP=m
 +CONFIG_NF_LOG_IPV4=m
-+CONFIG_IP_NF_IPTABLES=y
-+CONFIG_IP_NF_FILTER=y
-+CONFIG_IP_NF_TARGET_REJECT=y
++CONFIG_NF_REJECT_IPV4=y
++CONFIG_IP_NF_IPTABLES=m
++CONFIG_IP_NF_FILTER=m
++CONFIG_IP_NF_TARGET_REJECT=m
 +CONFIG_IP_NF_NAT=m
 +CONFIG_IP_NF_TARGET_MASQUERADE=m
 +CONFIG_IP_NF_TARGET_NETMAP=m
@@ -407,7 +409,7 @@ index 000000000..2dad7e5b3
 +CONFIG_QRTR=m
 +CONFIG_CGROUP_NET_PRIO=y
 +CONFIG_BPF_STREAM_PARSER=y
-+CONFIG_CAN=y
++CONFIG_CAN=m
 +CONFIG_BT=m
 +CONFIG_BT_RFCOMM=m
 +CONFIG_BT_RFCOMM_TTY=y
@@ -439,8 +441,9 @@ index 000000000..2dad7e5b3
 +CONFIG_MAC80211_LEDS=y
 +CONFIG_RFKILL=m
 +CONFIG_RFKILL_INPUT=y
-+CONFIG_NET_9P=m
-+CONFIG_NET_9P_VIRTIO=m
++CONFIG_NET_9P=y
++CONFIG_NET_9P_FD=m
++CONFIG_NET_9P_VIRTIO=y
 +CONFIG_CEPH_LIB=m
 +CONFIG_NFC=m
 +CONFIG_NFC_DIGITAL=m
@@ -459,7 +462,7 @@ index 000000000..2dad7e5b3
 +CONFIG_PCI_HOST_GENERIC=y
 +CONFIG_PCIE_XILINX=y
 +CONFIG_PCIE_FU740=y
-+CONFIG_PCIE_STARFIVE_HOST=y
++CONFIG_PCIE_STARFIVE_HOST=m
 +CONFIG_DEVTMPFS=y
 +CONFIG_DEVTMPFS_MOUNT=y
 +# CONFIG_STANDALONE is not set
@@ -476,7 +479,7 @@ index 000000000..2dad7e5b3
 +CONFIG_BLK_DEV_LOOP=y
 +CONFIG_BLK_DEV_LOOP_MIN_COUNT=1
 +CONFIG_VIRTIO_BLK=y
-+CONFIG_BLK_DEV_NVME=y
++CONFIG_BLK_DEV_NVME=m
 +CONFIG_NVME_HWMON=y
 +CONFIG_EEPROM_AT24=y
 +CONFIG_BLK_DEV_SD=y
@@ -493,6 +496,7 @@ index 000000000..2dad7e5b3
 +CONFIG_MACVLAN=m
 +CONFIG_IPVLAN=m
 +CONFIG_VXLAN=m
++CONFIG_TUN=y
 +CONFIG_VETH=m
 +CONFIG_VIRTIO_NET=y
 +# CONFIG_NET_VENDOR_ALACRITECH is not set
@@ -524,11 +528,10 @@ index 000000000..2dad7e5b3
 +# CONFIG_NET_VENDOR_SEEQ is not set
 +# CONFIG_NET_VENDOR_SOLARFLARE is not set
 +# CONFIG_NET_VENDOR_SOCIONEXT is not set
-+CONFIG_STMMAC_ETH=y
++CONFIG_STMMAC_ETH=m
 +CONFIG_STMMAC_SELFTESTS=y
-+CONFIG_DWMAC_DWC_QOS_ETH=y
++CONFIG_DWMAC_DWC_QOS_ETH=m
 +# CONFIG_DWMAC_GENERIC is not set
-+CONFIG_DWMAC_STARFIVE=y
 +# CONFIG_NET_VENDOR_SYNOPSYS is not set
 +# CONFIG_NET_VENDOR_VIA is not set
 +# CONFIG_NET_VENDOR_WIZNET is not set
@@ -540,6 +543,7 @@ index 000000000..2dad7e5b3
 +CONFIG_MOTORCOMM_PHY=y
 +CONFIG_CAN_CASTCAN=m
 +CONFIG_CAN_RCAR_CANFD=m
++CONFIG_PCS_XPCS=y
 +# CONFIG_WLAN is not set
 +CONFIG_INPUT_MOUSEDEV=y
 +CONFIG_INPUT_EVDEV=y
@@ -567,16 +571,17 @@ index 000000000..2dad7e5b3
 +CONFIG_VIRTIO_CONSOLE=y
 +CONFIG_HW_RANDOM=y
 +CONFIG_HW_RANDOM_VIRTIO=y
-+CONFIG_HW_RANDOM_JH7110=y
++CONFIG_HW_RANDOM_JH7110=m
++CONFIG_I2C=y
 +# CONFIG_I2C_COMPAT is not set
-+CONFIG_I2C_CHARDEV=y
++CONFIG_I2C_CHARDEV=m
 +# CONFIG_I2C_HELPER_AUTO is not set
 +CONFIG_I2C_DESIGNWARE_PLATFORM=y
 +CONFIG_I2C_MV64XXX=m
 +CONFIG_I2C_RIIC=y
 +CONFIG_SPI=y
-+CONFIG_SPI_CADENCE_QUADSPI=y
-+CONFIG_SPI_PL022=y
++CONFIG_SPI_CADENCE_QUADSPI=m
++CONFIG_SPI_PL022=m
 +CONFIG_SPI_RSPI=m
 +CONFIG_SPI_SIFIVE=y
 +CONFIG_SPI_SUN6I=y
@@ -586,7 +591,7 @@ index 000000000..2dad7e5b3
 +CONFIG_GPIO_SYSFS=y
 +CONFIG_GPIO_SIFIVE=y
 +CONFIG_POWER_RESET_GPIO_RESTART=y
-+CONFIG_SENSORS_SFCTEMP=y
++CONFIG_SENSORS_SFCTEMP=m
 +CONFIG_CPU_THERMAL=y
 +CONFIG_DEVFREQ_THERMAL=y
 +CONFIG_THERMAL_EMULATION=y
@@ -601,13 +606,13 @@ index 000000000..2dad7e5b3
 +CONFIG_REGULATOR_AXP20X=y
 +CONFIG_REGULATOR_GPIO=y
 +# CONFIG_MEDIA_CEC_SUPPORT is not set
-+CONFIG_MEDIA_SUPPORT=y
++CONFIG_MEDIA_SUPPORT=m
 +CONFIG_MEDIA_USB_SUPPORT=y
-+CONFIG_USB_VIDEO_CLASS=y
++CONFIG_USB_VIDEO_CLASS=m
 +CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_VIDEO_CADENCE_CSI2RX=y
-+CONFIG_VIDEO_IMX219=y
-+CONFIG_DRM=y
++CONFIG_VIDEO_CADENCE_CSI2RX=m
++CONFIG_VIDEO_IMX219=m
++CONFIG_DRM=m
 +CONFIG_DRM_RADEON=m
 +CONFIG_DRM_NOUVEAU=m
 +CONFIG_DRM_SUN4I=m
@@ -619,29 +624,30 @@ index 000000000..2dad7e5b3
 +CONFIG_SND=y
 +CONFIG_SND_USB_AUDIO=y
 +CONFIG_SND_SOC=y
-+CONFIG_SND_DESIGNWARE_I2S=y
-+CONFIG_SND_SOC_STARFIVE=y
++CONFIG_SND_DESIGNWARE_I2S=m
++CONFIG_SND_SOC_STARFIVE=m
 +CONFIG_SND_SOC_JH7110_PWMDAC=m
-+CONFIG_SND_SOC_JH7110_TDM=y
++CONFIG_SND_SOC_JH7110_TDM=m
 +CONFIG_SND_SOC_WM8960=y
 +CONFIG_SND_SOC_WM8978=m
-+CONFIG_SND_SIMPLE_CARD=y
++CONFIG_SND_SIMPLE_CARD=m
 +CONFIG_UHID=y
 +CONFIG_USB=y
 +CONFIG_USB_OTG=y
 +CONFIG_USB_XHCI_HCD=y
++CONFIG_USB_XHCI_PLATFORM=y
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_EHCI_HCD_PLATFORM=y
 +CONFIG_USB_OHCI_HCD=y
 +CONFIG_USB_OHCI_HCD_PLATFORM=y
 +CONFIG_USB_RENESAS_USBHS=m
 +CONFIG_USB_STORAGE=y
 +CONFIG_USB_UAS=y
-+CONFIG_USB_CDNS_SUPPORT=y
-+CONFIG_USB_CDNS3=y
++CONFIG_USB_CDNS_SUPPORT=m
++CONFIG_USB_CDNS3=m
 +CONFIG_USB_CDNS3_GADGET=y
 +CONFIG_USB_CDNS3_HOST=y
-+CONFIG_USB_CDNS3_STARFIVE=y
++CONFIG_USB_CDNS3_STARFIVE=m
 +CONFIG_USB_MUSB_HDRC=m
 +CONFIG_USB_MUSB_SUNXI=m
 +CONFIG_USB_SERIAL=m
@@ -693,7 +699,7 @@ index 000000000..2dad7e5b3
 +CONFIG_NOP_USB_XCEIV=m
 +CONFIG_USB_GADGET=y
 +CONFIG_USB_RENESAS_USBHS_UDC=m
-+CONFIG_USB_CONFIGFS=y
++CONFIG_USB_CONFIGFS=m
 +CONFIG_USB_CONFIGFS_SERIAL=y
 +CONFIG_USB_CONFIGFS_ACM=y
 +CONFIG_USB_CONFIGFS_OBEX=y
@@ -704,6 +710,8 @@ index 000000000..2dad7e5b3
 +CONFIG_USB_CONFIGFS_EEM=y
 +CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 +CONFIG_USB_CONFIGFS_F_FS=y
++CONFIG_USB_MASS_STORAGE=m
++CONFIG_USB_ROLE_SWITCH=y
 +CONFIG_MMC=y
 +# CONFIG_PWRSEQ_EMMC is not set
 +# CONFIG_PWRSEQ_SIMPLE is not set
@@ -752,24 +760,24 @@ index 000000000..2dad7e5b3
 +CONFIG_PWM_OCORES=m
 +CONFIG_PHY_SUN4I_USB=m
 +CONFIG_PHY_RCAR_GEN3_USB2=y
-+CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=y
-+CONFIG_PHY_STARFIVE_JH7110_PCIE=y
-+CONFIG_PHY_STARFIVE_JH7110_USB=y
++CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m
++CONFIG_PHY_STARFIVE_JH7110_PCIE=m
++CONFIG_PHY_STARFIVE_JH7110_USB=m
 +CONFIG_RAS=y
 +CONFIG_LIBNVDIMM=y
 +CONFIG_NVMEM_SUNXI_SID=y
 +CONFIG_EXT4_FS=y
 +CONFIG_EXT4_FS_POSIX_ACL=y
 +CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_BTRFS_FS=y
++CONFIG_BTRFS_FS=m
 +CONFIG_BTRFS_FS_POSIX_ACL=y
 +# CONFIG_DNOTIFY is not set
 +CONFIG_FANOTIFY=y
 +CONFIG_AUTOFS_FS=y
 +CONFIG_FUSE_FS=y
 +CONFIG_CUSE=y
 +CONFIG_VIRTIO_FS=y
-+CONFIG_OVERLAY_FS=y
++CONFIG_OVERLAY_FS=m
 +CONFIG_OVERLAY_FS_INDEX=y
 +CONFIG_OVERLAY_FS_XINO_AUTO=y
 +CONFIG_OVERLAY_FS_METACOPY=y
@@ -787,6 +795,7 @@ index 000000000..2dad7e5b3
 +CONFIG_TMPFS=y
 +CONFIG_TMPFS_POSIX_ACL=y
 +CONFIG_HUGETLBFS=y
++CONFIG_CONFIGFS_FS=y
 +CONFIG_EFIVAR_FS=y
 +CONFIG_JFFS2_FS=y
 +CONFIG_NFS_FS=y
@@ -803,10 +812,10 @@ index 000000000..2dad7e5b3
 +CONFIG_CIFS_DFS_UPCALL=y
 +CONFIG_CIFS_FSCACHE=y
 +CONFIG_SMB_SERVER=m
-+CONFIG_9P_FS=m
++CONFIG_9P_FS=y
 +CONFIG_NLS_DEFAULT="iso8859-15"
 +CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_ISO8859_1=y
++CONFIG_NLS_ISO8859_1=m
 +CONFIG_NLS_ISO8859_15=y
 +CONFIG_SECURITY=y
 +CONFIG_SECURITY_SELINUX=y
@@ -818,14 +827,22 @@ index 000000000..2dad7e5b3
 +CONFIG_CRYPTO_TEST=m
 +CONFIG_CRYPTO_ECDH=y
 +CONFIG_CRYPTO_AES=y
++CONFIG_CRYPTO_BLAKE2B=y
 +CONFIG_CRYPTO_CMAC=y
++CONFIG_CRYPTO_XXHASH=y
 +CONFIG_CRYPTO_ZSTD=y
 +CONFIG_CRYPTO_USER_API_HASH=y
 +CONFIG_CRYPTO_USER_API_SKCIPHER=y
 +CONFIG_CRYPTO_USER_API_RNG=y
 +CONFIG_CRYPTO_USER_API_AEAD=y
 +CONFIG_CRYPTO_DEV_VIRTIO=y
++CONFIG_CRYPTO_DEV_CCREE=m
++CONFIG_CRYPTO_DEV_HISI_SEC2=m
++CONFIG_CRYPTO_DEV_HISI_ZIP=m
++CONFIG_CRYPTO_DEV_HISI_HPRE=m
++CONFIG_CRYPTO_DEV_SA2UL=m
 +# CONFIG_RAID6_PQ_BENCHMARK is not set
++CONFIG_LIBCRC32C=y
 +CONFIG_DMA_CMA=y
 +CONFIG_PRINTK_TIME=y
 +# CONFIG_DEBUG_MISC is not set