Skip to content

Commit

Permalink
kernel: bump 5.4 to 5.4.260 (#11657)
Browse files Browse the repository at this point in the history 
Signed-off-by: aakkll <[email protected]>
  • Loading branch information
@aakkll
aakkll authored Nov 13, 2023
1 parent 59e6620 commit 03ef179
Show file tree
Hide file tree
Showing 47 changed files with 127 additions and 141 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.4
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .258
LINUX_KERNEL_HASH-5.4.258 = 39701815a7a1b5ea4253db18e9327a45926a944499628d032da63c1bb6ea623e
LINUX_VERSION-5.4 = .260
LINUX_KERNEL_HASH-5.4.260 = 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfeO
8 changes: 4 additions & 4 deletions target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
list_for_each_entry(p, head, list) {
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -461,48 +461,53 @@ static void tcp_options_write(__be32 *pt
@@ -460,48 +460,53 @@ static void tcp_options_write(__be32 *pt
u16 options = opts->options; /* mungable copy */

if (unlikely(OPTION_MD5 & options)) {
Expand Down Expand Up @@ -382,7 +382,7 @@
}

if (unlikely(opts->num_sack_blocks)) {
@@ -510,16 +515,17 @@ static void tcp_options_write(__be32 *pt
@@ -509,16 +514,17 @@ static void tcp_options_write(__be32 *pt
tp->duplicate_sack : tp->selective_acks;
int this_sack;

Expand All @@ -406,7 +406,7 @@
}

tp->rx_opt.dsack = 0;
@@ -532,13 +538,14 @@ static void tcp_options_write(__be32 *pt
@@ -531,13 +537,14 @@ static void tcp_options_write(__be32 *pt

if (foc->exp) {
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
Expand Down Expand Up @@ -706,7 +706,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4004,14 +4004,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -4017,14 +4017,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

Expand Down
4 changes: 2 additions & 2 deletions ...m53xx/patches-5.4/034-v5.11-0002-ARM-dts-BCM5301X-Harmonize-EHCI-OHCI-DT-nodes-name.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Signed-off-by: Florian Fainelli <[email protected]>
compatible = "generic-ohci";
--- a/arch/arm/boot/dts/bcm53573.dtsi
+++ b/arch/arm/boot/dts/bcm53573.dtsi
@@ -135,7 +135,7 @@
@@ -138,7 +138,7 @@
#address-cells = <1>;
#size-cells = <1>;

Expand All @@ -49,7 +49,7 @@ Signed-off-by: Florian Fainelli <[email protected]>
compatible = "generic-ehci";
reg = <0x4000 0x1000>;
interrupt-parent = <&gic>;
@@ -155,7 +155,7 @@
@@ -158,7 +158,7 @@
};
};

Expand Down
2 changes: 1 addition & 1 deletion .../linux/bcm63xx/patches-5.4/021-v5.8-mtd-rawnand-brcmnand-improve-hamming-oob-layout.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]

--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1004,33 +1004,30 @@ static int brcmnand_hamming_ooblayout_fr
@@ -1020,33 +1020,30 @@ static int brcmnand_hamming_ooblayout_fr
struct brcmnand_cfg *cfg = &host->hwcfg;
int sas = cfg->spare_area_size << cfg->sector_size_1k;
int sectors = cfg->page_size / (512 << cfg->sector_size_1k);
Expand Down
4 changes: 2 additions & 2 deletions target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]

--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -269,8 +269,8 @@ enum brcmnand_reg {
@@ -270,8 +270,8 @@ enum brcmnand_reg {
BRCMNAND_FC_BASE,
};

Expand All @@ -30,7 +30,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
[BRCMNAND_CMD_START] = 0x04,
[BRCMNAND_CMD_EXT_ADDRESS] = 0x08,
[BRCMNAND_CMD_ADDRESS] = 0x0c,
@@ -522,8 +522,8 @@ static int brcmnand_revision_init(struct
@@ -551,8 +551,8 @@ static int brcmnand_revision_init(struct
ctrl->reg_offsets = brcmnand_regs_v60;
else if (ctrl->nand_version >= 0x0500)
ctrl->reg_offsets = brcmnand_regs_v50;
Expand Down
4 changes: 2 additions & 2 deletions target/linux/bcm63xx/patches-5.4/025-v5.8-mtd-rawnand-brcmnand-rename-page-sizes.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]

--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -502,7 +502,7 @@ static int brcmnand_revision_init(struct
@@ -531,7 +531,7 @@ static int brcmnand_revision_init(struct
{
static const unsigned int block_sizes_v6[] = { 8, 16, 128, 256, 512, 1024, 2048, 0 };
static const unsigned int block_sizes_v4[] = { 16, 128, 8, 512, 256, 1024, 2048, 0 };
Expand All @@ -27,7 +27,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]

ctrl->nand_version = nand_readreg(ctrl, 0) & 0xffff;

@@ -549,7 +549,7 @@ static int brcmnand_revision_init(struct
@@ -578,7 +578,7 @@ static int brcmnand_revision_init(struct
ctrl->max_page_size = 16 * 1024;
ctrl->max_block_size = 2 * 1024 * 1024;
} else {
Expand Down
36 changes: 11 additions & 25 deletions ...nux/bcm63xx/patches-5.4/026-v5.8-mtd-rawnand-brcmnand-support-v2.1-v2.2-controllers.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
const unsigned int *page_sizes;
+ unsigned int page_size_shift;
unsigned int max_oob;
u32 ecc_level_shift;
u32 features;

@@ -269,6 +270,36 @@ enum brcmnand_reg {
@@ -270,6 +271,36 @@ enum brcmnand_reg {
BRCMNAND_FC_BASE,
};

Expand Down Expand Up @@ -64,7 +64,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
/* BRCMNAND v3.3-v4.0 */
static const u16 brcmnand_regs_v33[] = {
[BRCMNAND_CMD_START] = 0x04,
@@ -467,6 +498,9 @@ enum {
@@ -468,6 +499,9 @@ enum {
CFG_BUS_WIDTH = BIT(CFG_BUS_WIDTH_SHIFT),
CFG_DEVICE_SIZE_SHIFT = 24,

Expand All @@ -74,7 +74,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
/* Only for pre-v7.1 (with no CFG_EXT register) */
CFG_PAGE_SIZE_SHIFT = 20,
CFG_BLK_SIZE_SHIFT = 28,
@@ -502,12 +536,16 @@ static int brcmnand_revision_init(struct
@@ -531,12 +565,16 @@ static int brcmnand_revision_init(struct
{
static const unsigned int block_sizes_v6[] = { 8, 16, 128, 256, 512, 1024, 2048, 0 };
static const unsigned int block_sizes_v4[] = { 16, 128, 8, 512, 256, 1024, 2048, 0 };
Expand All @@ -93,7 +93,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
dev_err(ctrl->dev, "version %#x not supported\n",
ctrl->nand_version);
return -ENODEV;
@@ -524,6 +562,8 @@ static int brcmnand_revision_init(struct
@@ -553,6 +591,8 @@ static int brcmnand_revision_init(struct
ctrl->reg_offsets = brcmnand_regs_v50;
else if (ctrl->nand_version >= 0x0303)
ctrl->reg_offsets = brcmnand_regs_v33;
Expand All @@ -102,7 +102,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]

/* Chip-select stride */
if (ctrl->nand_version >= 0x0701)
@@ -549,14 +589,32 @@ static int brcmnand_revision_init(struct
@@ -578,14 +618,32 @@ static int brcmnand_revision_init(struct
ctrl->max_page_size = 16 * 1024;
ctrl->max_block_size = 2 * 1024 * 1024;
} else {
Expand Down Expand Up @@ -138,7 +138,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
ctrl->max_block_size = 512 * 1024;
}
}
@@ -724,6 +782,9 @@ static void brcmnand_wr_corr_thresh(stru
@@ -759,6 +817,9 @@ static void brcmnand_wr_corr_thresh(stru
enum brcmnand_reg reg = BRCMNAND_CORR_THRESHOLD;
int cs = host->cs;

Expand All @@ -148,7 +148,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
if (ctrl->nand_version == 0x0702)
bits = 7;
else if (ctrl->nand_version >= 0x0600)
@@ -782,8 +843,10 @@ static inline u32 brcmnand_spare_area_ma
@@ -793,8 +854,10 @@ static inline u32 brcmnand_spare_area_ma
return GENMASK(7, 0);
else if (ctrl->nand_version >= 0x0600)
return GENMASK(6, 0);
Expand All @@ -159,8 +159,8 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
+ return GENMASK(4, 0);
}

#define NAND_ACC_CONTROL_ECC_SHIFT 16
@@ -2146,7 +2209,7 @@ static int brcmnand_set_cfg(struct brcmn
static inline u32 brcmnand_ecc_level_mask(struct brcmnand_controller *ctrl)
@@ -2186,7 +2249,7 @@ static int brcmnand_set_cfg(struct brcmn
(!!(cfg->device_width == 16) << CFG_BUS_WIDTH_SHIFT) |
(device_size << CFG_DEVICE_SIZE_SHIFT);
if (cfg_offs == cfg_ext_offs) {
Expand All @@ -169,21 +169,7 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
(block_size << CFG_BLK_SIZE_SHIFT);
nand_writereg(ctrl, cfg_offs, tmp);
} else {
@@ -2158,9 +2221,11 @@ static int brcmnand_set_cfg(struct brcmn

tmp = nand_readreg(ctrl, acc_control_offs);
tmp &= ~brcmnand_ecc_level_mask(ctrl);
- tmp |= cfg->ecc_level << NAND_ACC_CONTROL_ECC_SHIFT;
tmp &= ~brcmnand_spare_area_mask(ctrl);
- tmp |= cfg->spare_area_size;
+ if (ctrl->nand_version >= 0x0302) {
+ tmp |= cfg->ecc_level << NAND_ACC_CONTROL_ECC_SHIFT;
+ tmp |= cfg->spare_area_size;
+ }
nand_writereg(ctrl, acc_control_offs, tmp);

brcmnand_set_sector_size_1k(host, cfg->sector_size_1k);
@@ -2530,6 +2595,8 @@ const struct dev_pm_ops brcmnand_pm_ops
@@ -2570,6 +2633,8 @@ const struct dev_pm_ops brcmnand_pm_ops
EXPORT_SYMBOL_GPL(brcmnand_pm_ops);

static const struct of_device_id brcmnand_of_match[] = {
Expand Down
10 changes: 5 additions & 5 deletions ...ux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2392,7 +2392,14 @@ static int mv88e6xxx_setup_upstream_port
@@ -2394,7 +2394,14 @@ static int mv88e6xxx_setup_upstream_port

if (chip->info->ops->set_egress_port) {
err = chip->info->ops->set_egress_port(chip,
Expand Down Expand Up @@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <[email protected]>
#define MV88E6XXX_CASCADE_PORT_MULTIPLE 0xf
--- a/drivers/net/dsa/mv88e6xxx/global1.c
+++ b/drivers/net/dsa/mv88e6xxx/global1.c
@@ -294,7 +294,9 @@ int mv88e6250_g1_ieee_pri_map(struct mv8
@@ -263,7 +263,9 @@ int mv88e6250_g1_ieee_pri_map(struct mv8
/* Offset 0x1a: Monitor Control */
/* Offset 0x1a: Monitor & MGMT Control on some devices */

Expand All @@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <[email protected]>
{
u16 reg;
int err;
@@ -303,11 +305,20 @@ int mv88e6095_g1_set_egress_port(struct
@@ -272,11 +274,20 @@ int mv88e6095_g1_set_egress_port(struct
if (err)
return err;

Expand All @@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <[email protected]>

return mv88e6xxx_g1_write(chip, MV88E6185_G1_MONITOR_CTL, reg);
}
@@ -341,17 +352,24 @@ static int mv88e6390_g1_monitor_write(st
@@ -310,17 +321,24 @@ static int mv88e6390_g1_monitor_write(st
return mv88e6xxx_g1_write(chip, MV88E6390_G1_MONITOR_MGMT_CTL, reg);
}

Expand Down Expand Up @@ -132,7 +132,7 @@ Signed-off-by: David S. Miller <[email protected]>
return err;
--- a/drivers/net/dsa/mv88e6xxx/global1.h
+++ b/drivers/net/dsa/mv88e6xxx/global1.h
@@ -289,8 +289,12 @@ int mv88e6095_g1_stats_set_histogram(str
@@ -288,8 +288,12 @@ int mv88e6095_g1_stats_set_histogram(str
int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip);
void mv88e6xxx_g1_stats_read(struct mv88e6xxx_chip *chip, int stat, u32 *val);
int mv88e6xxx_g1_stats_clear(struct mv88e6xxx_chip *chip);
Expand Down
14 changes: 7 additions & 7 deletions ...inux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4942,6 +4942,80 @@ static int mv88e6xxx_port_mdb_del(struct
@@ -4944,6 +4944,80 @@ static int mv88e6xxx_port_mdb_del(struct
return err;
}

Expand Down Expand Up @@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <[email protected]>
static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port,
bool unicast, bool multicast)
{
@@ -4996,6 +5070,8 @@ static const struct dsa_switch_ops mv88e
@@ -4998,6 +5072,8 @@ static const struct dsa_switch_ops mv88e
.port_mdb_prepare = mv88e6xxx_port_mdb_prepare,
.port_mdb_add = mv88e6xxx_port_mdb_add,
.port_mdb_del = mv88e6xxx_port_mdb_del,
Expand Down Expand Up @@ -139,15 +139,15 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/mv88e6xxx/global1.c
+++ b/drivers/net/dsa/mv88e6xxx/global1.c
@@ -298,6 +298,7 @@ int mv88e6095_g1_set_egress_port(struct
@@ -267,6 +267,7 @@ int mv88e6095_g1_set_egress_port(struct
enum mv88e6xxx_egress_direction direction,
int port)
{
+ int *dest_port_chip;
u16 reg;
int err;

@@ -307,11 +308,13 @@ int mv88e6095_g1_set_egress_port(struct
@@ -276,11 +277,13 @@ int mv88e6095_g1_set_egress_port(struct

switch (direction) {
case MV88E6XXX_EGRESS_DIR_INGRESS:
Expand All @@ -161,7 +161,7 @@ Signed-off-by: David S. Miller <[email protected]>
reg &= MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK;
reg |= port <<
__bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK);
@@ -320,7 +323,11 @@ int mv88e6095_g1_set_egress_port(struct
@@ -289,7 +292,11 @@ int mv88e6095_g1_set_egress_port(struct
return -EINVAL;
}

Expand All @@ -174,7 +174,7 @@ Signed-off-by: David S. Miller <[email protected]>
}

/* Older generations also call this the ARP destination. It has been
@@ -356,14 +363,17 @@ int mv88e6390_g1_set_egress_port(struct
@@ -325,14 +332,17 @@ int mv88e6390_g1_set_egress_port(struct
enum mv88e6xxx_egress_direction direction,
int port)
{
Expand All @@ -192,7 +192,7 @@ Signed-off-by: David S. Miller <[email protected]>
ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_EGRESS_DEST;
break;
default:
@@ -371,10 +381,10 @@ int mv88e6390_g1_set_egress_port(struct
@@ -340,10 +350,10 @@ int mv88e6390_g1_set_egress_port(struct
}

err = mv88e6390_g1_monitor_write(chip, ptr, port);
Expand Down
2 changes: 1 addition & 1 deletion .../generic/backport-5.4/748-v5.5-net-dsa-mv88e6xxx-fix-broken-if-statement-because-of.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5009,7 +5009,7 @@ static void mv88e6xxx_port_mirror_del(st
@@ -5011,7 +5011,7 @@ static void mv88e6xxx_port_mirror_del(st
if (chip->info->ops->set_egress_port(chip,
direction,
dsa_upstream_port(ds,
Expand Down
2 changes: 1 addition & 1 deletion ...et/linux/generic/backport-5.4/749-v5.5-net-dsa-mv88e6xxx-Fix-masking-of-egress-port.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/dsa/mv88e6xxx/global1.c
+++ b/drivers/net/dsa/mv88e6xxx/global1.c
@@ -309,13 +309,13 @@ int mv88e6095_g1_set_egress_port(struct
@@ -278,13 +278,13 @@ int mv88e6095_g1_set_egress_port(struct
switch (direction) {
case MV88E6XXX_EGRESS_DIR_INGRESS:
dest_port_chip = &chip->ingress_dest_port;
Expand Down
6 changes: 3 additions & 3 deletions ...linux/generic/backport-5.4/760-net-ethernet-mediatek-Integrate-GDM-PSE-setup-operat.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2252,6 +2252,28 @@ static int mtk_start_dma(struct mtk_eth
@@ -2255,6 +2255,28 @@ static int mtk_start_dma(struct mtk_eth
return 0;
}

Expand Down Expand Up @@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <[email protected]>
static int mtk_open(struct net_device *dev)
{
struct mtk_mac *mac = netdev_priv(dev);
@@ -2447,8 +2469,6 @@ static int mtk_hw_init(struct mtk_eth *e
@@ -2450,8 +2472,6 @@ static int mtk_hw_init(struct mtk_eth *e
mtk_w32(eth, 0, MTK_QDMA_DELAY_INT);
mtk_tx_irq_disable(eth, ~0);
mtk_rx_irq_disable(eth, ~0);
Expand All @@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <[email protected]>

/* FE int grouping */
mtk_w32(eth, MTK_TX_DONE_INT, MTK_PDMA_INT_GRP1);
@@ -2457,18 +2477,7 @@ static int mtk_hw_init(struct mtk_eth *e
@@ -2460,18 +2480,7 @@ static int mtk_hw_init(struct mtk_eth *e
mtk_w32(eth, MTK_RX_DONE_INT, MTK_QDMA_INT_GRP2);
mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);

Expand Down
6 changes: 3 additions & 3 deletions ...linux/generic/backport-5.4/761-net-ethernet-mediatek-Refine-the-timing-of-GDM-PSE-s.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2256,6 +2256,9 @@ static void mtk_gdm_config(struct mtk_et
@@ -2259,6 +2259,9 @@ static void mtk_gdm_config(struct mtk_et
{
int i;

Expand All @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <[email protected]>
for (i = 0; i < MTK_MAC_COUNT; i++) {
u32 val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i));

@@ -2294,6 +2297,8 @@ static int mtk_open(struct net_device *d
@@ -2297,6 +2300,8 @@ static int mtk_open(struct net_device *d
if (err)
return err;

Expand All @@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <[email protected]>
napi_enable(&eth->tx_napi);
napi_enable(&eth->rx_napi);
mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
@@ -2477,8 +2482,6 @@ static int mtk_hw_init(struct mtk_eth *e
@@ -2480,8 +2485,6 @@ static int mtk_hw_init(struct mtk_eth *e
mtk_w32(eth, MTK_RX_DONE_INT, MTK_QDMA_INT_GRP2);
mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);

Expand Down
2 changes: 1 addition & 1 deletion .../linux/generic/backport-5.4/762-net-ethernet-mediatek-Enable-GDM-GDMA_DROP_ALL-mode.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2351,6 +2351,8 @@ static int mtk_stop(struct net_device *d
@@ -2354,6 +2354,8 @@ static int mtk_stop(struct net_device *d
if (!refcount_dec_and_test(&eth->dma_refcnt))
return 0;

Expand Down
Loading

1 comment on commit 03ef179

@hubbylei
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"linux-5.4.260.tar.xz" "9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfeO" "" "@KERNEL/linux/kernel/v5.x" '
Cannot find appropriate hash command, ensure the provided hash is either a MD5 or SHA256 checksum.

hash值错误，应该是9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe 多了个O

Please sign in to comment.