Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.122
Browse files Browse the repository at this point in the history 
All patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800

Signed-off-by: John Audia <therealgraysky@proton.me>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed Jun 26, 2022
1 parent 706a4ec commit 9edc514
Show file tree
Hide file tree
Showing 23 changed files with 61 additions and 61 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
View file
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .121
LINUX_KERNEL_HASH-5.10.121 = 9044e7b4084afc636ccd7a7fe06439d8941b28613df79f16ce603ccca35292c6
LINUX_VERSION-5.10 = .122
LINUX_KERNEL_HASH-5.10.122 = 920bb3110a881b132a8960db8311689dec3c984634d3d93bbaa4b57047740f40
2 changes: 1 addition & 1 deletion target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
View file
Expand Up @@ -706,7 +706,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4084,14 +4084,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -4087,14 +4087,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

Expand Down
2 changes: 1 addition & 1 deletion ...t/linux/bcm53xx/patches-5.10/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch
View file
Expand Up @@ -49,7 +49,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
return UBI_IO_BAD_HDR_EBADMSG;
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -824,6 +824,7 @@ extern struct mutex ubi_devices_mutex;
@@ -822,6 +822,7 @@ extern struct mutex ubi_devices_mutex;
extern struct blocking_notifier_head ubi_notifiers;

