Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFT,RFC] generic: Add support for 6.6 kernel version #14751

Merged
merged 35 commits into from Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
53e3851
tools: add util-linux
hackpascal Jan 9, 2024
7136066
kernel: add define for kernel 6.6
hackpascal Jan 3, 2024
8a9273d
generic: copy backport, hack, pending patch and config from 6.1 to 6.6
hackpascal Jan 3, 2024
8c3892b
generic: 6.6: drop backport patches
hackpascal Jan 3, 2024
1057d9b
generic: 6.6: drop pending patch backported as fixes
hackpascal Jan 3, 2024
a76397c
generic: 6.6: manually refresh backport patches
hackpascal Jan 3, 2024
5b6bca8
generic: 6.6: manually refresh pending patches
hackpascal Jan 3, 2024
d9bc5c9
generic: 6.6: manually refresh hack patches
hackpascal Jan 3, 2024
6bac820
generic: 6.6: refresh backport patches
hackpascal Mar 8, 2024
293caa1
generic: 6.6: refresh pending patches
hackpascal Mar 8, 2024
9a67364
generic: 6.6: refresh hack patches
hackpascal Mar 8, 2024
7f356a7
generic: 6.6: add missing symbols
hackpascal Jan 5, 2024
6be4e48
generic: 6.6: refresh config symbols
hackpascal Jan 5, 2024
d356fb3
generic: v6.6: update fitblk driver to work with Linux 6.6
dangowrt Mar 1, 2024
7acb820
generic: 6.6: fix uncompressed kallsyms
robimarko Mar 1, 2024
f6c27b2
generic: 6.6: fix realtek PHY detection patch
dangowrt Mar 2, 2024
8d83b9e
kernel: modules: iio: adapt for kernel 6.6
hackpascal Jan 6, 2024
0c98d99
kernel: modules: input: adapt for kernel 6.6
hackpascal Jan 6, 2024
48b52d5
kernel: modules: netsupport: adapt for kernel 6.6
hackpascal Jan 6, 2024
ad2906b
kernel: modules: netdevices: adapt for kernel 6.6
dangowrt Mar 2, 2024
ef523fd
kernel: modules: usb: adapt for kernel 6.6
hackpascal Jan 6, 2024
f919848
kernel: modules: fs: adapt for kernel 6.6
hackpascal Jan 6, 2024
85ede92
kernel: modules: block: adapt for kernel 6.6
hackpascal Jan 6, 2024
5b08b56
kernel: modules: video: adapt for kernel 6.6
hackpascal Jan 6, 2024
35b04ba
kernel: modules: crypto: adapt for kernel 6.6
hackpascal Mar 3, 2024
faf3d80
kernel: modules: hwmon: adapt for kernel 6.6
nasbdh9 Mar 3, 2024
b065981
kernel: crypto: package geniv as a separate module for 6.6
robimarko Mar 7, 2024
e129450
kernel: crypto: remove geniv from aead with kernel 6.6
robimarko Mar 7, 2024
729ad2f
kernel: crypto: add kmod-crypto-geniv as dependency to modules that u…
robimarko Mar 7, 2024
7fcbcea
gpio-button-hotplug: fix 6.2 build failure
hackpascal Jan 6, 2024
a325c5f
mac80211: fix build with linux kernel 6.6
hackpascal Feb 29, 2024
504cf50
mt76: fix build failure on linux kernel 6.6
hackpascal Mar 1, 2024
01f0453
rtl8812au-ct: fix build failure on linux kernel 6.6
hackpascal Feb 29, 2024
ba521e5
ath10k-ct: fix build error on linux kernel 6.6
hackpascal Feb 29, 2024
b72a7bf
fitblk: invert kernel version dependency
dangowrt Mar 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions include/kernel-6.6
@@ -0,0 +1,2 @@
LINUX_VERSION-6.6 = .20
LINUX_KERNEL_HASH-6.6.20 = e2f6c7f39b304248193370f8c5755553ab73ad5672e92dae994a344084d8dd22
@@ -0,0 +1,11 @@
--- a/ath10k-6.4/wmi.h
+++ b/ath10k-6.4/wmi.h
@@ -6341,7 +6341,7 @@ struct qca9880_set_ctl_table_cmd {
__le32 ctl_len; /* in bytes. This may be ignored in firmware,
* make sure ctl_info data is sizeof(qca9880_power_ctl) */
/** ctl array (len adjusted to number of words) */
- __le32 ctl_info[1]; /* data would be the qca9880_power_ctl table above */
+ __le32 ctl_info[]; /* data would be the qca9880_power_ctl table above */
};

