Skip to content

Commit 92a852a

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 5.10 to 5.10.153 (coolsnowwolf#10377) kernel: bump 5.4 to 5.4.223 (coolsnowwolf#10376) generic: add DUAL_READ flag to EON EN25Q128 (coolsnowwolf#10368) netsupport.mk: add MultiPath TCP modules (coolsnowwolf#10358)
2 parents 03fec35 + 6d2ba00 commit 92a852a

21 files changed

+115
-61
lines changed

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .152
2-
LINUX_KERNEL_HASH-5.10.152 = fa0b5c83a4ebfda9f0a52cc693646eb6c24dbade6c37ee2d18b66ee2df15d8a6
1+
LINUX_VERSION-5.10 = .153
2+
LINUX_KERNEL_HASH-5.10.153 = 3cf2e4519fe451caef0ee0a8beac694612267325f7055fc38d6a990a762f1662

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .222
2-
LINUX_KERNEL_HASH-5.4.222 = 351af7a7ee11544e605d9d97add1421576d69459762d9a704f243db7d1c0324b
1+
LINUX_VERSION-5.4 = .223
2+
LINUX_KERNEL_HASH-5.4.223 = 9ef07f12df6887f196e2e21c197f26854859e6b586aa4bfdd4798f562a717eeb

‎package/kernel/linux/modules/netsupport.mk

+46
Original file line numberDiff line numberDiff line change
@@ -1392,3 +1392,49 @@ define KernelPackage/qrtr-mhi/description
13921392
endef
13931393

13941394
$(eval $(call KernelPackage,qrtr-mhi))
1395+
1396+
1397+
define KernelPackage/mptcp
1398+
SUBMENU:=$(NETWORK_SUPPORT_MENU)
1399+
TITLE:=MultiPath TCP support
1400+
KCONFIG:[email protected]=y
1401+
AUTOLOAD:=$(call AutoProbe,mptcp)
1402+
endef
1403+
1404+
define KernelPackage/mptcp/description
1405+
MPTCP is a module made for MultiPath TCP support
1406+
endef
1407+
1408+
$(eval $(call KernelPackage,mptcp))
1409+
1410+
1411+
define KernelPackage/mptcp_ipv6
1412+
SUBMENU:=$(NETWORK_SUPPORT_MENU)
1413+
TITLE:=MultiPath TCP IPv6 support
1414+
DEPENDS:=@IPV6 +kmod-mptcp
1415+
KCONFIG:[email protected]=y
1416+
AUTOLOAD:=$(call AutoProbe,mptcp_ipv6)
1417+
endef
1418+
1419+
define KernelPackage/mptcp_ipv6/description
1420+
MPTCP_IPV6 is a module made for MultiPath TCP IPv6 support
1421+
endef
1422+
1423+
$(eval $(call KernelPackage,mptcp_ipv6))
1424+
1425+
1426+
define KernelPackage/inet-mptcp-diag
1427+
SUBMENU:=$(NETWORK_SUPPORT_MENU)
1428+
TITLE:=INET diag support for MultiPath TCP
1429+
DEPENDS:=kmod-mptcp +kmod-inet-diag
1430+
KCONFIG:= [email protected]
1431+
FILES:= $(LINUX_DIR)/net/mptcp/[email protected]
1432+
AUTOLOAD:=$(call AutoProbe,mptcp_diag)
1433+
endef
1434+
1435+
define KernelPackage/inet-mptcp-diag/description
1436+
Support for INET (MultiPath TCP) socket monitoring interface used by
1437+
native Linux tools such as ss.
1438+
endef
1439+
1440+
$(eval $(call KernelPackage,inet-mptcp-diag))

‎target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ produce a noisy warning.
1313

1414
--- a/drivers/usb/host/xhci-pci.c
1515
+++ b/drivers/usb/host/xhci-pci.c
16-
@@ -287,6 +287,7 @@ static void xhci_pci_quirks(struct devic
16+
@@ -291,6 +291,7 @@ static void xhci_pci_quirks(struct devic
1717
pdev->device == 0x0015) {
1818
xhci->quirks |= XHCI_RESET_ON_RESUME;
1919
xhci->quirks |= XHCI_ZERO_64B_REGS;
@@ -43,7 +43,7 @@ produce a noisy warning.
4343
hcd->msi_enabled = 1;
4444
--- a/drivers/usb/host/xhci.h
4545
+++ b/drivers/usb/host/xhci.h
46-
@@ -1896,6 +1896,7 @@ struct xhci_hcd {
46+
@@ -1897,6 +1897,7 @@ struct xhci_hcd {
4747
struct xhci_hub usb2_rhub;
4848
struct xhci_hub usb3_rhub;
4949
/* support xHCI 1.0 spec USB2 hardware LPM */

‎target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <[email protected]>
9393
static const char hcd_name[] = "xhci_hcd";
9494

9595
static struct hc_driver __read_mostly xhci_pci_hc_driver;
96-
@@ -334,6 +374,873 @@ static void xhci_pme_acpi_rtd3_enable(st
96+
@@ -340,6 +380,873 @@ static void xhci_pme_acpi_rtd3_enable(st
9797
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
9898
#endif /* CONFIG_ACPI */
9999

@@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <[email protected]>
967967
/* called during probe() after chip reset completes */
968968
static int xhci_pci_setup(struct usb_hcd *hcd)
969969
{
970-
@@ -375,6 +1282,27 @@ static int xhci_pci_probe(struct pci_dev
970+
@@ -381,6 +1288,27 @@ static int xhci_pci_probe(struct pci_dev
971971
struct hc_driver *driver;
972972
struct usb_hcd *hcd;
973973

@@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <[email protected]>
995995
driver = (struct hc_driver *)id->driver_data;
996996

997997
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
998-
@@ -436,6 +1364,16 @@ static void xhci_pci_remove(struct pci_d
998+
@@ -442,6 +1370,16 @@ static void xhci_pci_remove(struct pci_d
999999
{
10001000
struct xhci_hcd *xhci;
10011001

@@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <[email protected]>
10121012
xhci = hcd_to_xhci(pci_get_drvdata(dev));
10131013
xhci->xhc_state |= XHCI_STATE_REMOVING;
10141014

1015-
@@ -575,6 +1513,11 @@ static int xhci_pci_resume(struct usb_hc
1015+
@@ -581,6 +1519,11 @@ static int xhci_pci_resume(struct usb_hc
10161016
if (pdev->vendor == PCI_VENDOR_ID_INTEL)
10171017
usb_enable_intel_xhci_ports(pdev);
10181018

‎target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@
706706
EXPORT_SYMBOL(xfrm_parse_spi);
707707
--- a/net/ipv4/tcp_input.c
708708
+++ b/net/ipv4/tcp_input.c
709-
@@ -4127,14 +4127,16 @@ static bool tcp_parse_aligned_timestamp(
709+
@@ -4128,14 +4128,16 @@ static bool tcp_parse_aligned_timestamp(
710710
{
711711
const __be32 *ptr = (const __be32 *)(th + 1);
712712

‎target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@
706706
EXPORT_SYMBOL(xfrm_parse_spi);
707707
--- a/net/ipv4/tcp_input.c
708708
+++ b/net/ipv4/tcp_input.c
709-
@@ -3997,14 +3997,16 @@ static bool tcp_parse_aligned_timestamp(
709+
@@ -3998,14 +3998,16 @@ static bool tcp_parse_aligned_timestamp(
710710
{
711711
const __be32 *ptr = (const __be32 *)(th + 1);
712712

‎target/linux/bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ it on BCM4708 family.
127127
/*
128128
--- a/drivers/usb/host/xhci.h
129129
+++ b/drivers/usb/host/xhci.h
130-
@@ -1889,6 +1889,7 @@ struct xhci_hcd {
131-
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
130+
@@ -1890,6 +1890,7 @@ struct xhci_hcd {
132131
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
133132
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
134-
+#define XHCI_FAKE_DOORBELL BIT_ULL(44)
133+
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
134+
+#define XHCI_FAKE_DOORBELL BIT_ULL(45)
135135

136136
unsigned int num_active_eps;
137137
unsigned int limit_active_eps;

‎target/linux/generic/pending-5.10/476-mtd-spi-nor-add-eon-en25q128.patch

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
From: Piotr Dymacz <[email protected]>
22
Subject: kernel/mtd: add support for EON EN25Q128
33

4+
Add support for EON EN25Q128 with flags SECT_4K and
5+
from documentation supports QUAD_READ
6+
47
Signed-off-by: Piotr Dymacz <[email protected]>
8+
Signed-off-by: Christian Marangi <[email protected]>
59
---
610
drivers/mtd/spi-nor/spi-nor.c | 1 +
711
1 file changed, 1 insertion(+)
812

913
--- a/drivers/mtd/spi-nor/eon.c
1014
+++ b/drivers/mtd/spi-nor/eon.c
11-
@@ -15,6 +15,8 @@ static const struct flash_info eon_parts
15+
@@ -15,6 +15,9 @@ static const struct flash_info eon_parts
1216
{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) },
1317
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
1418
{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
15-
+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) },
19+
+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256,
20+
+ SECT_4K | SPI_NOR_DUAL_READ) },
1621
+ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, SECT_4K) },
1722
{ "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16,
1823
SECT_4K | SPI_NOR_DUAL_READ) },

‎target/linux/generic/pending-5.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch

+9-9
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <[email protected]>
338338
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
339339
return -1;
340340

341-
@@ -1555,6 +1716,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
341+
@@ -1556,6 +1717,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
342342
t->parms.link = p->link;
343343
t->parms.proto = p->proto;
344344
t->parms.fwmark = p->fwmark;
@@ -353,15 +353,15 @@ Signed-off-by: Steven Barth <[email protected]>
353353
dst_cache_reset(&t->dst_cache);
354354
ip6_tnl_link_config(t);
355355
return 0;
356-
@@ -1593,6 +1762,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
356+
@@ -1594,6 +1763,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
357357
p->flowinfo = u->flowinfo;
358358
p->link = u->link;
359359
p->proto = u->proto;
360360
+ p->fmrs = NULL;
361361
memcpy(p->name, u->name, sizeof(u->name));
362362
}
363363

364-
@@ -1978,6 +2148,15 @@ static int ip6_tnl_validate(struct nlatt
364+
@@ -1979,6 +2149,15 @@ static int ip6_tnl_validate(struct nlatt
365365
return 0;
366366
}
367367

@@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <[email protected]>
377377
static void ip6_tnl_netlink_parms(struct nlattr *data[],
378378
struct __ip6_tnl_parm *parms)
379379
{
380-
@@ -2015,6 +2194,46 @@ static void ip6_tnl_netlink_parms(struct
380+
@@ -2016,6 +2195,46 @@ static void ip6_tnl_netlink_parms(struct
381381

382382
if (data[IFLA_IPTUN_FWMARK])
383383
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
@@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <[email protected]>
424424
}
425425

426426
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
427-
@@ -2130,6 +2349,12 @@ static void ip6_tnl_dellink(struct net_d
427+
@@ -2131,6 +2350,12 @@ static void ip6_tnl_dellink(struct net_d
428428

429429
static size_t ip6_tnl_get_size(const struct net_device *dev)
430430
{
@@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <[email protected]>
437437
return
438438
/* IFLA_IPTUN_LINK */
439439
nla_total_size(4) +
440-
@@ -2159,6 +2384,24 @@ static size_t ip6_tnl_get_size(const str
440+
@@ -2160,6 +2385,24 @@ static size_t ip6_tnl_get_size(const str
441441
nla_total_size(0) +
442442
/* IFLA_IPTUN_FWMARK */
443443
nla_total_size(4) +
@@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <[email protected]>
462462
0;
463463
}
464464

465-
@@ -2166,6 +2409,9 @@ static int ip6_tnl_fill_info(struct sk_b
465+
@@ -2167,6 +2410,9 @@ static int ip6_tnl_fill_info(struct sk_b
466466
{
467467
struct ip6_tnl *tunnel = netdev_priv(dev);
468468
struct __ip6_tnl_parm *parm = &tunnel->parms;
@@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <[email protected]>
472472

473473
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
474474
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
475-
@@ -2175,9 +2421,27 @@ static int ip6_tnl_fill_info(struct sk_b
475+
@@ -2176,9 +2422,27 @@ static int ip6_tnl_fill_info(struct sk_b
476476
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
477477
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
478478
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
@@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <[email protected]>
501501
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
502502
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
503503
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
504-
@@ -2217,6 +2481,7 @@ static const struct nla_policy ip6_tnl_p
504+
@@ -2218,6 +2482,7 @@ static const struct nla_policy ip6_tnl_p
505505
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
506506
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
507507
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },

‎target/linux/generic/pending-5.15/476-mtd-spi-nor-add-eon-en25q128.patch

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
From: Piotr Dymacz <[email protected]>
22
Subject: kernel/mtd: add support for EON EN25Q128
33

4+
Add support for EON EN25Q128 with flags SECT_4K and
5+
from documentation supports QUAD_READ
6+
47
Signed-off-by: Piotr Dymacz <[email protected]>
8+
Signed-off-by: Christian Marangi <[email protected]>
59
---
610
drivers/mtd/spi-nor/spi-nor.c | 1 +
711
1 file changed, 1 insertion(+)
812

913
--- a/drivers/mtd/spi-nor/eon.c
1014
+++ b/drivers/mtd/spi-nor/eon.c
11-
@@ -15,6 +15,8 @@ static const struct flash_info eon_parts
15+
@@ -15,6 +15,9 @@ static const struct flash_info eon_parts
1216
{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) },
1317
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
1418
{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
15-
+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) },
19+
+ { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256,
20+
+ SECT_4K | SPI_NOR_DUAL_READ) },
1621
+ { "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, SECT_4K) },
1722
{ "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16,
1823
SECT_4K | SPI_NOR_DUAL_READ) },

‎target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch

+10-11
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ Signed-off-by: John Crispin <[email protected]>
625625
return 0;
626626
}
627627

628-
@@ -457,16 +651,16 @@ ltq_etop_tx(struct sk_buff *skb, struct
628+
@@ -457,15 +651,16 @@ ltq_etop_tx(struct sk_buff *skb, struct
629629
int queue = skb_get_queue_mapping(skb);
630630
struct netdev_queue *txq = netdev_get_tx_queue(dev, queue);
631631
struct ltq_etop_priv *priv = netdev_priv(dev);
@@ -641,13 +641,12 @@ Signed-off-by: John Crispin <[email protected]>
641641
len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
642642

643643
- if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {
644-
- dev_kfree_skb_any(skb);
645644
+ if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) ||
646645
+ priv->txch.skb[priv->txch.dma.desc]) {
647646
netdev_err(dev, "tx ring full\n");
648647
netif_tx_stop_queue(txq);
649648
return NETDEV_TX_BUSY;
650-
@@ -474,7 +668,7 @@ ltq_etop_tx(struct sk_buff *skb, struct
649+
@@ -473,7 +668,7 @@ ltq_etop_tx(struct sk_buff *skb, struct
651650

652651
/* dma needs to start on a 16 byte aligned address */
653652
byte_offset = CPHYSADDR(skb->data) % 16;
@@ -656,7 +655,7 @@ Signed-off-by: John Crispin <[email protected]>
656655

657656
netif_trans_update(dev);
658657

659-
@@ -484,11 +678,11 @@ ltq_etop_tx(struct sk_buff *skb, struct
658+
@@ -483,11 +678,11 @@ ltq_etop_tx(struct sk_buff *skb, struct
660659
wmb();
661660
desc->ctl = LTQ_DMA_OWN | LTQ_DMA_SOP | LTQ_DMA_EOP |
662661
LTQ_DMA_TX_OFFSET(byte_offset) | (len & LTQ_DMA_SIZE_MASK);
@@ -671,7 +670,7 @@ Signed-off-by: John Crispin <[email protected]>
671670
netif_tx_stop_queue(txq);
672671

673672
return NETDEV_TX_OK;
674-
@@ -499,11 +693,14 @@ ltq_etop_change_mtu(struct net_device *d
673+
@@ -498,11 +693,14 @@ ltq_etop_change_mtu(struct net_device *d
675674
{
676675
struct ltq_etop_priv *priv = netdev_priv(dev);
677676
unsigned long flags;
@@ -687,7 +686,7 @@ Signed-off-by: John Crispin <[email protected]>
687686
spin_unlock_irqrestore(&priv->lock, flags);
688687

689688
return 0;
690-
@@ -556,6 +753,9 @@ ltq_etop_init(struct net_device *dev)
689+
@@ -555,6 +753,9 @@ ltq_etop_init(struct net_device *dev)
691690
if (err)
692691
goto err_hw;
693692
ltq_etop_change_mtu(dev, 1500);
@@ -697,7 +696,7 @@ Signed-off-by: John Crispin <[email protected]>
697696

698697
memcpy(&mac, &priv->pldata->mac, sizeof(struct sockaddr));
699698
if (!is_valid_ether_addr(mac.sa_data)) {
700-
@@ -573,9 +773,10 @@ ltq_etop_init(struct net_device *dev)
699+
@@ -572,9 +773,10 @@ ltq_etop_init(struct net_device *dev)
701700
dev->addr_assign_type = NET_ADDR_RANDOM;
702701

703702
ltq_etop_set_multicast_list(dev);
@@ -711,7 +710,7 @@ Signed-off-by: John Crispin <[email protected]>
711710
return 0;
712711

713712
err_netdev:
714-
@@ -595,6 +796,9 @@ ltq_etop_tx_timeout(struct net_device *d
713+
@@ -594,6 +796,9 @@ ltq_etop_tx_timeout(struct net_device *d
715714
err = ltq_etop_hw_init(dev);
716715
if (err)
717716
goto err_hw;
@@ -721,7 +720,7 @@ Signed-off-by: John Crispin <[email protected]>
721720
netif_trans_update(dev);
722721
netif_wake_queue(dev);
723722
return;
724-
@@ -618,14 +822,19 @@ static const struct net_device_ops ltq_e
723+
@@ -617,14 +822,19 @@ static const struct net_device_ops ltq_e
725724
.ndo_tx_timeout = ltq_etop_tx_timeout,
726725
};
727726

@@ -745,7 +744,7 @@ Signed-off-by: John Crispin <[email protected]>
745744

746745
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
747746
if (!res) {
748-
@@ -651,31 +860,64 @@ ltq_etop_probe(struct platform_device *p
747+
@@ -650,31 +860,64 @@ ltq_etop_probe(struct platform_device *p
749748
goto err_out;
750749
}
751750

@@ -825,7 +824,7 @@ Signed-off-by: John Crispin <[email protected]>
825824

826825
err = register_netdev(dev);
827826
if (err)
828-
@@ -704,31 +946,22 @@ ltq_etop_remove(struct platform_device *
827+
@@ -703,31 +946,22 @@ ltq_etop_remove(struct platform_device *
829828
return 0;
830829
}
831830

0 commit comments

Comments
 (0)