[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: kernel: refresh `6.6` patches (coolsnowwolf#13179) kernel: refresh `6.12` patches (coolsnowwolf#13178)
BCYDTZ · Dec 7, 2024 · d0411cf · d0411cf
2 parents afe98d4 + fd9b9cc
commit d0411cf
Show file tree

Hide file tree

Showing 82 changed files with 420 additions and 640 deletions.
diff --git a/target/linux/bcm27xx/patches-6.6/950-0092-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-6.6/950-0092-MMC-added-alternative-MMC-driver.patch
@@ -285,7 +285,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  static inline int mmc_blk_part_switch(struct mmc_card *card,
  				      unsigned int part_type);
  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -3066,6 +3073,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3016,6 +3023,8 @@ static int mmc_blk_probe(struct mmc_card
  {
  	struct mmc_blk_data *md;
  	int ret = 0;
@@ -294,7 +294,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
  	/*
  	 * Check that the card supports the command class(es) we need.
-@@ -3073,7 +3082,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3023,7 +3032,16 @@ static int mmc_blk_probe(struct mmc_card
  	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
  		return -ENODEV;
 
@@ -312,7 +312,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
  	card->complete_wq = alloc_workqueue("mmc_complete",
  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -3088,6 +3106,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -3038,6 +3056,17 @@ static int mmc_blk_probe(struct mmc_card
  		goto out_free;
  	}
 

diff --git a/target/linux/generic/backport-6.6/780-22-v6.12-r8169-add-support-for-RTL8126A-rev.b.patch b/target/linux/generic/backport-6.6/780-22-v6.12-r8169-add-support-for-RTL8126A-rev.b.patch
@@ -44,7 +44,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  };
 
  static const struct pci_device_id rtl8169_pci_tbl[] = {
-@@ -1201,7 +1203,7 @@ static void rtl_writephy(struct rtl8169_
+@@ -1228,7 +1230,7 @@ static void rtl_writephy(struct rtl8169_
  	case RTL_GIGA_MAC_VER_31:
  		r8168dp_2_mdio_write(tp, location, val);
  		break;
@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		r8168g_mdio_write(tp, location, val);
  		break;
  	default:
-@@ -1216,7 +1218,7 @@ static int rtl_readphy(struct rtl8169_pr
+@@ -1243,7 +1245,7 @@ static int rtl_readphy(struct rtl8169_pr
  	case RTL_GIGA_MAC_VER_28:
  	case RTL_GIGA_MAC_VER_31:
  		return r8168dp_2_mdio_read(tp, location);
@@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		return r8168g_mdio_read(tp, location);
  	default:
  		return r8169_mdio_read(tp, location);
-@@ -1425,7 +1427,7 @@ static void rtl_set_d3_pll_down(struct r
+@@ -1452,7 +1454,7 @@ static void rtl_set_d3_pll_down(struct r
  	case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26:
  	case RTL_GIGA_MAC_VER_29 ... RTL_GIGA_MAC_VER_30:
  	case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_37:
@@ -71,7 +71,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		if (enable)
  			RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~D3_NO_PLL_DOWN);
  		else
-@@ -1592,7 +1594,7 @@ static void __rtl8169_set_wol(struct rtl
+@@ -1619,7 +1621,7 @@ static void __rtl8169_set_wol(struct rtl
  		break;
  	case RTL_GIGA_MAC_VER_34:
  	case RTL_GIGA_MAC_VER_37:
@@ -80,31 +80,31 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		if (wolopts)
  			rtl_mod_config2(tp, 0, PME_SIGNAL);
  		else
-@@ -2071,6 +2073,7 @@ static void rtl_set_eee_txidle_timer(str
+@@ -2098,6 +2100,7 @@ static void rtl_set_eee_txidle_timer(str
  	case RTL_GIGA_MAC_VER_61:
  	case RTL_GIGA_MAC_VER_63:
  	case RTL_GIGA_MAC_VER_65:
 +	case RTL_GIGA_MAC_VER_66:
  		tp->tx_lpi_timer = timer_val;
  		RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);
  		break;
-@@ -2200,6 +2203,7 @@ static enum mac_version rtl8169_get_mac_
+@@ -2227,6 +2230,7 @@ static enum mac_version rtl8169_get_mac_
  		enum mac_version ver;
  	} mac_info[] = {
  		/* 8126A family. */
 +		{ 0x7cf, 0x64a,	RTL_GIGA_MAC_VER_66 },
  		{ 0x7cf, 0x649,	RTL_GIGA_MAC_VER_65 },
 
  		/* 8125B family. */
-@@ -2471,6 +2475,7 @@ static void rtl_init_rxcfg(struct rtl816
+@@ -2498,6 +2502,7 @@ static void rtl_init_rxcfg(struct rtl816
  		break;
  	case RTL_GIGA_MAC_VER_63:
  	case RTL_GIGA_MAC_VER_65:
 +	case RTL_GIGA_MAC_VER_66:
  		RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST |
  			RX_PAUSE_SLOT_ON);
  		break;
-@@ -2657,7 +2662,7 @@ static void rtl_wait_txrx_fifo_empty(str
+@@ -2684,7 +2689,7 @@ static void rtl_wait_txrx_fifo_empty(str
  	case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_61:
  		rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
  		break;
@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq);
  		rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42);
  		rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond_2, 100, 42);
-@@ -2900,7 +2905,7 @@ static void rtl_enable_exit_l1(struct rt
+@@ -2927,7 +2932,7 @@ static void rtl_enable_exit_l1(struct rt
  	case RTL_GIGA_MAC_VER_37 ... RTL_GIGA_MAC_VER_38:
  		rtl_eri_set_bits(tp, 0xd4, 0x0c00);
  		break;
@@ -122,7 +122,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		r8168_mac_ocp_modify(tp, 0xc0ac, 0, 0x1f80);
  		break;
  	default:
-@@ -2914,7 +2919,7 @@ static void rtl_disable_exit_l1(struct r
+@@ -2941,7 +2946,7 @@ static void rtl_disable_exit_l1(struct r
  	case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_38:
  		rtl_eri_clear_bits(tp, 0xd4, 0x1f00);
  		break;
@@ -131,15 +131,15 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		r8168_mac_ocp_modify(tp, 0xc0ac, 0x1f80, 0);
  		break;
  	default:
-@@ -2941,6 +2946,7 @@ static void rtl_hw_aspm_clkreq_enable(st
+@@ -2968,6 +2973,7 @@ static void rtl_hw_aspm_clkreq_enable(st
  		rtl_mod_config5(tp, 0, ASPM_en);
  		switch (tp->mac_version) {
  		case RTL_GIGA_MAC_VER_65:
 +		case RTL_GIGA_MAC_VER_66:
  			val8 = RTL_R8(tp, INT_CFG0_8125) | INT_CFG0_CLKREQEN;
  			RTL_W8(tp, INT_CFG0_8125, val8);
  			break;
-@@ -2951,7 +2957,7 @@ static void rtl_hw_aspm_clkreq_enable(st
+@@ -2978,7 +2984,7 @@ static void rtl_hw_aspm_clkreq_enable(st
 
  		switch (tp->mac_version) {
  		case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:
@@ -148,7 +148,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  			/* reset ephy tx/rx disable timer */
  			r8168_mac_ocp_modify(tp, 0xe094, 0xff00, 0);
  			/* chip can trigger L1.2 */
-@@ -2963,7 +2969,7 @@ static void rtl_hw_aspm_clkreq_enable(st
+@@ -2990,7 +2996,7 @@ static void rtl_hw_aspm_clkreq_enable(st
  	} else {
  		switch (tp->mac_version) {
  		case RTL_GIGA_MAC_VER_46 ... RTL_GIGA_MAC_VER_48:
@@ -157,15 +157,15 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  			r8168_mac_ocp_modify(tp, 0xe092, 0x00ff, 0);
  			break;
  		default:
-@@ -2972,6 +2978,7 @@ static void rtl_hw_aspm_clkreq_enable(st
+@@ -2999,6 +3005,7 @@ static void rtl_hw_aspm_clkreq_enable(st
 
  		switch (tp->mac_version) {
  		case RTL_GIGA_MAC_VER_65:
 +		case RTL_GIGA_MAC_VER_66:
  			val8 = RTL_R8(tp, INT_CFG0_8125) & ~INT_CFG0_CLKREQEN;
  			RTL_W8(tp, INT_CFG0_8125, val8);
  			break;
-@@ -3691,10 +3698,12 @@ static void rtl_hw_start_8125_common(str
+@@ -3718,10 +3725,12 @@ static void rtl_hw_start_8125_common(str
  	/* disable new tx descriptor format */
  	r8168_mac_ocp_modify(tp, 0xeb58, 0x0001, 0x0000);
 
@@ -180,7 +180,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0400);
  	else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
  		r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
-@@ -3712,7 +3721,8 @@ static void rtl_hw_start_8125_common(str
+@@ -3739,7 +3748,8 @@ static void rtl_hw_start_8125_common(str
  	r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
  	r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
  	r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
@@ -190,23 +190,23 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		r8168_mac_ocp_modify(tp, 0xea1c, 0x0300, 0x0000);
  	else
  		r8168_mac_ocp_modify(tp, 0xea1c, 0x0004, 0x0000);
-@@ -3826,6 +3836,7 @@ static void rtl_hw_config(struct rtl8169
+@@ -3853,6 +3863,7 @@ static void rtl_hw_config(struct rtl8169
  		[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
  		[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
  		[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8126a,
 +		[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8126a,
  	};
 
  	if (hw_configs[tp->mac_version])
-@@ -3846,6 +3857,7 @@ static void rtl_hw_start_8125(struct rtl
+@@ -3873,6 +3884,7 @@ static void rtl_hw_start_8125(struct rtl
  		break;
  	case RTL_GIGA_MAC_VER_63:
  	case RTL_GIGA_MAC_VER_65:
 +	case RTL_GIGA_MAC_VER_66:
  		for (i = 0xa00; i < 0xa80; i += 4)
  			RTL_W32(tp, i, 0);
  		RTL_W16(tp, INT_CFG1_8125, 0x0000);
-@@ -4074,7 +4086,7 @@ static void rtl8169_cleanup(struct rtl81
+@@ -4101,7 +4113,7 @@ static void rtl8169_cleanup(struct rtl81
  		RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq);
  		rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 666);
  		break;
@@ -215,7 +215,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		rtl_enable_rxdvgate(tp);
  		fsleep(2000);
  		break;
-@@ -4225,7 +4237,7 @@ static unsigned int rtl_quirk_packet_pad
+@@ -4252,7 +4264,7 @@ static unsigned int rtl_quirk_packet_pad
 
  	switch (tp->mac_version) {
  	case RTL_GIGA_MAC_VER_34:
@@ -224,7 +224,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  		padto = max_t(unsigned int, padto, ETH_ZLEN);
  		break;
  	default:
-@@ -5259,7 +5271,7 @@ static void rtl_hw_initialize(struct rtl
+@@ -5288,7 +5300,7 @@ static void rtl_hw_initialize(struct rtl
  	case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
  		rtl_hw_init_8168g(tp);
  		break;
@@ -235,7 +235,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  	default:
 --- a/drivers/net/ethernet/realtek/r8169_phy_config.c
 +++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
-@@ -1159,6 +1159,7 @@ void r8169_hw_phy_config(struct rtl8169_
+@@ -1161,6 +1161,7 @@ void r8169_hw_phy_config(struct rtl8169_
  		[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
  		[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
  		[RTL_GIGA_MAC_VER_65] = rtl8126a_hw_phy_config,

diff --git a/target/linux/generic/hack-6.12/253-ksmbd-config.patch b/target/linux/generic/hack-6.12/253-ksmbd-config.patch
@@ -1,6 +1,6 @@
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -2030,7 +2030,7 @@ config PADATA
+@@ -2043,7 +2043,7 @@ config PADATA
  	bool
 
  config ASN1

diff --git a/target/linux/generic/hack-6.12/410-block-fit-partition-parser.patch b/target/linux/generic/hack-6.12/410-block-fit-partition-parser.patch
@@ -1,6 +1,6 @@
 --- a/block/blk.h
 +++ b/block/blk.h
-@@ -558,6 +558,8 @@ void blk_free_ext_minor(unsigned int min
+@@ -564,6 +564,8 @@ void blk_free_ext_minor(unsigned int min
  #define ADDPART_FLAG_NONE	0
  #define ADDPART_FLAG_RAID	1
  #define ADDPART_FLAG_WHOLEDISK	2

diff --git a/target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.12/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
@@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -712,8 +712,6 @@ config NFT_REJECT_NETDEV
+@@ -715,8 +715,6 @@ config NFT_REJECT_NETDEV
 
  endif # NF_TABLES_NETDEV
 
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  config NF_FLOW_TABLE_INET
  	tristate "Netfilter flow table mixed IPv4/IPv6 module"
  	depends on NF_FLOW_TABLE
-@@ -722,11 +720,12 @@ config NF_FLOW_TABLE_INET
+@@ -725,11 +723,12 @@ config NF_FLOW_TABLE_INET
 
  	  To compile it as a module, choose M here.
 

diff --git a/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1082,6 +1082,7 @@ static const struct usb_device_id produc
+@@ -1083,6 +1083,7 @@ static const struct usb_device_id produc
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},	/* Quectel EM160R-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},	/* Quectel RM500Q-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},	/* Quectel RM520N */
@@ -19,7 +19,7 @@
 
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1199,6 +1201,11 @@ static const struct usb_device_id option
+@@ -1201,6 +1203,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

diff --git a/target/linux/generic/hack-6.12/902-debloat_proc.patch b/target/linux/generic/hack-6.12/902-debloat_proc.patch
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (!pe)
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -2192,10 +2192,12 @@ void __init init_mm_internals(void)
+@@ -2194,10 +2194,12 @@ void __init init_mm_internals(void)
  	start_shepherd_timer();
  #endif
  #ifdef CONFIG_PROC_FS
@@ -319,7 +319,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4223,6 +4223,8 @@ static __net_initdata struct pernet_oper
+@@ -4229,6 +4229,8 @@ static __net_initdata struct pernet_oper
 
  static int __init proto_init(void)
  {

diff --git a/target/linux/generic/hack-6.12/904-debloat_dma_buf.patch b/target/linux/generic/hack-6.12/904-debloat_dma_buf.patch
@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +dma-shared-buffer-objs :=  $(dma-buf-objs-y)
 --- a/drivers/dma-buf/dma-buf.c
 +++ b/drivers/dma-buf/dma-buf.c
-@@ -1731,4 +1731,5 @@ static void __exit dma_buf_deinit(void)
+@@ -1743,4 +1743,5 @@ static void __exit dma_buf_deinit(void)
  	kern_unmount(dma_buf_mnt);
  	dma_buf_uninit_sysfs_statistics();
  }
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4487,6 +4487,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4419,6 +4419,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }

diff --git a/target/linux/generic/hack-6.12/920-device_tree_cmdline.patch b/target/linux/generic/hack-6.12/920-device_tree_cmdline.patch
@@ -1,6 +1,6 @@
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1051,6 +1051,9 @@ int __init early_init_dt_scan_chosen(cha
+@@ -1052,6 +1052,9 @@ int __init early_init_dt_scan_chosen(cha
  	p = of_get_flat_dt_prop(node, "bootargs", &l);
  	if (p != NULL && l > 0)
  		strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));

diff --git a/...et/linux/generic/hack-6.12/952-add-net-conntrack-events-support-multiple-registrant.patch b/...et/linux/generic/hack-6.12/952-add-net-conntrack-events-support-multiple-registrant.patch
@@ -123,7 +123,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2801,6 +2801,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2750,6 +2750,10 @@ int nf_conntrack_init_net(struct net *ne
  	nf_conntrack_ecache_pernet_init(net);
  	nf_conntrack_proto_pernet_init(net);
 
@@ -299,7 +299,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
-@@ -723,12 +723,19 @@ static size_t ctnetlink_nlmsg_size(const
+@@ -721,12 +721,19 @@ static size_t ctnetlink_nlmsg_size(const
  }
 
  static int
@@ -319,7 +319,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	struct nf_conn *ct = item->ct;
  	struct sk_buff *skb;
  	unsigned int type;
-@@ -3750,11 +3757,17 @@ static int ctnetlink_stat_exp_cpu(struct
+@@ -3754,11 +3761,17 @@ static int ctnetlink_stat_exp_cpu(struct
  }
 
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -337,7 +337,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
 
  static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
  	[IPCTNL_MSG_CT_NEW]	= {
-@@ -3853,8 +3866,12 @@ static int __net_init ctnetlink_net_init
+@@ -3857,8 +3870,12 @@ static int __net_init ctnetlink_net_init
  static void ctnetlink_net_pre_exit(struct net *net)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS