kernel: bump 6.6 to 6.6.36

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.36

Manually rebased:
        generic/hack-6.6/765-mxl-gpy-control-LED-reg-from-DT.patch
        bcm27xx/patches-6.6/950-0536-dmaengine-dw-axi-dmac-Fixes-for-RP1.patch

Removed upstreamed:
	bmips/patches-6.6/010-v6.10-mips-bmips-BCM6358-make-sure-CBR-is-correctly-set.patch[1]

All other patches automatically rebased.

1. openwrt@7c9644a

Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <[email protected]>

include/kernel-6.6

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .35
-LINUX_KERNEL_HASH-6.6.35 = fce3ee728712ed063aa8c14a8756c8ff8c7a46ba3827f61d2b04a73c7cf5dd9e
+LINUX_VERSION-6.6 = .36
+LINUX_KERNEL_HASH-6.6.36 = b9676828b737e8fb8eaa5198303d35d35e8df019550be153c8a42c99afe0cdd5

target/linux/bcm27xx/patches-6.6/950-0169-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch

@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201
 
-@@ -1404,6 +1407,9 @@
+@@ -1405,6 +1408,9 @@
  #define USB_VENDOR_ID_XIAOMI		0x2717
  #define USB_DEVICE_ID_MI_SILENT_MOUSE	0x5014
 

target/linux/bcm27xx/patches-6.6/950-0536-dmaengine-dw-axi-dmac-Fixes-for-RP1.patch

