fix.patch 3.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. --- a/include/target.mk
  2. +++ b/include/target.mk
  3. @@ -155,11 +155,12 @@ ifeq ($(TARGET_BUILD),1)
  4. endif
  5. endif
  6. +GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
  7. +
  8. ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
  9. include $(INCLUDE_DIR)/kernel-version.mk
  10. endif
  11. -GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
  12. GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
  13. GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
  14. GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
  15. diff --git a/target/linux/qualcommax/patches-6.12/999-fix-netdev-cacheline-size.patch b/target/linux/qualcommax/patches-6.12/999-fix-netdev-cacheline-size.patch
  16. new file mode 100644
  17. index 00000000000000..1481f8844bf45e
  18. --- /dev/null
  19. +++ b/target/linux/qualcommax/patches-6.12/999-fix-netdev-cacheline-size.patch
  20. @@ -0,0 +1,11 @@
  21. +--- a/net/core/dev.c
  22. ++++ b/net/core/dev.c
  23. +@@ -12060,7 +12060,7 @@ static void __init net_dev_struct_check(void)
  24. + #ifdef CONFIG_NET_XGRESS
  25. + CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_tx, tcx_egress);
  26. + #endif
  27. +- CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_tx, 160);
  28. ++ CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_tx, 192);
  29. +
  30. + /* TXRX read-mostly hotpath */
  31. + CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, lstats);
  32. --- a/target/linux/qualcommax/image/ipq50xx.mk
  33. +++ b/target/linux/qualcommax/image/ipq50xx.mk
  34. @@ -57,6 +57,18 @@ define Device/glinet_gl-b3000
  35. endef
  36. TARGET_DEVICES += glinet_gl-b3000
  37. +define Device/jdcloud_re-cs-03
  38. + $(call Device/FitImage)
  39. + $(call Device/EmmcImage)
  40. + SOC := ipq5018
  41. + BLOCKSIZE := 64k
  42. + KERNEL_SIZE := 6144k
  43. + DEVICE_VENDOR := JDCloud
  44. + DEVICE_MODEL := AX3000
  45. + DEVICE_DTS_CONFIG := [email protected]
  46. +endef
  47. +TARGET_DEVICES += jdcloud_re-cs-03
  48. +
  49. define Device/iodata_wn-dax3000gr
  50. $(call Device/FitImageLzma)
  51. DEVICE_VENDOR := I-O DATA
  52. --- a/target/linux/qualcommax/ipq50xx/base-files/etc/board.d/02_network
  53. +++ b/target/linux/qualcommax/ipq50xx/base-files/etc/board.d/02_network
  54. @@ -15,6 +15,7 @@ ipq50xx_setup_interfaces()
  55. glinet,gl-b3000)
  56. ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
  57. ;;
  58. + jdcloud,re-cs-03|\
  59. linksys,mx2000|\
  60. linksys,mx5500|\
  61. linksys,spnmx56|\
  62. --- a/target/linux/qualcommax/ipq50xx/base-files/lib/upgrade/platform.sh
  63. +++ b/target/linux/qualcommax/ipq50xx/base-files/lib/upgrade/platform.sh
  64. @@ -120,6 +120,11 @@ platform_do_upgrade() {
  65. glinet,gl-b3000)
  66. glinet_do_upgrade "$1"
  67. ;;
  68. + jdcloud,re-cs-03)
  69. + CI_KERNPART="0:HLOS"
  70. + CI_ROOTPART="rootfs"
  71. + emmc_do_upgrade "$1"
  72. + ;;
  73. linksys,mr5500|\
  74. linksys,mx2000|\
  75. linksys,mx5500|\
  76. @@ -157,3 +162,12 @@ platform_do_upgrade() {
  77. ;;
  78. esac
  79. }
  80. +
  81. +platform_copy_config() {
  82. + case "$(board_name)" in
  83. + jdcloud,re-cs-03)
  84. + emmc_copy_config
  85. + ;;
  86. + esac
  87. + return 0;
  88. +}