kernel: bump 5.15 to 5.15.49 (#9633)

* kernel: bump 5.15 to 5.15.49

Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>

* kernel: 5.15: x86-64: enable CONFIG_SLS
This commit is contained in:
aakkll 2022-06-23 13:27:11 +08:00 committed by GitHub
parent fbf4b5d231
commit 04d870e468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 46 additions and 45 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .48 LINUX_VERSION-5.15 = .49
LINUX_KERNEL_HASH-5.15.48 = 19f0075d1b94d6874a2af7127a59b6b6c423fc7d4a883a51415543e7ec1be2a6 LINUX_KERNEL_HASH-5.15.49 = 32497893ba47f4ad32a59fa4254e8c25e41bc821798e3b2f2443822fa00059dc

View File

@ -16,7 +16,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/crypto/Kconfig --- a/crypto/Kconfig
+++ b/crypto/Kconfig +++ b/crypto/Kconfig
@@ -33,7 +33,7 @@ config CRYPTO_FIPS @@ -34,7 +34,7 @@ config CRYPTO_FIPS
this is. this is.
config CRYPTO_ALGAPI config CRYPTO_ALGAPI
@ -25,7 +25,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_ALGAPI2 select CRYPTO_ALGAPI2
help help
This option provides the API for cryptographic algorithms. This option provides the API for cryptographic algorithms.
@@ -42,7 +42,7 @@ config CRYPTO_ALGAPI2 @@ -43,7 +43,7 @@ config CRYPTO_ALGAPI2
tristate tristate
config CRYPTO_AEAD config CRYPTO_AEAD
@ -34,7 +34,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_AEAD2 select CRYPTO_AEAD2
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
@@ -53,7 +53,7 @@ config CRYPTO_AEAD2 @@ -54,7 +54,7 @@ config CRYPTO_AEAD2
select CRYPTO_RNG2 select CRYPTO_RNG2
config CRYPTO_SKCIPHER config CRYPTO_SKCIPHER
@ -43,7 +43,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_SKCIPHER2 select CRYPTO_SKCIPHER2
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
@@ -63,7 +63,7 @@ config CRYPTO_SKCIPHER2 @@ -64,7 +64,7 @@ config CRYPTO_SKCIPHER2
select CRYPTO_RNG2 select CRYPTO_RNG2
config CRYPTO_HASH config CRYPTO_HASH
@ -52,7 +52,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
select CRYPTO_HASH2 select CRYPTO_HASH2
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
@@ -72,7 +72,7 @@ config CRYPTO_HASH2 @@ -73,7 +73,7 @@ config CRYPTO_HASH2
select CRYPTO_ALGAPI2 select CRYPTO_ALGAPI2
config CRYPTO_RNG config CRYPTO_RNG
@ -92,7 +92,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
bool bool
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -440,16 +440,16 @@ config BCH_CONST_T @@ -443,16 +443,16 @@ config BCH_CONST_T
# Textsearch support is select'ed if needed # Textsearch support is select'ed if needed
# #
config TEXTSEARCH config TEXTSEARCH

View File

@ -11,7 +11,7 @@
that can be interpreted by the ASN.1 stream decoder and used to that can be interpreted by the ASN.1 stream decoder and used to
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -611,7 +611,7 @@ config LIBFDT @@ -614,7 +614,7 @@ config LIBFDT
bool bool
config OID_REGISTRY config OID_REGISTRY

View File

@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/crypto/Kconfig --- a/crypto/Kconfig
+++ b/crypto/Kconfig +++ b/crypto/Kconfig
@@ -120,13 +120,13 @@ config CRYPTO_MANAGER @@ -121,13 +121,13 @@ config CRYPTO_MANAGER
cbc(aes). cbc(aes).
config CRYPTO_MANAGER2 config CRYPTO_MANAGER2

View File

@ -19,7 +19,7 @@
#define QUECTEL_VENDOR_ID 0x2c7c #define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */ /* These Quectel products use Quectel's vendor ID */
@@ -1129,6 +1131,11 @@ static const struct usb_device_id option @@ -1131,6 +1133,11 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) }, .driver_info = RSVD(4) },