@@ -93,16 +93,16 @@ Signed-off-by: Phil Elwell <[email protected]>
  	for (i = 0; i < chip->dw->hdata->nr_channels; i++) {
  		axi_chan_irq_disable(&chip->dw->chan[i], DWAXIDMAC_IRQ_ALL);
  		axi_chan_disable(&chip->dw->chan[i]);
-@@ -282,7 +305,7 @@ static struct axi_dma_lli *axi_desc_get(
+@@ -283,7 +306,7 @@ static struct axi_dma_lli *axi_desc_get(
  static void axi_desc_put(struct axi_dma_desc *desc)
  {
  	struct axi_dma_chan *chan = desc->chan;
--	int count = atomic_read(&chan->descs_allocated);
+-	int count = desc->nr_hw_descs;
 +	u32 count = desc->hw_desc_count;
  	struct axi_dma_hw_desc *hw_desc;
  	int descs_put;
 
-@@ -304,6 +327,48 @@ static void vchan_desc_put(struct virt_d
+@@ -305,6 +328,48 @@ static void vchan_desc_put(struct virt_d
  	axi_desc_put(vd_to_axi_desc(vdesc));
  }
 
@@ -151,7 +151,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  static enum dma_status
  dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie,
  		  struct dma_tx_state *txstate)
-@@ -313,10 +378,7 @@ dma_chan_tx_status(struct dma_chan *dcha
+@@ -314,10 +379,7 @@ dma_chan_tx_status(struct dma_chan *dcha
  	enum dma_status status;
  	u32 completed_length;
  	unsigned long flags;
@@ -162,7 +162,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
  	status = dma_cookie_status(dchan, cookie, txstate);
  	if (status == DMA_COMPLETE || !txstate)
-@@ -325,16 +387,31 @@ dma_chan_tx_status(struct dma_chan *dcha
+@@ -326,16 +388,31 @@ dma_chan_tx_status(struct dma_chan *dcha
  	spin_lock_irqsave(&chan->vc.lock, flags);
 
  	vdesc = vchan_find_desc(&chan->vc, cookie);
@@ -201,7 +201,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
  	return status;
  }
-@@ -522,7 +599,7 @@ static void dw_axi_dma_set_hw_channel(st
+@@ -523,7 +600,7 @@ static void dw_axi_dma_set_hw_channel(st
  	unsigned long reg_value, val;
 
  	if (!chip->apb_regs) {
@@ -210,7 +210,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  		return;
  	}
 
-@@ -626,18 +703,25 @@ static int dw_axi_dma_set_hw_desc(struct
+@@ -627,18 +704,25 @@ static int dw_axi_dma_set_hw_desc(struct
  	switch (chan->direction) {
  	case DMA_MEM_TO_DEV:
  		reg_width = __ffs(chan->config.dst_addr_width);
@@ -238,7 +238,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  			DWAXIDMAC_CH_CTL_L_INC << CH_CTL_L_DST_INC_POS |
  			DWAXIDMAC_CH_CTL_L_NOINC << CH_CTL_L_SRC_INC_POS;
  		block_ts = len >> reg_width;
-@@ -673,9 +757,6 @@ static int dw_axi_dma_set_hw_desc(struct
+@@ -674,9 +758,6 @@ static int dw_axi_dma_set_hw_desc(struct
  	}
 
  	hw_desc->lli->block_ts_lo = cpu_to_le32(block_ts - 1);
@@ -248,7 +248,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	hw_desc->lli->ctl_lo = cpu_to_le32(ctllo);
 
  	set_desc_src_master(hw_desc);
-@@ -770,6 +851,8 @@ dw_axi_dma_chan_prep_cyclic(struct dma_c
+@@ -771,6 +852,8 @@ dw_axi_dma_chan_prep_cyclic(struct dma_c
  		src_addr += segment_len;
  	}
 
@@ -257,7 +257,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	llp = desc->hw_desc[0].llp;
 
  	/* Managed transfer list */
-@@ -849,6 +932,8 @@ dw_axi_dma_chan_prep_slave_sg(struct dma
+@@ -850,6 +933,8 @@ dw_axi_dma_chan_prep_slave_sg(struct dma
  		} while (len >= segment_len);
  	}
 
@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	/* Set end-of-link to the last link descriptor of list */
  	set_desc_last(&desc->hw_desc[num_sgs - 1]);
 
-@@ -956,6 +1041,8 @@ dma_chan_prep_dma_memcpy(struct dma_chan
+@@ -957,6 +1042,8 @@ dma_chan_prep_dma_memcpy(struct dma_chan
  		num++;
  	}
 
@@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	/* Set end-of-link to the last link descriptor of list */
  	set_desc_last(&desc->hw_desc[num - 1]);
  	/* Managed transfer list */
-@@ -1004,7 +1091,7 @@ static void axi_chan_dump_lli(struct axi
+@@ -1005,7 +1092,7 @@ static void axi_chan_dump_lli(struct axi
  static void axi_chan_list_dump_lli(struct axi_dma_chan *chan,
  				   struct axi_dma_desc *desc_head)
  {
@@ -284,7 +284,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	int i;
 
  	for (i = 0; i < count; i++)
-@@ -1047,11 +1134,11 @@ out:
+@@ -1048,11 +1135,11 @@ out:
 
  static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
  {
@@ -297,15 +297,15 @@ Signed-off-by: Phil Elwell <[email protected]>
  	u64 llp;
  	int i;
 
-@@ -1073,6 +1160,7 @@ static void axi_chan_block_xfer_complete
+@@ -1074,6 +1161,7 @@ static void axi_chan_block_xfer_complete
  	if (chan->cyclic) {
  		desc = vd_to_axi_desc(vd);
  		if (desc) {
 +			count = desc->hw_desc_count;
  			llp = lo_hi_readq(chan->chan_regs + CH_LLP);
  			for (i = 0; i < count; i++) {
  				hw_desc = &desc->hw_desc[i];
-@@ -1325,6 +1413,10 @@ static int parse_device_properties(struc
+@@ -1323,6 +1411,10 @@ static int parse_device_properties(struc
 
  	chip->dw->hdata->nr_masters = tmp;
 

target/linux/bcm27xx/patches-6.6/950-0967-dmaengine-dw-axi-dmac-Fix-a-non-atomic-update.patch

@@ -30,7 +30,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
 +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-@@ -465,8 +465,6 @@ static void axi_chan_block_xfer_start(st
+@@ -466,8 +466,6 @@ static void axi_chan_block_xfer_start(st
  		return;
  	}
 

target/linux/bcm27xx/patches-6.6/950-0986-Revert-net-usb-ax88179_178a-avoid-two-consecutive-de.patch

@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/drivers/net/usb/ax88179_178a.c
 +++ b/drivers/net/usb/ax88179_178a.c
-@@ -1320,6 +1320,8 @@ static int ax88179_bind(struct usbnet *d
+@@ -1319,6 +1319,8 @@ static int ax88179_bind(struct usbnet *d
 
  	ax88179_reset(dev);
 

target/linux/bcm27xx/patches-6.6/950-1047-dw-axi-dmac-platform-Avoid-trampling-with-zero-lengt.patch

@@ -22,7 +22,7 @@ Signed-off-by: Dom Cobley <[email protected]>
 
 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
 +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-@@ -916,6 +916,9 @@ dw_axi_dma_chan_prep_slave_sg(struct dma
+@@ -917,6 +917,9 @@ dw_axi_dma_chan_prep_slave_sg(struct dma
  		mem = sg_dma_address(sg);
  		len = sg_dma_len(sg);
  		num_segments = DIV_ROUND_UP(sg_dma_len(sg), axi_block_len);

target/linux/generic/hack-6.6/765-mxl-gpy-control-LED-reg-from-DT.patch

@@ -55,7 +55,7 @@ Signed-off-by: David Bauer <[email protected]>
  #define PHY_PMA_MGBT_POLARITY	0x82
  #define PHY_MDI_MDI_X_MASK	GENMASK(1, 0)
  #define PHY_MDI_MDI_X_NORMAL	0x3
-@@ -260,6 +267,35 @@ out:
+@@ -270,10 +277,39 @@ out:
  	return ret;
  }
 
@@ -90,15 +90,8 @@ Signed-off-by: David Bauer <[email protected]>
 +
  static int gpy_config_init(struct phy_device *phydev)
  {
- 	int ret;
-@@ -271,7 +307,10 @@ static int gpy_config_init(struct phy_de
-
- 	/* Clear all pending interrupts */
- 	ret = phy_read(phydev, PHY_ISTAT);
--	return ret < 0 ? ret : 0;
-+	if (ret < 0)
-+		return ret;
-+
+ 	/* Nothing to configure. Configuration Requirement Placeholder */
+-	return 0;
 +	return gpy_led_write(phydev);
  }
 

target/linux/generic/hack-6.6/790-SFP-GE-T-ignore-TX_FAULT.patch

@@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  	// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report
  	// 2500MBd NRZ in their EEPROM
  	SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex),
-@@ -2586,7 +2589,8 @@ static void sfp_sm_main(struct sfp *sfp,
+@@ -2589,7 +2592,8 @@ static void sfp_sm_main(struct sfp *sfp,
  			 * or t_start_up, so assume there is a fault.
  			 */
  			sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT,
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  		} else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) {
  	init_done:
  			/* Create mdiobus and start trying for PHY */
-@@ -2840,10 +2844,12 @@ static void sfp_check_state(struct sfp *
+@@ -2843,10 +2847,12 @@ static void sfp_check_state(struct sfp *
  	mutex_lock(&sfp->st_mutex);
  	state = sfp_get_state(sfp);
  	changed = state ^ sfp->state;

target/linux/generic/hack-6.6/810-bcma-ssb-fallback-sprom.patch

@@ -133,7 +133,7 @@ Subject: [PATCH] ssb_sprom: add generic kernel support for Broadcom  Fallback SP
  # host support
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -1287,6 +1287,14 @@ static int __init ssb_modinit(void)
+@@ -1289,6 +1289,14 @@ static int __init ssb_modinit(void)
  {
  	int err;
 

target/linux/generic/hack-6.6/902-debloat_proc.patch

@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4145,6 +4145,8 @@ static __net_initdata struct pernet_oper
+@@ -4148,6 +4148,8 @@ static __net_initdata struct pernet_oper
 
  static int __init proto_init(void)
  {

target/linux/generic/pending-6.6/600-netfilter_conntrack_flush.patch

@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #include <net/net_namespace.h>
  #ifdef CONFIG_SYSCTL
  #include <linux/sysctl.h>
-@@ -461,6 +462,58 @@ static int ct_cpu_seq_show(struct seq_fi
+@@ -458,6 +459,58 @@ static int ct_cpu_seq_show(struct seq_fi
  	return 0;
  }
 
@@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static const struct seq_operations ct_cpu_seq_ops = {
  	.start	= ct_cpu_seq_start,
  	.next	= ct_cpu_seq_next,
-@@ -474,8 +527,9 @@ static int nf_conntrack_standalone_init_
+@@ -471,8 +524,9 @@ static int nf_conntrack_standalone_init_
  	kuid_t root_uid;
  	kgid_t root_gid;
 

target/linux/generic/pending-6.6/630-packet_socket_type.patch

@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -4034,6 +4037,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -4036,6 +4039,16 @@ packet_setsockopt(struct socket *sock, i
  		packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val);
  		return 0;
  	}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -4093,6 +4106,13 @@ static int packet_getsockopt(struct sock
+@@ -4095,6 +4108,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_VNET_HDR_SZ:
  		val = READ_ONCE(po->vnet_hdr_sz);
  		break;