/* Used by: WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID */
5 changes: 3 additions & 2 deletions package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
Expand Up @@ -538,8 +538,9 @@ static int gpio_keys_button_probe(struct platform_device *pdev,
struct device_node *child =
of_get_next_child(dev->of_node, prev);

bdata->gpiod = devm_gpiod_get_from_of_node(dev,
child, "gpios", 0, GPIOD_IN, desc);
bdata->gpiod = devm_fwnode_gpiod_get(dev,
of_fwnode_handle(child), NULL, GPIOD_IN,
desc);

prev = child;
}
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/linux/modules/block.mk
Expand Up @@ -263,7 +263,7 @@ define KernelPackage/iscsi-initiator
CONFIG_INET \
CONFIG_SCSI_LOWLEVEL=y \
CONFIG_ISCSI_TCP \
CONFIG_SCSI_ISCSI_ATTRS=y
CONFIG_SCSI_ISCSI_ATTRS
FILES:= \
$(LINUX_DIR)/drivers/scsi/iscsi_tcp.ko \
$(LINUX_DIR)/drivers/scsi/libiscsi.ko \
Expand Down
29 changes: 22 additions & 7 deletions package/kernel/linux/modules/crypto.mk
Expand Up @@ -39,10 +39,11 @@ define KernelPackage/crypto-aead
TITLE:=CryptoAPI AEAD support
KCONFIG:= \
CONFIG_CRYPTO_AEAD \
CONFIG_CRYPTO_AEAD2
CONFIG_CRYPTO_AEAD2 \
CONFIG_CRYPTO_GENIV@lt6.6
FILES:= \
$(LINUX_DIR)/crypto/aead.ko \
$(LINUX_DIR)/crypto/geniv.ko
$(LINUX_DIR)/crypto/geniv.ko@lt6.6
AUTOLOAD:=$(call AutoLoad,09,aead,1)
$(call AddDepends/crypto, +kmod-crypto-null)
endef
Expand Down Expand Up @@ -216,7 +217,7 @@ $(eval $(call KernelPackage,crypto-ecb))

define KernelPackage/crypto-ecdh
TITLE:=ECDH algorithm
DEPENDS:=+kmod-crypto-kpp
DEPENDS:=+kmod-crypto-kpp +kmod-crypto-rng
KCONFIG:= CONFIG_CRYPTO_ECDH
FILES:= \
$(LINUX_DIR)/crypto/ecdh_generic.ko \
Expand All @@ -230,7 +231,7 @@ $(eval $(call KernelPackage,crypto-ecdh))

define KernelPackage/crypto-echainiv
TITLE:=Encrypted Chain IV Generator
DEPENDS:=+kmod-crypto-aead
DEPENDS:=+kmod-crypto-aead +LINUX_6_6:kmod-crypto-geniv
KCONFIG:=CONFIG_CRYPTO_ECHAINIV
FILES:=$(LINUX_DIR)/crypto/echainiv.ko
AUTOLOAD:=$(call AutoLoad,09,echainiv)
Expand Down Expand Up @@ -846,7 +847,8 @@ define KernelPackage/crypto-rsa
KCONFIG:= CONFIG_CRYPTO_RSA
HIDDEN:=1
FILES:= \
$(LINUX_DIR)/lib/mpi/mpi.ko \
$(LINUX_DIR)/lib/mpi/mpi.ko@lt6.5 \
$(LINUX_DIR)/lib/crypto/mpi/mpi.ko@ge6.5 \
$(LINUX_DIR)/crypto/akcipher.ko \
$(LINUX_DIR)/crypto/rsa_generic.ko
AUTOLOAD:=$(call AutoLoad,10,rsa_generic)
Expand All @@ -870,7 +872,7 @@ $(eval $(call KernelPackage,crypto-rmd160))

define KernelPackage/crypto-rng
TITLE:=CryptoAPI random number generation
DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha512
DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha512 +LINUX_6_6:kmod-crypto-sha3
KCONFIG:= \
CONFIG_CRYPTO_DRBG \
CONFIG_CRYPTO_DRBG_HMAC=y \
Expand All @@ -889,9 +891,22 @@ endef
$(eval $(call KernelPackage,crypto-rng))


