kernel: bump 6.1 to 6.1.68

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.68 Removed upstreamed: generic/backport-6.1/795-v6.6-12-r8152-Rename-RTL8152_UNPLUG-to-RTL8152_INACCESSIBLE.patch[1] Manually rebased: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.68&id=3759e735562a31e44fee825498f05c06e64b25a8 Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me>
graysky2 · Dec 19, 2023 · 1e6c6a3 · 1e6c6a3
1 parent 2872ff7
commit 1e6c6a3
Show file tree

Hide file tree

Showing 25 changed files with 51 additions and 498 deletions.
diff --git a/include/kernel-6.1 b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .67
-LINUX_KERNEL_HASH-6.1.67 = 7537db7289ca4854a126bc1237c47c5b21784bcbf27b4e571d389e3528c59285
+LINUX_VERSION-6.1 = .68
+LINUX_KERNEL_HASH-6.1.68 = 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1
diff --git a/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
@@ -750,7 +750,7 @@ SVN-Revision: 35130
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4179,14 +4179,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4183,14 +4183,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
 

diff --git a/...t/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/...t/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1430,6 +1430,7 @@ static bool pl011_tx_char(struct uart_am
+@@ -1426,6 +1426,7 @@ static bool pl011_tx_char(struct uart_am
  		return false; /* unable to transmit character */
 
  	pl011_write(c, uap, REG_DR);

diff --git a/.../linux/bcm27xx/patches-6.1/950-0102-amba_pl011-Add-cts-event-workaround-DT-property.patch b/.../linux/bcm27xx/patches-6.1/950-0102-amba_pl011-Add-cts-event-workaround-DT-property.patch
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
    - reg
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -2805,6 +2805,11 @@ static int pl011_probe(struct amba_devic
+@@ -2801,6 +2801,11 @@ static int pl011_probe(struct amba_devic
  	if (IS_ERR(uap->clk))
  		return PTR_ERR(uap->clk);
 

diff --git a/.../linux/bcm27xx/patches-6.1/950-0103-tty-amba-pl011-Avoid-rare-write-when-full-error.patch b/.../linux/bcm27xx/patches-6.1/950-0103-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
@@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1491,6 +1491,10 @@ static bool pl011_tx_chars(struct uart_a
+@@ -1487,6 +1487,10 @@ static bool pl011_tx_chars(struct uart_a
  		if (likely(from_irq) && count-- == 0)
  			break;
 

diff --git a/target/linux/bcm27xx/patches-6.1/950-0146-sc16is7xx-Don-t-spin-if-no-data-received.patch b/target/linux/bcm27xx/patches-6.1/950-0146-sc16is7xx-Don-t-spin-if-no-data-received.patch
@@ -12,8 +12,8 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/tty/serial/sc16is7xx.c
 +++ b/drivers/tty/serial/sc16is7xx.c
-@@ -771,6 +771,8 @@ static bool sc16is7xx_port_irq(struct sc
- 			rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
+@@ -783,6 +783,8 @@ static bool sc16is7xx_port_irq(struct sc
+
  			if (rxlen)
  				sc16is7xx_handle_rx(port, rxlen, iir);
 +			else

diff --git a/...x/generic/backport-6.1/795-v6.3-01-r8152-add-USB-device-driver-for-config-selection.patch b/...x/generic/backport-6.1/795-v6.3-01-r8152-add-USB-device-driver-for-config-selection.patch
@@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -9661,6 +9661,9 @@ static int rtl8152_probe(struct usb_inte
+@@ -9675,6 +9675,9 @@ static int rtl8152_probe(struct usb_inte
  	if (version == RTL_VER_UNKNOWN)
  		return -ENODEV;
 
@@ -97,7 +97,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	if (!rtl_vendor_mode(intf))
  		return -ENODEV;
 
-@@ -9861,43 +9864,35 @@ static void rtl8152_disconnect(struct us
+@@ -9875,43 +9878,35 @@ static void rtl8152_disconnect(struct us
  	}
  }
 
@@ -164,7 +164,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	{}
  };
 
-@@ -9917,7 +9912,61 @@ static struct usb_driver rtl8152_driver
+@@ -9931,7 +9926,61 @@ static struct usb_driver rtl8152_driver
  	.disable_hub_initiated_lpm = 1,
  };
 

diff --git a/...et/linux/generic/backport-6.1/795-v6.3-03-r8152-avoid-to-change-cfg-for-all-devices.patch b/...et/linux/generic/backport-6.1/795-v6.3-03-r8152-avoid-to-change-cfg-for-all-devices.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -9542,9 +9542,8 @@ static int rtl_fw_init(struct r8152 *tp)
+@@ -9556,9 +9556,8 @@ static int rtl_fw_init(struct r8152 *tp)
  	return 0;
  }
 
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	u32 ocp_data = 0;
  	__le32 *tmp;
  	u8 version;
-@@ -9614,10 +9613,19 @@ u8 rtl8152_get_version(struct usb_interf
+@@ -9628,10 +9627,19 @@ u8 rtl8152_get_version(struct usb_interf
  		break;
  	default:
  		version = RTL_VER_UNKNOWN;
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	dev_dbg(&intf->dev, "Detected version 0x%04x\n", version);
 
  	return version;
-@@ -9917,6 +9925,12 @@ static int rtl8152_cfgselector_probe(str
+@@ -9931,6 +9939,12 @@ static int rtl8152_cfgselector_probe(str
  	struct usb_host_config *c;
  	int i, num_configs;
 

diff --git a/target/linux/generic/backport-6.1/795-v6.3-04-r8152-remove-rtl_vendor_mode-function.patch b/target/linux/generic/backport-6.1/795-v6.3-04-r8152-remove-rtl_vendor_mode-function.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -8274,43 +8274,6 @@ static bool rtl_check_vendor_ok(struct u
+@@ -8288,43 +8288,6 @@ static bool rtl_check_vendor_ok(struct u
  	return true;
  }
 
@@ -60,7 +60,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  static int rtl8152_pre_reset(struct usb_interface *intf)
  {
  	struct r8152 *tp = usb_get_intfdata(intf);
-@@ -9672,7 +9635,7 @@ static int rtl8152_probe(struct usb_inte
+@@ -9686,7 +9649,7 @@ static int rtl8152_probe(struct usb_inte
  	if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
  		return -ENODEV;
 

diff --git a/...neric/backport-6.1/795-v6.3-05-r8152-reduce-the-control-transfer-of-rtl8152_get_ver.patch b/...neric/backport-6.1/795-v6.3-05-r8152-reduce-the-control-transfer-of-rtl8152_get_ver.patch
@@ -18,7 +18,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -9624,20 +9624,21 @@ static int rtl8152_probe(struct usb_inte
+@@ -9638,20 +9638,21 @@ static int rtl8152_probe(struct usb_inte
  			 const struct usb_device_id *id)
  {
  	struct usb_device *udev = interface_to_usbdev(intf);

diff --git a/target/linux/generic/backport-6.1/795-v6.4-07-r8152-fix-the-autosuspend-doesn-t-work.patch b/target/linux/generic/backport-6.1/795-v6.4-07-r8152-fix-the-autosuspend-doesn-t-work.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -9925,6 +9925,7 @@ static struct usb_device_driver rtl8152_
+@@ -9939,6 +9939,7 @@ static struct usb_device_driver rtl8152_
  	.probe =	rtl8152_cfgselector_probe,
  	.id_table =	rtl8152_table,
  	.generic_subclass = 1,

diff --git a/target/linux/generic/backport-6.1/795-v6.6-09-r8152-set-bp-in-bulk.patch b/target/linux/generic/backport-6.1/795-v6.6-09-r8152-set-bp-in-bulk.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -3984,29 +3984,10 @@ static void rtl_reset_bmu(struct r8152 *
+@@ -3990,29 +3990,10 @@ static void rtl_reset_bmu(struct r8152 *
  /* Clear the bp to stop the firmware before loading a new one */
  static void rtl_clear_bp(struct r8152 *tp, u16 type)
  {
@@ -48,7 +48,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  	case RTL_VER_08:
  	case RTL_VER_09:
  	case RTL_VER_10:
-@@ -4014,32 +3995,31 @@ static void rtl_clear_bp(struct r8152 *t
+@@ -4020,32 +4001,31 @@ static void rtl_clear_bp(struct r8152 *t
  	case RTL_VER_12:
  	case RTL_VER_13:
  	case RTL_VER_15:
@@ -100,7 +100,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
  	/* wait 3 ms to make sure the firmware is stopped */
  	usleep_range(3000, 6000);
-@@ -5016,10 +4996,9 @@ static void rtl8152_fw_phy_nc_apply(stru
+@@ -5022,10 +5002,9 @@ static void rtl8152_fw_phy_nc_apply(stru
 
  static void rtl8152_fw_mac_apply(struct r8152 *tp, struct fw_mac *mac)
  {
@@ -112,7 +112,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
  	switch (__le32_to_cpu(mac->blk_hdr.type)) {
  	case RTL_FW_PLA:
-@@ -5061,12 +5040,8 @@ static void rtl8152_fw_mac_apply(struct
+@@ -5067,12 +5046,8 @@ static void rtl8152_fw_mac_apply(struct
  	ocp_write_word(tp, type, __le16_to_cpu(mac->bp_ba_addr),
  		       __le16_to_cpu(mac->bp_ba_value));
 

diff --git a/target/linux/generic/backport-6.1/795-v6.6-10-eth-r8152-try-to-use-a-normal-budget.patch b/target/linux/generic/backport-6.1/795-v6.6-10-eth-r8152-try-to-use-a-normal-budget.patch
@@ -27,7 +27,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -9770,8 +9770,7 @@ static int rtl8152_probe(struct usb_inte
+@@ -9784,8 +9784,7 @@ static int rtl8152_probe(struct usb_inte
 
  	usb_set_intfdata(intf, tp);
 

diff --git a/...eneric/backport-6.1/795-v6.6-11-r8152-add-vendor-device-ID-pair-for-D-Link-DUB-E250.patch b/...eneric/backport-6.1/795-v6.6-11-r8152-add-vendor-device-ID-pair-for-D-Link-DUB-E250.patch
@@ -29,7 +29,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  extern u8 rtl8152_get_version(struct usb_interface *intf);
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -9846,6 +9846,7 @@ static const struct usb_device_id rtl815
+@@ -9860,6 +9860,7 @@ static const struct usb_device_id rtl815
  	{ USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041) },
  	{ USB_DEVICE(VENDOR_ID_NVIDIA,  0x09ff) },
  	{ USB_DEVICE(VENDOR_ID_TPLINK,  0x0601) },