/* attach.c */
Expand Down
10 changes: 5 additions & 5 deletions ...ric/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
View file
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1470,13 +1470,16 @@ struct nft_trans_chain {
@@ -1469,13 +1469,16 @@ struct nft_trans_chain {

struct nft_trans_table {
bool update;
Expand All @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct nft_set *set;
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -891,6 +891,12 @@ static void nf_tables_table_disable(stru
@@ -892,6 +892,12 @@ static void nf_tables_table_disable(stru
nft_table_disable(net, table, 0);
}

Expand All @@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
static int nf_tables_updtable(struct nft_ctx *ctx)
{
struct nft_trans *trans;
@@ -914,19 +920,17 @@ static int nf_tables_updtable(struct nft
@@ -915,19 +921,17 @@ static int nf_tables_updtable(struct nft

if ((flags & NFT_TABLE_F_DORMANT) &&
!(ctx->table->flags & NFT_TABLE_F_DORMANT)) {
Expand All @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
return 0;
@@ -7918,11 +7922,10 @@ static int nf_tables_commit(struct net *
@@ -7910,11 +7914,10 @@ static int nf_tables_commit(struct net *
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
Expand All @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
} else {
nft_clear(net, trans->ctx.table);
}
@@ -8135,11 +8138,9 @@ static int __nf_tables_abort(struct net
@@ -8127,11 +8130,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
Expand Down
2 changes: 1 addition & 1 deletion ...eric/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch
View file
Expand Up @@ -38,7 +38,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT ||
!eth->netdev[mac]))
@@ -2254,6 +2254,9 @@ static void mtk_gdm_config(struct mtk_et
@@ -2257,6 +2257,9 @@ static void mtk_gdm_config(struct mtk_et

val |= config;

Expand Down
10 changes: 5 additions & 5 deletions ...ric/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch
View file
Expand Up @@ -27,7 +27,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
obj-$(CONFIG_NET_MEDIATEK_STAR_EMAC) += mtk_star_emac.o
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2279,12 +2279,17 @@ static int mtk_open(struct net_device *d
@@ -2282,12 +2282,17 @@ static int mtk_open(struct net_device *d

/* we run 2 netdevs on the same dma ring so we only bring it up once */
if (!refcount_read(&eth->dma_refcnt)) {
Expand All @@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

napi_enable(&eth->tx_napi);
napi_enable(&eth->rx_napi);
@@ -2351,6 +2356,9 @@ static int mtk_stop(struct net_device *d
@@ -2354,6 +2359,9 @@ static int mtk_stop(struct net_device *d

mtk_dma_free(eth);

Expand All @@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
return 0;
}

@@ -3079,6 +3087,13 @@ static int mtk_probe(struct platform_dev
@@ -3082,6 +3090,13 @@ static int mtk_probe(struct platform_dev
goto err_free_dev;
}

Expand All @@ -71,15 +71,15 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
for (i = 0; i < MTK_MAX_DEVS; i++) {
if (!eth->netdev[i])
continue;
@@ -3153,6 +3168,7 @@ static const struct mtk_soc_data mt7621_
@@ -3156,6 +3171,7 @@ static const struct mtk_soc_data mt7621_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7621_CLKS_BITMAP,
.required_pctl = false,
+ .offload_version = 2,
};

static const struct mtk_soc_data mt7622_data = {
@@ -3161,6 +3177,7 @@ static const struct mtk_soc_data mt7622_
@@ -3164,6 +3180,7 @@ static const struct mtk_soc_data mt7622_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7622_CLKS_BITMAP,
.required_pctl = false,
Expand Down
4 changes: 2 additions & 2 deletions ...ric/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch
View file
Expand Up @@ -21,15 +21,15 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
obj-$(CONFIG_NET_MEDIATEK_STAR_EMAC) += mtk_star_emac.o
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2834,6 +2834,7 @@ static const struct net_device_ops mtk_n
@@ -2837,6 +2837,7 @@ static const struct net_device_ops mtk_n
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = mtk_poll_controller,
#endif
+ .ndo_setup_tc = mtk_eth_setup_tc,
};

static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
@@ -3092,6 +3093,10 @@ static int mtk_probe(struct platform_dev
@@ -3095,6 +3096,10 @@ static int mtk_probe(struct platform_dev
eth->base + MTK_ETH_PPE_BASE, 2);
if (err)
goto err_free_dev;
Expand Down
2 changes: 1 addition & 1 deletion ...ric/backport-5.10/610-v5.13-43-net-ethernet-mtk_eth_soc-use-larger-burst-size-for-Q.patch
View file
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2214,7 +2214,7 @@ static int mtk_start_dma(struct mtk_eth
@@ -2217,7 +2217,7 @@ static int mtk_start_dma(struct mtk_eth
if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
mtk_w32(eth,
MTK_TX_WB_DDONE | MTK_TX_DMA_EN |
Expand Down
14 changes: 7 additions & 7 deletions ...ric/backport-5.10/610-v5.13-45-net-ethernet-mtk_eth_soc-implement-dynamic-interrupt.patch
View file
Expand Up @@ -87,23 +87,23 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (mtk_queue_stopped(eth) &&
(atomic_read(&ring->free_count) > ring->thresh))
mtk_wake_queue(eth);
@@ -2150,6 +2165,7 @@ static irqreturn_t mtk_handle_irq_rx(int
@@ -2153,6 +2168,7 @@ static irqreturn_t mtk_handle_irq_rx(int
{
struct mtk_eth *eth = _eth;

+ eth->rx_events++;
if (likely(napi_schedule_prep(&eth->rx_napi))) {
__napi_schedule(&eth->rx_napi);
mtk_rx_irq_disable(eth, MTK_RX_DONE_INT);
@@ -2162,6 +2178,7 @@ static irqreturn_t mtk_handle_irq_tx(int
@@ -2165,6 +2181,7 @@ static irqreturn_t mtk_handle_irq_tx(int
{
struct mtk_eth *eth = _eth;

+ eth->tx_events++;
if (likely(napi_schedule_prep(&eth->tx_napi))) {
__napi_schedule(&eth->tx_napi);
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
@@ -2346,6 +2363,9 @@ static int mtk_stop(struct net_device *d
@@ -2349,6 +2366,9 @@ static int mtk_stop(struct net_device *d
napi_disable(&eth->tx_napi);
napi_disable(&eth->rx_napi);

Expand All @@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
mtk_stop_dma(eth, MTK_QDMA_GLO_CFG);
mtk_stop_dma(eth, MTK_PDMA_GLO_CFG);
@@ -2398,6 +2418,64 @@ err_disable_clks:
@@ -2401,6 +2421,64 @@ err_disable_clks:
return ret;
}

Expand Down Expand Up @@ -178,7 +178,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int mtk_hw_init(struct mtk_eth *eth)
{
int i, val, ret;
@@ -2419,9 +2497,6 @@ static int mtk_hw_init(struct mtk_eth *e
@@ -2422,9 +2500,6 @@ static int mtk_hw_init(struct mtk_eth *e
goto err_disable_pm;
}

Expand All @@ -188,7 +188,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* disable delay and normal interrupt */
mtk_tx_irq_disable(eth, ~0);
mtk_rx_irq_disable(eth, ~0);
@@ -2460,11 +2535,11 @@ static int mtk_hw_init(struct mtk_eth *e
@@ -2463,11 +2538,11 @@ static int mtk_hw_init(struct mtk_eth *e
/* Enable RX VLan Offloading */
mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);

Expand All @@ -203,7 +203,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mtk_tx_irq_disable(eth, ~0);
mtk_rx_irq_disable(eth, ~0);

@@ -2969,6 +3044,13 @@ static int mtk_probe(struct platform_dev
@@ -2972,6 +3047,13 @@ static int mtk_probe(struct platform_dev
spin_lock_init(&eth->page_lock);
spin_lock_init(&eth->tx_irq_lock);
spin_lock_init(&eth->rx_irq_lock);
Expand Down
2 changes: 1 addition & 1 deletion ...ric/backport-5.10/610-v5.13-51-net-ethernet-mtk_eth_soc-use-iopoll.h-macro-for-DMA-.patch
View file
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2054,25 +2054,22 @@ static int mtk_set_features(struct net_d
@@ -2057,25 +2057,22 @@ static int mtk_set_features(struct net_d
/* wait for DMA to finish whatever it is doing before we start using it again */
static int mtk_dma_busy_wait(struct mtk_eth *eth)
{
Expand Down
6 changes: 3 additions & 3 deletions target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch
View file
Expand Up @@ -48,7 +48,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>

return buf_size;
}
@@ -2606,6 +2606,35 @@ static void mtk_uninit(struct net_device
@@ -2609,6 +2609,35 @@ static void mtk_uninit(struct net_device
mtk_rx_irq_disable(eth, ~0);
}

Expand Down Expand Up @@ -84,15 +84,15 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct mtk_mac *mac = netdev_priv(dev);
@@ -2902,6 +2931,7 @@ static const struct net_device_ops mtk_n
@@ -2905,6 +2934,7 @@ static const struct net_device_ops mtk_n
.ndo_set_mac_address = mtk_set_mac_address,
.ndo_validate_addr = eth_validate_addr,
.ndo_do_ioctl = mtk_do_ioctl,
+ .ndo_change_mtu = mtk_change_mtu,
.ndo_tx_timeout = mtk_tx_timeout,
.ndo_get_stats64 = mtk_get_stats64,
.ndo_fix_features = mtk_fix_features,
@@ -3004,7 +3034,10 @@ static int mtk_add_mac(struct mtk_eth *e
@@ -3007,7 +3037,10 @@ static int mtk_add_mac(struct mtk_eth *e
eth->netdev[id]->irq = eth->irq[0];
eth->netdev[id]->dev.of_node = np;

Expand Down
10 changes: 5 additions & 5 deletions ...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View file
Expand Up @@ -264,15 +264,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
ndev->dev_addr);
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -1351,7 +1351,6 @@ static int altera_tse_probe(struct platf
@@ -1355,7 +1355,6 @@ static int altera_tse_probe(struct platf
struct resource *control_port;
struct resource *dma_res;
struct altera_tse_private *priv;
- const unsigned char *macaddr;
void __iomem *descmap;
const struct of_device_id *of_id = NULL;

@@ -1528,10 +1527,8 @@ static int altera_tse_probe(struct platf
@@ -1532,10 +1531,8 @@ static int altera_tse_probe(struct platf
priv->rx_dma_buf_sz = ALTERA_RXDMABUFFER_SIZE;

/* get default MAC address from device tree */
Expand Down Expand Up @@ -895,7 +895,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2580,14 +2580,11 @@ static int __init mtk_init(struct net_de
@@ -2583,14 +2583,11 @@ static int __init mtk_init(struct net_de
{
struct mtk_mac *mac = netdev_priv(dev);
struct mtk_eth *eth = mac->hw;
Expand Down Expand Up @@ -1420,15 +1420,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -1741,7 +1741,6 @@ static int am65_cpsw_nuss_init_slave_por
@@ -1742,7 +1742,6 @@ static int am65_cpsw_nuss_init_slave_por

for_each_child_of_node(node, port_np) {
struct am65_cpsw_port *port;
- const void *mac_addr;
u32 port_id;

/* it is not a slave port node, continue */
@@ -1820,15 +1819,15 @@ static int am65_cpsw_nuss_init_slave_por
@@ -1821,15 +1820,15 @@ static int am65_cpsw_nuss_init_slave_por
return ret;
}

Expand Down
12 changes: 6 additions & 6 deletions target/linux/generic/hack-5.10/204-module_strip.patch
View file
Expand Up @@ -143,7 +143,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2037,7 +2037,9 @@ static void read_symbols(const char *mod
@@ -2038,7 +2038,9 @@ static void read_symbols(const char *mod
symname = remove_dot(info.strtab + sym->st_name);

handle_symbol(mod, &info, sym, symname);
Expand All @@ -153,7 +153,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}

for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
@@ -2250,8 +2252,10 @@ static void add_header(struct buffer *b,
@@ -2251,8 +2253,10 @@ static void add_header(struct buffer *b,
buf_printf(b, "\n");
buf_printf(b, "BUILD_SALT;\n");
buf_printf(b, "\n");
Expand All @@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
buf_printf(b, "\n");
buf_printf(b, "__visible struct module __this_module\n");
buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n");
@@ -2268,8 +2272,10 @@ static void add_header(struct buffer *b,
@@ -2269,8 +2273,10 @@ static void add_header(struct buffer *b,

static void add_intree_flag(struct buffer *b, int is_intree)
{
Expand All @@ -175,7 +175,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}

/* Cannot check for assembler */
@@ -2282,8 +2288,10 @@ static void add_retpoline(struct buffer
@@ -2283,8 +2289,10 @@ static void add_retpoline(struct buffer

static void add_staging_flag(struct buffer *b, const char *name)
{
Expand All @@ -186,7 +186,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}

/**
@@ -2367,11 +2375,13 @@ static void add_depends(struct buffer *b
@@ -2368,11 +2376,13 @@ static void add_depends(struct buffer *b

static void add_srcversion(struct buffer *b, struct module *mod)
{
Expand All @@ -200,7 +200,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}

static void write_buf(struct buffer *b, const char *fname)
@@ -2630,7 +2640,9 @@ int main(int argc, char **argv)
@@ -2631,7 +2641,9 @@ int main(int argc, char **argv)
add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod);
add_depends(&buf, mod);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-5.10/494-mtd-ubi-add-EOF-marker-support.patch
View file
Expand Up @@ -50,7 +50,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
break;
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -782,6 +782,7 @@ struct ubi_attach_info {
@@ -780,6 +780,7 @@ struct ubi_attach_info {
int mean_ec;
uint64_t ec_sum;
int ec_count;
Expand Down

0 comments on commit 9edc514

Please sign in to comment.