define KernelPackage/crypto-geniv
TITLE:=CryptoAPI Shared IV generator
HIDDEN:=1
DEPENDS:=+kmod-crypto-rng +kmod-crypto-aead @LINUX_6_6
KCONFIG:=CONFIG_CRYPTO_GENIV
FILES:=$(LINUX_DIR)/crypto/geniv.ko
AUTOLOAD:=$(call AutoLoad,09,geniv)
$(call AddDepends/crypto)
endef

$(eval $(call KernelPackage,crypto-geniv))


define KernelPackage/crypto-seqiv
TITLE:=CryptoAPI Sequence Number IV Generator
DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng
DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng +LINUX_6_6:kmod-crypto-geniv
KCONFIG:=CONFIG_CRYPTO_SEQIV
FILES:=$(LINUX_DIR)/crypto/seqiv.ko
AUTOLOAD:=$(call AutoLoad,09,seqiv)
Expand Down
8 changes: 5 additions & 3 deletions package/kernel/linux/modules/fs.mk
Expand Up @@ -10,7 +10,7 @@ FS_MENU:=Filesystems
define KernelPackage/fs-9p
SUBMENU:=$(FS_MENU)
TITLE:=Plan 9 Resource Sharing Support
DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs
DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6:kmod-fs-netfs
KCONFIG:=\
CONFIG_9P_FS \
CONFIG_9P_FS_POSIX_ACL=n \
Expand Down Expand Up @@ -87,6 +87,7 @@ define KernelPackage/fs-smbfs-common
SUBMENU:=$(FS_MENU)
TITLE:=SMBFS common dependencies support
HIDDEN:=1
DEPENDS:=+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils
KCONFIG:=\
CONFIG_SMBFS_COMMON@lt6.1 \
CONFIG_SMBFS@ge6.1
Expand Down Expand Up @@ -344,6 +345,7 @@ define KernelPackage/fs-jfs
FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
AUTOLOAD:=$(call AutoLoad,30,jfs,1)
$(call AddDepends/nls)
DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils
endef

