From 6df8b653fa700691bace5023e640e5300253934c Mon Sep 17 00:00:00 2001 From: Vince Jerald Villamora <1276544+vincejv@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:15:10 +0800 Subject: [PATCH] kernel: bump to 6.6.20 --- .config | 23 ++-- .config.old | 120 ++++++++++++------ feeds.conf.default | 2 +- include/kernel-6.6 | 4 +- package/kernel/linux/modules/crypto.mk | 5 +- package/kernel/linux/modules/virt.mk | 44 ++++++- ...-netfilter-add-xt_FLOWOFFLOAD-target.patch | 4 +- ...ow_offload-handle-netdevice-events-f.patch | 6 +- ...les-ignore-EOPNOTSUPP-on-flowtable-d.patch | 2 +- ...rtl8221-allow-to-configure-SERDES-mo.patch | 6 +- ...support-switching-between-SGMII-and-.patch | 4 +- ...-use-genphy_soft_reset-for-2.5G-PHYs.patch | 12 +- ...sable-SGMII-in-band-AN-for-2-5G-PHYs.patch | 4 +- ...make-sure-paged-read-is-protected-by.patch | 2 +- ...use-inline-functions-for-10GbE-adver.patch | 4 +- ...check-validity-of-10GbE-link-partner.patch | 2 +- ...-phy-realtek-introduce-rtl822x_probe.patch | 10 +- ...tek-detect-early-version-of-RTL8221B.patch | 4 +- ...ealtek-support-interrupt-of-RTL8221B.patch | 4 +- .../pending-6.6/834-ledtrig-libata.patch | 8 +- 20 files changed, 172 insertions(+), 98 deletions(-) diff --git a/.config b/.config index 246eacd6180039..5349c24346bb6e 100644 --- a/.config +++ b/.config @@ -1835,7 +1835,7 @@ CONFIG_PACKAGE_ledumon=m # CONFIG_PACKAGE_nasm is not set CONFIG_PACKAGE_objdump=m # CONFIG_PACKAGE_patch is not set -CONFIG_PACKAGE_perf=n +# CONFIG_PACKAGE_perf is not set # CONFIG_PACKAGE_pkg-config is not set # CONFIG_PACKAGE_pkgconf is not set CONFIG_PACKAGE_tmon=m @@ -2257,7 +2257,7 @@ CONFIG_PACKAGE_kmod-gpio-button-hotplug=m CONFIG_PACKAGE_kmod-gpio-cascade=m CONFIG_PACKAGE_kmod-gpio-f7188x=m CONFIG_PACKAGE_kmod-gpio-it87=m -CONFIG_PACKAGE_kmod-gpio-nct5104d=n +# CONFIG_PACKAGE_kmod-gpio-nct5104d is not set CONFIG_PACKAGE_kmod-gpio-nxp-74hc164=m CONFIG_PACKAGE_kmod-gpio-pca953x=m CONFIG_PACKAGE_kmod-gpio-pcf857x=m @@ -2747,8 +2747,8 @@ CONFIG_PACKAGE_kmod-openvswitch-lisp-intree=m CONFIG_PACKAGE_kmod-openvswitch-stt-intree=m CONFIG_PACKAGE_kmod-openvswitch-vxlan=m CONFIG_PACKAGE_kmod-openvswitch-vxlan-intree=m -CONFIG_PACKAGE_kmod-ovpn-dco-v2=m -CONFIG_PACKAGE_kmod-pf-ring=n +# CONFIG_PACKAGE_kmod-ovpn-dco-v2 is not set +# CONFIG_PACKAGE_kmod-pf-ring is not set CONFIG_PACKAGE_kmod-pktgen=m CONFIG_PACKAGE_kmod-ppp=y CONFIG_PACKAGE_kmod-mppe=m @@ -2997,7 +2997,7 @@ CONFIG_PACKAGE_kmod-usb-serial-belkin=m CONFIG_PACKAGE_kmod-usb-serial-ch341=m CONFIG_PACKAGE_kmod-usb-serial-cp210x=m CONFIG_PACKAGE_kmod-usb-serial-cypress-m8=m -CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module=m +# CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set CONFIG_PACKAGE_kmod-usb-serial-edgeport=m CONFIG_PACKAGE_kmod-usb-serial-ftdi=m CONFIG_PACKAGE_kmod-usb-serial-garmin=m @@ -3015,7 +3015,7 @@ CONFIG_PACKAGE_kmod-usb-serial-simple=m CONFIG_PACKAGE_kmod-usb-serial-ti-usb=m CONFIG_PACKAGE_kmod-usb-serial-visor=m CONFIG_PACKAGE_kmod-usb-serial-wwan=m -CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=m +# CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common is not set CONFIG_PACKAGE_kmod-usb-storage=y CONFIG_PACKAGE_kmod-usb-storage-extras=m CONFIG_PACKAGE_kmod-usb-storage-uas=m @@ -3107,8 +3107,8 @@ CONFIG_PACKAGE_kmod-irqbypass=m CONFIG_PACKAGE_kmod-kvm-amd=m CONFIG_PACKAGE_kmod-kvm-intel=m CONFIG_PACKAGE_kmod-kvm-x86=m -CONFIG_PACKAGE_kmod-vfio=n -CONFIG_PACKAGE_kmod-vfio-pci=n +CONFIG_PACKAGE_kmod-vfio=m +CONFIG_PACKAGE_kmod-vfio-pci=m CONFIG_PACKAGE_kmod-vhost=m CONFIG_PACKAGE_kmod-vhost-net=m # end of Virtualization @@ -3116,10 +3116,7 @@ CONFIG_PACKAGE_kmod-vhost-net=m # # Voice over IP # -CONFIG_PACKAGE_kmod-dahdi=m -CONFIG_PACKAGE_kmod-dahdi-dummy=m -CONFIG_PACKAGE_kmod-dahdi-echocan-oslec=m -CONFIG_PACKAGE_kmod-dahdi-hfcs=m +# CONFIG_PACKAGE_kmod-dahdi is not set # end of Voice over IP # @@ -4785,7 +4782,7 @@ CONFIG_PCRE2_JIT_ENABLED=y # CONFIG_PACKAGE_libpcre32 is not set # CONFIG_PACKAGE_libpcrecpp is not set # CONFIG_PACKAGE_libpcsclite is not set -CONFIG_PACKAGE_libpfring=n +# CONFIG_PACKAGE_libpfring is not set # CONFIG_PACKAGE_libpkcs11-spy is not set # CONFIG_PACKAGE_libpkgconf is not set # CONFIG_PACKAGE_libpng is not set diff --git a/.config.old b/.config.old index 243f5fa5822101..5741f7763f8f94 100644 --- a/.config.old +++ b/.config.old @@ -8,6 +8,7 @@ CONFIG_HOST_OS_LINUX=y # CONFIG_HOST_OS_MACOS is not set CONFIG_DEFAULT_TARGET_x86_64=y # CONFIG_TARGET_airoha is not set +# CONFIG_TARGET_d1 is not set # CONFIG_TARGET_sunxi is not set # CONFIG_TARGET_apm821xx is not set # CONFIG_TARGET_armsr is not set @@ -23,7 +24,9 @@ CONFIG_DEFAULT_TARGET_x86_64=y # CONFIG_TARGET_gemini is not set # CONFIG_TARGET_mpc85xx is not set # CONFIG_TARGET_mxs is not set +# CONFIG_TARGET_ixp4xx is not set # CONFIG_TARGET_lantiq is not set +# CONFIG_TARGET_loongarch64 is not set # CONFIG_TARGET_malta is not set # CONFIG_TARGET_pistachio is not set # CONFIG_TARGET_mvebu is not set @@ -37,9 +40,9 @@ CONFIG_DEFAULT_TARGET_x86_64=y # CONFIG_TARGET_imx is not set # CONFIG_TARGET_octeontx is not set # CONFIG_TARGET_oxnas is not set +# CONFIG_TARGET_qualcommax is not set # CONFIG_TARGET_ipq40xx is not set # CONFIG_TARGET_ipq806x is not set -# CONFIG_TARGET_ipq807x is not set # CONFIG_TARGET_realtek is not set # CONFIG_TARGET_rockchip is not set # CONFIG_TARGET_sifiveu is not set @@ -69,9 +72,9 @@ CONFIG_HAS_DEVICES=y CONFIG_TARGET_BOARD="x86" CONFIG_TARGET_SUBTARGET="64" CONFIG_TARGET_ARCH_PACKAGES="x86_64" -CONFIG_DEFAULT_TARGET_OPTIMIZATION="-O2 -pipe -march=sandybridge -mtune=sandybridge" +CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe" CONFIG_CPU_TYPE=" " -CONFIG_LINUX_6_1=y +CONFIG_LINUX_6_6=y CONFIG_DEFAULT_base-files=y CONFIG_MODULE_DEFAULT_base-files=y CONFIG_DEFAULT_busybox=y @@ -353,11 +356,6 @@ CONFIG_KERNEL_IPV6_SEG6_LWTUNNEL=y # CONFIG_KERNEL_LWTUNNEL_BPF is not set # CONFIG_KERNEL_NET_L3_MASTER_DEV is not set # CONFIG_KERNEL_XDP_SOCKETS is not set -# CONFIG_KERNEL_WIRELESS_EXT is not set -# CONFIG_KERNEL_WEXT_CORE is not set -# CONFIG_KERNEL_WEXT_PRIV is not set -# CONFIG_KERNEL_WEXT_PROC is not set -# CONFIG_KERNEL_WEXT_SPY is not set CONFIG_KERNEL_PAGE_POOL=y # CONFIG_KERNEL_PAGE_POOL_STATS is not set # CONFIG_KERNEL_IP_PNP is not set @@ -431,6 +429,7 @@ CONFIG_PKG_ASLR_PIE_REGULAR=y # CONFIG_PKG_CC_STACKPROTECTOR_NONE is not set CONFIG_PKG_CC_STACKPROTECTOR_REGULAR=y # CONFIG_PKG_CC_STACKPROTECTOR_STRONG is not set +# CONFIG_PKG_CC_STACKPROTECTOR_ALL is not set # CONFIG_KERNEL_CC_STACKPROTECTOR_NONE is not set CONFIG_KERNEL_CC_STACKPROTECTOR_REGULAR=y # CONFIG_KERNEL_CC_STACKPROTECTOR_STRONG is not set @@ -467,7 +466,7 @@ CONFIG_BUILD_LOG_DIR="" # CONFIG_SRC_TREE_OVERRIDE is not set CONFIG_EXTRA_OPTIMIZATION="-fno-caller-saves -fno-plt" # CONFIG_TARGET_OPTIONS is not set -CONFIG_TARGET_OPTIMIZATION="-O2 -pipe -march=sandybridge -mtune=sandybridge" +CONFIG_TARGET_OPTIMIZATION="-Os -pipe" # CONFIG_BPF_TOOLCHAIN_NONE is not set # CONFIG_BPF_TOOLCHAIN_HOST is not set CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y @@ -987,7 +986,7 @@ CONFIG_BUSYBOX_DEFAULT_FEATURE_SHADOWPASSWDS=y # CONFIG_BUSYBOX_DEFAULT_USE_BB_PWD_GRP is not set # CONFIG_BUSYBOX_DEFAULT_USE_BB_SHADOW is not set # CONFIG_BUSYBOX_DEFAULT_USE_BB_CRYPT is not set -# CONFIG_BUSYBOX_DEFAULT_USE_BB_CRYPT_SHA is not set +CONFIG_BUSYBOX_DEFAULT_USE_BB_CRYPT_SHA=y # CONFIG_BUSYBOX_DEFAULT_ADD_SHELL is not set # CONFIG_BUSYBOX_DEFAULT_REMOVE_SHELL is not set # CONFIG_BUSYBOX_DEFAULT_ADDGROUP is not set @@ -998,7 +997,7 @@ CONFIG_BUSYBOX_DEFAULT_LAST_ID=0 CONFIG_BUSYBOX_DEFAULT_FIRST_SYSTEM_ID=0 CONFIG_BUSYBOX_DEFAULT_LAST_SYSTEM_ID=0 # CONFIG_BUSYBOX_DEFAULT_CHPASSWD is not set -CONFIG_BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO="md5" +CONFIG_BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO="sha256" # CONFIG_BUSYBOX_DEFAULT_CRYPTPW is not set # CONFIG_BUSYBOX_DEFAULT_MKPASSWD is not set # CONFIG_BUSYBOX_DEFAULT_DELUSER is not set @@ -1638,12 +1637,15 @@ CONFIG_DROPBEAR_CURVE25519=y # CONFIG_DROPBEAR_ECC is not set CONFIG_DROPBEAR_ED25519=y CONFIG_DROPBEAR_CHACHA20POLY1305=y +CONFIG_DROPBEAR_U2F=y +CONFIG_DROPBEAR_ED25519_SK=y # CONFIG_DROPBEAR_ZLIB is not set CONFIG_DROPBEAR_DBCLIENT=y +# CONFIG_DROPBEAR_ASKPASS is not set CONFIG_DROPBEAR_DBCLIENT_AGENTFORWARD=y CONFIG_DROPBEAR_SCP=y -# CONFIG_DROPBEAR_ASKPASS is not set CONFIG_DROPBEAR_AGENTFORWARD=y +# CONFIG_DROPBEAR_MODERN_ONLY is not set # end of Configuration # CONFIG_PACKAGE_ead is not set @@ -1707,6 +1709,7 @@ CONFIG_PACKAGE_urandom-seed=y CONFIG_PACKAGE_urngd=y CONFIG_PACKAGE_usign=y # CONFIG_PACKAGE_uxc is not set +CONFIG_PACKAGE_wifi-scripts=m # CONFIG_PACKAGE_wireless-tools is not set # CONFIG_PACKAGE_zram-swap is not set # CONFIG_PACKAGE_zyxel-bootconfig is not set @@ -1821,6 +1824,8 @@ CONFIG_PACKAGE_grub2-efi=y # CONFIG_PACKAGE_gdbserver is not set # CONFIG_PACKAGE_gitlab-runner is not set # CONFIG_PACKAGE_gperf is not set +CONFIG_PACKAGE_ledhwbmon=m +CONFIG_PACKAGE_ledumon=m # CONFIG_PACKAGE_libtool-bin is not set # CONFIG_PACKAGE_lpc21isp is not set # CONFIG_PACKAGE_lttng-tools is not set @@ -1830,9 +1835,10 @@ CONFIG_PACKAGE_grub2-efi=y # CONFIG_PACKAGE_nasm is not set CONFIG_PACKAGE_objdump=m # CONFIG_PACKAGE_patch is not set -CONFIG_PACKAGE_perf=m +# CONFIG_PACKAGE_perf is not set # CONFIG_PACKAGE_pkg-config is not set # CONFIG_PACKAGE_pkgconf is not set +CONFIG_PACKAGE_tmon=m # CONFIG_PACKAGE_trace-cmd is not set # CONFIG_PACKAGE_trace-cmd-extra is not set # CONFIG_PACKAGE_valgrind is not set @@ -1860,6 +1866,7 @@ CONFIG_PACKAGE_libiwinfo-data=y # end of ath10k Board-Specific Overrides # CONFIG_PACKAGE_aircard-pcmcia-firmware is not set +CONFIG_PACKAGE_airoha-en8811h-firmware=m # CONFIG_PACKAGE_amd64-microcode is not set CONFIG_PACKAGE_amdgpu-firmware=m CONFIG_PACKAGE_ar3k-firmware=m @@ -1894,6 +1901,7 @@ CONFIG_PACKAGE_ar3k-firmware=m # CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct is not set # CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct-full-htt is not set # CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct-htt is not set +CONFIG_PACKAGE_ath11k-firmware-ipq6018=m # CONFIG_PACKAGE_ath11k-firmware-ipq8074 is not set # CONFIG_PACKAGE_ath11k-firmware-qca6390 is not set # CONFIG_PACKAGE_ath11k-firmware-qcn9074 is not set @@ -1912,6 +1920,7 @@ CONFIG_PACKAGE_bnx2x-firmware=m CONFIG_PACKAGE_brcmfmac-firmware-usb=m # CONFIG_PACKAGE_brcmfmac-nvram-43430-sdio is not set # CONFIG_PACKAGE_brcmfmac-nvram-43455-sdio is not set +CONFIG_PACKAGE_brcmfmac-nvram-4356-sdio=m # CONFIG_PACKAGE_brcmsmac-firmware is not set # CONFIG_PACKAGE_broadcom-4306-sprom is not set # CONFIG_PACKAGE_broadcom-43112-sprom is not set @@ -1959,8 +1968,10 @@ CONFIG_PACKAGE_edgeport-firmware=m CONFIG_PACKAGE_intel-microcode=m # CONFIG_PACKAGE_iwl3945-firmware is not set # CONFIG_PACKAGE_iwl4965-firmware is not set +CONFIG_PACKAGE_iwlwifi-firmware-ax101=m # CONFIG_PACKAGE_iwlwifi-firmware-ax200 is not set # CONFIG_PACKAGE_iwlwifi-firmware-ax210 is not set +CONFIG_PACKAGE_iwlwifi-firmware-be200=m # CONFIG_PACKAGE_iwlwifi-firmware-iwl100 is not set # CONFIG_PACKAGE_iwlwifi-firmware-iwl1000 is not set # CONFIG_PACKAGE_iwlwifi-firmware-iwl105 is not set @@ -1986,12 +1997,14 @@ CONFIG_PACKAGE_intel-microcode=m # CONFIG_PACKAGE_libertas-spi-firmware is not set # CONFIG_PACKAGE_libertas-usb-firmware is not set # CONFIG_PACKAGE_midisport-firmware is not set +CONFIG_PACKAGE_mlxsw_spectrum-firmware=m CONFIG_PACKAGE_mt7601u-firmware=m # CONFIG_PACKAGE_mt7622bt-firmware is not set # CONFIG_PACKAGE_mt7921bt-firmware is not set # CONFIG_PACKAGE_mt7922bt-firmware is not set # CONFIG_PACKAGE_mt7981-wo-firmware is not set # CONFIG_PACKAGE_mt7986-wo-firmware is not set +CONFIG_PACKAGE_mt7988-2p5g-phy-firmware=m CONFIG_PACKAGE_mwifiex-pcie-firmware=m CONFIG_PACKAGE_mwifiex-sdio-firmware=m CONFIG_PACKAGE_mwl8k-firmware=m @@ -2014,12 +2027,18 @@ CONFIG_PACKAGE_rtl8192de-firmware=m CONFIG_PACKAGE_rtl8192se-firmware=m # CONFIG_PACKAGE_rtl8723au-firmware is not set # CONFIG_PACKAGE_rtl8723bu-firmware is not set +CONFIG_PACKAGE_rtl8723de-firmware=m # CONFIG_PACKAGE_rtl8761a-firmware is not set # CONFIG_PACKAGE_rtl8761b-firmware is not set # CONFIG_PACKAGE_rtl8761bu-firmware is not set CONFIG_PACKAGE_rtl8821ae-firmware=m +CONFIG_PACKAGE_rtl8821ce-firmware=m CONFIG_PACKAGE_rtl8822be-firmware=m CONFIG_PACKAGE_rtl8822ce-firmware=m +CONFIG_PACKAGE_rtl8851be-firmware=m +CONFIG_PACKAGE_rtl8852ae-firmware=m +CONFIG_PACKAGE_rtl8852be-firmware=m +CONFIG_PACKAGE_rtl8852ce-firmware=m # CONFIG_PACKAGE_ti-3410-firmware is not set # CONFIG_PACKAGE_ti-5052-firmware is not set CONFIG_PACKAGE_wil6210-firmware=m @@ -2071,6 +2090,7 @@ CONFIG_PACKAGE_kmod-aoe=m CONFIG_PACKAGE_kmod-ata-ahci=y CONFIG_PACKAGE_kmod-ata-artop=m CONFIG_PACKAGE_kmod-ata-core=y +CONFIG_PACKAGE_kmod-ata-dwc=m CONFIG_PACKAGE_kmod-ata-nvidia-sata=m CONFIG_PACKAGE_kmod-ata-pdc202xx-old=m CONFIG_PACKAGE_kmod-ata-piix=y @@ -2200,7 +2220,7 @@ CONFIG_PACKAGE_kmod-fs-jfs=m CONFIG_PACKAGE_kmod-fs-ksmbd=m CONFIG_PACKAGE_kmod-fs-minix=m CONFIG_PACKAGE_kmod-fs-msdos=m -CONFIG_PACKAGE_kmod-fs-netfs=m +CONFIG_PACKAGE_kmod-fs-netfs=y CONFIG_PACKAGE_kmod-fs-nfs=m CONFIG_PACKAGE_kmod-fs-nfs-common=m CONFIG_PACKAGE_kmod-fs-nfs-common-rpcsec=m @@ -2231,7 +2251,16 @@ CONFIG_PACKAGE_kmod-firewire-sbp2=m # # GPIO support # +CONFIG_PACKAGE_kmod-gpio-amd-fch=m +CONFIG_PACKAGE_kmod-gpio-beeper=m +CONFIG_PACKAGE_kmod-gpio-button-hotplug=m CONFIG_PACKAGE_kmod-gpio-cascade=m +CONFIG_PACKAGE_kmod-gpio-f7188x=m +CONFIG_PACKAGE_kmod-gpio-it87=m +# CONFIG_PACKAGE_kmod-gpio-nct5104d is not set +CONFIG_PACKAGE_kmod-gpio-nxp-74hc164=m +CONFIG_PACKAGE_kmod-gpio-pca953x=m +CONFIG_PACKAGE_kmod-gpio-pcf857x=m # end of GPIO support # @@ -2438,6 +2467,7 @@ CONFIG_PACKAGE_kmod-nls-iso8859-2=m CONFIG_PACKAGE_kmod-nls-iso8859-6=m CONFIG_PACKAGE_kmod-nls-iso8859-8=m CONFIG_PACKAGE_kmod-nls-koi8r=m +CONFIG_PACKAGE_kmod-nls-ucs2-utils=y CONFIG_PACKAGE_kmod-nls-utf8=y # end of Native Language Support @@ -2568,7 +2598,7 @@ CONFIG_PACKAGE_kmod-bnx2=y CONFIG_PACKAGE_kmod-bnx2x=m CONFIG_PACKAGE_kmod-dm9000=m CONFIG_PACKAGE_kmod-dummy=m -CONFIG_PACKAGE_kmod-dwmac-intel=y +# CONFIG_PACKAGE_kmod-dwmac-intel is not set CONFIG_PACKAGE_kmod-e100=m CONFIG_PACKAGE_kmod-e1000=y CONFIG_PACKAGE_kmod-e1000e=y @@ -2610,6 +2640,7 @@ CONFIG_PACKAGE_kmod-net-selftests=m CONFIG_PACKAGE_kmod-niu=m CONFIG_PACKAGE_kmod-pcnet32=m CONFIG_PACKAGE_kmod-pcs-xpcs=y +CONFIG_PACKAGE_kmod-phy-airoha-en8811h=m CONFIG_PACKAGE_kmod-phy-amd=m CONFIG_PACKAGE_kmod-phy-aquantia=m CONFIG_PACKAGE_kmod-phy-ax88796b=m @@ -2635,7 +2666,6 @@ CONFIG_PACKAGE_kmod-skge=m CONFIG_PACKAGE_kmod-sky2=m CONFIG_PACKAGE_kmod-solos-pci=m CONFIG_PACKAGE_kmod-spi-ks8995=m -CONFIG_PACKAGE_kmod-stmmac-core=y CONFIG_PACKAGE_kmod-swconfig=m CONFIG_PACKAGE_kmod-switch-ar8xxx=m CONFIG_PACKAGE_kmod-switch-bcm53xx=m @@ -2717,8 +2747,8 @@ CONFIG_PACKAGE_kmod-openvswitch-lisp-intree=m CONFIG_PACKAGE_kmod-openvswitch-stt-intree=m CONFIG_PACKAGE_kmod-openvswitch-vxlan=m CONFIG_PACKAGE_kmod-openvswitch-vxlan-intree=m -CONFIG_PACKAGE_kmod-ovpn-dco-v2=m -CONFIG_PACKAGE_kmod-pf-ring=m +CONFIG_PACKAGE_kmod-ovpn-dco-v2=n +# CONFIG_PACKAGE_kmod-pf-ring is not set CONFIG_PACKAGE_kmod-pktgen=m CONFIG_PACKAGE_kmod-ppp=y CONFIG_PACKAGE_kmod-mppe=m @@ -2746,6 +2776,7 @@ CONFIG_PACKAGE_kmod-sched-flower=m CONFIG_PACKAGE_kmod-sched-fq-pie=m CONFIG_PACKAGE_kmod-sched-ipset=m CONFIG_PACKAGE_kmod-sched-mqprio=m +CONFIG_PACKAGE_kmod-sched-mqprio-common=m CONFIG_PACKAGE_kmod-sched-pie=m CONFIG_PACKAGE_kmod-sched-prio=m CONFIG_PACKAGE_kmod-sched-red=m @@ -2786,15 +2817,6 @@ CONFIG_PACKAGE_kmod-eeprom-at24=m CONFIG_PACKAGE_kmod-eeprom-at25=m CONFIG_PACKAGE_kmod-f71808e-wdt=m CONFIG_PACKAGE_kmod-google-firmware=m -CONFIG_PACKAGE_kmod-gpio-amd-fch=m -CONFIG_PACKAGE_kmod-gpio-beeper=m -CONFIG_PACKAGE_kmod-gpio-button-hotplug=m -CONFIG_PACKAGE_kmod-gpio-f7188x=m -CONFIG_PACKAGE_kmod-gpio-it87=m -CONFIG_PACKAGE_kmod-gpio-nct5104d=m -CONFIG_PACKAGE_kmod-gpio-nxp-74hc164=m -CONFIG_PACKAGE_kmod-gpio-pca953x=m -CONFIG_PACKAGE_kmod-gpio-pcf857x=m CONFIG_PACKAGE_kmod-i6300esb-wdt=m CONFIG_PACKAGE_kmod-ib700-wdt=m CONFIG_PACKAGE_kmod-ikconfig=y @@ -2835,6 +2857,7 @@ CONFIG_PACKAGE_kmod-rtc-ds1374=m CONFIG_PACKAGE_kmod-rtc-ds1672=m CONFIG_PACKAGE_kmod-rtc-em3027=m CONFIG_PACKAGE_kmod-rtc-isl1208=m +CONFIG_PACKAGE_kmod-rtc-mv=m CONFIG_PACKAGE_kmod-rtc-pcf2123=m CONFIG_PACKAGE_kmod-rtc-pcf2127=m CONFIG_PACKAGE_kmod-rtc-pcf8563=m @@ -2974,7 +2997,7 @@ CONFIG_PACKAGE_kmod-usb-serial-belkin=m CONFIG_PACKAGE_kmod-usb-serial-ch341=m CONFIG_PACKAGE_kmod-usb-serial-cp210x=m CONFIG_PACKAGE_kmod-usb-serial-cypress-m8=m -CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module=m +# CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set CONFIG_PACKAGE_kmod-usb-serial-edgeport=m CONFIG_PACKAGE_kmod-usb-serial-ftdi=m CONFIG_PACKAGE_kmod-usb-serial-garmin=m @@ -2992,7 +3015,7 @@ CONFIG_PACKAGE_kmod-usb-serial-simple=m CONFIG_PACKAGE_kmod-usb-serial-ti-usb=m CONFIG_PACKAGE_kmod-usb-serial-visor=m CONFIG_PACKAGE_kmod-usb-serial-wwan=m -CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=m +CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n CONFIG_PACKAGE_kmod-usb-storage=y CONFIG_PACKAGE_kmod-usb-storage-extras=m CONFIG_PACKAGE_kmod-usb-storage-uas=m @@ -3032,8 +3055,8 @@ CONFIG_PACKAGE_kmod-fb-sys-fops=m CONFIG_PACKAGE_kmod-fb-sys-ram=m CONFIG_PACKAGE_kmod-fb-tft=m CONFIG_PACKAGE_kmod-fb-tft-ili9486=m -CONFIG_PACKAGE_kmod-v4l2loopback=m CONFIG_PACKAGE_kmod-video-core=m +CONFIG_PACKAGE_kmod-v4l2loopback=m CONFIG_PACKAGE_kmod-video-cpia2=m CONFIG_PACKAGE_kmod-video-dma=m CONFIG_PACKAGE_kmod-video-gspca-core=m @@ -3093,10 +3116,10 @@ CONFIG_PACKAGE_kmod-vhost-net=m # # Voice over IP # -CONFIG_PACKAGE_kmod-dahdi=m -CONFIG_PACKAGE_kmod-dahdi-dummy=m -CONFIG_PACKAGE_kmod-dahdi-echocan-oslec=m -CONFIG_PACKAGE_kmod-dahdi-hfcs=m +CONFIG_PACKAGE_kmod-dahdi=n +CONFIG_PACKAGE_kmod-dahdi-dummy=n +CONFIG_PACKAGE_kmod-dahdi-echocan-oslec=n +CONFIG_PACKAGE_kmod-dahdi-hfcs=n # end of Voice over IP # @@ -3234,6 +3257,7 @@ CONFIG_PACKAGE_kmod-mt7925e=m CONFIG_PACKAGE_kmod-mt7925u=m CONFIG_PACKAGE_kmod-mt792x-common=m CONFIG_PACKAGE_kmod-mt792x-usb=m +CONFIG_PACKAGE_kmod-mt7996-firmware=m CONFIG_PACKAGE_kmod-mt7996e=m CONFIG_PACKAGE_kmod-mwifiex-pcie=m CONFIG_PACKAGE_kmod-mwifiex-sdio=m @@ -3350,10 +3374,10 @@ CONFIG_GOLANG_BUILD_CACHE_DIR="" # CONFIG_PACKAGE_lpeg is not set # CONFIG_PACKAGE_lsqlite3 is not set # CONFIG_PACKAGE_lsqlite3-lua5.3 is not set -# CONFIG_PACKAGE_lua is not set +CONFIG_PACKAGE_lua=m # CONFIG_PACKAGE_lua-argparse is not set # CONFIG_PACKAGE_lua-bencode is not set -# CONFIG_PACKAGE_lua-bit32 is not set +CONFIG_PACKAGE_lua-bit32=m # CONFIG_PACKAGE_lua-cjson is not set # CONFIG_PACKAGE_lua-copas is not set # CONFIG_PACKAGE_lua-coxpcall is not set @@ -3380,6 +3404,7 @@ CONFIG_LUA_ECO_MBEDTLS=y # CONFIG_PACKAGE_lua-eco-ubus is not set # CONFIG_PACKAGE_lua-eco-websocket is not set # CONFIG_PACKAGE_lua-ev is not set +CONFIG_PACKAGE_lua-examples=m # CONFIG_PACKAGE_lua-libmodbus is not set # CONFIG_PACKAGE_lua-lzlib is not set # CONFIG_PACKAGE_lua-md5 is not set @@ -3390,6 +3415,7 @@ CONFIG_LUA_ECO_MBEDTLS=y # CONFIG_PACKAGE_lua-rings is not set # CONFIG_PACKAGE_lua-rs232 is not set # CONFIG_PACKAGE_lua-sha2 is not set +CONFIG_PACKAGE_lua-struct=m # CONFIG_PACKAGE_lua-wsapi-base is not set # CONFIG_PACKAGE_lua-wsapi-xavante is not set # CONFIG_PACKAGE_lua-xavante is not set @@ -3404,7 +3430,7 @@ CONFIG_HAS_LUAJIT_ARCH=y # CONFIG_PACKAGE_luajit2 is not set # CONFIG_PACKAGE_lualanes is not set # CONFIG_PACKAGE_luaossl is not set -# CONFIG_PACKAGE_luaposix is not set +CONFIG_PACKAGE_luaposix=m # CONFIG_PACKAGE_luarocks is not set # CONFIG_PACKAGE_luasec is not set # CONFIG_PACKAGE_luasoap is not set @@ -3740,7 +3766,7 @@ CONFIG_PACKAGE_ucode=y CONFIG_PACKAGE_ucode-mod-fs=y # CONFIG_PACKAGE_ucode-mod-log is not set CONFIG_PACKAGE_ucode-mod-math=y -# CONFIG_PACKAGE_ucode-mod-nl80211 is not set +CONFIG_PACKAGE_ucode-mod-nl80211=m # CONFIG_PACKAGE_ucode-mod-resolv is not set # CONFIG_PACKAGE_ucode-mod-rtnl is not set # CONFIG_PACKAGE_ucode-mod-struct is not set @@ -4505,10 +4531,13 @@ CONFIG_PACKAGE_confuse=m # CONFIG_PACKAGE_czmq is not set # CONFIG_PACKAGE_davici is not set # CONFIG_PACKAGE_dtndht is not set +CONFIG_PACKAGE_efivar=m # CONFIG_PACKAGE_getdns is not set # CONFIG_PACKAGE_giflib is not set CONFIG_PACKAGE_glib2=m # CONFIG_PACKAGE_google-authenticator-libpam is not set +CONFIG_PACKAGE_gperftools-headers=m +CONFIG_PACKAGE_gperftools-runtime=m # CONFIG_PACKAGE_hidapi is not set # CONFIG_PACKAGE_hyperscan-headers is not set # CONFIG_PACKAGE_hyperscan-runtime is not set @@ -4573,6 +4602,7 @@ CONFIG_PACKAGE_libdevmapper=y # CONFIG_PACKAGE_libdnet is not set # CONFIG_PACKAGE_libdrm is not set CONFIG_PACKAGE_libdw=m +CONFIG_PACKAGE_libe2p=y # CONFIG_PACKAGE_libecdsautil is not set # CONFIG_PACKAGE_libedit is not set CONFIG_PACKAGE_libelf=m @@ -4616,7 +4646,7 @@ CONFIG_PACKAGE_libftdi=m # CONFIG_PACKAGE_libgee is not set # CONFIG_PACKAGE_libgensio is not set # CONFIG_PACKAGE_libgensiocpp is not set -# CONFIG_PACKAGE_libgmp is not set +CONFIG_PACKAGE_libgmp=m # CONFIG_PACKAGE_libgpg-error is not set # CONFIG_PACKAGE_libgpgme is not set # CONFIG_PACKAGE_libgpgmepp is not set @@ -4653,7 +4683,7 @@ CONFIG_PACKAGE_libjson-c=y # CONFIG_PACKAGE_libleptonica is not set # CONFIG_PACKAGE_libloragw is not set # CONFIG_PACKAGE_libltdl is not set -# CONFIG_PACKAGE_liblua is not set +CONFIG_PACKAGE_liblua=m # CONFIG_PACKAGE_liblua5.3 is not set # CONFIG_PACKAGE_liblucihttp is not set # CONFIG_PACKAGE_liblucihttp-lua is not set @@ -4679,6 +4709,7 @@ CONFIG_PACKAGE_libmount=m # CONFIG_PACKAGE_libmpc is not set # CONFIG_PACKAGE_libmpdclient is not set # CONFIG_PACKAGE_libmpeg2 is not set +CONFIG_PACKAGE_libmpfr=m # CONFIG_PACKAGE_libmpg123 is not set # CONFIG_PACKAGE_libmspack is not set # CONFIG_PACKAGE_libnatpmp is not set @@ -4828,12 +4859,13 @@ CONFIG_PACKAGE_libuci=y CONFIG_PACKAGE_libuclient=y CONFIG_PACKAGE_libucode=y # CONFIG_PACKAGE_libucontext is not set +CONFIG_PACKAGE_libudebug=y # CONFIG_PACKAGE_libudev-zero is not set # CONFIG_PACKAGE_libudns is not set # CONFIG_PACKAGE_libuecc is not set # CONFIG_PACKAGE_libugpio is not set # CONFIG_PACKAGE_libunistring is not set -# CONFIG_PACKAGE_libunwind is not set +CONFIG_PACKAGE_libunwind=m # CONFIG_PACKAGE_libupnp is not set # CONFIG_PACKAGE_libupnpp is not set # CONFIG_PACKAGE_liburcu is not set @@ -6918,6 +6950,7 @@ CONFIG_PACKAGE_libjson-script=y # CONFIG_PACKAGE_mpremote is not set # CONFIG_PACKAGE_mqttled is not set # CONFIG_PACKAGE_mt-st is not set +CONFIG_PACKAGE_mt5311=m # CONFIG_PACKAGE_namei is not set # CONFIG_PACKAGE_naywatch is not set # CONFIG_PACKAGE_nerdctl is not set @@ -7071,6 +7104,9 @@ CONFIG_PACKAGE_tini=m # CONFIG_PACKAGE_ucode-mod-bpf is not set # CONFIG_PACKAGE_ucode-mod-html is not set # CONFIG_PACKAGE_ucode-mod-lua is not set +CONFIG_PACKAGE_ucode-mod-udebug=m +CONFIG_PACKAGE_udebug-cli=m +CONFIG_PACKAGE_udebugd=m # CONFIG_PACKAGE_udns-dnsget is not set # CONFIG_PACKAGE_udns-ex-rdns is not set # CONFIG_PACKAGE_udns-rblcheck is not set @@ -7115,4 +7151,4 @@ CONFIG_PACKAGE_tini=m # # CONFIG_PACKAGE_fontconfig is not set # end of Font-Utils -# end of Xorg \ No newline at end of file +# end of Xorg diff --git a/feeds.conf.default b/feeds.conf.default index fc679335e0e47f..40737b412707f7 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ -src-git packages https://git.openwrt.org/feed/packages.git +src-git packages https://github.com/vincejv/packages.git src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 1fed507b15642a..53132d2ae57151 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .18 -LINUX_KERNEL_HASH-6.6.18 = 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d +LINUX_VERSION-6.6 = .20 +LINUX_KERNEL_HASH-6.6.20 = e2f6c7f39b304248193370f8c5755553ab73ad5672e92dae994a344084d8dd22 diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index d4557fa0ca63e9..7f46ea4729298a 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -43,10 +43,9 @@ define KernelPackage/crypto-aead CONFIG_CRYPTO_GENIV FILES:= \ $(LINUX_DIR)/crypto/aead.ko \ - $(LINUX_DIR)/crypto/geniv.ko \ - $(LINUX_DIR)/crypto/rng.ko + $(LINUX_DIR)/crypto/geniv.ko AUTOLOAD:=$(call AutoLoad,09,aead,1) - $(call AddDepends/crypto, +kmod-crypto-null) + $(call AddDepends/crypto, +kmod-crypto-null +kmod-crypto-rng) endef $(eval $(call KernelPackage,crypto-aead)) diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk index 8161671dfd717e..a4f85fd57dfcfd 100644 --- a/package/kernel/linux/modules/virt.mk +++ b/package/kernel/linux/modules/virt.mk @@ -74,6 +74,48 @@ endef $(eval $(call KernelPackage,kvm-amd)) +define KernelPackage/vfio + SUBMENU:=Virtualization + TITLE:=VFIO Non-Privileged userspace driver framework + DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 + KCONFIG:= \ + CONFIG_VFIO \ + CONFIG_VFIO_NOIOMMU=n \ + CONFIG_VFIO_MDEV=n + FILES:= \ + $(LINUX_DIR)/drivers/vfio/vfio.ko \ + $(LINUX_DIR)/drivers/vfio/vfio_iommu_type1.ko + AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1) +endef + +define KernelPackage/vfio/description + VFIO provides a framework for secure userspace device drivers. +endef + +$(eval $(call KernelPackage,vfio)) + + +define KernelPackage/vfio-pci + SUBMENU:=Virtualization + TITLE:=Generic VFIO support for any PCI device + DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 @PCI_SUPPORT +kmod-vfio +kmod-irqbypass + KCONFIG:= \ + CONFIG_VFIO_PCI \ + CONFIG_VFIO_PCI_IGD=n + FILES:= \ + $(LINUX_DIR)/drivers/vfio/pci/vfio-pci-core.ko \ + $(LINUX_DIR)/drivers/vfio/pci/vfio-pci.ko + AUTOLOAD:=$(call AutoProbe,vfio-pci) +endef + +define KernelPackage/vfio-pci/description + Support for the generic PCI VFIO bus driver which can connect any PCI + device to the VFIO framework. +endef + +$(eval $(call KernelPackage,vfio-pci)) + + define KernelPackage/vhost SUBMENU:=Virtualization TITLE:=Host kernel accelerator for virtio (base) @@ -95,4 +137,4 @@ define KernelPackage/vhost-net AUTOLOAD:=$(call AutoProbe,vhost_net) endef -$(eval $(call KernelPackage,vhost-net)) +$(eval $(call KernelPackage,vhost-net)) \ No newline at end of file diff --git a/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch index 70123e4c57efb3..cccfac5bd5df35 100644 --- a/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch +++ b/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch @@ -745,7 +745,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -366,8 +365,7 @@ flow_offload_lookup(struct nf_flowtable +@@ -377,8 +376,7 @@ flow_offload_lookup(struct nf_flowtable } EXPORT_SYMBOL_GPL(flow_offload_lookup); @@ -755,7 +755,7 @@ Signed-off-by: Felix Fietkau void (*iter)(struct nf_flowtable *flowtable, struct flow_offload *flow, void *data), void *data) -@@ -428,6 +426,7 @@ static void nf_flow_offload_gc_step(stru +@@ -439,6 +437,7 @@ static void nf_flow_offload_gc_step(stru nf_flow_offload_stats(flow_table, flow); } } diff --git a/target/linux/generic/pending-6.6/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch b/target/linux/generic/pending-6.6/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch index 15c06aa1f37066..6b93f47772e13b 100644 --- a/target/linux/generic/pending-6.6/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch +++ b/target/linux/generic/pending-6.6/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch @@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso --- a/net/netfilter/nf_flow_table_core.c +++ b/net/netfilter/nf_flow_table_core.c -@@ -651,6 +651,23 @@ static struct pernet_operations nf_flow_ +@@ -662,6 +662,23 @@ static struct pernet_operations nf_flow_ .exit_batch = nf_flow_table_pernet_exit, }; @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso static int __init nf_flow_table_module_init(void) { int ret; -@@ -663,8 +680,14 @@ static int __init nf_flow_table_module_i +@@ -674,8 +691,14 @@ static int __init nf_flow_table_module_i if (ret) goto out_offload; @@ -49,7 +49,7 @@ Signed-off-by: Pablo Neira Ayuso out_offload: unregister_pernet_subsys(&nf_flow_table_net_ops); return ret; -@@ -672,6 +695,7 @@ out_offload: +@@ -683,6 +706,7 @@ out_offload: static void __exit nf_flow_table_module_exit(void) { diff --git a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index c8cad7f38f87b1..cc37180277c8db 100644 --- a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -8210,7 +8210,7 @@ static int nft_register_flowtable_net_ho +@@ -8213,7 +8213,7 @@ static int nft_register_flowtable_net_ho err = flowtable->data.type->setup(&flowtable->data, hook->ops.dev, FLOW_BLOCK_BIND); diff --git a/target/linux/generic/pending-6.6/721-net-phy-realtek-rtl8221-allow-to-configure-SERDES-mo.patch b/target/linux/generic/pending-6.6/721-net-phy-realtek-rtl8221-allow-to-configure-SERDES-mo.patch index 7e97886d5b9ea1..7e9b3660d5e6f1 100644 --- a/target/linux/generic/pending-6.6/721-net-phy-realtek-rtl8221-allow-to-configure-SERDES-mo.patch +++ b/target/linux/generic/pending-6.6/721-net-phy-realtek-rtl8221-allow-to-configure-SERDES-mo.patch @@ -39,7 +39,7 @@ Signed-off-by: Alexander Couzens #define RTL8366RB_POWER_SAVE 0x15 #define RTL8366RB_POWER_SAVE_ON BIT(12) -@@ -877,6 +886,48 @@ static irqreturn_t rtl9000a_handle_inter +@@ -879,6 +888,48 @@ static irqreturn_t rtl9000a_handle_inter return IRQ_HANDLED; } @@ -88,7 +88,7 @@ Signed-off-by: Alexander Couzens static struct phy_driver realtek_drvs[] = { { PHY_ID_MATCH_EXACT(0x00008201), -@@ -1031,6 +1082,7 @@ static struct phy_driver realtek_drvs[] +@@ -1033,6 +1084,7 @@ static struct phy_driver realtek_drvs[] PHY_ID_MATCH_EXACT(0x001cc849), .name = "RTL8221B-VB-CG 2.5Gbps PHY", .get_features = rtl822x_get_features, @@ -96,7 +96,7 @@ Signed-off-by: Alexander Couzens .config_aneg = rtl822x_config_aneg, .read_status = rtl822x_read_status, .suspend = genphy_suspend, -@@ -1042,6 +1094,7 @@ static struct phy_driver realtek_drvs[] +@@ -1044,6 +1096,7 @@ static struct phy_driver realtek_drvs[] .name = "RTL8221B-VM-CG 2.5Gbps PHY", .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, diff --git a/target/linux/generic/pending-6.6/722-net-phy-realtek-support-switching-between-SGMII-and-.patch b/target/linux/generic/pending-6.6/722-net-phy-realtek-support-switching-between-SGMII-and-.patch index 6b0d17d8a5c4ff..58bd25919891ba 100644 --- a/target/linux/generic/pending-6.6/722-net-phy-realtek-support-switching-between-SGMII-and-.patch +++ b/target/linux/generic/pending-6.6/722-net-phy-realtek-support-switching-between-SGMII-and-.patch @@ -16,7 +16,7 @@ Signed-off-by: Chukun Pan --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -712,6 +712,25 @@ static int rtl822x_config_aneg(struct ph +@@ -714,6 +714,25 @@ static int rtl822x_config_aneg(struct ph return __genphy_config_aneg(phydev, ret); } @@ -42,7 +42,7 @@ Signed-off-by: Chukun Pan static int rtl822x_read_status(struct phy_device *phydev) { int ret; -@@ -730,11 +749,14 @@ static int rtl822x_read_status(struct ph +@@ -732,11 +751,14 @@ static int rtl822x_read_status(struct ph phydev->lp_advertising, lpadv & RTL_LPADV_2500FULL); } diff --git a/target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch b/target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch index a7ba3e6076adce..8efedd3a116fd2 100644 --- a/target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch +++ b/target/linux/generic/pending-6.6/724-net-phy-realtek-use-genphy_soft_reset-for-2.5G-PHYs.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1068,6 +1068,7 @@ static struct phy_driver realtek_drvs[] +@@ -1070,6 +1070,7 @@ static struct phy_driver realtek_drvs[] .write_page = rtl821x_write_page, .read_mmd = rtl822x_read_mmd, .write_mmd = rtl822x_write_mmd, @@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle }, { PHY_ID_MATCH_EXACT(0x001cc840), .name = "RTL8226B_RTL8221B 2.5Gbps PHY", -@@ -1080,6 +1081,7 @@ static struct phy_driver realtek_drvs[] +@@ -1082,6 +1083,7 @@ static struct phy_driver realtek_drvs[] .write_page = rtl821x_write_page, .read_mmd = rtl822x_read_mmd, .write_mmd = rtl822x_write_mmd, @@ -31,7 +31,7 @@ Signed-off-by: Daniel Golle }, { PHY_ID_MATCH_EXACT(0x001cc838), .name = "RTL8226-CG 2.5Gbps PHY", -@@ -1090,6 +1092,7 @@ static struct phy_driver realtek_drvs[] +@@ -1092,6 +1094,7 @@ static struct phy_driver realtek_drvs[] .resume = rtlgen_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, @@ -39,7 +39,7 @@ Signed-off-by: Daniel Golle }, { PHY_ID_MATCH_EXACT(0x001cc848), .name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY", -@@ -1100,6 +1103,7 @@ static struct phy_driver realtek_drvs[] +@@ -1102,6 +1105,7 @@ static struct phy_driver realtek_drvs[] .resume = rtlgen_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, @@ -47,7 +47,7 @@ Signed-off-by: Daniel Golle }, { PHY_ID_MATCH_EXACT(0x001cc849), .name = "RTL8221B-VB-CG 2.5Gbps PHY", -@@ -1111,6 +1115,7 @@ static struct phy_driver realtek_drvs[] +@@ -1113,6 +1117,7 @@ static struct phy_driver realtek_drvs[] .resume = rtlgen_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, @@ -55,7 +55,7 @@ Signed-off-by: Daniel Golle }, { PHY_ID_MATCH_EXACT(0x001cc84a), .name = "RTL8221B-VM-CG 2.5Gbps PHY", -@@ -1122,6 +1127,7 @@ static struct phy_driver realtek_drvs[] +@@ -1124,6 +1129,7 @@ static struct phy_driver realtek_drvs[] .resume = rtlgen_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, diff --git a/target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch b/target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch index 2d4ffc29568c96..43cf35ab77227f 100644 --- a/target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch +++ b/target/linux/generic/pending-6.6/725-net-phy-realtek-disable-SGMII-in-band-AN-for-2-5G-PHYs.patch @@ -19,7 +19,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -911,6 +911,7 @@ static irqreturn_t rtl9000a_handle_inter +@@ -913,6 +913,7 @@ static irqreturn_t rtl9000a_handle_inter static int rtl8221b_config_init(struct phy_device *phydev) { u16 option_mode; @@ -27,7 +27,7 @@ Signed-off-by: Daniel Golle switch (phydev->interface) { case PHY_INTERFACE_MODE_2500BASEX: -@@ -947,6 +948,13 @@ static int rtl8221b_config_init(struct p +@@ -949,6 +950,13 @@ static int rtl8221b_config_init(struct p break; } diff --git a/target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch b/target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch index 063aa142d18b65..be86a774ea7c7b 100644 --- a/target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch +++ b/target/linux/generic/pending-6.6/726-net-phy-realtek-make-sure-paged-read-is-protected-by.patch @@ -18,7 +18,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -763,9 +763,11 @@ static bool rtlgen_supports_2_5gbps(stru +@@ -765,9 +765,11 @@ static bool rtlgen_supports_2_5gbps(stru { int val; diff --git a/target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch b/target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch index e32036d518ad89..e6cbfbe6493899 100644 --- a/target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch +++ b/target/linux/generic/pending-6.6/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch @@ -25,7 +25,7 @@ Signed-off-by: Daniel Golle #define RTL9000A_GINMR 0x14 #define RTL9000A_GINMR_LINK_STATUS BIT(4) -@@ -697,14 +693,11 @@ static int rtl822x_config_aneg(struct ph +@@ -699,14 +695,11 @@ static int rtl822x_config_aneg(struct ph int ret = 0; if (phydev->autoneg == AUTONEG_ENABLE) { @@ -44,7 +44,7 @@ Signed-off-by: Daniel Golle if (ret < 0) return ret; } -@@ -741,12 +734,7 @@ static int rtl822x_read_status(struct ph +@@ -743,12 +736,7 @@ static int rtl822x_read_status(struct ph if (lpadv < 0) return lpadv; diff --git a/target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch b/target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch index d5d46aa7dda953..329415bab5148c 100644 --- a/target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch +++ b/target/linux/generic/pending-6.6/728-net-phy-realtek-check-validity-of-10GbE-link-partner.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -734,6 +734,10 @@ static int rtl822x_read_status(struct ph +@@ -736,6 +736,10 @@ static int rtl822x_read_status(struct ph if (lpadv < 0) return lpadv; diff --git a/target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch b/target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch index 3701de9a3a93ea..7098fa6b286d3b 100644 --- a/target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch +++ b/target/linux/generic/pending-6.6/729-net-phy-realtek-introduce-rtl822x_probe.patch @@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle #define RTL8366RB_POWER_SAVE 0x15 #define RTL8366RB_POWER_SAVE_ON BIT(12) -@@ -776,6 +780,25 @@ static int rtl8226_match_phy_device(stru +@@ -778,6 +782,25 @@ static int rtl8226_match_phy_device(stru rtlgen_supports_2_5gbps(phydev); } @@ -50,7 +50,7 @@ Signed-off-by: Daniel Golle static int rtlgen_resume(struct phy_device *phydev) { int ret = genphy_resume(phydev); -@@ -1089,6 +1112,7 @@ static struct phy_driver realtek_drvs[] +@@ -1091,6 +1114,7 @@ static struct phy_driver realtek_drvs[] .name = "RTL8226-CG 2.5Gbps PHY", .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, @@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle .read_status = rtl822x_read_status, .suspend = genphy_suspend, .resume = rtlgen_resume, -@@ -1100,6 +1124,7 @@ static struct phy_driver realtek_drvs[] +@@ -1102,6 +1126,7 @@ static struct phy_driver realtek_drvs[] .name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY", .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, @@ -66,7 +66,7 @@ Signed-off-by: Daniel Golle .read_status = rtl822x_read_status, .suspend = genphy_suspend, .resume = rtlgen_resume, -@@ -1112,6 +1137,7 @@ static struct phy_driver realtek_drvs[] +@@ -1114,6 +1139,7 @@ static struct phy_driver realtek_drvs[] .get_features = rtl822x_get_features, .config_init = rtl8221b_config_init, .config_aneg = rtl822x_config_aneg, @@ -74,7 +74,7 @@ Signed-off-by: Daniel Golle .read_status = rtl822x_read_status, .suspend = genphy_suspend, .resume = rtlgen_resume, -@@ -1124,6 +1150,7 @@ static struct phy_driver realtek_drvs[] +@@ -1126,6 +1152,7 @@ static struct phy_driver realtek_drvs[] .get_features = rtl822x_get_features, .config_aneg = rtl822x_config_aneg, .config_init = rtl8221b_config_init, diff --git a/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch b/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch index 2233240cc95a23..1d30a196547487 100644 --- a/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch +++ b/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch @@ -24,7 +24,7 @@ Signed-off-by: Daniel Golle MODULE_DESCRIPTION("Realtek PHY driver"); MODULE_AUTHOR("Johnson Leung"); -@@ -799,6 +800,54 @@ static int rtl822x_probe(struct phy_devi +@@ -801,6 +802,54 @@ static int rtl822x_probe(struct phy_devi return 0; } @@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle static int rtlgen_resume(struct phy_device *phydev) { int ret = genphy_resume(phydev); -@@ -1132,7 +1181,7 @@ static struct phy_driver realtek_drvs[] +@@ -1134,7 +1183,7 @@ static struct phy_driver realtek_drvs[] .write_page = rtl821x_write_page, .soft_reset = genphy_soft_reset, }, { diff --git a/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch b/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch index cc54f4f240a3f4..aab0d3f7d50258 100644 --- a/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch +++ b/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c -@@ -1024,6 +1024,51 @@ static int rtl8221b_config_init(struct p +@@ -1026,6 +1026,51 @@ static int rtl8221b_config_init(struct p return 0; } @@ -52,7 +52,7 @@ static struct phy_driver realtek_drvs[] = { { PHY_ID_MATCH_EXACT(0x00008201), -@@ -1186,6 +1231,8 @@ static struct phy_driver realtek_drvs[] +@@ -1188,6 +1233,8 @@ static struct phy_driver realtek_drvs[] .get_features = rtl822x_get_features, .config_init = rtl8221b_config_init, .config_aneg = rtl822x_config_aneg, diff --git a/target/linux/generic/pending-6.6/834-ledtrig-libata.patch b/target/linux/generic/pending-6.6/834-ledtrig-libata.patch index b256f166e9c0d5..0282e337e0fa5d 100644 --- a/target/linux/generic/pending-6.6/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-6.6/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @qc: Metadata associated with the taskfile to build -@@ -4767,6 +4780,9 @@ void __ata_qc_complete(struct ata_queued +@@ -4771,6 +4784,9 @@ void __ata_qc_complete(struct ata_queued link->active_tag = ATA_TAG_POISON; ap->nr_active_links--; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle /* clear exclusive status */ if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL && -@@ -5490,6 +5506,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5494,6 +5510,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -5526,6 +5545,12 @@ static void ata_host_release(struct kref +@@ -5530,6 +5549,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); kfree(ap->ncq_sense_buf); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -5916,7 +5941,23 @@ int ata_host_register(struct ata_host *h +@@ -5920,7 +5945,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; }