View File

@ -1087,7 +1087,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
#define JFFS2_NODE_ACCURATE 0x2000 #define JFFS2_NODE_ACCURATE 0x2000
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -337,6 +337,12 @@ config ZSTD_DECOMPRESS @@ -340,6 +340,12 @@ config ZSTD_DECOMPRESS
source "lib/xz/Kconfig" source "lib/xz/Kconfig"

View File

@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/clk.h> #include <linux/clk.h>
@@ -828,7 +829,7 @@ static int mtk_init_fq_dma(struct mtk_et @@ -839,7 +840,7 @@ static int mtk_init_fq_dma(struct mtk_et
dma_addr_t dma_addr; dma_addr_t dma_addr;
int i; int i;
@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
cnt * sizeof(struct mtk_tx_dma), cnt * sizeof(struct mtk_tx_dma),
&eth->phy_scratch_ring, &eth->phy_scratch_ring,
GFP_ATOMIC); GFP_ATOMIC);
@@ -840,10 +841,10 @@ static int mtk_init_fq_dma(struct mtk_et @@ -851,10 +852,10 @@ static int mtk_init_fq_dma(struct mtk_et
if (unlikely(!eth->scratch_head)) if (unlikely(!eth->scratch_head))
return -ENOMEM; return -ENOMEM;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return -ENOMEM; return -ENOMEM;
phy_ring_tail = eth->phy_scratch_ring + phy_ring_tail = eth->phy_scratch_ring +
@@ -897,26 +898,26 @@ static void mtk_tx_unmap(struct mtk_eth @@ -908,26 +909,26 @@ static void mtk_tx_unmap(struct mtk_eth
{ {
if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) { if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
if (tx_buf->flags & MTK_TX_FLAGS_SINGLE0) { if (tx_buf->flags & MTK_TX_FLAGS_SINGLE0) {
@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
dma_unmap_addr(tx_buf, dma_addr1), dma_unmap_addr(tx_buf, dma_addr1),
dma_unmap_len(tx_buf, dma_len1), dma_unmap_len(tx_buf, dma_len1),
DMA_TO_DEVICE); DMA_TO_DEVICE);
@@ -994,9 +995,9 @@ static int mtk_tx_map(struct sk_buff *sk @@ -1005,9 +1006,9 @@ static int mtk_tx_map(struct sk_buff *sk
if (skb_vlan_tag_present(skb)) if (skb_vlan_tag_present(skb))
txd4 |= TX_DMA_INS_VLAN | skb_vlan_tag_get(skb); txd4 |= TX_DMA_INS_VLAN | skb_vlan_tag_get(skb);
@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return -ENOMEM; return -ENOMEM;
WRITE_ONCE(itxd->txd1, mapped_addr); WRITE_ONCE(itxd->txd1, mapped_addr);
@@ -1035,10 +1036,10 @@ static int mtk_tx_map(struct sk_buff *sk @@ -1046,10 +1047,10 @@ static int mtk_tx_map(struct sk_buff *sk
frag_map_size = min(frag_size, MTK_TX_DMA_BUF_LEN); frag_map_size = min(frag_size, MTK_TX_DMA_BUF_LEN);
@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto err_dma; goto err_dma;
if (i == nr_frags - 1 && if (i == nr_frags - 1 &&
@@ -1316,18 +1317,18 @@ static int mtk_poll_rx(struct napi_struc @@ -1330,18 +1331,18 @@ static int mtk_poll_rx(struct napi_struc
netdev->stats.rx_dropped++; netdev->stats.rx_dropped++;
goto release_desc; goto release_desc;
} }
@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ring->buf_size, DMA_FROM_DEVICE); ring->buf_size, DMA_FROM_DEVICE);
/* receive data */ /* receive data */
@@ -1600,7 +1601,7 @@ static int mtk_tx_alloc(struct mtk_eth * @@ -1614,7 +1615,7 @@ static int mtk_tx_alloc(struct mtk_eth *
if (!ring->buf) if (!ring->buf)
goto no_tx_mem; goto no_tx_mem;
@ -129,7 +129,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
&ring->phys, GFP_ATOMIC); &ring->phys, GFP_ATOMIC);
if (!ring->dma) if (!ring->dma)
goto no_tx_mem; goto no_tx_mem;
@@ -1618,7 +1619,7 @@ static int mtk_tx_alloc(struct mtk_eth * @@ -1632,7 +1633,7 @@ static int mtk_tx_alloc(struct mtk_eth *
* descriptors in ring->dma_pdma. * descriptors in ring->dma_pdma.
*/ */
if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) { if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
@ -138,7 +138,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
&ring->phys_pdma, &ring->phys_pdma,
GFP_ATOMIC); GFP_ATOMIC);
if (!ring->dma_pdma) if (!ring->dma_pdma)
@@ -1677,7 +1678,7 @@ static void mtk_tx_clean(struct mtk_eth @@ -1691,7 +1692,7 @@ static void mtk_tx_clean(struct mtk_eth
} }
if (ring->dma) { if (ring->dma) {
@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
MTK_DMA_SIZE * sizeof(*ring->dma), MTK_DMA_SIZE * sizeof(*ring->dma),
ring->dma, ring->dma,
ring->phys); ring->phys);
@@ -1685,7 +1686,7 @@ static void mtk_tx_clean(struct mtk_eth @@ -1699,7 +1700,7 @@ static void mtk_tx_clean(struct mtk_eth
} }
if (ring->dma_pdma) { if (ring->dma_pdma) {
@ -156,7 +156,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
MTK_DMA_SIZE * sizeof(*ring->dma_pdma), MTK_DMA_SIZE * sizeof(*ring->dma_pdma),
ring->dma_pdma, ring->dma_pdma,
ring->phys_pdma); ring->phys_pdma);
@@ -1730,18 +1731,18 @@ static int mtk_rx_alloc(struct mtk_eth * @@ -1747,18 +1748,18 @@ static int mtk_rx_alloc(struct mtk_eth *
return -ENOMEM; return -ENOMEM;
} }
@ -178,7 +178,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return -ENOMEM; return -ENOMEM;
ring->dma[i].rxd1 = (unsigned int)dma_addr; ring->dma[i].rxd1 = (unsigned int)dma_addr;
@@ -1777,7 +1778,7 @@ static void mtk_rx_clean(struct mtk_eth @@ -1794,7 +1795,7 @@ static void mtk_rx_clean(struct mtk_eth
continue; continue;
if (!ring->dma[i].rxd1) if (!ring->dma[i].rxd1)
continue; continue;
@ -187,7 +187,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ring->dma[i].rxd1, ring->dma[i].rxd1,
ring->buf_size, ring->buf_size,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
@@ -1788,7 +1789,7 @@ static void mtk_rx_clean(struct mtk_eth @@ -1805,7 +1806,7 @@ static void mtk_rx_clean(struct mtk_eth
} }
if (ring->dma) { if (ring->dma) {
@ -196,7 +196,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ring->dma_size * sizeof(*ring->dma), ring->dma_size * sizeof(*ring->dma),
ring->dma, ring->dma,
ring->phys); ring->phys);
@@ -2144,7 +2145,7 @@ static void mtk_dma_free(struct mtk_eth @@ -2161,7 +2162,7 @@ static void mtk_dma_free(struct mtk_eth
if (eth->netdev[i]) if (eth->netdev[i])
netdev_reset_queue(eth->netdev[i]); netdev_reset_queue(eth->netdev[i]);
if (eth->scratch_ring) { if (eth->scratch_ring) {
@ -205,7 +205,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
MTK_DMA_SIZE * sizeof(struct mtk_tx_dma), MTK_DMA_SIZE * sizeof(struct mtk_tx_dma),
eth->scratch_ring, eth->scratch_ring,
eth->phy_scratch_ring); eth->phy_scratch_ring);
@@ -2494,6 +2495,8 @@ static void mtk_dim_tx(struct work_struc @@ -2511,6 +2512,8 @@ static void mtk_dim_tx(struct work_struc
static int mtk_hw_init(struct mtk_eth *eth) static int mtk_hw_init(struct mtk_eth *eth)
{ {
@ -214,7 +214,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
int i, val, ret; int i, val, ret;
if (test_and_set_bit(MTK_HW_INIT, &eth->state)) if (test_and_set_bit(MTK_HW_INIT, &eth->state))
@@ -2506,6 +2509,10 @@ static int mtk_hw_init(struct mtk_eth *e @@ -2523,6 +2526,10 @@ static int mtk_hw_init(struct mtk_eth *e
if (ret) if (ret)
goto err_disable_pm; goto err_disable_pm;
@ -225,7 +225,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
ret = device_reset(eth->dev); ret = device_reset(eth->dev);
if (ret) { if (ret) {
@@ -3059,6 +3066,35 @@ free_netdev: @@ -3076,6 +3083,35 @@ free_netdev:
return err; return err;
} }
@ -261,7 +261,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int mtk_probe(struct platform_device *pdev) static int mtk_probe(struct platform_device *pdev)
{ {
struct device_node *mac_np; struct device_node *mac_np;
@@ -3072,6 +3108,7 @@ static int mtk_probe(struct platform_dev @@ -3089,6 +3125,7 @@ static int mtk_probe(struct platform_dev
eth->soc = of_device_get_match_data(&pdev->dev); eth->soc = of_device_get_match_data(&pdev->dev);
eth->dev = &pdev->dev; eth->dev = &pdev->dev;
@ -269,7 +269,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
eth->base = devm_platform_ioremap_resource(pdev, 0); eth->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(eth->base)) if (IS_ERR(eth->base))
return PTR_ERR(eth->base); return PTR_ERR(eth->base);
@@ -3120,6 +3157,16 @@ static int mtk_probe(struct platform_dev @@ -3137,6 +3174,16 @@ static int mtk_probe(struct platform_dev
} }
} }

View File

@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int mtk_msg_level = -1; static int mtk_msg_level = -1;
module_param_named(msg_level, mtk_msg_level, int, 0); module_param_named(msg_level, mtk_msg_level, int, 0);
@@ -3189,6 +3190,22 @@ static int mtk_probe(struct platform_dev @@ -3206,6 +3207,22 @@ static int mtk_probe(struct platform_dev
} }
} }

View File

@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2315,7 +2315,7 @@ static int mtk_open(struct net_device *d @@ -2332,7 +2332,7 @@ static int mtk_open(struct net_device *d
if (err) if (err)
return err; return err;
@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
gdm_config = MTK_GDMA_TO_PPE; gdm_config = MTK_GDMA_TO_PPE;
mtk_gdm_config(eth, gdm_config); mtk_gdm_config(eth, gdm_config);
@@ -2389,7 +2389,7 @@ static int mtk_stop(struct net_device *d @@ -2406,7 +2406,7 @@ static int mtk_stop(struct net_device *d
mtk_dma_free(eth); mtk_dma_free(eth);
if (eth->soc->offload_version) if (eth->soc->offload_version)
@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0; return 0;
} }
@@ -3281,10 +3281,11 @@ static int mtk_probe(struct platform_dev @@ -3298,10 +3298,11 @@ static int mtk_probe(struct platform_dev
} }
if (eth->soc->offload_version) { if (eth->soc->offload_version) {

View File

@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <net/dsa.h> #include <net/dsa.h>
#include "mtk_eth_soc.h" #include "mtk_eth_soc.h"
@@ -1281,7 +1282,7 @@ static int mtk_poll_rx(struct napi_struc @@ -1292,7 +1293,7 @@ static int mtk_poll_rx(struct napi_struc
struct net_device *netdev; struct net_device *netdev;
unsigned int pktlen; unsigned int pktlen;
dma_addr_t dma_addr; dma_addr_t dma_addr;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
int mac; int mac;
ring = mtk_get_rx_ring(eth); ring = mtk_get_rx_ring(eth);
@@ -1357,6 +1358,11 @@ static int mtk_poll_rx(struct napi_struc @@ -1371,6 +1372,11 @@ static int mtk_poll_rx(struct napi_struc
skb_set_hash(skb, hash, PKT_HASH_TYPE_L4); skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);
} }
@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX && if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX &&
(trxd.rxd2 & RX_DMA_VTAG)) (trxd.rxd2 & RX_DMA_VTAG))
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
@@ -3281,7 +3287,7 @@ static int mtk_probe(struct platform_dev @@ -3298,7 +3304,7 @@ static int mtk_probe(struct platform_dev
} }
if (eth->soc->offload_version) { if (eth->soc->offload_version) {

View File

@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2189,8 +2189,8 @@ static irqreturn_t mtk_handle_irq_rx(int @@ -2206,8 +2206,8 @@ static irqreturn_t mtk_handle_irq_rx(int
eth->rx_events++; eth->rx_events++;
if (likely(napi_schedule_prep(&eth->rx_napi))) { if (likely(napi_schedule_prep(&eth->rx_napi))) {
@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
} }
return IRQ_HANDLED; return IRQ_HANDLED;
@@ -2202,8 +2202,8 @@ static irqreturn_t mtk_handle_irq_tx(int @@ -2219,8 +2219,8 @@ static irqreturn_t mtk_handle_irq_tx(int
eth->tx_events++; eth->tx_events++;
if (likely(napi_schedule_prep(&eth->tx_napi))) { if (likely(napi_schedule_prep(&eth->tx_napi))) {
@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
} }
return IRQ_HANDLED; return IRQ_HANDLED;
@@ -3316,6 +3316,8 @@ static int mtk_probe(struct platform_dev @@ -3333,6 +3333,8 @@ static int mtk_probe(struct platform_dev
* for NAPI to work * for NAPI to work
*/ */
init_dummy_netdev(&eth->dummy_dev); init_dummy_netdev(&eth->dummy_dev);

View File

@ -19,7 +19,7 @@
}, },
[PORT_NPCM] = { [PORT_NPCM] = {
.name = "Nuvoton 16550", .name = "Nuvoton 16550",
@@ -2764,6 +2764,11 @@ serial8250_do_set_termios(struct uart_po @@ -2766,6 +2766,11 @@ serial8250_do_set_termios(struct uart_po
unsigned long flags; unsigned long flags;
unsigned int baud, quot, frac = 0; unsigned int baud, quot, frac = 0;

View File

@ -14,7 +14,7 @@ Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -3367,6 +3367,7 @@ static const struct mtk_soc_data mt2701_ @@ -3384,6 +3384,7 @@ static const struct mtk_soc_data mt2701_
.hw_features = MTK_HW_FEATURES, .hw_features = MTK_HW_FEATURES,
.required_clks = MT7623_CLKS_BITMAP, .required_clks = MT7623_CLKS_BITMAP,
.required_pctl = true, .required_pctl = true,

View File

@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2971,6 +2971,7 @@ static const struct net_device_ops mtk_n @@ -2988,6 +2988,7 @@ static const struct net_device_ops mtk_n
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{ {
@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
const __be32 *_id = of_get_property(np, "reg", NULL); const __be32 *_id = of_get_property(np, "reg", NULL);
phy_interface_t phy_mode; phy_interface_t phy_mode;
struct phylink *phylink; struct phylink *phylink;
@@ -3066,6 +3067,9 @@ static int mtk_add_mac(struct mtk_eth *e @@ -3083,6 +3084,9 @@ static int mtk_add_mac(struct mtk_eth *e
else else
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN; eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;

View File

@ -377,6 +377,7 @@ CONFIG_SENSORS_K8TEMP=y
CONFIG_SENSORS_VIA_CPUTEMP=y CONFIG_SENSORS_VIA_CPUTEMP=y
CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SLS=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM=y
CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_EXTREME=y