define KernelPackage/fs-jfs/description
Expand Down Expand Up @@ -470,8 +472,7 @@ define KernelPackage/fs-nfs-common
FILES:= \
$(LINUX_DIR)/fs/lockd/lockd.ko \
$(LINUX_DIR)/net/sunrpc/sunrpc.ko \
$(LINUX_DIR)/fs/nfs_common/grace.ko \
$(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko
$(LINUX_DIR)/fs/nfs_common/grace.ko
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing nfs_ssc.ko looks strange, the build should have failed when it is not there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll recheck it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/fs/Kconfig?h=linux-5.15.y#n360

NFS_V4_2_SSC_HELPER is now bool in 5.15+
It will never be built as nfs_ssc.ko. Instead, it will be treated as built-in, and will never fail the build.

AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
endef

Expand Down Expand Up @@ -712,6 +713,7 @@ define KernelPackage/pstore
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko
AUTOLOAD:=$(call AutoLoad,30,pstore,1)
DEPENDS:=+LINUX_6_6:kmod-lib-zlib-deflate +LINUX_6_6:kmod-lib-zlib-inflate
endef

define KernelPackage/pstore/description
Expand Down
4 changes: 2 additions & 2 deletions package/kernel/linux/modules/hwmon.mk
Expand Up @@ -34,7 +34,7 @@ define KernelPackage/hwmon-ad7418
KCONFIG:=CONFIG_SENSORS_AD7418
FILES:=$(LINUX_DIR)/drivers/hwmon/ad7418.ko
AUTOLOAD:=$(call AutoLoad,60,ad7418 ad7418)
$(call AddDepends/hwmon,+kmod-i2c-core)
$(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_6:kmod-regmap-core)
endef

define KernelPackage/hwmon-ad7418/description
Expand All @@ -52,7 +52,7 @@ define KernelPackage/hwmon-adt7410
$(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
$(LINUX_DIR)/drivers/hwmon/adt7410.ko
AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410)
$(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_1:kmod-regmap-core)
$(call AddDepends/hwmon,+kmod-i2c-core +!LINUX_5_15:kmod-regmap-core)
endef

define KernelPackage/hwmon-adt7410/description
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/linux/modules/iio.mk
Expand Up @@ -383,7 +383,7 @@ $(eval $(call KernelPackage,iio-st_accel-spi))


define KernelPackage/iio-lsm6dsx
DEPENDS:=+kmod-iio-kfifo-buf +kmod-regmap-core
DEPENDS:=+kmod-iio-kfifo-buf +kmod-regmap-core +LINUX_6_6:kmod-industrialio-triggered-buffer
TITLE:=ST LSM6DSx driver for IMU MEMS sensors
KCONFIG:=CONFIG_IIO_ST_LSM6DSX
FILES:=$(LINUX_DIR)/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.ko
Expand Down
4 changes: 2 additions & 2 deletions package/kernel/linux/modules/input.mk
Expand Up @@ -11,7 +11,7 @@ define KernelPackage/hid
SUBMENU:=$(INPUT_MODULES_MENU)
TITLE:=HID Devices
DEPENDS:=+kmod-input-core +kmod-input-evdev
KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y CONFIG_HID_BATTERY_STRENGTH=y
KCONFIG:=CONFIG_HID CONFIG_HID_SUPPORT=y CONFIG_HIDRAW=y CONFIG_HID_BATTERY_STRENGTH=y
FILES:=$(LINUX_DIR)/drivers/hid/hid.ko
AUTOLOAD:=$(call AutoLoad,61,hid)
endef
Expand Down Expand Up @@ -179,7 +179,7 @@ $(eval $(call KernelPackage,input-touchscreen-ads7846))
define KernelPackage/input-touchscreen-edt-ft5x06
SUBMENU:=$(INPUT_MODULES_MENU)
TITLE:=EDT FT5x06 and Focaltech FT6236 based touchscreens
DEPENDS:=+kmod-i2c-core +kmod-input-core
DEPENDS:=+kmod-i2c-core +kmod-input-core +LINUX_6_6:kmod-regmap-i2c
KCONFIG:= \
CONFIG_INPUT_TOUCHSCREEN=y \
CONFIG_TOUCHSCREEN_EDT_FT5X06
Expand Down
6 changes: 3 additions & 3 deletions package/kernel/linux/modules/netdevices.mk
Expand Up @@ -378,7 +378,7 @@ $(eval $(call KernelPackage,phy-smsc))
define KernelPackage/phy-airoha-en8811h
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Airoha EN8811H 2.5G Ethernet PHY
DEPENDS:=+airoha-en8811h-firmware +kmod-libphy @LINUX_6_1
DEPENDS:=+airoha-en8811h-firmware +kmod-libphy @!LINUX_5_15
KCONFIG:=CONFIG_AIR_EN8811H_PHY
FILES:= \
$(LINUX_DIR)/drivers/net/phy/air_en8811h.ko
Expand Down Expand Up @@ -1360,7 +1360,7 @@ $(eval $(call KernelPackage,mlx4-core))
define KernelPackage/mlx5-core
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Mellanox ConnectX(R) mlx5 core Network Driver
DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mlxfw
DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mlxfw +LINUX_6_6:kmod-hwmon-core
FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
KCONFIG:= CONFIG_MLX5_CORE \
CONFIG_MLX5_CORE_EN=y \
Expand Down Expand Up @@ -1573,7 +1573,7 @@ $(eval $(call KernelPackage,pcs-xpcs))
define KernelPackage/stmmac-core
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Synopsis Ethernet Controller core (NXP,STMMicro,others)
DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 +kmod-pcs-xpcs +kmod-ptp
DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 +kmod-pcs-xpcs +LINUX_6_6:kmod-of-mdio +kmod-ptp
KCONFIG:=CONFIG_STMMAC_ETH \
CONFIG_STMMAC_SELFTESTS=n \
CONFIG_STMMAC_PLATFORM \
Expand Down
18 changes: 17 additions & 1 deletion package/kernel/linux/modules/netsupport.mk
Expand Up @@ -907,10 +907,26 @@ endef
$(eval $(call KernelPackage,sched-ipset))


define KernelPackage/sched-mqprio-common
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=mqprio queue common dependencies support
DEPENDS:=@LINUX_6_6
HIDDEN:=1
KCONFIG:=CONFIG_NET_SCH_MQPRIO_LIB
FILES:=$(LINUX_DIR)/net/sched/sch_mqprio_lib.ko
endef

define KernelPackage/sched-mqprio-common/description
Common library for manipulating mqprio queue configurations
endef

$(eval $(call KernelPackage,sched-mqprio-common))


define KernelPackage/sched-mqprio
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Multi-queue priority scheduler (MQPRIO)
DEPENDS:=+kmod-sched-core
DEPENDS:=+kmod-sched-core +LINUX_6_6:kmod-sched-mqprio-common
KCONFIG:=CONFIG_NET_SCH_MQPRIO
FILES:=$(LINUX_DIR)/net/sched/sch_mqprio.ko
AUTOLOAD:=$(call AutoProbe, sch_mqprio)
Expand Down
17 changes: 17 additions & 0 deletions package/kernel/linux/modules/nls.mk
Expand Up @@ -339,3 +339,20 @@ define KernelPackage/nls-utf8/description
endef

$(eval $(call KernelPackage,nls-utf8))


define KernelPackage/nls-ucs2-utils
SUBMENU:=Native Language Support
TITLE:=UCS-2 common library
DEPENDS+=@LINUX_6_6
HIDDEN:=1
KCONFIG:=CONFIG_NLS_UCS2_UTILS
FILES:=$(LINUX_DIR)/fs/nls/nls_ucs2_utils.ko
$(call AddDepends/nls)
endef

define KernelPackage/nls-ucs2-utils/description
UCS-2 common library
endef

$(eval $(call KernelPackage,nls-ucs2-utils))
6 changes: 3 additions & 3 deletions package/kernel/linux/modules/usb.mk
Expand Up @@ -1184,7 +1184,7 @@ define KernelPackage/usb-net-asix
TITLE:=Kernel module for USB-to-Ethernet Asix convertors
DEPENDS:= \
+kmod-libphy +kmod-net-selftests +kmod-mdio-devres +kmod-phy-ax88796b \
+LINUX_6_1:kmod-phylink
+LINUX_6_1:kmod-phylink +LINUX_6_6:kmod-phylink
KCONFIG:=CONFIG_USB_NET_AX8817X
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko
AUTOLOAD:=$(call AutoProbe,asix)
Expand Down Expand Up @@ -1312,7 +1312,7 @@ $(eval $(call KernelPackage,usb-net-smsc75xx))

define KernelPackage/usb-net-smsc95xx
TITLE:=SMSC LAN95XX based USB 2.0 10/100 ethernet devices
DEPENDS:=+kmod-libphy +kmod-phy-smsc +LINUX_6_1:kmod-net-selftests
DEPENDS:=+kmod-libphy +kmod-phy-smsc +!LINUX_5_15:kmod-net-selftests
KCONFIG:=CONFIG_USB_NET_SMSC95XX
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko
AUTOLOAD:=$(call AutoProbe,smsc95xx)
Expand Down Expand Up @@ -1605,7 +1605,7 @@ define KernelPackage/usb-hid-mcp2221
SUBMENU:=$(USB_MENU)
TITLE:=Microchip USB 2.0 to I2C/UART Protocol Converter with GPIO
KCONFIG:=CONFIG_HID_MCP2221
DEPENDS:=@GPIO_SUPPORT +kmod-usb-hid +kmod-i2c-core
DEPENDS:=@GPIO_SUPPORT +kmod-usb-hid +kmod-i2c-core +LINUX_6_6:kmod-iio-core
FILES:=$(LINUX_DIR)/drivers/hid/hid-mcp2221.ko
AUTOLOAD:=$(call AutoProbe,hid-mcp2221)
endef
Expand Down
24 changes: 15 additions & 9 deletions package/kernel/linux/modules/video.mk
Expand Up @@ -246,11 +246,15 @@ define KernelPackage/drm
HIDDEN:=1
DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight \
+kmod-fb
KCONFIG:=CONFIG_DRM
KCONFIG:=CONFIG_DRM \
CONFIG_DRM_EXEC@ge6.6 \
CONFIG_DRM_SUBALLOC_HELPER@ge6.4
FILES:= \
$(LINUX_DIR)/drivers/gpu/drm/drm.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
AUTOLOAD:=$(call AutoLoad,05,drm)
$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_exec.ko@ge6.6 \
$(LINUX_DIR)/drivers/gpu/drm/drm_suballoc_helper.ko@ge6.4
AUTOLOAD:=$(call AutoLoad,05,drm_exec@ge6.6 drm_suballoc_helper@ge6.4 drm)
endef

define KernelPackage/drm/description
Expand All @@ -262,7 +266,7 @@ $(eval $(call KernelPackage,drm))
define KernelPackage/drm-buddy
SUBMENU:=$(VIDEO_MENU)
TITLE:=A page based buddy allocator
DEPENDS:=@DISPLAY_SUPPORT +kmod-drm @LINUX_6_1
DEPENDS:=@DISPLAY_SUPPORT +kmod-drm @LINUX_6_1||LINUX_6_6
KCONFIG:=CONFIG_DRM_BUDDY
FILES:= $(LINUX_DIR)/drivers/gpu/drm/drm_buddy.ko
AUTOLOAD:=$(call AutoProbe,drm_buddy)
Expand All @@ -277,7 +281,7 @@ $(eval $(call KernelPackage,drm-buddy))
define KernelPackage/drm-display-helper
SUBMENU:=$(VIDEO_MENU)
TITLE:=DRM helpers for display adapters drivers
DEPENDS:=@DISPLAY_SUPPORT +kmod-drm-kms-helper @LINUX_6_1
DEPENDS:=@DISPLAY_SUPPORT +kmod-drm-kms-helper @LINUX_6_1||LINUX_6_6
KCONFIG:=CONFIG_DRM_DISPLAY_HELPER
FILES:=$(LINUX_DIR)/drivers/gpu/drm/display/drm_display_helper.ko
AUTOLOAD:=$(call AutoProbe,drm_display_helper)
Expand Down Expand Up @@ -349,7 +353,8 @@ define KernelPackage/drm-amdgpu
CONFIG_DRM_AMD_DC=y \
CONFIG_DEBUG_KERNEL_DC=n
FILES:=$(LINUX_DIR)/drivers/gpu/drm/amd/amdgpu/amdgpu.ko \
$(LINUX_DIR)/drivers/gpu/drm/scheduler/gpu-sched.ko
$(LINUX_DIR)/drivers/gpu/drm/scheduler/gpu-sched.ko \
$(LINUX_DIR)/drivers/gpu/drm/amd/amdxcp/amdxcp.ko@ge6.5
AUTOLOAD:=$(call AutoProbe,amdgpu)
endef

Expand Down Expand Up @@ -557,9 +562,10 @@ $(eval $(call KernelPackage,video-pwc))
define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 +kmod-input-core
KCONFIG:= CONFIG_USB_VIDEO_CLASS
FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoProbe,uvcvideo)
KCONFIG:= CONFIG_USB_VIDEO_CLASS CONFIG_UVC_COMMON@ge6.3
FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko \
$(LINUX_DIR)/drivers/media/common/uvc.ko@ge6.3
AUTOLOAD:=$(call AutoProbe,uvc@ge6.3 uvcvideo)
$(call AddDepends/camera)
endef

Expand Down
@@ -0,0 +1,32 @@
--- a/backport-include/net/genetlink.h
+++ b/backport-include/net/genetlink.h
@@ -3,6 +3,7 @@
#include_next <net/genetlink.h>
#include <linux/version.h>

+#if LINUX_VERSION_IS_LESS(4,12,0)
static inline void __bp_genl_info_userhdr_set(struct genl_info *info,
void *userhdr)
{
@@ -14,7 +15,6 @@ static inline void *__bp_genl_info_userh
return info->userhdr;
}

-#if LINUX_VERSION_IS_LESS(4,12,0)
#define GENL_SET_ERR_MSG(info, msg) NL_SET_ERR_MSG(genl_info_extack(info), msg)

static inline int genl_err_attr(struct genl_info *info, int err,
@@ -44,11 +44,13 @@ static inline struct netlink_ext_ack *ge
#endif
}

+#if LINUX_VERSION_IS_LESS(6,6,0)
/* this gets put in place of info->userhdr, since we use that above */
static inline void *genl_info_userhdr(struct genl_info *info)
{
return (u8 *)info->genlhdr + GENL_HDRLEN;
}
+#endif

#if LINUX_VERSION_IS_LESS(4,10,0)
#define __genl_ro_after_init