Skip to content

Commit

Permalink
kernel: refresh 5.10 patches (coolsnowwolf#11719)
Browse files Browse the repository at this point in the history
  • Loading branch information
Beginner-Go authored Dec 18, 2023
1 parent 67dcd38 commit fae6bc8
Show file tree
Hide file tree
Showing 89 changed files with 274 additions and 481 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>

--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -3161,6 +3161,7 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -3162,6 +3162,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
+ const char __maybe_unused *of_mtd_name = NULL;
int ret;
int i;

@@ -3215,7 +3216,12 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -3216,7 +3217,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ SVN-Revision: 35130
list_for_each_entry(p, head, list) {
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -609,48 +609,53 @@ static void tcp_options_write(__be32 *pt
@@ -608,48 +608,53 @@ static void tcp_options_write(__be32 *pt
u16 options = opts->options; /* mungable copy */

if (unlikely(OPTION_MD5 & options)) {
Expand Down Expand Up @@ -416,7 +416,7 @@ SVN-Revision: 35130
}

if (unlikely(opts->num_sack_blocks)) {
@@ -658,16 +663,17 @@ static void tcp_options_write(__be32 *pt
@@ -657,16 +662,17 @@ static void tcp_options_write(__be32 *pt
tp->duplicate_sack : tp->selective_acks;
int this_sack;

Expand All @@ -440,7 +440,7 @@ SVN-Revision: 35130
}

tp->rx_opt.dsack = 0;
@@ -680,13 +686,14 @@ static void tcp_options_write(__be32 *pt
@@ -679,13 +685,14 @@ static void tcp_options_write(__be32 *pt

if (foc->exp) {
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ it on BCM4708 family.
/*
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1895,6 +1895,7 @@ struct xhci_hcd {
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
@@ -1896,6 +1896,7 @@ struct xhci_hcd {
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
+#define XHCI_FAKE_DOORBELL BIT_ULL(45)
#define XHCI_ZHAOXIN_TRB_FETCH BIT_ULL(45)
#define XHCI_ZHAOXIN_HOST BIT_ULL(46)
+#define XHCI_FAKE_DOORBELL BIT_ULL(47)

unsigned int num_active_eps;
unsigned int limit_active_eps;
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+};
--- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
@@ -42,3 +42,40 @@
@@ -43,3 +43,40 @@
&usb3_phy {
status = "okay";
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
}
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1911,7 +1911,8 @@ int gpiochip_add_pingroup_range(struct g
@@ -1924,7 +1924,8 @@ int gpiochip_add_pingroup_range(struct g

list_add_tail(&pin_range->node, &gdev->pin_ranges);

Expand All @@ -126,7 +126,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
}
EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);

@@ -1968,7 +1969,7 @@ int gpiochip_add_pin_range(struct gpio_c
@@ -1981,7 +1982,7 @@ int gpiochip_add_pin_range(struct gpio_c

list_add_tail(&pin_range->node, &gdev->pin_ranges);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -319,6 +319,9 @@ config BCM63XX
@@ -320,6 +320,9 @@ config BCM63XX
select SYNC_R4K
select DMA_NONCOHERENT
select IRQ_MIPS_CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -237,47 +237,14 @@ static struct nft_expr_type nft_flow_off
@@ -239,47 +239,14 @@ static struct nft_expr_type nft_flow_off
.owner = THIS_MODULE,
};

Expand Down
Original file line number Diff line number Diff line change
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
@@ -1500,13 +1500,16 @@ struct nft_trans_chain {
@@ -1479,13 +1479,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
@@ -1056,6 +1056,12 @@ static void nf_tables_table_disable(stru
@@ -1074,6 +1074,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;
@@ -1079,19 +1085,17 @@ static int nf_tables_updtable(struct nft
@@ -1097,19 +1103,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;
nft_trans_commit_list_add_tail(ctx->net, trans);
return 0;
@@ -8191,11 +8195,10 @@ static int nf_tables_commit(struct net *
@@ -8475,11 +8479,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);
}
@@ -8414,11 +8417,9 @@ static int __nf_tables_abort(struct net
@@ -8728,11 +8731,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
Expand Down
Original file line number Diff line number Diff line change
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]))
@@ -2275,6 +2275,9 @@ static void mtk_gdm_config(struct mtk_et
@@ -2278,6 +2278,9 @@ static void mtk_gdm_config(struct mtk_et

val |= config;

Expand Down
Original file line number Diff line number Diff line change
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
@@ -2300,15 +2300,20 @@ static int mtk_open(struct net_device *d
@@ -2303,15 +2303,20 @@ 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 @@ -50,7 +50,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

napi_enable(&eth->tx_napi);
napi_enable(&eth->rx_napi);
@@ -2375,6 +2380,9 @@ static int mtk_stop(struct net_device *d
@@ -2378,6 +2383,9 @@ static int mtk_stop(struct net_device *d

mtk_dma_free(eth);

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

@@ -3103,6 +3111,13 @@ static int mtk_probe(struct platform_dev
@@ -3106,6 +3114,13 @@ static int mtk_probe(struct platform_dev
goto err_free_dev;
}

Expand All @@ -74,15 +74,15 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
for (i = 0; i < MTK_MAX_DEVS; i++) {
if (!eth->netdev[i])
continue;
@@ -3177,6 +3192,7 @@ static const struct mtk_soc_data mt7621_
@@ -3180,6 +3195,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 = {
@@ -3185,6 +3201,7 @@ static const struct mtk_soc_data mt7622_
@@ -3188,6 +3204,7 @@ static const struct mtk_soc_data mt7622_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7622_CLKS_BITMAP,
.required_pctl = false,
Expand Down
Original file line number Diff line number Diff line change
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
@@ -2858,6 +2858,7 @@ static const struct net_device_ops mtk_n
@@ -2861,6 +2861,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)
@@ -3116,6 +3117,10 @@ static int mtk_probe(struct platform_dev
@@ -3119,6 +3120,10 @@ static int mtk_probe(struct platform_dev
eth->base + MTK_ETH_PPE_BASE, 2);
if (err)
goto err_free_dev;
Expand Down
Original file line number Diff line number Diff line change
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
@@ -2235,7 +2235,7 @@ static int mtk_start_dma(struct mtk_eth
@@ -2238,7 +2238,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
Loading

0 comments on commit fae6bc8

Please sign in to comment.